gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-12-04 14:34:24 +01:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Merge 9004b724e7e54850026a071287a972297dd4a261 into 67d2175ce93939e05709856a624004168ff66daf

Browse Source
This commit is contained in:
SngAbc 2025-12-03 08:46:19 +00:00 committed by GitHub
commit e33f22057c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/client/src/widgets/type_widgets/code/Code.tsx
View File

@ -165,9 +165,20 @@ export function CodeEditor({ parentComponent, ntxId, containerRef: externalConta
useTriliumEvent("executeWithCodeEditor", async ({ resolve, ntxId: eventNtxId }) => {
if (eventNtxId !== ntxId) return;
await initialized.current.promise();
if (!codeEditorRef.current) return;
resolve(codeEditorRef.current!);
});
useTriliumEvent("noteContextRemoved", async ({ ntxIds: eventNtxIds }) => {
if (!ntxId || !eventNtxIds.includes(ntxId)) return;
const cm = codeEditorRef.current;
if (cm) {
cm.destroy();
codeEditorRef.current = null;
}
});
useTriliumEvent("executeWithContentElement", async ({ resolve, ntxId: eventNtxId}) => {
if (eventNtxId !== ntxId) return;
await initialized.current.promise();

10
apps/client/src/widgets/type_widgets/text/EditableText.tsx
View File

@ -188,6 +188,16 @@ export default function EditableText({ note, parentComponent, ntxId, noteContext
resolve(editor);
});
useTriliumEvent("noteContextRemoved", async ({ ntxIds: eventNtxIds }) => {
if (!ntxId || !eventNtxIds.includes(ntxId)) return;
const watchdog = watchdogRef.current;
if (!watchdog) return;
await watchdog.destroy();
watchdogRef.current = null;
});
async function waitForEditor() {
await initialized.current;
const editor = watchdogRef.current?.editor;

9
apps/client/src/widgets/type_widgets/text/ReadOnlyText.tsx
View File

@ -51,6 +51,15 @@ export default function ReadOnlyText({ note, noteContext, ntxId }: TypeWidgetPro
resolve($(contentRef.current));
});
useTriliumEvent("noteContextRemoved", ({ ntxIds: eventNtxIds }) => {
if (!ntxId || !eventNtxIds.includes(ntxId)) return;
if (contentRef.current) {
contentRef.current.innerHTML = "";
}
contentRef.current = null;
});
return (
<>
<RawHtmlBlock