Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-07-27 18:12:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(text-snippets): handle renames by refreshing the editor

Browse Source
This commit is contained in:
Elian Doran 2025-06-17 17:03:23 +03:00
parent fb1a74a96d
commit 97799bfacc
No known key found for this signature in database
3 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/client/src/components/app_context.ts
View File

@ -281,6 +281,7 @@ export type CommandMappings = {
buildIcon(name: string): NativeImage; buildIcon(name: string): NativeImage;
}; };
refreshTouchBar: CommandData; refreshTouchBar: CommandData;
reloadTextEditor: CommandData;
}; };
type EventMappings = { type EventMappings = {

38
apps/client/src/widgets/type_widgets/ckeditor/snippets.ts
View File

@ -3,9 +3,15 @@ import froca from "../../../services/froca.js";
import type LoadResults from "../../../services/load_results.js"; import type LoadResults from "../../../services/load_results.js";
import search from "../../../services/search.js"; import search from "../../../services/search.js";
import type { TemplateDefinition } from "@triliumnext/ckeditor5"; import type { TemplateDefinition } from "@triliumnext/ckeditor5";
import appContext from "../../../components/app_context.js";
let templateCache: Map<string, string | undefined> = new Map(); interface TemplateData {
const debouncedHandleUpdate = debounce(handleUpdate, 1000); title: string;
content: string | undefined;
}
let templateCache: Map<string, TemplateData> = new Map();
const debouncedHandleContentUpdate = debounce(handleContentUpdate, 1000);
/** /**
* Generates the list of snippets based on the user's notes to be passed down to the CKEditor configuration. * Generates the list of snippets based on the user's notes to be passed down to the CKEditor configuration.
@ -17,17 +23,20 @@ export default async function getTemplates() {
const snippets = await search.searchForNotes("#textSnippet"); const snippets = await search.searchForNotes("#textSnippet");
const definitions: TemplateDefinition[] = []; const definitions: TemplateDefinition[] = [];
for (const snippet of snippets) { for (const snippet of snippets) {
templateCache.set(snippet.noteId, await snippet.getContent()); templateCache.set(snippet.noteId, {
title: snippet.title,
content: await snippet.getContent()
});
definitions.push({ definitions.push({
title: snippet.title, title: snippet.title,
data: () => templateCache.get(snippet.noteId) ?? "" data: () => templateCache.get(snippet.noteId)?.content ?? ""
}) })
} }
return definitions; return definitions;
} }
async function handleUpdate(affectedNoteIds: string[]) { async function handleContentUpdate(affectedNoteIds: string[]) {
const updatedNoteIds = new Set(affectedNoteIds); const updatedNoteIds = new Set(affectedNoteIds);
const templateNoteIds = new Set(templateCache.keys()); const templateNoteIds = new Set(templateCache.keys());
const affectedTemplateNoteIds = templateNoteIds.intersection(updatedNoteIds); const affectedTemplateNoteIds = templateNoteIds.intersection(updatedNoteIds);
@ -36,6 +45,7 @@ async function handleUpdate(affectedNoteIds: string[]) {
await froca.getNotes(affectedNoteIds); await froca.getNotes(affectedNoteIds);
let fullReloadNeeded = false;
for (const affectedTemplateNoteId of affectedTemplateNoteIds) { for (const affectedTemplateNoteId of affectedTemplateNoteIds) {
const template = await froca.getNote(affectedTemplateNoteId); const template = await froca.getNote(affectedTemplateNoteId);
if (!template) { if (!template) {
@ -43,14 +53,28 @@ async function handleUpdate(affectedNoteIds: string[]) {
continue; continue;
} }
templateCache.set(affectedTemplateNoteId, await template.getContent()); const newTitle = template.title;
if (templateCache.get(affectedTemplateNoteId)?.title !== newTitle) {
fullReloadNeeded = true;
break;
}
templateCache.set(affectedTemplateNoteId, {
title: template.title,
content: await template.getContent()
});
}
if (fullReloadNeeded) {
console.warn("Full text editor reload needed");
appContext.triggerCommand("reloadTextEditor");
} }
} }
export function updateTemplateCache(loadResults: LoadResults): boolean { export function updateTemplateCache(loadResults: LoadResults): boolean {
const affectedNoteIds = loadResults.getNoteIds(); const affectedNoteIds = loadResults.getNoteIds();
if (affectedNoteIds.length > 0) { if (affectedNoteIds.length > 0) {
debouncedHandleUpdate(affectedNoteIds); debouncedHandleContentUpdate(affectedNoteIds);
} }

4
apps/client/src/widgets/type_widgets/editable_text.ts
View File

@ -578,6 +578,10 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
await this.reinitializeWithData(data ?? ""); await this.reinitializeWithData(data ?? "");
} }
async reloadTextEditorEvent() {
await this.reinitialize();
}
async onLanguageChanged() { async onLanguageChanged() {
await this.reinitialize(); await this.reinitialize();
} }