mirror of
https://gitlab.com/ArkHost/HelixNotes.git
synced 2026-09-20 18:07:29 +02:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5d11ae6ea0 | ||
|
|
bc372993c4 | ||
|
|
4897703111 | ||
|
|
1bc067d470 | ||
|
|
565688b284 | ||
|
|
e87a2edc00 | ||
|
|
9f595212dd | ||
|
|
79f16b454a | ||
|
|
7be1b56b7c | ||
|
|
0b17a7c458 |
@@ -1,7 +1,7 @@
|
|||||||
# HelixNotes
|
# HelixNotes
|
||||||
|
|
||||||
[](https://codeberg.org/ArkHost/HelixNotes/src/branch/main/LICENSE)
|
[](https://codeberg.org/ArkHost/HelixNotes/src/branch/main/LICENSE)
|
||||||
[](https://codeberg.org/ArkHost/HelixNotes/releases)
|
[](https://codeberg.org/ArkHost/HelixNotes/releases)
|
||||||
[](https://helixnotes.com)
|
[](https://helixnotes.com)
|
||||||
[]()
|
[]()
|
||||||
|
|
||||||
@@ -10,7 +10,7 @@ A local markdown note-taking app built with Tauri, SvelteKit, and Rust.
|
|||||||
Your notes are stored as standard Markdown files on your local filesystem.
|
Your notes are stored as standard Markdown files on your local filesystem.
|
||||||
No cloud, no lock-in.
|
No cloud, no lock-in.
|
||||||
|
|
||||||
## Download (v1.2.3)
|
## Download (v1.2.6)
|
||||||
|
|
||||||
### Linux
|
### Linux
|
||||||
|
|
||||||
@@ -28,23 +28,23 @@ curl -fsSL https://repo.arkhost.com/gpg.key | sudo gpg --dearmor -o /usr/share/k
|
|||||||
|
|
||||||
#### AppImage (Arch, Fedora 43+, openSUSE Tumbleweed)
|
#### AppImage (Arch, Fedora 43+, openSUSE Tumbleweed)
|
||||||
|
|
||||||
[Download AppImage](https://download.helixnotes.com/releases/v1.2.3/HelixNotes_1.2.3_amd64.AppImage)
|
[Download AppImage](https://download.helixnotes.com/releases/v1.2.6/HelixNotes_1.2.6_amd64.AppImage)
|
||||||
|
|
||||||
#### .deb (manual)
|
#### .deb (manual)
|
||||||
|
|
||||||
[Download .deb](https://codeberg.org/ArkHost/HelixNotes/releases/download/v1.2.3/HelixNotes_1.2.3_amd64.deb) (Ubuntu 22.04+)
|
[Download .deb](https://codeberg.org/ArkHost/HelixNotes/releases/download/v1.2.6/HelixNotes_1.2.6_amd64.deb) (Ubuntu 22.04+)
|
||||||
|
|
||||||
### Windows
|
### Windows
|
||||||
|
|
||||||
[Download Installer](https://codeberg.org/ArkHost/HelixNotes/releases/download/v1.2.3/HelixNotes_1.2.3_x64-setup.exe) (Windows 10/11)
|
[Download Installer](https://codeberg.org/ArkHost/HelixNotes/releases/download/v1.2.6/HelixNotes_1.2.6_x64-setup.exe) (Windows 10/11)
|
||||||
|
|
||||||
### macOS
|
### macOS
|
||||||
|
|
||||||
[Download .dmg](https://codeberg.org/ArkHost/HelixNotes/releases/download/v1.2.3/HelixNotes_1.2.3_x64.dmg) (Intel, runs on Apple Silicon via Rosetta)
|
[Download .dmg](https://codeberg.org/ArkHost/HelixNotes/releases/download/v1.2.6/HelixNotes_1.2.6_x64.dmg) (Intel, runs on Apple Silicon via Rosetta)
|
||||||
|
|
||||||
### Android
|
### Android
|
||||||
|
|
||||||
[Download APK](https://codeberg.org/ArkHost/HelixNotes/releases/download/v1.2.3/HelixNotes_1.2.3_android.apk)
|
[Download APK](https://codeberg.org/ArkHost/HelixNotes/releases/download/v1.2.6/HelixNotes_1.2.6_android.apk)
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -55,7 +55,7 @@ All releases: [codeberg.org/ArkHost/HelixNotes/releases](https://codeberg.org/Ar
|
|||||||
- Markdown editor with toolbar, slash commands, source mode, code highlighting
|
- Markdown editor with toolbar, slash commands, source mode, code highlighting
|
||||||
- `[[Wiki-links]]` and graph view
|
- `[[Wiki-links]]` and graph view
|
||||||
- Full-text search (Tantivy)
|
- Full-text search (Tantivy)
|
||||||
- Outline panel, daily notes, tags, drag-and-drop
|
- Outline panel, daily notes with calendar view, tags, drag-and-drop
|
||||||
- Math (KaTeX), PDF preview, Obsidian import
|
- Math (KaTeX), PDF preview, Obsidian import
|
||||||
- AI writing tools (Ollama / Anthropic / OpenAI)
|
- AI writing tools (Ollama / Anthropic / OpenAI)
|
||||||
- Version history with diffs, automatic backups
|
- Version history with diffs, automatic backups
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
"name": "helixnotes",
|
"name": "helixnotes",
|
||||||
"private": true,
|
"private": true,
|
||||||
"license": "AGPL-3.0-or-later",
|
"license": "AGPL-3.0-or-later",
|
||||||
"version": "1.2.4",
|
"version": "1.2.7",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite dev",
|
"dev": "vite dev",
|
||||||
|
|||||||
Generated
+1
-1
@@ -1850,7 +1850,7 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "helixnotes"
|
name = "helixnotes"
|
||||||
version = "1.2.4"
|
version = "1.2.7"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arboard",
|
"arboard",
|
||||||
"chrono",
|
"chrono",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "helixnotes"
|
name = "helixnotes"
|
||||||
version = "1.2.4"
|
version = "1.2.7"
|
||||||
description = "Local markdown note-taking app"
|
description = "Local markdown note-taking app"
|
||||||
authors = ["HelixNotes"]
|
authors = ["HelixNotes"]
|
||||||
license = "AGPL-3.0-or-later"
|
license = "AGPL-3.0-or-later"
|
||||||
|
|||||||
@@ -12,6 +12,8 @@
|
|||||||
"core:window:allow-close",
|
"core:window:allow-close",
|
||||||
"core:window:allow-is-maximized",
|
"core:window:allow-is-maximized",
|
||||||
"core:window:allow-set-decorations",
|
"core:window:allow-set-decorations",
|
||||||
|
"core:window:allow-is-fullscreen",
|
||||||
|
"core:window:allow-set-fullscreen",
|
||||||
"core:window:allow-set-title",
|
"core:window:allow-set-title",
|
||||||
"core:webview:allow-create-webview-window",
|
"core:webview:allow-create-webview-window",
|
||||||
"dialog:default",
|
"dialog:default",
|
||||||
|
|||||||
+58
-15
@@ -112,6 +112,13 @@ pub fn get_notebooks(state: State<'_, AppState>) -> Result<Vec<NotebookEntry>, S
|
|||||||
operations::scan_notebooks(vault_path)
|
operations::scan_notebooks(vault_path)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn count_root_notes(state: State<'_, AppState>) -> Result<usize, String> {
|
||||||
|
let config = state.config.lock().map_err(|e| e.to_string())?;
|
||||||
|
let vault_path = config.active_vault.as_ref().ok_or("No active vault")?;
|
||||||
|
operations::count_root_notes(vault_path)
|
||||||
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn create_notebook(
|
pub fn create_notebook(
|
||||||
state: State<'_, AppState>,
|
state: State<'_, AppState>,
|
||||||
@@ -201,9 +208,11 @@ pub fn move_notebook(
|
|||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn delete_notebook(state: State<'_, AppState>, path: String) -> Result<(), String> {
|
pub fn delete_notebook(state: State<'_, AppState>, path: String) -> Result<(), String> {
|
||||||
let config = state.config.lock().map_err(|e| e.to_string())?;
|
let vault_path = {
|
||||||
let vault_path = config.active_vault.as_ref().ok_or("No active vault")?;
|
let config = state.config.lock().map_err(|e| e.to_string())?;
|
||||||
operations::delete_notebook(vault_path, &path)
|
config.active_vault.as_ref().ok_or("No active vault")?.clone()
|
||||||
|
};
|
||||||
|
operations::delete_notebook(&vault_path, &path)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── Notes ──
|
// ── Notes ──
|
||||||
@@ -248,6 +257,14 @@ pub fn save_note(
|
|||||||
drop(config);
|
drop(config);
|
||||||
|
|
||||||
operations::save_note(&path, &meta, &body)?;
|
operations::save_note(&path, &meta, &body)?;
|
||||||
|
|
||||||
|
// Re-index note so search picks up changes immediately
|
||||||
|
if let Ok(search_guard) = state.search_index.lock() {
|
||||||
|
if let Some(ref search) = *search_guard {
|
||||||
|
let _ = search.index_note(&path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -272,10 +289,10 @@ pub fn create_note(
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn create_daily_note(state: State<'_, AppState>) -> Result<NoteEntry, String> {
|
pub fn create_daily_note(state: State<'_, AppState>, date: Option<String>) -> Result<NoteEntry, String> {
|
||||||
let config = state.config.lock().map_err(|e| e.to_string())?;
|
let config = state.config.lock().map_err(|e| e.to_string())?;
|
||||||
let vault_path = config.active_vault.as_ref().ok_or("No active vault")?;
|
let vault_path = config.active_vault.as_ref().ok_or("No active vault")?;
|
||||||
let entry = operations::create_daily_note(vault_path)?;
|
let entry = operations::create_daily_note(vault_path, date.as_deref())?;
|
||||||
|
|
||||||
if let Ok(search_guard) = state.search_index.lock() {
|
if let Ok(search_guard) = state.search_index.lock() {
|
||||||
if let Some(ref search) = *search_guard {
|
if let Some(ref search) = *search_guard {
|
||||||
@@ -554,10 +571,10 @@ pub fn reindex(state: State<'_, AppState>) -> Result<(), String> {
|
|||||||
// ── Trash ──
|
// ── Trash ──
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn get_trash(state: State<'_, AppState>) -> Result<Vec<NoteEntry>, String> {
|
pub fn get_trash(state: State<'_, AppState>) -> Result<TrashContents, String> {
|
||||||
let config = state.config.lock().map_err(|e| e.to_string())?;
|
let config = state.config.lock().map_err(|e| e.to_string())?;
|
||||||
let vault_path = config.active_vault.as_ref().ok_or("No active vault")?;
|
let vault_path = config.active_vault.as_ref().ok_or("No active vault")?;
|
||||||
operations::get_trash_notes(vault_path)
|
operations::get_trash_contents(vault_path)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
@@ -566,14 +583,29 @@ pub fn restore_note(
|
|||||||
trash_path: String,
|
trash_path: String,
|
||||||
dest_notebook: Option<String>,
|
dest_notebook: Option<String>,
|
||||||
) -> Result<String, String> {
|
) -> Result<String, String> {
|
||||||
let config = state.config.lock().map_err(|e| e.to_string())?;
|
let vault_path = {
|
||||||
let vault_path = config.active_vault.as_ref().ok_or("No active vault")?;
|
let config = state.config.lock().map_err(|e| e.to_string())?;
|
||||||
operations::restore_note(vault_path, &trash_path, dest_notebook.as_deref())
|
config.active_vault.as_ref().ok_or("No active vault")?.clone()
|
||||||
|
};
|
||||||
|
operations::restore_note(&vault_path, &trash_path, dest_notebook.as_deref())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn permanent_delete(path: String) -> Result<(), String> {
|
pub fn restore_notebook(state: State<'_, AppState>, trash_path: String) -> Result<String, String> {
|
||||||
operations::permanent_delete(&path)
|
let vault_path = {
|
||||||
|
let config = state.config.lock().map_err(|e| e.to_string())?;
|
||||||
|
config.active_vault.as_ref().ok_or("No active vault")?.clone()
|
||||||
|
};
|
||||||
|
operations::restore_notebook(&vault_path, &trash_path)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn permanent_delete(state: State<'_, AppState>, path: String) -> Result<(), String> {
|
||||||
|
let vault_path = {
|
||||||
|
let config = state.config.lock().map_err(|e| e.to_string())?;
|
||||||
|
config.active_vault.as_ref().ok_or("No active vault")?.clone()
|
||||||
|
};
|
||||||
|
operations::permanent_delete(&vault_path, &path)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
@@ -1344,9 +1376,20 @@ fn resolve_wiki_ref(
|
|||||||
pub fn open_file(path: String) -> Result<(), String> {
|
pub fn open_file(path: String) -> Result<(), String> {
|
||||||
#[cfg(target_os = "linux")]
|
#[cfg(target_os = "linux")]
|
||||||
{
|
{
|
||||||
std::process::Command::new("xdg-open")
|
let mut cmd = std::process::Command::new("xdg-open");
|
||||||
.arg(&path)
|
cmd.arg(&path);
|
||||||
.spawn()
|
// Clear AppImage environment so child processes find host binaries
|
||||||
|
// (e.g. gio-launch-desktop on GNOME)
|
||||||
|
if std::env::var("APPIMAGE").is_ok() {
|
||||||
|
cmd.env_remove("LD_LIBRARY_PATH")
|
||||||
|
.env_remove("LD_PRELOAD")
|
||||||
|
.env_remove("GIO_LAUNCHED_DESKTOP_FILE")
|
||||||
|
.env_remove("GIO_LAUNCHED_DESKTOP_FILE_PID");
|
||||||
|
if let Ok(original_path) = std::env::var("PATH_ORIG") {
|
||||||
|
cmd.env("PATH", original_path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
cmd.spawn()
|
||||||
.map_err(|e| format!("Failed to open {}: {}", path, e))?;
|
.map_err(|e| format!("Failed to open {}: {}", path, e))?;
|
||||||
}
|
}
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
|
|||||||
@@ -98,6 +98,7 @@ pub fn run() {
|
|||||||
commands::set_font_family,
|
commands::set_font_family,
|
||||||
commands::set_line_height,
|
commands::set_line_height,
|
||||||
commands::get_notebooks,
|
commands::get_notebooks,
|
||||||
|
commands::count_root_notes,
|
||||||
commands::create_notebook,
|
commands::create_notebook,
|
||||||
commands::rename_notebook,
|
commands::rename_notebook,
|
||||||
commands::delete_notebook,
|
commands::delete_notebook,
|
||||||
@@ -117,6 +118,7 @@ pub fn run() {
|
|||||||
commands::reindex,
|
commands::reindex,
|
||||||
commands::get_trash,
|
commands::get_trash,
|
||||||
commands::restore_note,
|
commands::restore_note,
|
||||||
|
commands::restore_notebook,
|
||||||
commands::permanent_delete,
|
commands::permanent_delete,
|
||||||
commands::empty_trash,
|
commands::empty_trash,
|
||||||
commands::load_vault_state,
|
commands::load_vault_state,
|
||||||
|
|||||||
@@ -9,9 +9,9 @@ use tantivy::collector::TopDocs;
|
|||||||
use tantivy::directory::MmapDirectory;
|
use tantivy::directory::MmapDirectory;
|
||||||
#[cfg(target_os = "android")]
|
#[cfg(target_os = "android")]
|
||||||
use tantivy::directory::RamDirectory;
|
use tantivy::directory::RamDirectory;
|
||||||
use tantivy::query::QueryParser;
|
use tantivy::query::{BooleanQuery, FuzzyTermQuery, Occur, PhrasePrefixQuery, Query};
|
||||||
use tantivy::schema::*;
|
use tantivy::schema::*;
|
||||||
use tantivy::{Index, IndexWriter, TantivyDocument};
|
use tantivy::{Index, IndexWriter, TantivyDocument, Term};
|
||||||
use walkdir::WalkDir;
|
use walkdir::WalkDir;
|
||||||
|
|
||||||
pub struct SearchIndex {
|
pub struct SearchIndex {
|
||||||
@@ -152,14 +152,37 @@ impl SearchIndex {
|
|||||||
let reader = self.index.reader().map_err(|e| e.to_string())?;
|
let reader = self.index.reader().map_err(|e| e.to_string())?;
|
||||||
let searcher = reader.searcher();
|
let searcher = reader.searcher();
|
||||||
|
|
||||||
let query_parser = QueryParser::for_index(
|
let fields = vec![self.title_field, self.body_field, self.tags_field];
|
||||||
&self.index,
|
let terms: Vec<String> = query_str
|
||||||
vec![self.title_field, self.body_field, self.tags_field],
|
.split_whitespace()
|
||||||
);
|
.map(|t| t.to_lowercase())
|
||||||
|
.collect();
|
||||||
|
|
||||||
let query = query_parser
|
// For each search term, create prefix + fuzzy queries across all fields (OR),
|
||||||
.parse_query(query_str)
|
// then AND all terms together
|
||||||
.map_err(|e| e.to_string())?;
|
let term_queries: Vec<(Occur, Box<dyn Query>)> = terms
|
||||||
|
.iter()
|
||||||
|
.map(|term| {
|
||||||
|
let field_queries: Vec<(Occur, Box<dyn Query>)> = fields
|
||||||
|
.iter()
|
||||||
|
.flat_map(|&field| {
|
||||||
|
let prefix: Box<dyn Query> = Box::new(PhrasePrefixQuery::new(
|
||||||
|
vec![Term::from_field_text(field, term)],
|
||||||
|
));
|
||||||
|
let fuzzy: Box<dyn Query> = Box::new(FuzzyTermQuery::new(
|
||||||
|
Term::from_field_text(field, term),
|
||||||
|
1,
|
||||||
|
true,
|
||||||
|
));
|
||||||
|
vec![(Occur::Should, prefix), (Occur::Should, fuzzy)]
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
let combined: Box<dyn Query> = Box::new(BooleanQuery::new(field_queries));
|
||||||
|
(Occur::Must, combined)
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
let query = BooleanQuery::new(term_queries);
|
||||||
|
|
||||||
let top_docs = searcher
|
let top_docs = searcher
|
||||||
.search(&query, &TopDocs::with_limit(limit))
|
.search(&query, &TopDocs::with_limit(limit))
|
||||||
|
|||||||
@@ -19,6 +19,20 @@ pub struct NoteEntry {
|
|||||||
pub preview: String,
|
pub preview: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
pub struct TrashContents {
|
||||||
|
pub notes: Vec<NoteEntry>,
|
||||||
|
pub notebooks: Vec<TrashNotebookEntry>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
pub struct TrashNotebookEntry {
|
||||||
|
pub name: String,
|
||||||
|
pub path: String,
|
||||||
|
pub note_count: usize,
|
||||||
|
pub modified: DateTime<Utc>,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
pub struct NotebookEntry {
|
pub struct NotebookEntry {
|
||||||
pub name: String,
|
pub name: String,
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
use crate::types::{NoteContent, NoteEntry, NoteMeta, NotebookEntry, VaultState};
|
use crate::types::{NoteContent, NoteEntry, NoteMeta, NotebookEntry, TrashContents, TrashNotebookEntry, VaultState};
|
||||||
use crate::vault::frontmatter;
|
use crate::vault::frontmatter;
|
||||||
use chrono::{Local, Locale, Utc};
|
use chrono::{DateTime, Local, Locale, Utc};
|
||||||
use rayon::prelude::*;
|
use rayon::prelude::*;
|
||||||
use std::fs;
|
use std::fs;
|
||||||
use std::io::Read;
|
use std::io::Read;
|
||||||
@@ -63,7 +63,9 @@ fn scan_dir_recursive(dir: &Path, vault_root: &str) -> Vec<NotebookEntry> {
|
|||||||
let mut dirs: Vec<_> = read_dir
|
let mut dirs: Vec<_> = read_dir
|
||||||
.filter_map(|e| e.ok())
|
.filter_map(|e| e.ok())
|
||||||
.filter(|e| {
|
.filter(|e| {
|
||||||
e.file_type().map(|ft| ft.is_dir()).unwrap_or(false) && !is_hidden(&e.path())
|
e.file_type().map(|ft| ft.is_dir()).unwrap_or(false)
|
||||||
|
&& !is_hidden(&e.path())
|
||||||
|
&& e.file_name().to_string_lossy() != "Daily"
|
||||||
})
|
})
|
||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
@@ -165,6 +167,22 @@ fn is_hidden(path: &Path) -> bool {
|
|||||||
.unwrap_or(false)
|
.unwrap_or(false)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn count_root_notes(vault_path: &str) -> Result<usize, String> {
|
||||||
|
let root = Path::new(vault_path);
|
||||||
|
if !root.exists() {
|
||||||
|
return Err("Vault path does not exist".to_string());
|
||||||
|
}
|
||||||
|
let count = fs::read_dir(root)
|
||||||
|
.map_err(|e| e.to_string())?
|
||||||
|
.filter_map(|e| e.ok())
|
||||||
|
.filter(|e| {
|
||||||
|
e.file_type().map(|ft| ft.is_file()).unwrap_or(false)
|
||||||
|
&& e.path().extension().and_then(|x| x.to_str()) == Some("md")
|
||||||
|
})
|
||||||
|
.count();
|
||||||
|
Ok(count)
|
||||||
|
}
|
||||||
|
|
||||||
pub fn scan_notes(vault_path: &str, notebook_path: Option<&str>) -> Result<Vec<NoteEntry>, String> {
|
pub fn scan_notes(vault_path: &str, notebook_path: Option<&str>) -> Result<Vec<NoteEntry>, String> {
|
||||||
let scan_path = notebook_path.unwrap_or(vault_path);
|
let scan_path = notebook_path.unwrap_or(vault_path);
|
||||||
let root = Path::new(scan_path);
|
let root = Path::new(scan_path);
|
||||||
@@ -502,11 +520,15 @@ fn get_system_locale() -> Locale {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn create_daily_note(vault_path: &str) -> Result<NoteEntry, String> {
|
pub fn create_daily_note(vault_path: &str, date: Option<&str>) -> Result<NoteEntry, String> {
|
||||||
let today = Local::now();
|
let target_date = match date {
|
||||||
let date_str = today.format("%Y-%m-%d").to_string();
|
Some(d) => chrono::NaiveDate::parse_from_str(d, "%Y-%m-%d")
|
||||||
|
.map_err(|e| format!("Invalid date: {}", e))?,
|
||||||
|
None => Local::now().date_naive(),
|
||||||
|
};
|
||||||
|
let date_str = target_date.format("%Y-%m-%d").to_string();
|
||||||
let locale = get_system_locale();
|
let locale = get_system_locale();
|
||||||
let title = today.format_localized("%B %d, %Y", locale).to_string();
|
let title = target_date.format_localized("%B %d, %Y", locale).to_string();
|
||||||
|
|
||||||
let dir = Path::new(vault_path).join("Daily");
|
let dir = Path::new(vault_path).join("Daily");
|
||||||
fs::create_dir_all(&dir).map_err(|e| e.to_string())?;
|
fs::create_dir_all(&dir).map_err(|e| e.to_string())?;
|
||||||
@@ -621,6 +643,15 @@ pub fn delete_notebook(vault_path: &str, notebook_path: &str) -> Result<(), Stri
|
|||||||
let trash_name = format!("{}_{}", timestamp, dirname);
|
let trash_name = format!("{}_{}", timestamp, dirname);
|
||||||
let dest = trash_dir.join(&trash_name);
|
let dest = trash_dir.join(&trash_name);
|
||||||
|
|
||||||
|
// Save original relative path in a sidecar .meta file for restore
|
||||||
|
let relative = src
|
||||||
|
.strip_prefix(vault_path)
|
||||||
|
.unwrap_or(src)
|
||||||
|
.to_string_lossy()
|
||||||
|
.to_string();
|
||||||
|
let meta_path = trash_dir.join(format!("{}.meta", trash_name));
|
||||||
|
let _ = fs::write(&meta_path, &relative);
|
||||||
|
|
||||||
fs::rename(src, dest).map_err(|e| e.to_string())?;
|
fs::rename(src, dest).map_err(|e| e.to_string())?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -854,14 +885,29 @@ pub fn move_notebook(notebook_path: &str, dest_parent: &str) -> Result<String, S
|
|||||||
Ok(dest.to_string_lossy().to_string())
|
Ok(dest.to_string_lossy().to_string())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_trash_notes(vault_path: &str) -> Result<Vec<NoteEntry>, String> {
|
/// Remove a directory inside trash if it's empty (after restoring/deleting its last note).
|
||||||
|
fn cleanup_empty_trash_dir(vault_path: &str, dir: Option<&Path>) {
|
||||||
|
let trash_dir = helixnotes_dir(vault_path).join("trash");
|
||||||
|
if let Some(d) = dir {
|
||||||
|
if d != trash_dir && d.starts_with(&trash_dir) {
|
||||||
|
if let Ok(mut entries) = fs::read_dir(d) {
|
||||||
|
if entries.next().is_none() {
|
||||||
|
let _ = fs::remove_dir(d);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_trash_contents(vault_path: &str) -> Result<TrashContents, String> {
|
||||||
let trash_dir = helixnotes_dir(vault_path).join("trash");
|
let trash_dir = helixnotes_dir(vault_path).join("trash");
|
||||||
if !trash_dir.exists() {
|
if !trash_dir.exists() {
|
||||||
return Ok(Vec::new());
|
return Ok(TrashContents { notes: Vec::new(), notebooks: Vec::new() });
|
||||||
}
|
}
|
||||||
|
|
||||||
let vault_root = Path::new(vault_path);
|
let vault_root = Path::new(vault_path);
|
||||||
let mut notes = Vec::new();
|
let mut notes = Vec::new();
|
||||||
|
let mut notebooks = Vec::new();
|
||||||
|
|
||||||
for entry in fs::read_dir(&trash_dir).map_err(|e| e.to_string())? {
|
for entry in fs::read_dir(&trash_dir).map_err(|e| e.to_string())? {
|
||||||
let entry = entry.map_err(|e| e.to_string())?;
|
let entry = entry.map_err(|e| e.to_string())?;
|
||||||
@@ -870,11 +916,39 @@ pub fn get_trash_notes(vault_path: &str) -> Result<Vec<NoteEntry>, String> {
|
|||||||
if let Ok(note) = read_note_entry(&path, vault_root) {
|
if let Ok(note) = read_note_entry(&path, vault_root) {
|
||||||
notes.push(note);
|
notes.push(note);
|
||||||
}
|
}
|
||||||
|
} else if path.is_dir() {
|
||||||
|
// Deleted notebook — count .md files inside
|
||||||
|
let note_count = WalkDir::new(&path)
|
||||||
|
.min_depth(1)
|
||||||
|
.into_iter()
|
||||||
|
.filter_map(|e| e.ok())
|
||||||
|
.filter(|e| e.path().is_file() && e.path().extension().and_then(|x| x.to_str()) == Some("md"))
|
||||||
|
.count();
|
||||||
|
let dirname = path.file_name().unwrap_or_default().to_string_lossy();
|
||||||
|
// Strip timestamp prefix to get original notebook name
|
||||||
|
let name = if dirname.len() > 18 && dirname.chars().nth(17) == Some('_') {
|
||||||
|
dirname[18..].to_string()
|
||||||
|
} else if dirname.len() > 15 && dirname.chars().nth(14) == Some('_') {
|
||||||
|
dirname[15..].to_string()
|
||||||
|
} else {
|
||||||
|
dirname.to_string()
|
||||||
|
};
|
||||||
|
let modified = fs::metadata(&path)
|
||||||
|
.and_then(|m| m.modified())
|
||||||
|
.map(|t| DateTime::<Utc>::from(t))
|
||||||
|
.unwrap_or_else(|_| Utc::now());
|
||||||
|
notebooks.push(TrashNotebookEntry {
|
||||||
|
name,
|
||||||
|
path: path.to_string_lossy().to_string(),
|
||||||
|
note_count,
|
||||||
|
modified,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
notes.sort_by(|a, b| b.meta.modified.cmp(&a.meta.modified));
|
notes.sort_by(|a, b| b.meta.modified.cmp(&a.meta.modified));
|
||||||
Ok(notes)
|
notebooks.sort_by(|a, b| b.modified.cmp(&a.modified));
|
||||||
|
Ok(TrashContents { notes, notebooks })
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn restore_note(
|
pub fn restore_note(
|
||||||
@@ -902,18 +976,66 @@ pub fn restore_note(
|
|||||||
&filename
|
&filename
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let parent = src.parent().map(|p| p.to_path_buf());
|
||||||
let dest = dest_dir.join(original_name);
|
let dest = dest_dir.join(original_name);
|
||||||
fs::rename(src, &dest).map_err(|e| e.to_string())?;
|
fs::rename(src, &dest).map_err(|e| e.to_string())?;
|
||||||
|
|
||||||
|
// Clean up empty parent directory (deleted notebook folder) in trash
|
||||||
|
cleanup_empty_trash_dir(vault_path, parent.as_deref());
|
||||||
|
|
||||||
Ok(dest.to_string_lossy().to_string())
|
Ok(dest.to_string_lossy().to_string())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn permanent_delete(path: &str) -> Result<(), String> {
|
pub fn restore_notebook(vault_path: &str, trash_path: &str) -> Result<String, String> {
|
||||||
|
let src = Path::new(trash_path);
|
||||||
|
if !src.exists() || !src.is_dir() {
|
||||||
|
return Err("Trashed notebook does not exist".to_string());
|
||||||
|
}
|
||||||
|
|
||||||
|
let dirname = src.file_name().unwrap_or_default().to_string_lossy();
|
||||||
|
|
||||||
|
// Try to read original path from sidecar .meta file
|
||||||
|
let meta_path = src.with_extension("").with_file_name(format!("{}.meta", dirname));
|
||||||
|
let relative = if let Ok(original) = fs::read_to_string(&meta_path) {
|
||||||
|
original
|
||||||
|
} else {
|
||||||
|
// Fallback for notebooks trashed before .meta files existed:
|
||||||
|
// strip timestamp prefix to get notebook name, restore to root
|
||||||
|
let name = if dirname.len() > 18 && dirname.chars().nth(17) == Some('_') {
|
||||||
|
&dirname[18..]
|
||||||
|
} else if dirname.len() > 15 && dirname.chars().nth(14) == Some('_') {
|
||||||
|
&dirname[15..]
|
||||||
|
} else {
|
||||||
|
&dirname
|
||||||
|
};
|
||||||
|
name.to_string()
|
||||||
|
};
|
||||||
|
|
||||||
|
let dest = Path::new(vault_path).join(&relative);
|
||||||
|
|
||||||
|
// Recreate parent directories if needed
|
||||||
|
if let Some(parent) = dest.parent() {
|
||||||
|
fs::create_dir_all(parent).map_err(|e| e.to_string())?;
|
||||||
|
}
|
||||||
|
|
||||||
|
fs::rename(src, &dest).map_err(|e| e.to_string())?;
|
||||||
|
// Clean up .meta file
|
||||||
|
let _ = fs::remove_file(&meta_path);
|
||||||
|
Ok(dest.to_string_lossy().to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn permanent_delete(vault_path: &str, path: &str) -> Result<(), String> {
|
||||||
let p = Path::new(path);
|
let p = Path::new(path);
|
||||||
|
let parent = p.parent().map(|pp| pp.to_path_buf());
|
||||||
if p.is_dir() {
|
if p.is_dir() {
|
||||||
fs::remove_dir_all(p).map_err(|e| e.to_string())?;
|
fs::remove_dir_all(p).map_err(|e| e.to_string())?;
|
||||||
} else {
|
} else {
|
||||||
fs::remove_file(p).map_err(|e| e.to_string())?;
|
fs::remove_file(p).map_err(|e| e.to_string())?;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Clean up empty parent directory (deleted notebook folder) in trash
|
||||||
|
cleanup_empty_trash_dir(vault_path, parent.as_deref());
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
|
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
|
||||||
"productName": "HelixNotes",
|
"productName": "HelixNotes",
|
||||||
"version": "1.2.4",
|
"version": "1.2.7",
|
||||||
"identifier": "com.helixnotes.app",
|
"identifier": "com.helixnotes.app",
|
||||||
"build": {
|
"build": {
|
||||||
"frontendDist": "../build",
|
"frontendDist": "../build",
|
||||||
|
|||||||
+12
-3
@@ -7,6 +7,7 @@ import type {
|
|||||||
NotebookEntry,
|
NotebookEntry,
|
||||||
NoteTitleEntry,
|
NoteTitleEntry,
|
||||||
SearchResult,
|
SearchResult,
|
||||||
|
TrashContents,
|
||||||
VaultState,
|
VaultState,
|
||||||
VaultStats,
|
VaultStats,
|
||||||
ImportResult,
|
ImportResult,
|
||||||
@@ -46,6 +47,10 @@ export async function getNotebooks(): Promise<NotebookEntry[]> {
|
|||||||
return invoke("get_notebooks");
|
return invoke("get_notebooks");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function countRootNotes(): Promise<number> {
|
||||||
|
return invoke("count_root_notes");
|
||||||
|
}
|
||||||
|
|
||||||
export async function createNotebook(
|
export async function createNotebook(
|
||||||
parentRelative: string | null,
|
parentRelative: string | null,
|
||||||
name: string,
|
name: string,
|
||||||
@@ -96,8 +101,8 @@ export async function createNote(
|
|||||||
return invoke("create_note", { notebookRelative, title });
|
return invoke("create_note", { notebookRelative, title });
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function createDailyNote(): Promise<NoteEntry> {
|
export async function createDailyNote(date?: string): Promise<NoteEntry> {
|
||||||
return invoke("create_daily_note");
|
return invoke("create_daily_note", { date: date ?? null });
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function renameNote(
|
export async function renameNote(
|
||||||
@@ -141,7 +146,7 @@ export async function reindex(): Promise<void> {
|
|||||||
return invoke("reindex");
|
return invoke("reindex");
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function getTrash(): Promise<NoteEntry[]> {
|
export async function getTrash(): Promise<TrashContents> {
|
||||||
return invoke("get_trash");
|
return invoke("get_trash");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -152,6 +157,10 @@ export async function restoreNote(
|
|||||||
return invoke("restore_note", { trashPath, destNotebook });
|
return invoke("restore_note", { trashPath, destNotebook });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function restoreNotebook(trashPath: string): Promise<string> {
|
||||||
|
return invoke("restore_notebook", { trashPath });
|
||||||
|
}
|
||||||
|
|
||||||
export async function permanentDelete(path: string): Promise<void> {
|
export async function permanentDelete(path: string): Promise<void> {
|
||||||
return invoke("permanent_delete", { path });
|
return invoke("permanent_delete", { path });
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,6 +33,7 @@
|
|||||||
quickAccessPaths,
|
quickAccessPaths,
|
||||||
tags,
|
tags,
|
||||||
notes,
|
notes,
|
||||||
|
viewMode,
|
||||||
updateAvailable as globalUpdateAvailable,
|
updateAvailable as globalUpdateAvailable,
|
||||||
settingsTab
|
settingsTab
|
||||||
} from '$lib/stores/app';
|
} from '$lib/stores/app';
|
||||||
@@ -40,7 +41,7 @@
|
|||||||
const appWindow = getCurrentWindow();
|
const appWindow = getCurrentWindow();
|
||||||
const isMac = navigator.platform.startsWith('Mac');
|
const isMac = navigator.platform.startsWith('Mac');
|
||||||
const isMobile = /android|ios/i.test(navigator.userAgent);
|
const isMobile = /android|ios/i.test(navigator.userAgent);
|
||||||
import { loadVaultState, saveVaultState, readNote, createDailyNote, createBackup, getPendingOpenFile, addQuickAccess, removeQuickAccess, getQuickAccess } from '$lib/api';
|
import { loadVaultState, saveVaultState, readNote, createDailyNote, createBackup, getPendingOpenFile, addQuickAccess, removeQuickAccess, getQuickAccess, setTheme } from '$lib/api';
|
||||||
import { debounce } from '$lib/utils/debounce';
|
import { debounce } from '$lib/utils/debounce';
|
||||||
import { openNoteWindow } from '$lib/utils/window';
|
import { openNoteWindow } from '$lib/utils/window';
|
||||||
import { get } from 'svelte/store';
|
import { get } from 'svelte/store';
|
||||||
@@ -183,7 +184,8 @@
|
|||||||
$activeNotePath = entry.path;
|
$activeNotePath = entry.path;
|
||||||
$editorDirty = false;
|
$editorDirty = false;
|
||||||
editor?.loadNote(entry.path, content.content);
|
editor?.loadNote(entry.path, content.content);
|
||||||
noteList?.refresh();
|
$viewMode = 'daily';
|
||||||
|
noteList?.refresh(true);
|
||||||
sidebar?.refresh();
|
sidebar?.refresh();
|
||||||
if (isMobile) $mobileView = 'editor';
|
if (isMobile) $mobileView = 'editor';
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
@@ -250,6 +252,7 @@
|
|||||||
|
|
||||||
function handleKeydown(e: KeyboardEvent) {
|
function handleKeydown(e: KeyboardEvent) {
|
||||||
const mod = e.ctrlKey || e.metaKey;
|
const mod = e.ctrlKey || e.metaKey;
|
||||||
|
const code = e.code;
|
||||||
if (e.altKey && e.key === 'ArrowLeft') {
|
if (e.altKey && e.key === 'ArrowLeft') {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
navigateHistory(-1);
|
navigateHistory(-1);
|
||||||
@@ -260,19 +263,25 @@
|
|||||||
navigateHistory(1);
|
navigateHistory(1);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (mod && !e.shiftKey && e.key === 'n') {
|
if (mod && !e.shiftKey && code === 'KeyN') {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
createAndFocusNote();
|
createAndFocusNote();
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
if (mod && e.shiftKey && e.key === 'N') {
|
if (mod && e.shiftKey && code === 'KeyN') {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
const isDark = $theme === 'dark' || ($theme === 'system' && window.matchMedia('(prefers-color-scheme: dark)').matches);
|
||||||
|
const next = isDark ? 'light' : 'dark';
|
||||||
|
$theme = next;
|
||||||
|
setTheme(next);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
if (mod && e.shiftKey && e.key === 'F') {
|
if (mod && e.shiftKey && code === 'KeyF') {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
$showSearch = true;
|
$showSearch = true;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (mod && !e.shiftKey && e.key === 'f') {
|
if (mod && !e.shiftKey && code === 'KeyF') {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
if ($activeNotePath) {
|
if ($activeNotePath) {
|
||||||
editor?.openNoteSearch();
|
editor?.openNoteSearch();
|
||||||
@@ -281,28 +290,50 @@
|
|||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (mod && e.key === 'p') {
|
if (mod && !e.shiftKey && code === 'KeyP') {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
$showCommandPalette = true;
|
$showCommandPalette = true;
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
if (mod && e.key === 's') {
|
if (mod && !e.shiftKey && code === 'KeyS') {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
editor?.forceSave();
|
editor?.forceSave();
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
if (mod && e.key === 'k' && !e.shiftKey && $activeNotePath && !$sourceMode) {
|
if (mod && code === 'KeyK' && !e.shiftKey && $activeNotePath && !$sourceMode) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
editor?.addLinkFromToolbar();
|
editor?.addLinkFromToolbar();
|
||||||
}
|
}
|
||||||
if (mod && e.shiftKey && e.key === 'M') {
|
if (mod && e.shiftKey && code === 'KeyM') {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
$sourceMode = !$sourceMode;
|
$sourceMode = !$sourceMode;
|
||||||
}
|
}
|
||||||
if (mod && e.shiftKey && e.key === 'W') {
|
if (mod && e.shiftKey && code === 'KeyW') {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
if ($activeNotePath && $activeNote) {
|
if ($activeNotePath && $activeNote) {
|
||||||
openNoteWindow($activeNotePath, $activeNote.meta.title);
|
openNoteWindow($activeNotePath, $activeNote.meta.title);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (mod && e.key === '\\') {
|
||||||
|
e.preventDefault();
|
||||||
|
$sidebarCollapsed = !$sidebarCollapsed;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (mod && e.shiftKey && code === 'KeyE') {
|
||||||
|
e.preventDefault();
|
||||||
|
$focusMode = !$focusMode;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (mod && e.shiftKey && code === 'KeyR') {
|
||||||
|
e.preventDefault();
|
||||||
|
$readOnly = !$readOnly;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (e.key === 'F11') {
|
||||||
|
e.preventDefault();
|
||||||
|
appWindow.isFullscreen().then(fs => appWindow.setFullscreen(!fs));
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (e.key === 'Escape') {
|
if (e.key === 'Escape') {
|
||||||
if ($showSettings) $showSettings = false;
|
if ($showSettings) $showSettings = false;
|
||||||
else if ($showInfo) $showInfo = false;
|
else if ($showInfo) $showInfo = false;
|
||||||
@@ -402,9 +433,11 @@
|
|||||||
debouncedRefresh();
|
debouncedRefresh();
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
unlistenFileChange = await listen<FileEvent>('file-changed', async () => {
|
const debouncedDesktopRefresh = debounce(async () => {
|
||||||
await sidebar?.refresh();
|
await Promise.all([sidebar?.refresh(), noteList?.refresh(true)]);
|
||||||
await noteList?.refresh(true);
|
}, 300);
|
||||||
|
unlistenFileChange = await listen<FileEvent>('file-changed', () => {
|
||||||
|
debouncedDesktopRefresh();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -199,6 +199,7 @@
|
|||||||
let linkModalInput = $state<HTMLInputElement>(null!);
|
let linkModalInput = $state<HTMLInputElement>(null!);
|
||||||
let linkSelectionFrom = 0;
|
let linkSelectionFrom = 0;
|
||||||
let linkSelectionTo = 0;
|
let linkSelectionTo = 0;
|
||||||
|
let linkModalDisplayText = '';
|
||||||
let linkSuggestIndex = $state(0);
|
let linkSuggestIndex = $state(0);
|
||||||
let linkSuggestTitles = $state<NoteTitleEntry[]>([]);
|
let linkSuggestTitles = $state<NoteTitleEntry[]>([]);
|
||||||
let linkSuggestFiltered = $derived.by(() => {
|
let linkSuggestFiltered = $derived.by(() => {
|
||||||
@@ -306,24 +307,23 @@
|
|||||||
renderHTML({ HTMLAttributes }) {
|
renderHTML({ HTMLAttributes }) {
|
||||||
const src = HTMLAttributes.src || '';
|
const src = HTMLAttributes.src || '';
|
||||||
const name = HTMLAttributes.name || 'file.pdf';
|
const name = HTMLAttributes.name || 'file.pdf';
|
||||||
if (isMobile) {
|
const showInline = !isMobile && ($appConfig?.pdf_preview ?? false);
|
||||||
// On mobile, render as a clickable link instead of iframe
|
if (showInline) {
|
||||||
const vaultRoot = $appConfig?.active_vault ?? '';
|
const vaultRoot = $appConfig?.active_vault ?? '';
|
||||||
|
const pdfHeight = $appConfig?.pdf_height ?? 600;
|
||||||
const absPath = normalizePath(`${vaultRoot}/${decodeURIComponent(src)}`);
|
const absPath = normalizePath(`${vaultRoot}/${decodeURIComponent(src)}`);
|
||||||
return ['div', mergeAttributes({ 'data-pdf-src': src, 'data-pdf-name': name, class: 'pdf-embed-mobile' }),
|
const displaySrc = convertFileSrc(absPath);
|
||||||
['a', { href: '#', 'data-open-file': absPath, class: 'pdf-link-mobile', onclick: 'return false;' },
|
return ['div', mergeAttributes({ 'data-pdf-src': src, 'data-pdf-name': name, class: 'pdf-embed' }),
|
||||||
['span', { class: 'pdf-icon-mobile' }, '\uD83D\uDCC4'],
|
['iframe', { src: displaySrc, width: '100%', height: `${pdfHeight}px`, frameborder: '0' }],
|
||||||
['span', {}, name],
|
['p', { class: 'pdf-label' }, name],
|
||||||
],
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
const vaultRoot = $appConfig?.active_vault ?? '';
|
// Non-inline: render as a clickable link (mobile + desktop with setting off)
|
||||||
const pdfHeight = $appConfig?.pdf_height ?? 600;
|
return ['div', mergeAttributes({ 'data-pdf-src': src, 'data-pdf-name': name, class: 'pdf-embed-mobile' }),
|
||||||
const absPath = normalizePath(`${vaultRoot}/${decodeURIComponent(src)}`);
|
['a', { href: decodeURIComponent(src), class: 'pdf-link-mobile' },
|
||||||
const displaySrc = convertFileSrc(absPath);
|
['span', { class: 'pdf-icon-mobile' }, '\uD83D\uDCC4'],
|
||||||
return ['div', mergeAttributes({ 'data-pdf-src': src, 'data-pdf-name': name, class: 'pdf-embed' }),
|
['span', {}, name],
|
||||||
['iframe', { src: displaySrc, width: '100%', height: `${pdfHeight}px`, frameborder: '0' }],
|
],
|
||||||
['p', { class: 'pdf-label' }, name],
|
|
||||||
];
|
];
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
@@ -2085,16 +2085,17 @@
|
|||||||
return `[${text}](${url.replace(/ /g, '%20')})`;
|
return `[${text}](${url.replace(/ /g, '%20')})`;
|
||||||
});
|
});
|
||||||
|
|
||||||
// Pre-process: transform PDF embed divs — iframes on desktop, clickable links on mobile
|
// Pre-process: transform PDF embed divs — iframes when inline preview is on, clickable links otherwise
|
||||||
src = src.replace(/<div[^>]*data-pdf-src="([^"]*)"[^>]*data-pdf-name="([^"]*)"[^>]*>[^<]*<\/div>/gi, (_, pdfSrc, name) => {
|
src = src.replace(/<div[^>]*data-pdf-src="([^"]*)"[^>]*data-pdf-name="([^"]*)"[^>]*>[^<]*<\/div>/gi, (_, pdfSrc, name) => {
|
||||||
const vaultRoot = $appConfig?.active_vault ?? '';
|
const vaultRoot = $appConfig?.active_vault ?? '';
|
||||||
const absPath = normalizePath(`${vaultRoot}/${decodeURIComponent(pdfSrc)}`);
|
const absPath = normalizePath(`${vaultRoot}/${decodeURIComponent(pdfSrc)}`);
|
||||||
if (isMobile) {
|
const showInline = !isMobile && ($appConfig?.pdf_preview ?? false);
|
||||||
return `<div class="pdf-embed-mobile"><a href="#" data-open-file="${absPath}" class="pdf-link-mobile" onclick="return false;">\uD83D\uDCC4 ${name}</a></div>`;
|
if (showInline) {
|
||||||
|
const pdfHeight = $appConfig?.pdf_height ?? 600;
|
||||||
|
const displaySrc = convertFileSrc(absPath);
|
||||||
|
return `<div data-pdf-src="${pdfSrc}" data-pdf-name="${name}" class="pdf-embed"><iframe src="${displaySrc}" width="100%" height="${pdfHeight}px"></iframe><p class="pdf-label">${name}</p></div>`;
|
||||||
}
|
}
|
||||||
const pdfHeight = $appConfig?.pdf_height ?? 600;
|
return `<div data-pdf-src="${pdfSrc}" data-pdf-name="${name}" class="pdf-embed-mobile"><a href="${decodeURIComponent(pdfSrc)}" class="pdf-link-mobile">\uD83D\uDCC4 ${name}</a></div>`;
|
||||||
const displaySrc = convertFileSrc(absPath);
|
|
||||||
return `<div data-pdf-src="${pdfSrc}" data-pdf-name="${name}" class="pdf-embed"><iframe src="${displaySrc}" width="100%" height="${pdfHeight}px"></iframe><p class="pdf-label">${name}</p></div>`;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// Pre-process: render KaTeX math — only outside fenced code blocks
|
// Pre-process: render KaTeX math — only outside fenced code blocks
|
||||||
@@ -2315,20 +2316,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// On mobile, handle clicks on PDF file links to open in external app
|
|
||||||
...(isMobile ? { click: (_view: any, event: MouseEvent) => {
|
|
||||||
const target = (event.target as HTMLElement).closest('[data-open-file]') as HTMLElement | null;
|
|
||||||
if (target) {
|
|
||||||
event.preventDefault();
|
|
||||||
const filePath = target.getAttribute('data-open-file');
|
|
||||||
if (filePath) {
|
|
||||||
const bridge = (window as any).Android;
|
|
||||||
if (bridge && typeof bridge.openFile === 'function') {
|
|
||||||
bridge.openFile(filePath);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}} : {}),
|
|
||||||
// Prevent native text drag — it causes copy-instead-of-move in Tauri's webview.
|
// Prevent native text drag — it causes copy-instead-of-move in Tauri's webview.
|
||||||
// File drops from OS are handled by Tauri's onDragDropEvent listener instead.
|
// File drops from OS are handled by Tauri's onDragDropEvent listener instead.
|
||||||
dragstart: (_view, event) => {
|
dragstart: (_view, event) => {
|
||||||
@@ -2416,10 +2403,21 @@
|
|||||||
}
|
}
|
||||||
// Store raw URL — encoding is handled during markdown serialization/parsing
|
// Store raw URL — encoding is handled during markdown serialization/parsing
|
||||||
const href = url.replace(/[()]/g, (c) => encodeURIComponent(c));
|
const href = url.replace(/[()]/g, (c) => encodeURIComponent(c));
|
||||||
editor.chain().focus().setTextSelection({ from: linkSelectionFrom, to: linkSelectionTo }).setMark('link', { href }).run();
|
if (linkSelectionFrom === linkSelectionTo) {
|
||||||
|
// No text selected — insert link text with the mark
|
||||||
|
const text = linkModalDisplayText || url.replace(/\.md$/, '').split('/').pop() || url;
|
||||||
|
editor.chain().focus().setTextSelection(linkSelectionFrom).insertContent({
|
||||||
|
type: 'text',
|
||||||
|
text,
|
||||||
|
marks: [{ type: 'link', attrs: { href } }],
|
||||||
|
}).run();
|
||||||
|
} else {
|
||||||
|
editor.chain().focus().setTextSelection({ from: linkSelectionFrom, to: linkSelectionTo }).setMark('link', { href }).run();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
linkModal = false;
|
linkModal = false;
|
||||||
linkModalUrl = '';
|
linkModalUrl = '';
|
||||||
|
linkModalDisplayText = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
function linkModalSelectNote(entry: NoteTitleEntry) {
|
function linkModalSelectNote(entry: NoteTitleEntry) {
|
||||||
@@ -2439,12 +2437,14 @@
|
|||||||
} else {
|
} else {
|
||||||
linkModalUrl = entry.title + '.md';
|
linkModalUrl = entry.title + '.md';
|
||||||
}
|
}
|
||||||
|
linkModalDisplayText = entry.title;
|
||||||
linkModalConfirm();
|
linkModalConfirm();
|
||||||
}
|
}
|
||||||
|
|
||||||
function linkModalCancel() {
|
function linkModalCancel() {
|
||||||
linkModal = false;
|
linkModal = false;
|
||||||
linkModalUrl = '';
|
linkModalUrl = '';
|
||||||
|
linkModalDisplayText = '';
|
||||||
editor?.chain().focus().run();
|
editor?.chain().focus().run();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3014,19 +3014,7 @@
|
|||||||
if (href.startsWith('http://') || href.startsWith('https://') || href.startsWith('mailto:')) {
|
if (href.startsWith('http://') || href.startsWith('https://') || href.startsWith('mailto:')) {
|
||||||
openUrl(href).catch(console.error);
|
openUrl(href).catch(console.error);
|
||||||
} else {
|
} else {
|
||||||
const decoded = decodeURIComponent(href);
|
openFile(resolveHrefToAbsPath(href)).catch(console.error);
|
||||||
let absPath = decoded;
|
|
||||||
if (!decoded.startsWith('/')) {
|
|
||||||
const np = $activeNotePath;
|
|
||||||
if (np) {
|
|
||||||
const noteDir = np.substring(0, np.lastIndexOf('/'));
|
|
||||||
absPath = normalizePath(`${noteDir}/${decoded}`);
|
|
||||||
} else {
|
|
||||||
const vaultRoot = $appConfig?.active_vault;
|
|
||||||
if (vaultRoot) absPath = normalizePath(`${vaultRoot}/${decoded}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
openFile(absPath).catch(console.error);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3046,8 +3034,13 @@
|
|||||||
if (pos >= 0) {
|
if (pos >= 0) {
|
||||||
editor.chain().focus().setTextSelection(pos).extendMarkRange('link').run();
|
editor.chain().focus().setTextSelection(pos).extendMarkRange('link').run();
|
||||||
}
|
}
|
||||||
|
const { from, to } = editor.state.selection;
|
||||||
|
linkSelectionFrom = from;
|
||||||
|
linkSelectionTo = to;
|
||||||
linkModalUrl = decodeURIComponent(href);
|
linkModalUrl = decodeURIComponent(href);
|
||||||
|
linkModalDisplayText = '';
|
||||||
linkModal = true;
|
linkModal = true;
|
||||||
|
getAllNoteTitles().then(t => { linkSuggestTitles = t; }).catch(() => {});
|
||||||
tick().then(() => linkModalInput?.focus());
|
tick().then(() => linkModalInput?.focus());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3071,12 +3064,16 @@
|
|||||||
function resolveHrefToAbsPath(href: string): string {
|
function resolveHrefToAbsPath(href: string): string {
|
||||||
const decoded = decodeURIComponent(href);
|
const decoded = decodeURIComponent(href);
|
||||||
if (decoded.startsWith('/')) return decoded;
|
if (decoded.startsWith('/')) return decoded;
|
||||||
|
// .helixnotes/ paths are always relative to vault root, not the note's directory
|
||||||
|
const vaultRoot = $appConfig?.active_vault;
|
||||||
|
if (decoded.startsWith('.helixnotes/') && vaultRoot) {
|
||||||
|
return normalizePath(`${vaultRoot}/${decoded}`);
|
||||||
|
}
|
||||||
const notePath = $activeNotePath;
|
const notePath = $activeNotePath;
|
||||||
if (notePath) {
|
if (notePath) {
|
||||||
const noteDir = notePath.substring(0, notePath.lastIndexOf('/'));
|
const noteDir = notePath.substring(0, notePath.lastIndexOf('/'));
|
||||||
return normalizePath(`${noteDir}/${decoded}`);
|
return normalizePath(`${noteDir}/${decoded}`);
|
||||||
}
|
}
|
||||||
const vaultRoot = $appConfig?.active_vault;
|
|
||||||
if (vaultRoot) return normalizePath(`${vaultRoot}/${decoded}`);
|
if (vaultRoot) return normalizePath(`${vaultRoot}/${decoded}`);
|
||||||
return decoded;
|
return decoded;
|
||||||
}
|
}
|
||||||
@@ -3781,7 +3778,7 @@
|
|||||||
{/each}
|
{/each}
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
{#if historySelected && historyPreview !== null}
|
{#if historySelected}
|
||||||
<div class="history-actions">
|
<div class="history-actions">
|
||||||
<button class="history-restore-btn" onclick={restoreVersion}>
|
<button class="history-restore-btn" onclick={restoreVersion}>
|
||||||
Restore this version
|
Restore this version
|
||||||
@@ -7183,14 +7180,45 @@
|
|||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.editor-container.mobile .editor-body-row:has(.history-panel) > .editor-body,
|
||||||
|
.editor-container.mobile .editor-body-row:has(.outline-panel) > .editor-body {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
.editor-container.mobile .history-panel,
|
.editor-container.mobile .history-panel,
|
||||||
.editor-container.mobile .outline-panel {
|
.editor-container.mobile .outline-panel {
|
||||||
position: absolute;
|
position: static;
|
||||||
inset: 0;
|
flex: 1;
|
||||||
|
min-height: 0;
|
||||||
width: 100% !important;
|
width: 100% !important;
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
border-left: none;
|
border-left: none;
|
||||||
z-index: 10;
|
}
|
||||||
|
|
||||||
|
.editor-container.mobile .history-item {
|
||||||
|
padding: 12px 12px;
|
||||||
|
min-height: 48px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.editor-container.mobile .history-list {
|
||||||
|
padding-bottom: 80px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.editor-container.mobile .history-restore-btn {
|
||||||
|
padding: 14px 16px;
|
||||||
|
font-size: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.editor-container.mobile .history-actions {
|
||||||
|
position: fixed;
|
||||||
|
bottom: 0;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
padding: 12px;
|
||||||
|
padding-bottom: calc(12px + env(safe-area-inset-bottom, 0px));
|
||||||
|
background: var(--bg-secondary);
|
||||||
|
border-top: 1px solid var(--border-light);
|
||||||
|
z-index: 51;
|
||||||
}
|
}
|
||||||
|
|
||||||
.editor-container.mobile .note-search-bar {
|
.editor-container.mobile .note-search-bar {
|
||||||
|
|||||||
@@ -116,22 +116,37 @@
|
|||||||
</div>
|
</div>
|
||||||
{:else}
|
{:else}
|
||||||
<div class="shortcuts-section">
|
<div class="shortcuts-section">
|
||||||
<h4 class="shortcuts-group-title">Keyboard Shortcuts</h4>
|
<h4 class="shortcuts-group-title">General</h4>
|
||||||
<div class="shortcut-row"><span class="shortcut-desc">New note</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>N</kbd></span></div>
|
<div class="shortcut-row"><span class="shortcut-desc">New note</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>N</kbd></span></div>
|
||||||
|
<div class="shortcut-row"><span class="shortcut-desc">Save</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>S</kbd></span></div>
|
||||||
<div class="shortcut-row"><span class="shortcut-desc">Quick open</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>P</kbd></span></div>
|
<div class="shortcut-row"><span class="shortcut-desc">Quick open</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>P</kbd></span></div>
|
||||||
<div class="shortcut-row"><span class="shortcut-desc">Find in note</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>F</kbd></span></div>
|
<div class="shortcut-row"><span class="shortcut-desc">Find in note</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>F</kbd></span></div>
|
||||||
<div class="shortcut-row"><span class="shortcut-desc">Search vault</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>Shift</kbd>+<kbd>F</kbd></span></div>
|
<div class="shortcut-row"><span class="shortcut-desc">Search vault</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>Shift</kbd>+<kbd>F</kbd></span></div>
|
||||||
<div class="shortcut-row"><span class="shortcut-desc">Save</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>S</kbd></span></div>
|
<div class="shortcut-row"><span class="shortcut-desc">Open note in new window</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>Shift</kbd>+<kbd>W</kbd></span></div>
|
||||||
|
|
||||||
|
<h4 class="shortcuts-group-title">Interface</h4>
|
||||||
|
<div class="shortcut-row"><span class="shortcut-desc">Toggle sidebar</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>\</kbd></span></div>
|
||||||
|
<div class="shortcut-row"><span class="shortcut-desc">Toggle dark / light theme</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>Shift</kbd>+<kbd>N</kbd></span></div>
|
||||||
|
<div class="shortcut-row"><span class="shortcut-desc">Toggle focus mode</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>Shift</kbd>+<kbd>E</kbd></span></div>
|
||||||
|
<div class="shortcut-row"><span class="shortcut-desc">Toggle read-only</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>Shift</kbd>+<kbd>R</kbd></span></div>
|
||||||
|
<div class="shortcut-row"><span class="shortcut-desc">Toggle source / WYSIWYG</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>Shift</kbd>+<kbd>M</kbd></span></div>
|
||||||
|
<div class="shortcut-row"><span class="shortcut-desc">Toggle fullscreen</span><span class="shortcut-keys"><kbd>F11</kbd></span></div>
|
||||||
|
<div class="shortcut-row"><span class="shortcut-desc">Close panel / exit focus</span><span class="shortcut-keys"><kbd>Esc</kbd></span></div>
|
||||||
|
|
||||||
|
<h4 class="shortcuts-group-title">Navigation</h4>
|
||||||
|
<div class="shortcut-row"><span class="shortcut-desc">Go back</span><span class="shortcut-keys"><kbd>Alt</kbd>+<kbd>←</kbd></span></div>
|
||||||
|
<div class="shortcut-row"><span class="shortcut-desc">Go forward</span><span class="shortcut-keys"><kbd>Alt</kbd>+<kbd>→</kbd></span></div>
|
||||||
|
|
||||||
|
<h4 class="shortcuts-group-title">Formatting</h4>
|
||||||
<div class="shortcut-row"><span class="shortcut-desc">Bold</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>B</kbd></span></div>
|
<div class="shortcut-row"><span class="shortcut-desc">Bold</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>B</kbd></span></div>
|
||||||
<div class="shortcut-row"><span class="shortcut-desc">Italic</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>I</kbd></span></div>
|
<div class="shortcut-row"><span class="shortcut-desc">Italic</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>I</kbd></span></div>
|
||||||
<div class="shortcut-row"><span class="shortcut-desc">Underline</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>U</kbd></span></div>
|
<div class="shortcut-row"><span class="shortcut-desc">Underline</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>U</kbd></span></div>
|
||||||
|
<div class="shortcut-row"><span class="shortcut-desc">Strikethrough</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>Shift</kbd>+<kbd>X</kbd></span></div>
|
||||||
|
<div class="shortcut-row"><span class="shortcut-desc">Code</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>E</kbd></span></div>
|
||||||
|
<div class="shortcut-row"><span class="shortcut-desc">Link</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>K</kbd></span></div>
|
||||||
<div class="shortcut-row"><span class="shortcut-desc">Undo</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>Z</kbd></span></div>
|
<div class="shortcut-row"><span class="shortcut-desc">Undo</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>Z</kbd></span></div>
|
||||||
<div class="shortcut-row"><span class="shortcut-desc">Redo</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>Shift</kbd>+<kbd>Z</kbd></span></div>
|
<div class="shortcut-row"><span class="shortcut-desc">Redo</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>Shift</kbd>+<kbd>Z</kbd></span></div>
|
||||||
<div class="shortcut-row"><span class="shortcut-desc">Go back</span><span class="shortcut-keys"><kbd>Alt</kbd>+<kbd>←</kbd></span></div>
|
<div class="shortcut-row"><span class="shortcut-desc">Move line up / down</span><span class="shortcut-keys"><kbd>Alt</kbd>+<kbd>↑↓</kbd></span></div>
|
||||||
<div class="shortcut-row"><span class="shortcut-desc">Go forward</span><span class="shortcut-keys"><kbd>Alt</kbd>+<kbd>→</kbd></span></div>
|
|
||||||
<div class="shortcut-row"><span class="shortcut-desc">Toggle source mode</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>Shift</kbd>+<kbd>M</kbd></span></div>
|
|
||||||
<div class="shortcut-row"><span class="shortcut-desc">Open note in new window</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>Shift</kbd>+<kbd>W</kbd></span></div>
|
|
||||||
<div class="shortcut-row"><span class="shortcut-desc">Exit focus mode</span><span class="shortcut-keys"><kbd>Esc</kbd></span></div>
|
|
||||||
|
|
||||||
<h4 class="shortcuts-group-title">Editor Commands</h4>
|
<h4 class="shortcuts-group-title">Editor Commands</h4>
|
||||||
<div class="shortcut-row"><span class="shortcut-desc">Slash commands</span><span class="shortcut-keys"><kbd>/</kbd></span></div>
|
<div class="shortcut-row"><span class="shortcut-desc">Slash commands</span><span class="shortcut-keys"><kbd>/</kbd></span></div>
|
||||||
|
|||||||
@@ -24,17 +24,19 @@
|
|||||||
saveNote,
|
saveNote,
|
||||||
getTrash,
|
getTrash,
|
||||||
restoreNote,
|
restoreNote,
|
||||||
|
restoreNotebook,
|
||||||
permanentDelete,
|
permanentDelete,
|
||||||
getQuickAccess,
|
getQuickAccess,
|
||||||
addQuickAccess,
|
addQuickAccess,
|
||||||
removeQuickAccess,
|
removeQuickAccess,
|
||||||
reorderQuickAccess,
|
reorderQuickAccess,
|
||||||
moveNote,
|
moveNote,
|
||||||
getAllTags
|
getAllTags,
|
||||||
|
createDailyNote
|
||||||
} from '$lib/api';
|
} from '$lib/api';
|
||||||
import { formatRelativeTime } from '$lib/utils/time';
|
import { formatRelativeTime } from '$lib/utils/time';
|
||||||
import { openNoteWindow } from '$lib/utils/window';
|
import { openNoteWindow } from '$lib/utils/window';
|
||||||
import type { NoteEntry, SortMode } from '$lib/types';
|
import type { NoteEntry, TrashNotebookEntry, SortMode } from '$lib/types';
|
||||||
|
|
||||||
let { onNoteSelected = (_path: string, _content: string) => {}, onNoteMoved = () => {}, onBeforeNoteSwitch = () => {} }: {
|
let { onNoteSelected = (_path: string, _content: string) => {}, onNoteMoved = () => {}, onBeforeNoteSwitch = () => {} }: {
|
||||||
onNoteSelected?: (path: string, content: string) => void;
|
onNoteSelected?: (path: string, content: string) => void;
|
||||||
@@ -46,6 +48,67 @@
|
|||||||
const isMobile = /android|ios/i.test(navigator.userAgent);
|
const isMobile = /android|ios/i.test(navigator.userAgent);
|
||||||
const isAndroid = /android/i.test(navigator.userAgent);
|
const isAndroid = /android/i.test(navigator.userAgent);
|
||||||
let multiSelectMode = $state(false);
|
let multiSelectMode = $state(false);
|
||||||
|
let trashNotebooks = $state<TrashNotebookEntry[]>([]);
|
||||||
|
let trashBusy = $state<string | null>(null);
|
||||||
|
|
||||||
|
// Calendar state for daily notes view
|
||||||
|
let calMonth = $state(new Date().getMonth());
|
||||||
|
let calYear = $state(new Date().getFullYear());
|
||||||
|
let dailyDates = $state<Set<string>>(new Set());
|
||||||
|
|
||||||
|
const calMonthNames = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
|
||||||
|
const calDayNames = ['Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa', 'Su'];
|
||||||
|
|
||||||
|
function calDays(): Array<{ day: number; date: string; current: boolean }> {
|
||||||
|
const first = new Date(calYear, calMonth, 1);
|
||||||
|
const lastDay = new Date(calYear, calMonth + 1, 0).getDate();
|
||||||
|
// Monday=0 offset
|
||||||
|
let startDow = first.getDay() - 1;
|
||||||
|
if (startDow < 0) startDow = 6;
|
||||||
|
const cells: Array<{ day: number; date: string; current: boolean }> = [];
|
||||||
|
for (let i = 0; i < startDow; i++) cells.push({ day: 0, date: '', current: false });
|
||||||
|
for (let d = 1; d <= lastDay; d++) {
|
||||||
|
const mm = String(calMonth + 1).padStart(2, '0');
|
||||||
|
const dd = String(d).padStart(2, '0');
|
||||||
|
const date = `${calYear}-${mm}-${dd}`;
|
||||||
|
const now = new Date();
|
||||||
|
const current = d === now.getDate() && calMonth === now.getMonth() && calYear === now.getFullYear();
|
||||||
|
cells.push({ day: d, date, current });
|
||||||
|
}
|
||||||
|
return cells;
|
||||||
|
}
|
||||||
|
|
||||||
|
function calPrev() {
|
||||||
|
if (calMonth === 0) { calMonth = 11; calYear--; }
|
||||||
|
else calMonth--;
|
||||||
|
}
|
||||||
|
function calNext() {
|
||||||
|
if (calMonth === 11) { calMonth = 0; calYear++; }
|
||||||
|
else calMonth++;
|
||||||
|
}
|
||||||
|
function calToday() {
|
||||||
|
const now = new Date();
|
||||||
|
calMonth = now.getMonth();
|
||||||
|
calYear = now.getFullYear();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handleDayClick(date: string) {
|
||||||
|
try {
|
||||||
|
const entry = await createDailyNote(date);
|
||||||
|
const content = await readNote(entry.path);
|
||||||
|
onBeforeNoteSwitch();
|
||||||
|
$activeNote = content;
|
||||||
|
$activeNotePath = entry.path;
|
||||||
|
onNoteSelected(entry.path, content.content);
|
||||||
|
if (!dailyDates.has(date)) {
|
||||||
|
dailyDates = new Set([...dailyDates, date]);
|
||||||
|
}
|
||||||
|
noteCache.clear();
|
||||||
|
await refresh();
|
||||||
|
} catch (e) {
|
||||||
|
console.error('Failed to open daily note:', e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/** Derive tags from current $notes store (avoids re-scanning files on mobile) */
|
/** Derive tags from current $notes store (avoids re-scanning files on mobile) */
|
||||||
function deriveTagsFromNotes() {
|
function deriveTagsFromNotes() {
|
||||||
@@ -205,6 +268,7 @@
|
|||||||
if ($viewMode === 'notebook') return $activeNotebook?.name ?? 'Notebook';
|
if ($viewMode === 'notebook') return $activeNotebook?.name ?? 'Notebook';
|
||||||
if ($viewMode === 'tag') return `#${$activeTag}`;
|
if ($viewMode === 'tag') return `#${$activeTag}`;
|
||||||
if ($viewMode === 'quickaccess') return 'Quick Access';
|
if ($viewMode === 'quickaccess') return 'Quick Access';
|
||||||
|
if ($viewMode === 'daily') return 'Daily Notes';
|
||||||
if ($viewMode === 'trash') return 'Trash';
|
if ($viewMode === 'trash') return 'Trash';
|
||||||
return 'Notes';
|
return 'Notes';
|
||||||
});
|
});
|
||||||
@@ -214,6 +278,7 @@
|
|||||||
|
|
||||||
function cacheKey(): string {
|
function cacheKey(): string {
|
||||||
if ($viewMode === 'trash') return 'trash';
|
if ($viewMode === 'trash') return 'trash';
|
||||||
|
if ($viewMode === 'daily') return 'daily';
|
||||||
if ($viewMode === 'quickaccess') return 'quickaccess';
|
if ($viewMode === 'quickaccess') return 'quickaccess';
|
||||||
if ($viewMode === 'tag' && $activeTag) return `tag:${$activeTag}`;
|
if ($viewMode === 'tag' && $activeTag) return `tag:${$activeTag}`;
|
||||||
if ($viewMode === 'notebook' && $activeNotebook) return `nb:${$activeNotebook.path}`;
|
if ($viewMode === 'notebook' && $activeNotebook) return `nb:${$activeNotebook.path}`;
|
||||||
@@ -234,7 +299,24 @@
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
if ($viewMode === 'trash') {
|
if ($viewMode === 'trash') {
|
||||||
$notes = await getTrash();
|
const trash = await getTrash();
|
||||||
|
$notes = trash.notes;
|
||||||
|
trashNotebooks = trash.notebooks;
|
||||||
|
} else if ($viewMode === 'daily') {
|
||||||
|
const vault = $appConfig?.active_vault;
|
||||||
|
if (vault) {
|
||||||
|
$notes = await getNotes(`${vault}/Daily`);
|
||||||
|
// Build set of dates from filenames (YYYY-MM-DD.md)
|
||||||
|
const dates = new Set<string>();
|
||||||
|
for (const n of $notes) {
|
||||||
|
const fname = n.path.split('/').pop() ?? '';
|
||||||
|
const m = fname.match(/^(\d{4}-\d{2}-\d{2})\.md$/);
|
||||||
|
if (m) dates.add(m[1]);
|
||||||
|
}
|
||||||
|
dailyDates = dates;
|
||||||
|
} else {
|
||||||
|
$notes = [];
|
||||||
|
}
|
||||||
} else if ($viewMode === 'quickaccess') {
|
} else if ($viewMode === 'quickaccess') {
|
||||||
$notes = await getQuickAccess();
|
$notes = await getQuickAccess();
|
||||||
} else if ($viewMode === 'tag' && $activeTag) {
|
} else if ($viewMode === 'tag' && $activeTag) {
|
||||||
@@ -273,6 +355,14 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function handleCreateNote() {
|
export async function handleCreateNote() {
|
||||||
|
if ($viewMode === 'daily') {
|
||||||
|
const today = new Date();
|
||||||
|
const date = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
|
||||||
|
await handleDayClick(date);
|
||||||
|
calMonth = today.getMonth();
|
||||||
|
calYear = today.getFullYear();
|
||||||
|
return;
|
||||||
|
}
|
||||||
const nbRelative = $viewMode === 'notebook' ? $activeNotebook?.relative_path ?? null : null;
|
const nbRelative = $viewMode === 'notebook' ? $activeNotebook?.relative_path ?? null : null;
|
||||||
try {
|
try {
|
||||||
const entry = await createNote(nbRelative, 'Untitled');
|
const entry = await createNote(nbRelative, 'Untitled');
|
||||||
@@ -351,6 +441,32 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function handleRestoreNotebook(nb: TrashNotebookEntry) {
|
||||||
|
trashBusy = nb.path;
|
||||||
|
try {
|
||||||
|
await restoreNotebook(nb.path);
|
||||||
|
noteCache.clear();
|
||||||
|
await refresh();
|
||||||
|
} catch (e) {
|
||||||
|
console.error('Failed to restore notebook:', e);
|
||||||
|
} finally {
|
||||||
|
trashBusy = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handleDeleteNotebook(nb: TrashNotebookEntry) {
|
||||||
|
trashBusy = nb.path;
|
||||||
|
try {
|
||||||
|
await permanentDelete(nb.path);
|
||||||
|
noteCache.clear();
|
||||||
|
trashNotebooks = trashNotebooks.filter(n => n.path !== nb.path);
|
||||||
|
} catch (e) {
|
||||||
|
console.error('Failed to delete notebook permanently:', e);
|
||||||
|
} finally {
|
||||||
|
trashBusy = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function handleTogglePin(note: NoteEntry) {
|
async function handleTogglePin(note: NoteEntry) {
|
||||||
contextMenu = null;
|
contextMenu = null;
|
||||||
try {
|
try {
|
||||||
@@ -811,7 +927,41 @@
|
|||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<div class="list-content" bind:this={listContainer} onscroll={onListScroll}>
|
<div class="list-content" bind:this={listContainer} onscroll={onListScroll}>
|
||||||
{#if $sortedNotes.length === 0}
|
{#if $viewMode === 'daily'}
|
||||||
|
<div class="cal">
|
||||||
|
<div class="cal-nav">
|
||||||
|
<button class="cal-nav-btn" onclick={calPrev} title="Previous month">
|
||||||
|
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="15 18 9 12 15 6"/></svg>
|
||||||
|
</button>
|
||||||
|
<button class="cal-title" onclick={calToday}>{calMonthNames[calMonth]} {calYear}</button>
|
||||||
|
<button class="cal-nav-btn" onclick={calNext} title="Next month">
|
||||||
|
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="9 18 15 12 9 6"/></svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div class="cal-grid">
|
||||||
|
{#each calDayNames as name}
|
||||||
|
<div class="cal-head">{name}</div>
|
||||||
|
{/each}
|
||||||
|
{#each calDays() as cell}
|
||||||
|
{#if cell.day === 0}
|
||||||
|
<div class="cal-cell empty"></div>
|
||||||
|
{:else}
|
||||||
|
<button
|
||||||
|
class="cal-cell"
|
||||||
|
class:today={cell.current}
|
||||||
|
class:has-note={dailyDates.has(cell.date)}
|
||||||
|
class:active={$activeNotePath?.endsWith(`${cell.date}.md`) ?? false}
|
||||||
|
onclick={() => handleDayClick(cell.date)}
|
||||||
|
>
|
||||||
|
{cell.day}
|
||||||
|
</button>
|
||||||
|
{/if}
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
{#if $sortedNotes.length === 0 && $viewMode !== 'daily' && (!($viewMode === 'trash') || trashNotebooks.length === 0)}
|
||||||
<div class="empty-state">
|
<div class="empty-state">
|
||||||
{#if $viewMode === 'trash'}
|
{#if $viewMode === 'trash'}
|
||||||
<p>Trash is empty</p>
|
<p>Trash is empty</p>
|
||||||
@@ -822,6 +972,37 @@
|
|||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
|
{#if $viewMode === 'trash' && trashNotebooks.length > 0}
|
||||||
|
{#each trashNotebooks as nb (nb.path)}
|
||||||
|
<div class="note-item trash-notebook" class:busy={trashBusy === nb.path}>
|
||||||
|
<div class="note-title">
|
||||||
|
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="flex-shrink:0;opacity:0.6">
|
||||||
|
<path d="M22 19a2 2 0 01-2 2H4a2 2 0 01-2-2V5a2 2 0 012-2h5l2 3h9a2 2 0 012 2z"/>
|
||||||
|
</svg>
|
||||||
|
{nb.name}
|
||||||
|
</div>
|
||||||
|
{#if trashBusy === nb.path}
|
||||||
|
<div class="note-preview trash-busy">
|
||||||
|
<svg class="spinner" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round"><path d="M12 2a10 10 0 0 1 10 10"/></svg>
|
||||||
|
Working...
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
|
<div class="note-preview">{nb.note_count} {nb.note_count === 1 ? 'note' : 'notes'}</div>
|
||||||
|
<div class="trash-notebook-actions">
|
||||||
|
<button class="trash-nb-btn restore" onclick={() => handleRestoreNotebook(nb)} title="Restore notebook">
|
||||||
|
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="1 4 1 10 7 10"/><path d="M3.51 15a9 9 0 105.64-11.36L1 10"/></svg>
|
||||||
|
Restore
|
||||||
|
</button>
|
||||||
|
<button class="trash-nb-btn delete" onclick={() => handleDeleteNotebook(nb)} title="Delete permanently">
|
||||||
|
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="3 6 5 6 21 6"/><path d="M19 6l-1 14H6L5 6"/><path d="M10 11v6"/><path d="M14 11v6"/><path d="M9 6V4h6v2"/></svg>
|
||||||
|
Delete
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{/each}
|
||||||
|
{/if}
|
||||||
|
|
||||||
<div style="height: {topPad}px"></div>
|
<div style="height: {topPad}px"></div>
|
||||||
{#each visibleNotes as note, i (note.path)}
|
{#each visibleNotes as note, i (note.path)}
|
||||||
{@const noteIndex = startIndex + i}
|
{@const noteIndex = startIndex + i}
|
||||||
@@ -1871,4 +2052,165 @@
|
|||||||
.mobile-create-btn:active {
|
.mobile-create-btn:active {
|
||||||
opacity: 0.8;
|
opacity: 0.8;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.trash-notebook .note-title {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.trash-notebook-actions {
|
||||||
|
display: flex;
|
||||||
|
gap: 6px;
|
||||||
|
margin-top: 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.trash-nb-btn {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 4px;
|
||||||
|
padding: 3px 8px;
|
||||||
|
border: none;
|
||||||
|
border-radius: 4px;
|
||||||
|
font-size: 0.75rem;
|
||||||
|
cursor: pointer;
|
||||||
|
background: var(--bg-hover);
|
||||||
|
color: var(--text-secondary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.trash-nb-btn:hover {
|
||||||
|
background: var(--bg-active);
|
||||||
|
}
|
||||||
|
|
||||||
|
.trash-nb-btn.delete:hover {
|
||||||
|
background: color-mix(in srgb, #ef4444 15%, transparent);
|
||||||
|
color: #ef4444;
|
||||||
|
}
|
||||||
|
|
||||||
|
.trash-notebook.busy {
|
||||||
|
opacity: 0.6;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.trash-busy {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.spinner {
|
||||||
|
animation: spin 0.8s linear infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes spin {
|
||||||
|
to { transform: rotate(360deg); }
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Calendar */
|
||||||
|
.cal {
|
||||||
|
padding: 8px 10px;
|
||||||
|
border-bottom: 1px solid var(--border);
|
||||||
|
}
|
||||||
|
|
||||||
|
.cal-nav {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
margin-bottom: 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cal-nav-btn {
|
||||||
|
background: none;
|
||||||
|
border: none;
|
||||||
|
cursor: pointer;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
padding: 4px;
|
||||||
|
border-radius: 4px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cal-nav-btn:hover {
|
||||||
|
background: var(--bg-hover);
|
||||||
|
color: var(--text-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.cal-title {
|
||||||
|
font-size: 0.8rem;
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--text-primary);
|
||||||
|
background: none;
|
||||||
|
border: none;
|
||||||
|
cursor: pointer;
|
||||||
|
padding: 2px 8px;
|
||||||
|
border-radius: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cal-title:hover {
|
||||||
|
background: var(--bg-hover);
|
||||||
|
}
|
||||||
|
|
||||||
|
.cal-grid {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(7, 1fr);
|
||||||
|
gap: 4px 2px;
|
||||||
|
padding: 0 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cal-head {
|
||||||
|
font-size: 0.65rem;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
text-align: center;
|
||||||
|
padding: 2px 0;
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cal-cell {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
font-size: 0.72rem;
|
||||||
|
width: 28px;
|
||||||
|
height: 28px;
|
||||||
|
border-radius: 50%;
|
||||||
|
border: none;
|
||||||
|
background: none;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
cursor: pointer;
|
||||||
|
padding: 0;
|
||||||
|
margin: 0 auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cal-cell.empty {
|
||||||
|
cursor: default;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cal-cell:not(.empty):hover {
|
||||||
|
background: var(--bg-hover);
|
||||||
|
}
|
||||||
|
|
||||||
|
.cal-cell.today {
|
||||||
|
color: var(--accent);
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cal-cell.has-note {
|
||||||
|
background: color-mix(in srgb, var(--accent) 15%, transparent);
|
||||||
|
color: var(--text-primary);
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cal-cell.has-note:hover {
|
||||||
|
background: color-mix(in srgb, var(--accent) 25%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.cal-cell.active {
|
||||||
|
background: var(--accent);
|
||||||
|
color: white;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cal-cell.active:hover {
|
||||||
|
background: var(--accent);
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -67,11 +67,12 @@
|
|||||||
|
|
||||||
function handleKeydown(e: KeyboardEvent) {
|
function handleKeydown(e: KeyboardEvent) {
|
||||||
const mod = e.ctrlKey || e.metaKey;
|
const mod = e.ctrlKey || e.metaKey;
|
||||||
if (mod && e.key === 's') {
|
if (mod && !e.shiftKey && e.code === 'KeyS') {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
editor?.forceSave();
|
editor?.forceSave();
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
if (mod && e.shiftKey && e.key === 'M') {
|
if (mod && e.shiftKey && e.code === 'KeyM') {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
$sourceMode = !$sourceMode;
|
$sourceMode = !$sourceMode;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,9 +15,10 @@
|
|||||||
notebookIcons,
|
notebookIcons,
|
||||||
appConfig,
|
appConfig,
|
||||||
quickAccessPaths,
|
quickAccessPaths,
|
||||||
collapsedNotebooks
|
collapsedNotebooks,
|
||||||
|
rootNoteCount
|
||||||
} from '$lib/stores/app';
|
} from '$lib/stores/app';
|
||||||
import { getNotebooks, getAllTags, createNotebook, deleteNotebook, renameNotebook, moveNotebook, getNotebookIcons, setNotebookIcon, saveAttachment, getQuickAccess, addQuickAccess, removeQuickAccess, emptyTrash, moveNote, readNote, getNotes } from '$lib/api';
|
import { getNotebooks, getAllTags, createNotebook, deleteNotebook, renameNotebook, moveNotebook, getNotebookIcons, setNotebookIcon, saveAttachment, getQuickAccess, addQuickAccess, removeQuickAccess, emptyTrash, moveNote, readNote, getNotes, countRootNotes } from '$lib/api';
|
||||||
import { open as openDialog } from '@tauri-apps/plugin-dialog';
|
import { open as openDialog } from '@tauri-apps/plugin-dialog';
|
||||||
import { readFile } from '@tauri-apps/plugin-fs';
|
import { readFile } from '@tauri-apps/plugin-fs';
|
||||||
import { convertFileSrc } from '@tauri-apps/api/core';
|
import { convertFileSrc } from '@tauri-apps/api/core';
|
||||||
@@ -53,16 +54,20 @@
|
|||||||
try {
|
try {
|
||||||
if (isMobile) {
|
if (isMobile) {
|
||||||
// On mobile, parallelize and skip getAllTags (derive from $notes instead)
|
// On mobile, parallelize and skip getAllTags (derive from $notes instead)
|
||||||
const [nbs, icons, qaNotes] = await Promise.all([
|
const [nbs, icons, qaNotes, rootCount] = await Promise.all([
|
||||||
getNotebooks(),
|
getNotebooks(),
|
||||||
getNotebookIcons(),
|
getNotebookIcons(),
|
||||||
getQuickAccess(),
|
getQuickAccess(),
|
||||||
|
countRootNotes(),
|
||||||
]);
|
]);
|
||||||
$notebooks = nbs;
|
$notebooks = nbs;
|
||||||
$notebookIcons = icons;
|
$notebookIcons = icons;
|
||||||
$quickAccessPaths = qaNotes.map(n => n.relative_path);
|
$quickAccessPaths = qaNotes.map(n => n.relative_path);
|
||||||
|
$rootNoteCount = rootCount;
|
||||||
} else {
|
} else {
|
||||||
$notebooks = await getNotebooks();
|
const [nbs, rootCount] = await Promise.all([getNotebooks(), countRootNotes()]);
|
||||||
|
$notebooks = nbs;
|
||||||
|
$rootNoteCount = rootCount;
|
||||||
$tags = await getAllTags();
|
$tags = await getAllTags();
|
||||||
$notebookIcons = await getNotebookIcons();
|
$notebookIcons = await getNotebookIcons();
|
||||||
const qaNotes = await getQuickAccess();
|
const qaNotes = await getQuickAccess();
|
||||||
@@ -80,6 +85,19 @@
|
|||||||
onViewChanged();
|
onViewChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function selectUnfiled() {
|
||||||
|
const vault = $appConfig?.active_vault;
|
||||||
|
if (!vault) return;
|
||||||
|
if ($viewMode === 'notebook' && $activeNotebook?.relative_path === '') {
|
||||||
|
selectAllNotes();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
$viewMode = 'notebook';
|
||||||
|
$activeNotebook = { name: 'Unfiled Notes', path: vault, relative_path: '', children: [], note_count: $rootNoteCount };
|
||||||
|
$activeTag = null;
|
||||||
|
onViewChanged();
|
||||||
|
}
|
||||||
|
|
||||||
function selectNotebook(nb: NotebookEntry) {
|
function selectNotebook(nb: NotebookEntry) {
|
||||||
// Deselect if clicking the already-active notebook
|
// Deselect if clicking the already-active notebook
|
||||||
if ($viewMode === 'notebook' && $activeNotebook?.path === nb.path) {
|
if ($viewMode === 'notebook' && $activeNotebook?.path === nb.path) {
|
||||||
@@ -106,6 +124,13 @@
|
|||||||
onViewChanged();
|
onViewChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function selectDaily() {
|
||||||
|
$viewMode = 'daily';
|
||||||
|
$activeNotebook = null;
|
||||||
|
$activeTag = null;
|
||||||
|
onViewChanged();
|
||||||
|
}
|
||||||
|
|
||||||
function selectTrash() {
|
function selectTrash() {
|
||||||
$viewMode = 'trash';
|
$viewMode = 'trash';
|
||||||
$activeNotebook = null;
|
$activeNotebook = null;
|
||||||
@@ -379,6 +404,20 @@
|
|||||||
<span>Quick Access</span>
|
<span>Quick Access</span>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
|
<button
|
||||||
|
class="nav-item"
|
||||||
|
class:active={$viewMode === 'daily'}
|
||||||
|
onclick={selectDaily}
|
||||||
|
>
|
||||||
|
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||||
|
<rect x="3" y="4" width="18" height="18" rx="2" ry="2" />
|
||||||
|
<line x1="16" y1="2" x2="16" y2="6" />
|
||||||
|
<line x1="8" y1="2" x2="8" y2="6" />
|
||||||
|
<line x1="3" y1="10" x2="21" y2="10" />
|
||||||
|
</svg>
|
||||||
|
<span>Daily Notes</span>
|
||||||
|
</button>
|
||||||
|
|
||||||
<button
|
<button
|
||||||
class="nav-item"
|
class="nav-item"
|
||||||
class:active={$viewMode === 'trash'}
|
class:active={$viewMode === 'trash'}
|
||||||
@@ -445,6 +484,20 @@
|
|||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<div class="notebook-list">
|
<div class="notebook-list">
|
||||||
|
{#if $rootNoteCount > 0}
|
||||||
|
<button
|
||||||
|
class="notebook-item"
|
||||||
|
class:active={$viewMode === 'notebook' && $activeNotebook?.relative_path === ''}
|
||||||
|
onclick={selectUnfiled}
|
||||||
|
>
|
||||||
|
<span style="width:13px;flex-shrink:0"></span>
|
||||||
|
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="flex-shrink:0;opacity:0.6">
|
||||||
|
<path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z" />
|
||||||
|
<polyline points="14 2 14 8 20 8" />
|
||||||
|
</svg>
|
||||||
|
<span class="notebook-name">Unfiled Notes <span class="notebook-count">{$rootNoteCount}</span></span>
|
||||||
|
</button>
|
||||||
|
{/if}
|
||||||
{#each $notebooks as nb (nb.path)}
|
{#each $notebooks as nb (nb.path)}
|
||||||
{@render notebookItem(nb, 0)}
|
{@render notebookItem(nb, 0)}
|
||||||
{/each}
|
{/each}
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ export const collapsedNotebooks = writable<string[]>([]);
|
|||||||
|
|
||||||
// Data
|
// Data
|
||||||
export const notebooks = writable<NotebookEntry[]>([]);
|
export const notebooks = writable<NotebookEntry[]>([]);
|
||||||
|
export const rootNoteCount = writable<number>(0);
|
||||||
export const notes = writable<NoteEntry[]>([]);
|
export const notes = writable<NoteEntry[]>([]);
|
||||||
export const tags = writable<[string, number][]>([]);
|
export const tags = writable<[string, number][]>([]);
|
||||||
export const activeNote = writable<NoteContent | null>(null);
|
export const activeNote = writable<NoteContent | null>(null);
|
||||||
|
|||||||
+14
-1
@@ -14,6 +14,18 @@ export interface NoteEntry {
|
|||||||
preview: string;
|
preview: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface TrashNotebookEntry {
|
||||||
|
name: string;
|
||||||
|
path: string;
|
||||||
|
note_count: number;
|
||||||
|
modified: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TrashContents {
|
||||||
|
notes: NoteEntry[];
|
||||||
|
notebooks: TrashNotebookEntry[];
|
||||||
|
}
|
||||||
|
|
||||||
export interface NotebookEntry {
|
export interface NotebookEntry {
|
||||||
name: string;
|
name: string;
|
||||||
path: string;
|
path: string;
|
||||||
@@ -131,4 +143,5 @@ export type ViewMode =
|
|||||||
| "tag"
|
| "tag"
|
||||||
| "trash"
|
| "trash"
|
||||||
| "search"
|
| "search"
|
||||||
| "quickaccess";
|
| "quickaccess"
|
||||||
|
| "daily";
|
||||||
|
|||||||
@@ -33,6 +33,19 @@
|
|||||||
return resolved.join('/');
|
return resolved.join('/');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const isAndroid = /android/i.test(navigator.userAgent);
|
||||||
|
|
||||||
|
function openLocalFile(path: string) {
|
||||||
|
if (isAndroid) {
|
||||||
|
const bridge = (window as any).Android;
|
||||||
|
if (bridge && typeof bridge.openFile === 'function') {
|
||||||
|
bridge.openFile(path);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
openFile(path).catch((err) => console.error('Failed to open file:', err));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function resolveAndHandleLink(href: string) {
|
function resolveAndHandleLink(href: string) {
|
||||||
if (href.startsWith('http://') || href.startsWith('https://') || href.startsWith('mailto:')) {
|
if (href.startsWith('http://') || href.startsWith('https://') || href.startsWith('mailto:')) {
|
||||||
openUrl(href).catch((err) => console.error('Failed to open URL:', err));
|
openUrl(href).catch((err) => console.error('Failed to open URL:', err));
|
||||||
@@ -42,12 +55,17 @@
|
|||||||
const vaultRoot = config?.active_vault;
|
const vaultRoot = config?.active_vault;
|
||||||
let absPath = decoded;
|
let absPath = decoded;
|
||||||
if (!decoded.startsWith('/') && vaultRoot) {
|
if (!decoded.startsWith('/') && vaultRoot) {
|
||||||
const notePath = get(activeNotePath);
|
// .helixnotes/ paths are always relative to vault root, not the note's directory
|
||||||
if (notePath) {
|
if (decoded.startsWith('.helixnotes/')) {
|
||||||
const noteDir = notePath.substring(0, notePath.lastIndexOf('/'));
|
|
||||||
absPath = normalizePath(`${noteDir}/${decoded}`);
|
|
||||||
} else {
|
|
||||||
absPath = normalizePath(`${vaultRoot}/${decoded}`);
|
absPath = normalizePath(`${vaultRoot}/${decoded}`);
|
||||||
|
} else {
|
||||||
|
const notePath = get(activeNotePath);
|
||||||
|
if (notePath) {
|
||||||
|
const noteDir = notePath.substring(0, notePath.lastIndexOf('/'));
|
||||||
|
absPath = normalizePath(`${noteDir}/${decoded}`);
|
||||||
|
} else {
|
||||||
|
absPath = normalizePath(`${vaultRoot}/${decoded}`);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Internal .md note link — navigate within the app
|
// Internal .md note link — navigate within the app
|
||||||
@@ -57,7 +75,7 @@
|
|||||||
activeNotePath.set(absPath);
|
activeNotePath.set(absPath);
|
||||||
}).catch((err) => console.error('Failed to navigate to note:', err));
|
}).catch((err) => console.error('Failed to navigate to note:', err));
|
||||||
} else {
|
} else {
|
||||||
openFile(absPath).catch((err) => console.error('Failed to open file:', err));
|
openLocalFile(absPath);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -76,7 +94,17 @@
|
|||||||
// Intercept all link clicks in capture phase to prevent webview navigation
|
// Intercept all link clicks in capture phase to prevent webview navigation
|
||||||
onMount(() => {
|
onMount(() => {
|
||||||
function handleLinkClick(e: MouseEvent) {
|
function handleLinkClick(e: MouseEvent) {
|
||||||
const target = (e.target as HTMLElement)?.closest('a');
|
const el = e.target as HTMLElement;
|
||||||
|
// PDF/attachment embeds: check for data-open-file on target or ancestors
|
||||||
|
const fileTarget = el?.closest('[data-open-file]') as HTMLElement | null;
|
||||||
|
if (fileTarget) {
|
||||||
|
e.preventDefault();
|
||||||
|
e.stopPropagation();
|
||||||
|
e.stopImmediatePropagation();
|
||||||
|
openLocalFile(fileTarget.getAttribute('data-open-file')!);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const target = el?.closest('a');
|
||||||
if (!target) return;
|
if (!target) return;
|
||||||
const href = target.getAttribute('href');
|
const href = target.getAttribute('href');
|
||||||
if (!href) return;
|
if (!href) return;
|
||||||
@@ -97,10 +125,22 @@
|
|||||||
touchStartY = e.touches[0]?.clientY ?? 0;
|
touchStartY = e.touches[0]?.clientY ?? 0;
|
||||||
}
|
}
|
||||||
function handleTouchEnd(e: TouchEvent) {
|
function handleTouchEnd(e: TouchEvent) {
|
||||||
const endY = e.changedTouches[0]?.clientY ?? 0;
|
const touch = e.changedTouches[0];
|
||||||
|
if (!touch) return;
|
||||||
|
const endY = touch.clientY;
|
||||||
// If the finger moved > 10px, it's a scroll, not a tap
|
// If the finger moved > 10px, it's a scroll, not a tap
|
||||||
if (Math.abs(endY - touchStartY) > 10) return;
|
if (Math.abs(endY - touchStartY) > 10) return;
|
||||||
const target = (e.target as HTMLElement)?.closest('a');
|
// Android WebView may report e.target as the editor root for elements
|
||||||
|
// inside contenteditable="false" blocks; use elementFromPoint instead
|
||||||
|
const el = (document.elementFromPoint(touch.clientX, touch.clientY) ?? e.target) as HTMLElement;
|
||||||
|
// PDF/attachment embeds: check for data-open-file on target or ancestors
|
||||||
|
const fileTarget = el?.closest('[data-open-file]') as HTMLElement | null;
|
||||||
|
if (fileTarget) {
|
||||||
|
e.preventDefault();
|
||||||
|
openLocalFile(fileTarget.getAttribute('data-open-file')!);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const target = el?.closest('a');
|
||||||
if (!target) return;
|
if (!target) return;
|
||||||
const href = target.getAttribute('href');
|
const href = target.getAttribute('href');
|
||||||
if (!href) return;
|
if (!href) return;
|
||||||
|
|||||||
Reference in New Issue
Block a user