fix(code): preserve focus and pending edits during snippet autosave

* fix(code): preserve editor focus when renaming snippets

* fix(code): retain pending description edits when renaming

Author: antonreshetov

src/renderer/components/editor/Description.vue

@@ -21,20 +21,19 @@ const description = computed({
     }
 
     addToUpdateQueue(selectedSnippet.value!.id, {
-      name: selectedSnippet.value!.name,
       description: v,
-      folderId: selectedSnippet.value!.folder?.id || null,
-      isDeleted: selectedSnippet.value!.isDeleted,
-      isFavorites: selectedSnippet.value!.isFavorites,
     })
   },
 })
 
-watch(displayedSnippet, () => {
-  if (show.value) {
-    show.value = false
-  }
-})
+watch(
+  () => displayedSnippet.value?.id,
+  () => {
+    if (show.value) {
+      show.value = false
+    }
+  },
+)
 </script>
 
 <template>

src/renderer/components/editor/Editor.vue

@@ -37,7 +37,8 @@ const {
   displayedSnippetContent,
   selectedSnippetContent,
   selectedSnippet,
-  isEmpty,
+  isEmpty: isSnippetListEmpty,
+  isSearch,
   selectedSnippetIds,
   selectedSnippetRecordStatus,
   isAvailableToCodePreview,
@@ -105,6 +106,9 @@ const scrollBarOpacity = useCssVar(
   },
 )
 
+// Переименование может убрать последнее совпадение, но не должно закрывать редактор.
+const isEmpty = computed(() => isSnippetListEmpty.value && !isSearch.value)
+
 const isShowHeader = computed(() => {
   if (selectedSnippetIds.value.length > 1)
     return false

src/renderer/components/editor/header/Header.vue

@@ -91,11 +91,7 @@ const {
     }
 
     addToUpdateQueue(selectedSnippet.value.id, {
-      name: v,
-      description: selectedSnippet.value.description,
-      folderId: selectedSnippet.value.folder?.id || null,
-      isDeleted: selectedSnippet.value.isDeleted,
-      isFavorites: selectedSnippet.value.isFavorites,
+      name: v.trim(),
     })
   },
 )

src/renderer/composables/__tests__/useSnippetUpdate.test.ts

@@ -0,0 +1,76 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { ref } from 'vue'
+
+globalThis.ref = ref
+
+async function setup() {
+  vi.resetModules()
+  vi.useFakeTimers()
+  const updateSnippet = vi.fn(async () => undefined)
+  vi.doMock('../useSnippets', () => ({
+    useSnippets: () => ({ updateSnippet, updateSnippetContent: vi.fn() }),
+  }))
+  vi.doMock('../useStorageMutation', () => ({ markUserEdit: vi.fn() }))
+  vi.doMock('@/utils', () => ({ isRetriableSaveError: () => false }))
+  const { useSnippetUpdate } = await import('../useSnippetUpdate')
+  return { ...useSnippetUpdate(), updateSnippet }
+}
+
+afterEach(() => {
+  vi.clearAllTimers()
+  vi.useRealTimers()
+})
+
+describe('snippet metadata debounce', () => {
+  it.each([true, false])(
+    'preserves both fields when description is first: %s',
+    async (descriptionFirst) => {
+      const context = await setup()
+      const changes = [
+        { description: 'New description' },
+        { name: 'New name' },
+      ]
+      if (!descriptionFirst)
+        changes.reverse()
+      context.addToUpdateQueue(1, changes[0]!)
+      await vi.advanceTimersByTimeAsync(200)
+      context.addToUpdateQueue(1, changes[1]!)
+      await vi.advanceTimersByTimeAsync(499)
+      expect(context.updateSnippet).not.toHaveBeenCalled()
+      await vi.advanceTimersByTimeAsync(1)
+      expect(context.updateSnippet).toHaveBeenCalledExactlyOnceWith(1, {
+        name: 'New name',
+        description: 'New description',
+      })
+    },
+  )
+
+  it('keeps the latest field value, including an empty description', async () => {
+    const context = await setup()
+    context.addToUpdateQueue(1, {
+      description: 'Old description',
+      name: 'First',
+    })
+    context.addToUpdateQueue(1, { description: '' })
+    context.addToUpdateQueue(1, { name: 'Last' })
+    await vi.advanceTimersByTimeAsync(500)
+    expect(context.updateSnippet).toHaveBeenCalledExactlyOnceWith(1, {
+      name: 'Last',
+      description: '',
+    })
+  })
+
+  it('keeps updates for different snippets separate', async () => {
+    const context = await setup()
+    context.addToUpdateQueue(1, { description: 'A' })
+    context.addToUpdateQueue(2, { name: 'B' })
+    context.addToUpdateQueue(1, { name: 'A' })
+    await vi.advanceTimersByTimeAsync(500)
+    expect(context.updateSnippet).toHaveBeenCalledTimes(2)
+    expect(context.updateSnippet).toHaveBeenCalledWith(1, {
+      description: 'A',
+      name: 'A',
+    })
+    expect(context.updateSnippet).toHaveBeenCalledWith(2, { name: 'B' })
+  })
+})

