fix: support goto collapsed blocks

sethyuan · Dec 13, 2023 · 52c38bf · 52c38bf
1 parent 1a620b5
commit 52c38bf
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "logseq-plugin-tocgen",
-  "version": "2.12.3",
+  "version": "2.12.4",
   "main": "dist/index.html",
   "logseq": {
     "id": "_sethyuan-logseq-tocgen",

diff --git a/src/comps/Block.jsx b/src/comps/Block.jsx
@@ -22,6 +22,7 @@ export default function Block({
           block.name != null && block.children[0]
             ? block.children[0].uuid
             : block.uuid,
+          block.name != null && block.children[0] ? block.id : block.parentID,
         )
       }
     },

diff --git a/src/comps/TocGen.jsx b/src/comps/TocGen.jsx
@@ -119,6 +119,7 @@ export default function TocGen({
         name: src.name,
         content,
         collapsed: collapsings[src.id] ?? level >= expansionLevel,
+        parentID: src.parent?.id,
         children,
       }
     },

diff --git a/src/libs/utils.js b/src/libs/utils.js
@@ -124,7 +124,9 @@ export function waitForEl(selector, timeout) {
   return new Promise(tryFindEl)
 }
 
-export async function gotoBlock(pageName, blockUUID, count = 0) {
+export async function gotoBlock(pageName, blockUUID, parentID, count = 0) {
+  await expandAncestors(parentID)
+
   logseq.Editor.scrollToBlockInPage(pageName, blockUUID)
 
   // Avoid infinite loop
@@ -158,3 +160,15 @@ export async function gotoOffset(container, scrollTop) {
     await waitMs(300)
   }
 }
+
+async function expandAncestors(id) {
+  let parent = await logseq.Editor.getBlock(id)
+  while (parent) {
+    if (parent["collapsed?"]) {
+      await logseq.Editor.setBlockCollapsed(parent.uuid, false)
+    }
+    parent = parent.parent
+      ? await logseq.Editor.getBlock(parent.parent.id)
+      : null
+  }
+}