Merge 9004b724e7e54850026a071287a972297dd4a261 into 732494dfc51286926d86d49a73d3915a4aa22ef9

apps/client/src/widgets/type_widgets/code/Code.tsx

@@ -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();

apps/client/src/widgets/type_widgets/text/EditableText.tsx

@@ -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;

apps/client/src/widgets/type_widgets/text/ReadOnlyText.tsx

@@ -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