Merge pull request #8 from johnSamilin/master

2.1.0

Author: johnSamilin

src/App.tsx

@@ -149,10 +149,11 @@ const App = observer(() => {
   }, [settingsStore.syncMode, settingsStore.server, settingsStore.webDAV]);
 
   useEffect(() => {
-    if (editor && notesStore.selectedNote) {
+    if (editor && notesStore.selectedNote && !notesStore.isLoadingNoteContent) {
       // Load note content if not already loaded
       if (!notesStore.selectedNote.content) {
         notesStore.loadNoteContent(notesStore.selectedNote);
+        return; // Don't set content until loading is complete
       }
 
       if (notesStore.selectedNote.isCensored && settingsStore.isCensorshipEnabled()) {
@@ -180,7 +181,7 @@ const App = observer(() => {
       }
       setAutoZenDisabled(false);
     }
-  }, [editor, notesStore.selectedNote, settingsStore.isCensorshipEnabled()]);
+  }, [editor, notesStore.selectedNote, settingsStore.isCensorshipEnabled(), notesStore.isLoadingNoteContent]);
 
   useEffect(() => {
     if (!settingsStore.isZenMode) {

src/components/Editor/Editor.css

@@ -364,4 +364,28 @@
 
 .zen-mode .language-selector {
   left: 8rem;
+}
+
+.note-loading-overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(255, 255, 255, 0.9);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 10;
+}
+
+.note-loading-message {
+  padding: 1rem 2rem;
+  background: var(--color-white);
+  border-radius: 0.5rem;
+  box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1);
+  border: 1px solid var(--color-border);
+  color: var(--color-text);
+  font-family: 'Outfit', system-ui, sans-serif;
+  font-size: 0.875rem;
 }

src/components/Editor/Editor.tsx

@@ -405,7 +405,6 @@ export const Editor: FC<EditorProps> = observer(({
             <button
               onClick={handleNextNote}
               className="button-icon"
-              disabled={!hasNext}
               title="Next note"
             >
               <ArrowRight className="h-4 w-4" />

src/stores/NotesStore.ts

@@ -18,6 +18,7 @@ export class NotesStore {
   focusedNotebookId: string | null = null;
   isEditing = false;
   isLoading = false;
+  isLoadingNoteContent = false;
   private notebooksByParentId = new Map<string | null, Notebook[]>();
   private notesByNotebookId = new Map<string | null, Note[]>();
 
@@ -29,6 +30,7 @@ export class NotesStore {
       focusedNotebookId: observable,
       isEditing: observable,
       isLoading: observable,
+      isLoadingNoteContent: observable,
     });
     this.loadFromStorage();
   }
@@ -426,13 +428,17 @@ export class NotesStore {
   async loadNoteContent(note: Note): Promise<void> {
     if (note.content) return; // Already loaded
 
+    this.isLoadingNoteContent = true;
+    
     try {
       const dbNote = await db.getNote(note.id);
       if (dbNote) {
         note.content = dbNote.content;
       }
     } catch (error) {
       console.error('Error loading note content:', error);
+    } finally {
+      this.isLoadingNoteContent = false;
     }
   }