Fix setCurrentBlockByChildNode for EditorJS nesting

codex-team · Mar 10, 2020 · 03975f5 · 03975f5
1 parent 68f6b87
commit 03975f5
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/components/modules/blockManager.ts b/src/components/modules/blockManager.ts
@@ -515,14 +515,24 @@ export default class BlockManager extends Module {
       childNode = childNode.parentNode;
     }
 
-    const parentFirstLevelBlock = (childNode as HTMLElement).closest(`.${Block.CSS.wrapper}`);
+    /**
+     * Search parent Block
+     */
+    let parentBlock: HTMLElement | null = childNode as HTMLElement;
+    let currentBlockIndex: number;
+
+    do {
+      parentBlock = parentBlock.closest(`.${Block.CSS.wrapper}`);
+      currentBlockIndex = this._blocks.nodes.indexOf(parentBlock);
+      parentBlock = parentBlock.parentElement;
+    }while (parentBlock !== null && currentBlockIndex === -1);
 
-    if (parentFirstLevelBlock) {
+    if (currentBlockIndex !== -1) {
       /**
        * Update current Block's index
        * @type {number}
        */
-      this.currentBlockIndex = this._blocks.nodes.indexOf(parentFirstLevelBlock as HTMLElement);
+      this.currentBlockIndex = currentBlockIndex;
       return this.currentBlock;
     } else {
       throw new Error('Can not find a Block from this child Node');