From ac25dfd7733130166de52db22593e696310d8451 Mon Sep 17 00:00:00 2001 From: Yuri Karamian Date: Thu, 6 Aug 2026 14:01:47 +0200 Subject: [PATCH] Move note trash action into Note Info --- src/lib/components/Editor.svelte | 108 ++++++++++++++++++------------- 1 file changed, 63 insertions(+), 45 deletions(-) diff --git a/src/lib/components/Editor.svelte b/src/lib/components/Editor.svelte index 49b5cc0..3a503af 100644 --- a/src/lib/components/Editor.svelte +++ b/src/lib/components/Editor.svelte @@ -41,7 +41,7 @@ import { readFile } from '@tauri-apps/plugin-fs'; import { openFile, openUrl, copyFileTo, copyImageToClipboard as copyImageToClipboardCmd, writeBytesTo, copyPngToClipboard, copyTextToClipboard } from '$lib/api'; import { save as saveDialog } from '@tauri-apps/plugin-dialog'; - import { activeNote, activeNotePath, appConfig, editorDirty, sourceMode, focusMode, readOnly, quickAccessPaths, notes, navHistory, canGoBack, canGoForward, viewerNote, notebooks, outlineWidth } from '$lib/stores/app'; + import { activeNote, activeNotePath, appConfig, editorDirty, sourceMode, focusMode, readOnly, quickAccessPaths, notes, navHistory, canGoBack, canGoForward, viewerNote, viewMode, notebooks, outlineWidth } from '$lib/stores/app'; import { saveNote, saveImage, saveAttachment, readClipboardImage, addQuickAccess, removeQuickAccess, getQuickAccess, getNoteVersions, getNoteVersionContent, createVersion, aiAsk, getAllNoteTitles, readNote, renameNote } from '$lib/api'; import type { VersionEntry, AiStreamEvent, NoteTitleEntry, TaskItem as TaskRecord } from '$lib/types'; import { listen } from '@tauri-apps/api/event'; @@ -59,7 +59,7 @@ import { isMobile, isAndroid } from '$lib/platform'; import ResizeHandle from './ResizeHandle.svelte'; - let { onMoveToTrash = async () => false }: { + let { onMoveToTrash }: { onMoveToTrash?: (path: string) => Promise; } = $props(); @@ -3063,7 +3063,8 @@ } export async function moveOpenNoteToTrash(): Promise { - if (trashingNote || !$activeNotePath || $viewerNote) return false; + const moveToTrash = onMoveToTrash; + if (trashingNote || !$activeNotePath || $viewerNote || !moveToTrash) return false; const path = $activeNotePath; const wasDirty = $editorDirty; trashingNote = true; @@ -3074,7 +3075,7 @@ if ($activeNotePath !== path) return false; // A queued debounce observes this flag and cannot recreate the moved note. $editorDirty = false; - return await onMoveToTrash(path); + return await moveToTrash(path); } finally { trashingNote = false; } @@ -6039,13 +6040,6 @@ }} /> - {#if isMobile} - - {/if} {#if !isMobile}
{#if $canGoBack || $canGoForward} @@ -6184,11 +6178,6 @@ {/if} -
-
+
Details
Modified @@ -6579,6 +6568,17 @@ {/if}
+ {#if onMoveToTrash && $viewMode !== 'trash'} +
+ +
+ {/if} +
{/if}
@@ -8167,17 +8167,6 @@ color: var(--text-primary); } - .editor-trash-btn:hover, - .editor-trash-btn:focus-visible { - color: var(--danger); - background: color-mix(in srgb, var(--danger) 12%, transparent); - } - - .editor-trash-btn:disabled { - opacity: 0.45; - cursor: default; - } - .icon-btn.active { color: var(--text-accent); background: var(--accent-light); @@ -11323,9 +11312,9 @@ .editor-container.mobile .editor-toolbar { padding: 8px 16px 6px 16px; flex-shrink: 0; - flex-direction: row; - align-items: center; - gap: 8px; + flex-direction: column; + align-items: stretch; + gap: 2px; } .toolbar-actions.mobile { @@ -11350,20 +11339,6 @@ padding: 4px 0; } - .editor-container.mobile .editor-trash-btn.mobile { - width: 44px; - height: 44px; - padding: 0; - flex-shrink: 0; - justify-content: center; - border-radius: 8px; - } - - .editor-container.mobile .editor-trash-btn.mobile:active { - color: var(--danger); - background: color-mix(in srgb, var(--danger) 12%, transparent); - } - .editor-container.mobile .editor-body-wrapper { flex: 1; min-height: 0; @@ -11661,9 +11636,47 @@ .info-section:last-child { border-bottom: none; + } + + .info-details { flex: 1; } + .info-actions { + padding: 12px 14px; + } + + .info-trash-btn { + display: flex; + align-items: center; + justify-content: center; + gap: 7px; + width: 100%; + min-height: 36px; + border: 1px solid color-mix(in srgb, var(--danger) 30%, var(--border-color)); + border-radius: 6px; + background: transparent; + color: var(--danger); + font: inherit; + font-size: 12px; + font-weight: 600; + cursor: pointer; + } + + .info-trash-btn:hover { + background: color-mix(in srgb, var(--danger) 10%, transparent); + } + + .info-trash-btn:focus-visible { + outline: 2px solid var(--danger); + outline-offset: 2px; + } + + .info-trash-btn:disabled { + opacity: 0.45; + cursor: default; + } + .info-section-label { font-size: 11px; font-weight: 600; @@ -11787,4 +11800,9 @@ border-left: none; border-top: 1px solid var(--border-light); } + + .editor-container.mobile .info-trash-btn { + min-height: 44px; + font-size: 14px; + }