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(share): restore the tree's position before a page is first drawn
Elian Doran33a58f56fe59
diff --git a/packages/share-theme/src/templates/page.ejs b/packages/share-theme/src/templates/page.ejsindex e9d2e7e440..afe8a7dc0d 100644--- a/packages/share-theme/src/templates/page.ejs+++ b/packages/share-theme/src/templates/page.ejs@@ -9,8 +9,8 @@<% for (const url of cssToLoad) { %><link href="<%= url %>" rel="stylesheet"><% } %>- <% for (const url of jsToLoad) { %>- <script type="module" src="<%= url %>"></script>+ <% for (const [ index, url ] of jsToLoad.entries()) { %>+ <script type="module" src="<%= url %>"<% if (index === 0) { %> blocking="render"<% } %>></script><% } %><% if (head.noIndex) { %><meta name="robots" content="noindex,follow" />diff --git a/packages/trilium-core/src/share/content_renderer.spec.ts b/packages/trilium-core/src/share/content_renderer.spec.tsindex 910de6730f..332d3f0f9f 100644--- a/packages/trilium-core/src/share/content_renderer.spec.ts+++ b/packages/trilium-core/src/share/content_renderer.spec.ts@@ -1434,6 +1434,8 @@ describe("content_renderer pages", () => {expect(urls("link[rel=stylesheet]", "href")).toStrictEqual([ "api/notes/pageCss/download" ]);expect(urls("script[src]", "src")).toStrictEqual([ "assets/scripts.js", "api/notes/pageJs/download" ]);+ // The theme's script restores the tree before the first paint; the page's own scripts wait.+ expect(urls("script[src]", "blocking")).toStrictEqual([ "render", undefined ]);expect(urls("link[rel='shortcut icon']", "href")).toStrictEqual([ "api/notes/pageIcon/download" ]);});