Merge branch 'release/v1.5.2'

Author: freder

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.5.2
+### Fixed
+- Fixed bug where expanding collapsed blocks wasn't working properly
+
 ## 1.5.1
 ### Added
 - Added proper title and icon for settings (#19)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "logseq-plugin-jump-to-block",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "main": "dist/index.html",
   "logseq": {
     "id": "logseq-plugin-jump-to-block",

src/components/App.tsx

@@ -52,13 +52,13 @@ const selectionHandler = async (
 		return;
 	}
 	if (expand) {
-		await Promise.all(
-			R.dropLast(1, item.path as PathItem[])
-				.filter((pathItem) => pathItem.collapsed)
-				.map(({ uuid }) => logseq.Editor.setBlockCollapsed(uuid, false))
-		);
+		const collapsedItems = (item.path as PathItem[])
+			.filter((pathItem) => pathItem.collapsed);
+		for (const item of collapsedItems) {
+			await logseq.Editor.setBlockCollapsed(item.uuid, false);
+		}
 	}
-	if (item) scrollTo(item.id as string);
+	scrollTo(item.id as string);
 };
 
 
@@ -67,7 +67,8 @@ const makeCommands = (
 	mode: ModeOption,
 	maxDepth = Infinity
 ) => {
-	const items: Command[] = [];
+	const entries: Command[] = [];
+
 	const recurse = (
 		block: BlockEntity,
 		depth: number,
@@ -109,25 +110,28 @@ const makeCommands = (
 			color: 'transparent',
 			path: path,
 		};
-		items.push(cmd);
+		entries.push(cmd);
+
 		const children = block.children || [];
 		if (children.length) {
+			const parentPathItem: PathItem = {
+				uuid: block.uuid,
+				collapsed: block['collapsed?'],
+			};
 			(children as BlockEntity[]).forEach(
-				(block) => recurse(
-					block,
+				(child) => recurse(
+					child,
 					depth + 1,
-					[...path, {
-						uuid: block.uuid,
-						collapsed: block['collapsed?'],
-					}]
+					[...path, parentPathItem]
 				)
 			);
 		}
 	};
+
 	blocks.forEach(
 		(block) => recurse(block, 0, [])
 	);
-	return items;
+	return entries;
 };
 
 

src/constants.ts

@@ -2,6 +2,6 @@ import type { InitalSelectionOption, ModeOption } from './types';
 
 export const initialSelectionDefault: InitalSelectionOption = 'Nothing';
 export const defaultMaxDepth = 3;
-export const modeDefault: ModeOption = 'Headings-only';
+export const modeDefault: ModeOption = 'Default';
 
 export const headingRegex = /^#{1,6} (.*)/gi;