fix(notes): preserve sidebar after search clear (#768)

Author: antonreshetov

src/renderer/composables/spaces/notes/__tests__/useNotesApp.test.ts

@@ -0,0 +1,75 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { computed, reactive, ref, watch } from 'vue'
+
+globalThis.computed = computed
+globalThis.reactive = reactive
+globalThis.ref = ref
+globalThis.watch = watch
+
+const storeGet = vi.fn()
+const storeSet = vi.fn()
+
+async function setup() {
+  vi.resetModules()
+
+  storeGet.mockImplementation((key: string) => {
+    if (key === 'notes.selection') {
+      return {}
+    }
+
+    if (key === 'notes.editorMode') {
+      return 'livePreview'
+    }
+
+    if (key === 'notes.layout.mode') {
+      return 'all-panels'
+    }
+  })
+
+  vi.doMock('@/electron', () => ({
+    store: {
+      app: {
+        get: storeGet,
+        set: storeSet,
+      },
+    },
+  }))
+
+  const { useNotesApp } = await import('../useNotesApp')
+
+  return useNotesApp()
+}
+
+beforeEach(() => {
+  vi.clearAllMocks()
+})
+
+describe('useNotesApp', () => {
+  it('restores all notes panels after clearing search', async () => {
+    const notesApp = await setup()
+
+    notesApp.setNotesLayoutMode('all-panels')
+    notesApp.saveNotesStateSnapshot('beforeSearch')
+
+    notesApp.setNotesLayoutMode('list-editor')
+    notesApp.restoreNotesStateSnapshot('beforeSearch')
+
+    expect(notesApp.notesLayoutMode.value).toBe('all-panels')
+    expect(notesApp.isNotesSidebarHidden.value).toBe(false)
+    expect(notesApp.isNotesListHidden.value).toBe(false)
+  })
+
+  it('restores editor-only notes layout after clearing search', async () => {
+    const notesApp = await setup()
+
+    notesApp.setNotesLayoutMode('editor-only')
+    notesApp.saveNotesStateSnapshot('beforeSearch')
+
+    notesApp.setNotesLayoutMode('all-panels')
+    notesApp.restoreNotesStateSnapshot('beforeSearch')
+
+    expect(notesApp.notesLayoutMode.value).toBe('editor-only')
+    expect(notesApp.isNotesSidebarHidden.value).toBe(true)
+    expect(notesApp.isNotesListHidden.value).toBe(true)
+  })
+})

src/renderer/composables/spaces/notes/useNotesApp.ts

@@ -92,6 +92,18 @@ function restoreNotesStateSnapshot(action: NotesStateAction): void {
     notesState.tagId = snapshot.tagId
   if (snapshot.libraryFilter !== undefined)
     notesState.libraryFilter = snapshot.libraryFilter
+
+  if (
+    snapshot.isSidebarHidden !== undefined
+    && snapshot.isListHidden !== undefined
+  ) {
+    notesLayoutMode.value = getLayoutModeFromNotesPanels({
+      isListHidden: snapshot.isListHidden,
+      isSidebarHidden: snapshot.isSidebarHidden,
+    })
+    return
+  }
+
   if (snapshot.isSidebarHidden !== undefined) {
     isNotesSidebarHidden.value = snapshot.isSidebarHidden
   }