An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作
TypeScript agentic-aiai-agentknowledge-baselocal-firstmarkdownmcpmindmapnote-takingself-hostedsiyuanworkspace
:bug: Keep shortcut search results stable while editing https://github.com/siyuan-note/siyuan/issues/20597
Danielfc718b07eec1
diff --git a/app/src/config/tabs/keymapUi.test.ts b/app/src/config/tabs/keymapUi.test.tsindex f8a64f2151..c5df6f9d8f 100644--- a/app/src/config/tabs/keymapUi.test.ts+++ b/app/src/config/tabs/keymapUi.test.ts@@ -5,6 +5,40 @@ import {runInNewContext} from "node:vm";import {createSourceFile, isClassDeclaration, isMethodDeclaration, isVariableStatement, ModuleKind, ScriptTarget, transpileModule} from "typescript";import {CALLOUT_PRESETS} from "../../protyle/wysiwyg/calloutType";+test("editing bindings keeps search results and the active conflict filter until another search", () => {+ const source = createSourceFile("keymapUi.ts", readFileSync("src/config/tabs/keymapUi.ts", "utf8"), ScriptTarget.ES2021, true);+ const declaration = source.statements.find(statement => isVariableStatement(statement) &&+ statement.declarationList.declarations.some(item => item.name.getText(source) === "refreshKeymapBindings"));+ const code = transpileModule(declaration.getText(source) + "\nexports.refresh = refreshKeymapBindings;", {+ compilerOptions: {module: ModuleKind.CommonJS, target: ScriptTarget.ES2021},+ }).outputText;+ const reset = {style: {display: ""}, tabIndex: 0};+ let keys = ["F9"];+ const row = {dataset: {key: "general|test", defaults: '["F9"]', customized: "false", conflict: "true"},+ querySelector: () => ({querySelector: () => reset}), querySelectorAll: (): unknown[] => []};+ const hidden = new Map<string, boolean>();+ const filter = {dataset: {keymapFilterValue: "conflict"}, classList: {+ toggle: (name: string, value: boolean) => hidden.set(name, value),+ }, setAttribute: () => {}};+ const list = {dataset: {keymapFilter: "conflict"}, querySelector: (): undefined => undefined, querySelectorAll: () => [filter]};+ const root = {querySelectorAll: () => [row], querySelector: () => list};+ let searches = 0;+ const exports = {} as {refresh: (root: unknown) => void};+ runInNewContext(code, {exports, Constants: {ZWSP: "|"}, window: {siyuan: {config: {keymap: {}}}},+ getRowBindings: () => keys, normalizeShortcutKey: (key: string) => key, isMac: () => false,+ getKeymapItem: () => ({}), searchKeymapList: () => { searches++; },+ });+ for (const updated of [[], ["F10"], ["F9"]]) {+ keys = updated;+ exports.refresh(root);+ assert.equal(list.dataset.keymapFilter, "conflict");+ assert.equal(hidden.get("fn__none"), false);+ assert.equal(row.dataset.conflict, "false");+ }+ assert.equal(searches, 0);+ assert.equal(row.dataset.customized, "false");+});+test("callout shortcut rows use localized labels without requiring separate translation keys", () => {const source = createSourceFile("keymapUi.ts", readFileSync("src/config/tabs/keymapUi.ts", "utf8"), ScriptTarget.ES2021, true);const declaration = source.statements.find(statement => isVariableStatement(statement) &&diff --git a/app/src/config/tabs/keymapUi.ts b/app/src/config/tabs/keymapUi.tsindex e74ae86761..e36e691613 100644--- a/app/src/config/tabs/keymapUi.ts+++ b/app/src/config/tabs/keymapUi.ts@@ -406,6 +406,7 @@ const bindKeymapList = (root: HTMLElement) => {cancelRecording();keymapListElement.dataset.keymapFilter = button.dataset.keymapFilterValue;refreshBindings();+ searchKeymapList(keymapListElement, searchElement.value, searchKeymapElement.dataset.keymap || "");});const saveRow = (row: HTMLElement, keys: string[], reset = false) => {renderRowBindings(row, keys);@@ -710,19 +711,14 @@ const refreshKeymapBindings = (root: HTMLElement) => {});const list = root.querySelector<HTMLElement>("#keymapList");const hasConflict = Boolean(list.querySelector('[data-conflict="true"]'));- if (!hasConflict && list.dataset.keymapFilter === "conflict") {- list.dataset.keymapFilter = "all";- }list.querySelectorAll<HTMLElement>("[data-keymap-filter-value]").forEach(button => {const active = button.dataset.keymapFilterValue === list.dataset.keymapFilter;button.classList.toggle("b3-chip--current", active);button.setAttribute("aria-pressed", String(active));if (button.dataset.keymapFilterValue === "conflict") {- button.classList.toggle("fn__none", !hasConflict);+ button.classList.toggle("fn__none", !hasConflict && !active);}});- searchKeymapList(list, list.querySelector<HTMLInputElement>("#keymapInput").value,- list.querySelector<HTMLInputElement>("#searchByKey").dataset.keymap || "");};let keymapSaveQueue = Promise.resolve();