(null);
@@ -339,15 +275,11 @@ export function ExecutableCodeBlockNodeView({
{/* Code Content */}
-
+
{
- if (!editor || !note || !editor.view) return;
-
- const currentContent = editor.getHTML();
- if (note.content !== currentContent) {
- const editorHasFocus = editor.isFocused;
-
- if (!editorHasFocus) {
- const { from, to } = editor.state.selection;
-
- editor.commands.setContent(note.content || '', {
- emitUpdate: false,
- parseOptions: {
- preserveWhitespace: 'full',
- },
- });
- lastContentRef.current = note.content || '';
-
- const text = editor.state.doc.textContent;
- updateCounts(text);
-
- try {
- const docSize = editor.state.doc.content.size;
- if (from <= docSize && to <= docSize) {
- editor.commands.setTextSelection({ from, to });
+ if (!editor || !note) return;
+
+ try {
+ // Check if view and dom are available
+ if (!editor.view || !editor.view.dom) return;
+
+ const currentContent = editor.getHTML();
+ if (note.content !== currentContent) {
+ const editorHasFocus = editor.isFocused;
+
+ if (!editorHasFocus) {
+ const { from, to } = editor.state.selection;
+
+ editor.commands.setContent(note.content || '', {
+ emitUpdate: false,
+ parseOptions: {
+ preserveWhitespace: 'full',
+ },
+ });
+ lastContentRef.current = note.content || '';
+
+ const text = editor.state.doc.textContent;
+ updateCounts(text);
+
+ try {
+ const docSize = editor.state.doc.content.size;
+ if (from <= docSize && to <= docSize) {
+ editor.commands.setTextSelection({ from, to });
+ }
+ } catch {
+ // Ignore cursor restoration errors
}
- } catch {
- // Ignore cursor restoration errors
+ } else {
+ lastContentRef.current = currentContent;
}
- } else {
- lastContentRef.current = currentContent;
}
+ } catch {
+ // Silently ignore errors when editor is in transitional state
+ // This can happen during mount/unmount cycles
}
}, [note, editor, updateCounts, lastContentRef]);
// Initialize word count when editor is ready
useEffect(() => {
- if (!editor || !editor.view || !editor.view.dom) return;
+ if (!editor) return;
+
+ try {
+ if (!editor.view || !editor.view.dom) return;
- // Calculate initial word count
- const text = editor.state.doc.textContent;
- updateCounts(text);
+ // Calculate initial word count
+ const text = editor.state.doc.textContent;
+ updateCounts(text);
+ } catch {
+ // Silently ignore errors during initialization
+ }
}, [editor, updateCounts]);
// Track scroll percentage
useEffect(() => {
- if (!editor || !editor.view || !editor.view.dom) return;
+ if (!editor) return;
- const updateScrollPercentage = () => {
- const editorView = editor.view;
- if (!editorView || !editorView.dom) return;
+ try {
+ if (!editor.view || !editor.view.dom) return;
- const { scrollTop, scrollHeight, clientHeight } = editorView.dom;
- const maxScroll = scrollHeight - clientHeight;
+ const updateScrollPercentage = () => {
+ try {
+ if (!editor || !editor.view || !editor.view.dom) return;
- if (maxScroll <= 0) {
- setScrollPercentage(0);
- } else {
- const percentage = Math.round((scrollTop / maxScroll) * 100);
- setScrollPercentage(Math.min(100, Math.max(0, percentage)));
- }
- };
+ const editorView = editor.view;
+ if (!editorView || !editorView.dom) return;
- const editorElement = editor.view.dom;
- editorElement.addEventListener('scroll', updateScrollPercentage);
+ const { scrollTop, scrollHeight, clientHeight } = editorView.dom;
+ const maxScroll = scrollHeight - clientHeight;
- // Initial calculation
- updateScrollPercentage();
+ if (maxScroll <= 0) {
+ setScrollPercentage(0);
+ } else {
+ const percentage = Math.round((scrollTop / maxScroll) * 100);
+ setScrollPercentage(Math.min(100, Math.max(0, percentage)));
+ }
+ } catch {
+ // Silently ignore scroll errors
+ }
+ };
+
+ const editorElement = editor.view.dom;
+ editorElement.addEventListener('scroll', updateScrollPercentage);
+
+ // Initial calculation
+ updateScrollPercentage();
- return () => {
- editorElement.removeEventListener('scroll', updateScrollPercentage);
- };
+ return () => {
+ if (editorElement) {
+ editorElement.removeEventListener('scroll', updateScrollPercentage);
+ }
+ };
+ } catch {
+ // Silently ignore setup errors
+ }
}, [editor, setScrollPercentage]);
// Store the original font size when editor is first created
useEffect(() => {
- if (!editor || !editor.view || !editor.view.dom || baseFontSize) return;
+ if (!editor || baseFontSize) return;
+
+ try {
+ if (!editor.view || !editor.view.dom) return;
- const editorElement = editor.view.dom as HTMLElement;
- const computedStyle = window.getComputedStyle(editorElement);
- const originalFontSize = computedStyle.fontSize;
- setBaseFontSize(originalFontSize);
+ const editorElement = editor.view.dom as HTMLElement;
+ const computedStyle = window.getComputedStyle(editorElement);
+ const originalFontSize = computedStyle.fontSize;
+ setBaseFontSize(originalFontSize);
+ } catch {
+ // Silently ignore font size initialization errors
+ }
}, [editor, baseFontSize, setBaseFontSize]);
// Apply zoom level to editor
useEffect(() => {
- if (!editor || !editor.view || !editor.view.dom || !baseFontSize) return;
-
- const editorElement = editor.view.dom as HTMLElement;
-
- if (zoomLevel === 100) {
- // At 100%, use the original font size
- editorElement.style.fontSize = baseFontSize;
- } else {
- // Calculate the new font size based on the original
- const baseSize = parseFloat(baseFontSize);
- const scaleFactor = zoomLevel / 100;
- const newSize = baseSize * scaleFactor;
- editorElement.style.fontSize = `${newSize}px`;
+ if (!editor || !baseFontSize) return;
+
+ try {
+ if (!editor.view || !editor.view.dom) return;
+
+ const editorElement = editor.view.dom as HTMLElement;
+
+ if (zoomLevel === 100) {
+ // At 100%, use the original font size
+ editorElement.style.fontSize = baseFontSize;
+ } else {
+ // Calculate the new font size based on the original
+ const baseSize = parseFloat(baseFontSize);
+ const scaleFactor = zoomLevel / 100;
+ const newSize = baseSize * scaleFactor;
+ editorElement.style.fontSize = `${newSize}px`;
+ }
+ } catch {
+ // Silently ignore zoom level application errors
}
}, [editor, zoomLevel, baseFontSize]);
}
diff --git a/src/components/layout/MainLayout.tsx b/src/components/layout/MainLayout.tsx
index 43c17ed..0addb0b 100644
--- a/src/components/layout/MainLayout.tsx
+++ b/src/components/layout/MainLayout.tsx
@@ -84,15 +84,22 @@ export default function MainLayout() {
const handleEmptyTrash = useCallback(async () => {
try {
- await api.emptyTrash();
- if (selectedNote && currentView === 'trash') {
+ // Clear selected note if it's in trash, regardless of current view
+ if (selectedNote?.deleted) {
setSelectedNote(null);
}
+
+ // Optimistically remove all trashed notes from UI immediately
+ setNotes(prevNotes => prevNotes.filter(note => !note.deleted));
+
+ await api.emptyTrash();
await refetch();
} catch (error) {
console.error('Failed to empty trash:', error);
+ // Refetch to restore correct state on error
+ await refetch();
}
- }, [selectedNote, currentView, setSelectedNote, refetch]);
+ }, [selectedNote, setSelectedNote, setNotes, refetch]);
const handleToggleFolderPanel = useCallback(() => {
if (!isMobile) {
diff --git a/src/components/notes/NotesPanel/NotesList.tsx b/src/components/notes/NotesPanel/NotesList.tsx
index b0edd57..3c937bc 100644
--- a/src/components/notes/NotesPanel/NotesList.tsx
+++ b/src/components/notes/NotesPanel/NotesList.tsx
@@ -1,17 +1,7 @@
import { useState } from 'react';
-import { Trash2, AlertTriangle } from 'lucide-react';
+import { Trash2 } from 'lucide-react';
-import {
- AlertDialog,
- AlertDialogAction,
- AlertDialogCancel,
- AlertDialogContent,
- AlertDialogDescription,
- AlertDialogFooter,
- AlertDialogHeader,
- AlertDialogTitle,
-} from '@/components/ui/alert-dialog.tsx';
import { Button } from '@/components/ui/button.tsx';
import type { Note, Folder } from '@/types/note.ts';
@@ -38,16 +28,15 @@ export default function NotesList({
emptyMessage,
folders,
}: NotesListProps) {
- const [showEmptyTrashDialog, setShowEmptyTrashDialog] = useState(false);
const [isEmptyingTrash, setIsEmptyingTrash] = useState(false);
const handleEmptyTrash = async () => {
- if (!onEmptyTrash) return;
+ if (!onEmptyTrash || isEmptyingTrash) return;
setIsEmptyingTrash(true);
+
try {
await onEmptyTrash();
- setShowEmptyTrashDialog(false);
} catch (error) {
console.error('Failed to empty trash:', error);
} finally {
@@ -70,11 +59,18 @@ export default function NotesList({