Build your personal knowledge base with Trilium Notes
TypeScript electronelectron-appknowledge-baseknowledge-graphknowledge-managementknowledge-management-graphlocal-firstnote-managmentnote-takernote-takingnotebooknotesnotes-apppersonal-knowledge-basepersonal-wikiscriptableself-hostedself-hostingwiki
fix(render): close a script modal with the preview that opened it (closes #11847)
Elian Doran584a50db1c56
diff --git a/apps/client/src/services/content_renderer.spec.ts b/apps/client/src/services/content_renderer.spec.tsindex 0d4474dc5b..2cccba36da 100644--- a/apps/client/src/services/content_renderer.spec.ts+++ b/apps/client/src/services/content_renderer.spec.ts@@ -1,5 +1,6 @@import { attachmentIcon, CONTENT_RENDERER_GROUPS } from "@triliumnext/commons";-import { h, VNode } from "preact";+import { h, render, VNode } from "preact";+import { useLayoutEffect } from "preact/hooks";import { beforeEach, describe, expect, it, vi } from "vitest";// --- Mock heavy / side-effecting collaborators BEFORE importing the SUT. ---@@ -904,7 +905,27 @@ describe("getRenderedContent render / doc / protectedSession / mermaid", () => {it("mounts a JSX render note under the given parent component", async () => {const parentComponent = new Component();await getRenderedContent(buildNote({ title: "R", type: "render" }), { parentComponent });- expect(renderServiceRender.mock.lastCall?.[3]).toEqual({ parentComponent });+ expect(renderServiceRender.mock.lastCall?.[3]).toEqual(expect.objectContaining({ parentComponent }));+ });++ it("aborts the render and unmounts its JSX when the content is disposed", async () => {+ const unmounted = vi.fn();+ function Probe() {+ useLayoutEffect(() => unmounted, []);+ return null;+ }+ renderServiceRender.mockImplementationOnce(async (_n: unknown, $content: JQuery<HTMLElement>) => {+ render(h(Probe, {}), $content[0]);+ });++ const { $renderedContent } = await getRenderedContent(buildNote({ title: "R", type: "render" }));+ const { signal } = renderServiceRender.mock.lastCall?.[3] as { signal: AbortSignal };+ expect(signal.aborted).toBe(false);+ expect(unmounted).not.toHaveBeenCalled();++ disposeInteractiveContent($renderedContent);+ expect(signal.aborted).toBe(true);+ expect(unmounted).toHaveBeenCalledOnce();});it("render error callback shows an admonition with the error message", async () => {diff --git a/apps/client/src/services/content_renderer.ts b/apps/client/src/services/content_renderer.tsindex ee4cea3e43..e247dd891e 100644--- a/apps/client/src/services/content_renderer.ts+++ b/apps/client/src/services/content_renderer.ts@@ -229,11 +229,17 @@ export async function getRenderedContent(this: {} | { ctx: string }, entity: FNoawait renderFile(entity, type, $renderedContent, options);} else if (type === "render" && entity instanceof FNote) {const $content = $("<div>");+ // A script's `Modal` portals into `document.body`, so removing `$content` alone leaves it open.+ const controller = new AbortController();+ addContentDisposer($content[0], () => {+ controller.abort();+ render(null, $content[0]);+ });const { default: renderService } = await CONTENT_RENDERERS.render();await renderService.render(entity, $content, (e, noteId) => {showRenderError($content, e, noteId).catch((cardError) => console.error("Failed to render the script error card:", cardError));- }, { parentComponent: options.parentComponent });+ }, { parentComponent: options.parentComponent, signal: controller.signal });$renderedContent.append($content);} else if (type === "doc" && "noteId" in entity) {