Merge branch 'main' into fix/hide-window-controls-web-runtime

Author: ShowhyT

apps/desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zennotes/desktop",
   "productName": "ZenNotes",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "description": "ZenNotes desktop shell",
   "private": true,
   "main": "./out/main/index.js",

apps/desktop/src/main/app-config.ts

@@ -240,6 +240,11 @@ const SCALAR_FIELDS: Partial<Record<PortablePrefKey, ScalarFieldMap>> = {
     comment: 'code / monospace font; empty = system default'
   },
   // view
+  assetSortOrder: {
+    section: 'view',
+    tomlKey: 'asset_sort_order',
+    comment: 'Assets view sort: name | used | type | size | modified, each -asc or -desc'
+  },
   noteSortOrder: {
     section: 'view',
     tomlKey: 'note_sort_order',

apps/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zennotes/server",
   "private": true,
-  "version": "2.17.0",
+  "version": "2.18.0",
   "scripts": {
     "dev": "node ../../tooling/scripts/run-go-server-dev.mjs",
     "prepare-web": "node ../../tooling/scripts/prepare-server-web-dist.mjs",

apps/web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zennotes/web",
   "private": true,
-  "version": "2.17.0",
+  "version": "2.18.0",
   "type": "module",
   "description": "ZenNotes web client for self-hosted and hosted deployments",
   "homepage": "https://zennotes.org",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "zennotes-monorepo",
   "private": true,
-  "version": "2.17.0",
+  "version": "2.18.0",
   "description": "ZenNotes monorepo for desktop, web, and self-hosted server builds",
   "packageManager": "npm@10.9.2",
   "engines": {
@@ -32,7 +32,8 @@
     "pack": "npm run pack --workspace @zennotes/desktop",
     "dist:mac": "npm run dist:mac --workspace @zennotes/desktop",
     "dist:win": "npm run dist:win --workspace @zennotes/desktop",
-    "dist:linux": "npm run dist:linux --workspace @zennotes/desktop"
+    "dist:linux": "npm run dist:linux --workspace @zennotes/desktop",
+    "perf:editor-scroll": "node tooling/scripts/perf-editor-scroll.mjs"
   },
   "devDependencies": {
     "turbo": "^2.5.8"

packages/app-core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zennotes/app-core",
   "private": true,
-  "version": "2.17.0",
+  "version": "2.18.0",
   "type": "module",
   "exports": {
     "./main": "./src/main.tsx"

packages/app-core/src/components/AssetsView-sort.test.ts

@@ -2,7 +2,12 @@
 
 import { describe, expect, it } from 'vitest'
 import type { AssetMeta } from '@shared/ipc'
-import { sortAssets, type AssetSort } from './AssetsView'
+import {
+  assetSortOrderOf,
+  parseAssetSortOrder,
+  sortAssets,
+  type AssetSort
+} from './AssetsView'
 
 // #460: the Assets list can be sorted by any column.
 function asset(over: Partial<AssetMeta>): AssetMeta {
@@ -76,3 +81,28 @@ describe('#460 — sortAssets', () => {
     expect(input).toEqual([C, A, B])
   })
 })
+
+// #473: the chosen column is stored as one `<column>-<dir>` preference, so it
+// survives leaving the view (and restarting the app).
+describe('#473: asset sort order round-trip', () => {
+  const ALL: AssetSort[] = (['name', 'used', 'type', 'size', 'modified'] as const).flatMap((key) =>
+    (['asc', 'desc'] as const).map((dir) => ({ key, dir }))
+  )
+
+  it('round-trips every column and direction', () => {
+    for (const sort of ALL) {
+      expect(parseAssetSortOrder(assetSortOrderOf(sort))).toEqual(sort)
+    }
+  })
+
+  it('formats to the values the store accepts', () => {
+    expect(assetSortOrderOf({ key: 'modified', dir: 'desc' })).toBe('modified-desc')
+    expect(assetSortOrderOf({ key: 'name', dir: 'asc' })).toBe('name-asc')
+  })
+
+  it('sorts the same whether given the parsed pref or a literal', () => {
+    expect(names(sortAssets(LIST, usage, parseAssetSortOrder('size-desc')))).toEqual(
+      names(sortAssets(LIST, usage, { key: 'size', dir: 'desc' }))
+    )
+  })
+})

packages/app-core/src/components/AssetsView.tsx

@@ -1,6 +1,6 @@
 import { useMemo, useState } from 'react'
 import type { AssetMeta } from '@shared/ipc'
-import { useStore } from '../store'
+import { useStore, type AssetSortColumn, type AssetSortOrder } from '../store'
 import { assetTabPath } from '../lib/asset-tabs'
 import { confirmMoveToTrash } from '../lib/confirm-trash'
 import { promptApp } from '../lib/prompt-requests'
@@ -37,12 +37,28 @@ const ASSET_ROW_GRID =
   'grid grid-cols-[minmax(0,1fr)_6rem_4rem_5rem_5rem_1.75rem] items-center gap-4'
 
 // Which column the Assets list is sorted by. (#460)
-export type AssetSortKey = 'name' | 'used' | 'type' | 'size' | 'modified'
+export type AssetSortKey = AssetSortColumn
 export interface AssetSort {
   key: AssetSortKey
   dir: 'asc' | 'desc'
 }
 
+/** Split the stored `<column>-<dir>` preference into the shape `sortAssets`
+ *  takes. The value is validated in the store, so a bad split can't reach
+ *  here; fall back to the default anyway rather than sorting by `undefined`. (#473) */
+export function parseAssetSortOrder(order: AssetSortOrder): AssetSort {
+  const at = order.lastIndexOf('-')
+  const key = order.slice(0, at) as AssetSortKey
+  const dir = order.slice(at + 1) as AssetSort['dir']
+  if (!key || (dir !== 'asc' && dir !== 'desc')) return { key: 'name', dir: 'asc' }
+  return { key, dir }
+}
+
+/** Inverse of `parseAssetSortOrder`, for writing the preference back. (#473) */
+export function assetSortOrderOf(sort: AssetSort): AssetSortOrder {
+  return `${sort.key}-${sort.dir}` as AssetSortOrder
+}
+
 /** Display label for a note path in the "used by" menu — its filename. */
 function noteLabel(notePath: string): string {
   return notePath.split('/').pop()?.replace(/\.md$/i, '') ?? notePath
@@ -103,10 +119,11 @@ export function AssetsView(): JSX.Element {
   const [filter, setFilter] = useState('')
   const [menu, setMenu] = useState<{ x: number; y: number; asset: AssetMeta } | null>(null)
   const [usageMenu, setUsageMenu] = useState<{ x: number; y: number; notes: string[] } | null>(null)
-  const [sort, setSort] = useState<{ key: AssetSortKey; dir: 'asc' | 'desc' }>({
-    key: 'name',
-    dir: 'asc'
-  })
+  // Sort lives in the store (and config.toml), not local state, so leaving the
+  // view and coming back keeps the column you picked. (#473)
+  const assetSortOrder = useStore((s) => s.assetSortOrder)
+  const setAssetSortOrder = useStore((s) => s.setAssetSortOrder)
+  const sort = useMemo(() => parseAssetSortOrder(assetSortOrder), [assetSortOrder])
 
   // assetPath → note paths that embed it (resolved via relative-path + the
   // unique-basename fallback, matching how embeds render). (#185)
@@ -138,11 +155,11 @@ export function AssetsView(): JSX.Element {
   // Click a header: sort by it, or flip direction if it's already active. Text
   // columns start ascending; count/size/date start descending (biggest first).
   const toggleSort = (key: AssetSortKey): void => {
-    setSort((prev) =>
-      prev.key === key
-        ? { key, dir: prev.dir === 'asc' ? 'desc' : 'asc' }
+    const next: AssetSort =
+      sort.key === key
+        ? { key, dir: sort.dir === 'asc' ? 'desc' : 'asc' }
         : { key, dir: key === 'name' || key === 'type' ? 'asc' : 'desc' }
-    )
+    setAssetSortOrder(assetSortOrderOf(next))
   }
 
   const copyEmbed = (asset: AssetMeta): void => {

packages/app-core/src/components/DatabaseView.tsx

@@ -186,11 +186,13 @@ export function DatabaseView({
                 }
                 size="sm"
                 title="Filter rows"
-                onClick={(e) =>
-                  setFilterAnchor((prev) =>
-                    prev ? null : e.currentTarget.getBoundingClientRect()
-                  )
-                }
+                onClick={(e) => {
+                  // Read the anchor rect during dispatch — React nulls the
+                  // synthetic event's currentTarget once dispatch ends, and
+                  // the updater can run deferred (crashes the root otherwise).
+                  const rect = e.currentTarget.getBoundingClientRect()
+                  setFilterAnchor((prev) => (prev ? null : rect))
+                }}
               >
                 <FilterIcon className="h-3.5 w-3.5" /> Filter
                 {(activeView.filters?.length ?? 0) > 0 ? ` (${activeView.filters.length})` : ''}

packages/app-core/src/lib/cm-live-preview.test.ts

@@ -54,6 +54,79 @@ describe('livePreviewPlugin', () => {
     view.destroy()
   })
 
+  it('keeps a half-typed link readable while the target is written (#471)', () => {
+    // `[Example](` parses as `Link[0,9]`: the node stops at `]` because the
+    // target is unclosed, so the brackets used to be hidden and the label
+    // rendered as `Example(`. Nothing collapses until the `)` lands.
+    const steps = ['[Example](', '[Example](h', '[Example](https://example.com']
+    for (const doc of steps) {
+      const view = mountEditor(doc, doc.length)
+      expect(view.dom.textContent).toBe(doc)
+      view.destroy()
+    }
+
+    // The closing paren completes the link: now it renders as the label alone.
+    const done = mountEditor('[Example](https://example.com)\n\nfar', 32)
+    expect(done.dom.textContent).toContain('Example')
+    expect(done.dom.textContent).not.toContain('https://example.com')
+    done.destroy()
+  })
+
+  it('keeps a pasted URL visible in a half-typed link even off the caret line (#471)', () => {
+    // The URL parses as a GFM autolink hanging off the paragraph, not as the
+    // link destination. It follows a `(`, which used to be enough to hide it,
+    // so the pasted URL disappeared outright.
+    const doc = 'see [Example](https://example.com\n\nfar away'
+    const view = mountEditor(doc, doc.length)
+
+    expect(view.dom.textContent).toContain('see [Example](https://example.com')
+
+    view.destroy()
+  })
+
+  it('treats a half-typed image target the same way (#471)', () => {
+    const doc = '![alt](https://example.com'
+    const view = mountEditor(doc, doc.length)
+
+    expect(view.dom.textContent).toBe(doc)
+
+    view.destroy()
+  })
+
+  it('counts nested parens when deciding a link target is closed (#471)', () => {
+    // CommonMark destinations may contain balanced parens, so the first `)`
+    // is not necessarily the end of the target.
+    const open = '[wiki](https://en.wikipedia.org/wiki/Foo_(bar'
+    const half = mountEditor(`${open}\n\nfar`, open.length + 5)
+    expect(half.dom.textContent).toContain(open)
+    half.destroy()
+
+    const closed = mountEditor(`${open}))\n\nfar`, open.length + 7)
+    expect(closed.dom.textContent).toContain('wiki')
+    expect(closed.dom.textContent).not.toContain('en.wikipedia.org')
+    closed.destroy()
+  })
+
+  it('keeps a parenthesised bare URL visible (#471)', () => {
+    // `(https://…)` is an autolink wrapped in prose parens, not a link target.
+    const doc = 'a (https://parens.example) b\n\nfar away'
+    const view = mountEditor(doc, doc.length)
+
+    expect(view.dom.textContent).toContain('a (https://parens.example) b')
+
+    view.destroy()
+  })
+
+  it('keeps hiding the destination of a completed link (#471 regression guard)', () => {
+    const doc = '[label](https://a.com) tail\n\nfar away'
+    const view = mountEditor(doc, doc.length)
+
+    expect(view.dom.textContent).toContain('label tail')
+    expect(view.dom.textContent).not.toContain('https://a.com')
+
+    view.destroy()
+  })
+
   it('keeps the colon visible in a reference-link definition (#188)', () => {
     // The `:` parses as a LinkMark; live preview must not hide it, or the
     // definition reads as a broken `[label] url`.