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(print): print render notes inside a list collection
Elian Doranc379cc7f304a
diff --git a/apps/client/src/widgets/collections/legacy/ListPrintView.spec.tsx b/apps/client/src/widgets/collections/legacy/ListPrintView.spec.tsxnew file mode 100644index 0000000000..4901512f8d--- /dev/null+++ b/apps/client/src/widgets/collections/legacy/ListPrintView.spec.tsx@@ -0,0 +1,59 @@+import { afterEach, describe, expect, it, vi } from "vitest";++const h = vi.hoisted(() => ({ getRenderedContent: vi.fn() }));++vi.mock("../../../services/content_renderer", () => ({+ default: { getRenderedContent: h.getRenderedContent }+}));++import Component from "../../../components/component";+import froca from "../../../services/froca";+import { trackPendingRender } from "../../../services/pending_renders";+import { buildNote } from "../../../test/easy-froca";+import { renderInto } from "../../../test/render";+import { ListPrintView } from "./ListPrintView";++afterEach(() => {+ h.getRenderedContent.mockReset();+});++describe("ListPrintView", () => {+ it("mounts a render note's output and waits for its script before reporting ready", async () => {+ buildNote({ id: "root", title: "root", children: [ {+ id: "list-print", title: "Collection", type: "book",+ children: [ { id: "list-print-render", title: "Dashboard", type: "render" } ]+ } ] });+ const collection = froca.getNoteFromCache("list-print");+ if (!collection) throw new Error("expected the collection note");++ let finishScript: () => void = () => {};+ h.getRenderedContent.mockImplementation(async () => {+ const contentEl = document.createElement("div");+ trackPendingRender(contentEl, new Promise<void>((resolve) => {+ finishScript = () => {+ contentEl.insertAdjacentHTML("beforeend", "<p class='late'>Script output</p>");+ resolve();+ };+ }));+ return { $renderedContent: [ contentEl ] };+ });++ const onReady = vi.fn();+ const container = renderInto(+ <ListPrintView+ note={collection} notePath="root/list-print" noteIds={[ "list-print-render" ]}+ highlightedTokens={null} viewConfig={undefined} saveConfig={() => {}}+ media="print" onReady={onReady}+ />+ );++ await vi.waitFor(() => expect(h.getRenderedContent).toHaveBeenCalledOnce());+ expect(h.getRenderedContent.mock.calls[0]?.[1]?.parentComponent).toBeInstanceOf(Component);+ await new Promise((resolve) => setTimeout(resolve, 20));+ expect(onReady).not.toHaveBeenCalled();++ finishScript();+ await vi.waitFor(() => expect(onReady).toHaveBeenCalledOnce());+ expect(container.querySelector("#note-list-print-render .late")?.textContent).toBe("Script output");+ });+});diff --git a/apps/client/src/widgets/collections/legacy/ListPrintView.tsx b/apps/client/src/widgets/collections/legacy/ListPrintView.tsxindex a584696fb3..72071c68b4 100644--- a/apps/client/src/widgets/collections/legacy/ListPrintView.tsx+++ b/apps/client/src/widgets/collections/legacy/ListPrintView.tsx@@ -1,9 +1,11 @@import { useEffect, useLayoutEffect, useState } from "preact/hooks";+import Component from "../../../components/component";import type FNote from "../../../entities/fnote";import type { PrintReport } from "../../../print";import content_renderer from "../../../services/content_renderer";import froca from "../../../services/froca";+import { waitForPendingRenders } from "../../../services/pending_renders";import { sanitizeNoteContentHtml } from "../../../services/sanitize_content";import type { ViewModeProps } from "../interface";import { filterChildNotes, useFilteredNoteIds } from "./utils";@@ -35,10 +37,15 @@ export function ListPrintView({ note, noteIds: unfilteredNoteIds, onReady, onPronoChildrenList: true,// Printing preserves full embed nesting (see expandNestedEmbeds).expandNestedEmbeds: true,- mediaEnvironment: "native"+ mediaEnvironment: "native",+ // The copied content has no component tree, so a JSX render note mounts under this root.+ parentComponent: new Component()});const contentEl = content.$renderedContent[0];+ // A render note's script finishes after `getRenderedContent()`, and its+ // output is copied below, so wait for it first.+ await waitForPendingRenders(contentEl);insertPageTitle(contentEl, note.title);rewriteHeadings(contentEl, depth);