src/renderer/composables/__tests__/useSnippetsSearch.test.ts

@@ -12,6 +12,8 @@ interface SetupOptions {
   folderId?: number
   libraryFilter?: string
   snippetId?: number
+  sort?: 'name' | 'updatedAt'
+  order?: 'ASC' | 'DESC'
   tagId?: number
 }
 
@@ -56,7 +58,8 @@ async function setup(options: SetupOptions = {}) {
   // чтобы не тянуть electron store в тест.
   vi.doMock('@/composables/useContentSort', () => ({
     useContentSort: () => ({
-      getContentSortQuery: () => ({}),
+      getContentSortQuery: () =>
+        options.sort ? { sort: options.sort, order: options.order } : {},
     }),
   }))
 
@@ -349,3 +352,67 @@ describe('selected snippet full record', () => {
     consoleError.mockRestore()
   })
 })
+
+describe('snippet rename refresh', () => {
+  it.each(['name', 'updatedAt'] as const)(
+    'refreshes %s order without reloading the selected record',
+    async (sort) => {
+      const context = await setup({ snippetId: 1, sort, order: 'ASC' })
+      await context.snippets.refreshSelectedSnippet()
+      await context.snippets.getSnippets()
+      const fullRecordCalls = context.getSnippetsById.mock.calls.length
+      context.getSnippets.mockResolvedValueOnce({
+        data: [
+          { id: 2, name: 'B', contents: [], tags: [] },
+          { id: 1, name: 'Z', contents: [], tags: [] },
+        ],
+      })
+
+      await context.snippets.updateSnippet(1, { name: 'Z' })
+
+      expect(context.getSnippets).toHaveBeenLastCalledWith(
+        expect.objectContaining({ sort, order: 'ASC' }),
+      )
+      expect(
+        context.snippets.displayedSnippets.value?.map(item => item.id),
+      ).toEqual([2, 1])
+      expect(context.snippets.selectedSnippet.value?.name).toBe('Z')
+      expect(context.snippets.displayedSnippetContent.value?.value).toBe(
+        'Content 1',
+      )
+      expect(context.snippets.selectedSnippetRecordStatus.value).toBe('ready')
+      expect(context.getSnippetsById).toHaveBeenCalledTimes(fullRecordCalls)
+    },
+  )
+
+  it('removes and restores a search result while retaining the open record', async () => {
+    const context = await setup({ snippetId: 1 })
+    context.snippets.searchQuery.value = 'needle'
+    await context.snippets.search()
+    await context.snippets.refreshSelectedSnippet()
+    const fullRecordCalls = context.getSnippetsById.mock.calls.length
+    context.getSnippets.mockResolvedValueOnce({ data: [] })
+
+    await context.snippets.updateSnippet(1, { name: 'Renamed' })
+
+    expect(context.getSnippets).toHaveBeenLastCalledWith({ search: 'needle' })
+    expect(context.snippets.displayedSnippets.value).toEqual([])
+    expect(context.state.snippetId).toBe(1)
+    expect(context.state.snippetContentIndex).toBe(0)
+    expect(context.snippets.displayedSnippet.value?.name).toBe('Renamed')
+    expect(context.snippets.displayedSnippetContent.value?.value).toBe(
+      'Content 1',
+    )
+    expect(context.snippets.selectedSnippetRecordStatus.value).toBe('ready')
+
+    context.getSnippets.mockResolvedValueOnce({
+      data: [{ id: 1, name: 'needle again', contents: [], tags: [] }],
+    })
+    await context.snippets.updateSnippet(1, { name: 'needle again' })
+
+    expect(
+      context.snippets.displayedSnippets.value?.map(item => item.id),
+    ).toEqual([1])
+    expect(context.getSnippetsById).toHaveBeenCalledTimes(fullRecordCalls)
+  })
+})

src/renderer/composables/useSnippetUpdate.ts

@@ -146,7 +146,10 @@ function scheduleContentUpdate(key: string, delayMs = UPDATE_DEBOUNCE_TIME) {
 function addToUpdateQueue(snippetId: number, data: SnippetsUpdate) {
   markUserEdit()
   const key = `${snippetId}`
-  updateQueue.value.set(key, { snippetId, data })
+  updateQueue.value.set(key, {
+    snippetId,
+    data: { ...updateQueue.value.get(key)?.data, ...data },
+  })
   // Новый ввод сбрасывает backoff: пользователь активен, сохранение снова
   // пробуется быстро.
   retryAttemptsByKey.value.delete(key)

src/renderer/composables/useSnippets.ts

@@ -531,8 +531,10 @@ async function updateSnippet(snippetId: number, data: SnippetsUpdate) {
     return
   }
 
-  // Переименование/описание не меняют состав списка — обновляем точечно.
+  // Полную запись обновляем без loading, чтобы не сбрасывать фокус редактора.
   patchSnippetInCollections(snippetId, data)
+  // Название/описание влияют на поиск, а сохранение — на порядок updatedAt.
+  await getSnippets()
 }
 
 async function updateSnippets(snippetIds: number[], data: SnippetsUpdate[]) {