@jackuait/blok 0.7.0-beta.1 → 0.7.0-beta.3

package/src/components/i18n/locales/th/messages.json

@@ -4,6 +4,7 @@
   "toolbox.addBelow": "คลิกเพื่อเพิ่มด้านล่าง",
   "toolbox.optionAddAbove": "⌥ คลิกเพื่อเพิ่มด้านบน",
   "toolbox.ctrlAddAbove": "Ctrl คลิกเพื่อเพิ่มด้านบน",
+  "toolbox.typeToSearch": "พิมพ์เพื่อค้นหา",
   "popover.search": "ค้นหา",
   "popover.nothingFound": "ไม่พบผลลัพธ์",
   "popover.convertTo": "แปลงเป็น",
@@ -16,6 +17,7 @@
   "toolNames.bulletedList": "รายการแบบจุด",
   "toolNames.numberedList": "รายการแบบตัวเลข",
   "toolNames.todoList": "รายการสิ่งที่ต้องทำ",
+  "toolNames.toggleList": "รายการพับได้",
   "tools.link.addLink": "เพิ่มลิงก์",
   "tools.link.invalidLink": "ลิงก์ไม่ถูกต้อง",
   "tools.marker.textColor": "ข้อความ",
@@ -29,6 +31,10 @@
   "tools.header.heading4": "หัวข้อ 4",
   "tools.header.heading5": "หัวข้อ 5",
   "tools.header.heading6": "หัวข้อ 6",
+  "tools.header.toggleHeading": "หัวข้อพับได้",
+  "tools.header.toggleHeading1": "หัวข้อพับได้ 1",
+  "tools.header.toggleHeading2": "หัวข้อพับได้ 2",
+  "tools.header.toggleHeading3": "หัวข้อพับได้ 3",
   "tools.list.placeholder": "รายการ",
   "blockSettings.delete": "ลบ",
   "a11y.dragHandle": "ลากเพื่อย้ายบล็อก หรือคลิกเพื่อเปิดเมนู",
@@ -46,6 +52,7 @@
   "a11y.atTop": "บล็อกอยู่บนสุดแล้ว ไม่สามารถย้ายขึ้นได้",
   "a11y.atBottom": "บล็อกอยู่ล่างสุดแล้ว ไม่สามารถย้ายลงได้",
   "tools.paragraph.placeholder": "เขียนอะไรสักอย่าง หรือกด / เพื่อเลือกเครื่องมือ",
+  "tools.toggle.placeholder": "พับได้",
   "tools.table.title": "ตาราง",
   "tools.table.clearSelection": "ล้าง",
   "tools.table.copySelection": "คัดลอก",

package/src/components/i18n/locales/tr/messages.json

@@ -4,6 +4,7 @@
   "toolbox.addBelow": "Blok ekle",
   "toolbox.optionAddAbove": "⌥ Üstüne ekle",
   "toolbox.ctrlAddAbove": "Ctrl Üstüne ekle",
+  "toolbox.typeToSearch": "Aramak için yazın",
   "popover.search": "Ara",
   "popover.nothingFound": "Sonuç bulunamadı",
   "popover.convertTo": "Dönüştür",
@@ -16,6 +17,7 @@
   "toolNames.bulletedList": "Madde işaretli liste",
   "toolNames.numberedList": "Numaralı liste",
   "toolNames.todoList": "Yapılacaklar listesi",
+  "toolNames.toggleList": "Açılır liste",
   "tools.link.addLink": "Bağlantı ekle",
   "tools.link.invalidLink": "Geçersiz bağlantı",
   "tools.marker.textColor": "Metin",
@@ -29,6 +31,10 @@
   "tools.header.heading4": "Başlık 4",
   "tools.header.heading5": "Başlık 5",
   "tools.header.heading6": "Başlık 6",
+  "tools.header.toggleHeading": "Açılır başlık",
+  "tools.header.toggleHeading1": "Açılır başlık 1",
+  "tools.header.toggleHeading2": "Açılır başlık 2",
+  "tools.header.toggleHeading3": "Açılır başlık 3",
   "tools.list.placeholder": "Liste",
   "blockSettings.delete": "Sil",
   "a11y.dragHandle": "Taşımak için sürükle veya menü için tıkla",
@@ -46,6 +52,7 @@
   "a11y.atTop": "Blok en üstte, yukarı taşınamaz",
   "a11y.atBottom": "Blok en altta, aşağı taşınamaz",
   "tools.paragraph.placeholder": "Bir şeyler yazın veya seçmek için / tuşuna basın",
+  "tools.toggle.placeholder": "Açılır",
   "tools.table.title": "Tablo",
   "tools.table.clearSelection": "Temizle",
   "tools.table.copySelection": "Kopyala",

package/src/components/i18n/locales/ug/messages.json

@@ -4,6 +4,7 @@
   "toolbox.addBelow": "ئاستىغا قوشۇش ئۈچۈن چېكىڭ",
   "toolbox.optionAddAbove": "ئۈستىگە قوشۇش ئۈچۈن Option-چېكىڭ",
   "toolbox.ctrlAddAbove": "ئۈستىگە قوشۇش ئۈچۈن Ctrl-چېكىڭ",
+  "toolbox.typeToSearch": "ئىزدەش ئۈچۈن يېزىڭ",
   "popover.search": "ئىزدەش",
   "popover.nothingFound": "ھېچنېمە تېپىلمىدى",
   "popover.convertTo": "ئۆزگەرتىش",
@@ -16,6 +17,7 @@
   "toolNames.bulletedList": "چېكىتلىك تىزىملىك",
   "toolNames.numberedList": "نومۇرلۇق تىزىملىك",
   "toolNames.todoList": "ۋەزىپە تىزىملىكى",
+  "toolNames.toggleList": "يىغىلما تىزىملىك",
   "tools.link.addLink": "ئۇلانما قوشۇش",
   "tools.link.invalidLink": "ئىناۋەتسىز ئۇلانما",
   "tools.marker.textColor": "تېكىست",
@@ -29,8 +31,13 @@
   "tools.header.heading4": "ماۋزۇ 4",
   "tools.header.heading5": "ماۋزۇ 5",
   "tools.header.heading6": "ماۋزۇ 6",
+  "tools.header.toggleHeading": "يىغىلما ماۋزۇ",
+  "tools.header.toggleHeading1": "يىغىلما ماۋزۇ 1",
+  "tools.header.toggleHeading2": "يىغىلما ماۋزۇ 2",
+  "tools.header.toggleHeading3": "يىغىلما ماۋزۇ 3",
   "tools.list.placeholder": "تىزىملىك",
   "tools.paragraph.placeholder": "بىر نەرسە يېزىڭ ياكى / نى بېسىپ قورال تاللاڭ",
+  "tools.toggle.placeholder": "يىغىلما",
   "tools.table.title": "جەدۋەل",
   "tools.table.clearSelection": "تازىلاش",
   "tools.table.copySelection": "كۆچۈر",

package/src/components/i18n/locales/uk/messages.json

@@ -4,6 +4,7 @@
   "toolbox.addBelow": "Додати блок",
   "toolbox.optionAddAbove": "⌥ — додати вище",
   "toolbox.ctrlAddAbove": "Ctrl — додати вище",
+  "toolbox.typeToSearch": "Введіть для пошуку",
   "popover.search": "Пошук",
   "popover.nothingFound": "Нічого не знайдено",
   "popover.convertTo": "Перетворити на",
@@ -16,6 +17,7 @@
   "toolNames.bulletedList": "Маркований список",
   "toolNames.numberedList": "Нумерований список",
   "toolNames.todoList": "Список справ",
+  "toolNames.toggleList": "Згортний список",
   "tools.link.addLink": "Додати посилання",
   "tools.link.invalidLink": "Недійсне посилання",
   "tools.marker.textColor": "Текст",
@@ -29,6 +31,10 @@
   "tools.header.heading4": "Заголовок 4",
   "tools.header.heading5": "Заголовок 5",
   "tools.header.heading6": "Заголовок 6",
+  "tools.header.toggleHeading": "Згортний заголовок",
+  "tools.header.toggleHeading1": "Згортний заголовок 1",
+  "tools.header.toggleHeading2": "Згортний заголовок 2",
+  "tools.header.toggleHeading3": "Згортний заголовок 3",
   "tools.list.placeholder": "Список",
   "blockSettings.delete": "Видалити",
   "a11y.dragHandle": "Перетягніть або натисніть для меню",
@@ -46,6 +52,7 @@
   "a11y.atTop": "Блок вже вгорі",
   "a11y.atBottom": "Блок вже внизу",
   "tools.paragraph.placeholder": "Напишіть щось або натисніть / для вибору",
+  "tools.toggle.placeholder": "Згортний",
   "tools.table.title": "Таблиця",
   "tools.table.clearSelection": "Очистити",
   "tools.table.copySelection": "Копіювати",

package/src/components/i18n/locales/ur/messages.json

@@ -4,6 +4,7 @@
   "toolbox.addBelow": "نیچے شامل کرنے کے لیے کلک کریں",
   "toolbox.optionAddAbove": "اوپر شامل کرنے کے لیے Option-کلک",
   "toolbox.ctrlAddAbove": "اوپر شامل کرنے کے لیے Ctrl-کلک",
+  "toolbox.typeToSearch": "تلاش کے لیے ٹائپ کریں",
   "popover.search": "تلاش",
   "popover.nothingFound": "کچھ نہیں ملا",
   "popover.convertTo": "تبدیل کریں",
@@ -16,6 +17,7 @@
   "toolNames.bulletedList": "بلٹ فہرست",
   "toolNames.numberedList": "نمبر فہرست",
   "toolNames.todoList": "کام کی فہرست",
+  "toolNames.toggleList": "ٹوگل فہرست",
   "tools.link.addLink": "لنک شامل کریں",
   "tools.link.invalidLink": "غلط لنک",
   "tools.marker.textColor": "متن",
@@ -29,6 +31,10 @@
   "tools.header.heading4": "عنوان 4",
   "tools.header.heading5": "عنوان 5",
   "tools.header.heading6": "عنوان 6",
+  "tools.header.toggleHeading": "ٹوگل عنوان",
+  "tools.header.toggleHeading1": "ٹوگل عنوان 1",
+  "tools.header.toggleHeading2": "ٹوگل عنوان 2",
+  "tools.header.toggleHeading3": "ٹوگل عنوان 3",
   "tools.list.placeholder": "فہرست",
   "blockSettings.delete": "حذف کریں",
   "a11y.dragHandle": "بلاک منتقل کرنے کے لیے گھسیٹیں یا مینو کے لیے کلک کریں",
@@ -46,6 +52,7 @@
   "a11y.atTop": "بلاک سب سے اوپر ہے، اوپر نہیں جا سکتا",
   "a11y.atBottom": "بلاک سب سے نیچے ہے، نیچے نہیں جا سکتا",
   "tools.paragraph.placeholder": "کچھ لکھیں یا منتخب کرنے کیلئے / دبائیں",
+  "tools.toggle.placeholder": "ٹوگل",
   "tools.table.title": "ٹیبل",
   "tools.table.clearSelection": "صاف کریں",
   "tools.table.copySelection": "کاپی",

package/src/components/i18n/locales/vi/messages.json

@@ -4,6 +4,7 @@
   "toolbox.addBelow": "Nhấp để thêm bên dưới",
   "toolbox.optionAddAbove": "⌥ Nhấp để thêm bên trên",
   "toolbox.ctrlAddAbove": "Ctrl+Nhấp để thêm bên trên",
+  "toolbox.typeToSearch": "Nhập để tìm kiếm",
   "popover.search": "Tìm kiếm",
   "popover.nothingFound": "Không tìm thấy",
   "popover.convertTo": "Chuyển sang",
@@ -16,6 +17,7 @@
   "toolNames.bulletedList": "Danh sách chấm",
   "toolNames.numberedList": "Danh sách đánh số",
   "toolNames.todoList": "Danh sách việc cần làm",
+  "toolNames.toggleList": "Danh sách thu gọn",
   "tools.link.addLink": "Thêm liên kết",
   "tools.link.invalidLink": "Liên kết không hợp lệ",
   "tools.marker.textColor": "Chữ",
@@ -29,8 +31,13 @@
   "tools.header.heading4": "Tiêu đề 4",
   "tools.header.heading5": "Tiêu đề 5",
   "tools.header.heading6": "Tiêu đề 6",
+  "tools.header.toggleHeading": "Tiêu đề thu gọn",
+  "tools.header.toggleHeading1": "Tiêu đề thu gọn 1",
+  "tools.header.toggleHeading2": "Tiêu đề thu gọn 2",
+  "tools.header.toggleHeading3": "Tiêu đề thu gọn 3",
   "tools.list.placeholder": "Danh sách",
   "tools.paragraph.placeholder": "Viết gì đó hoặc nhấn / để chọn công cụ",
+  "tools.toggle.placeholder": "Thu gọn",
   "tools.table.title": "Bảng",
   "tools.table.clearSelection": "Xóa",
   "tools.table.copySelection": "Sao chép",

package/src/components/i18n/locales/yi/messages.json

@@ -4,6 +4,7 @@
   "toolbox.addBelow": "קליק צו צולייגן אונטן",
   "toolbox.optionAddAbove": "Option-קליק צו צולייגן אויבן",
   "toolbox.ctrlAddAbove": "Ctrl-קליק צו צולייגן אויבן",
+  "toolbox.typeToSearch": "טייפּט צו זוכן",
   "popover.search": "זוכן",
   "popover.nothingFound": "גארנישט געפֿונען",
   "popover.convertTo": "פֿאַרוואַנדלען צו",
@@ -16,6 +17,7 @@
   "toolNames.bulletedList": "פּונקט ליסטע",
   "toolNames.numberedList": "נומעריקע ליסטע",
   "toolNames.todoList": "צו-טאָן ליסטע",
+  "toolNames.toggleList": "אויפֿקלאַפּ ליסטע",
   "tools.link.addLink": "צולייגן לינק",
   "tools.link.invalidLink": "אומגילטיקער לינק",
   "tools.marker.textColor": "טעקסט",
@@ -29,8 +31,13 @@
   "tools.header.heading4": "קעפּל 4",
   "tools.header.heading5": "קעפּל 5",
   "tools.header.heading6": "קעפּל 6",
+  "tools.header.toggleHeading": "אויפֿקלאַפּ קעפּל",
+  "tools.header.toggleHeading1": "אויפֿקלאַפּ קעפּל 1",
+  "tools.header.toggleHeading2": "אויפֿקלאַפּ קעפּל 2",
+  "tools.header.toggleHeading3": "אויפֿקלאַפּ קעפּל 3",
   "tools.list.placeholder": "ליסטע",
   "tools.paragraph.placeholder": "שרײַב עפּעס אָדער דריק / צו קלײַבן אַ געצײַג",
+  "tools.toggle.placeholder": "אויפֿקלאַפּ",
   "tools.table.title": "טאַבעלע",
   "tools.table.clearSelection": "אויסמעקן",
   "tools.table.copySelection": "קאָפּירן",

package/src/components/i18n/locales/zh/messages.json

@@ -4,6 +4,7 @@
   "toolbox.addBelow": "添加内容块",
   "toolbox.optionAddAbove": "⌥ 在上方添加",
   "toolbox.ctrlAddAbove": "Ctrl 在上方添加",
+  "toolbox.typeToSearch": "输入以搜索",
   "popover.search": "搜索",
   "popover.nothingFound": "未找到结果",
   "popover.convertTo": "转换为",
@@ -16,6 +17,7 @@
   "toolNames.bulletedList": "无序列表",
   "toolNames.numberedList": "有序列表",
   "toolNames.todoList": "清单",
+  "toolNames.toggleList": "折叠列表",
   "tools.link.addLink": "添加链接",
   "tools.link.invalidLink": "链接无效",
   "tools.marker.textColor": "文字",
@@ -29,8 +31,13 @@
   "tools.header.heading4": "四级标题",
   "tools.header.heading5": "五级标题",
   "tools.header.heading6": "六级标题",
+  "tools.header.toggleHeading": "折叠标题",
+  "tools.header.toggleHeading1": "折叠一级标题",
+  "tools.header.toggleHeading2": "折叠二级标题",
+  "tools.header.toggleHeading3": "折叠三级标题",
   "tools.list.placeholder": "列表",
   "tools.paragraph.placeholder": "输入内容或按 / 选择工具",
+  "tools.toggle.placeholder": "折叠",
   "blockSettings.delete": "删除",
   "a11y.dragHandle": "拖动移动或点击打开菜单",
   "a11y.dragHandleRole": "拖动控件",

package/src/components/modules/blockEvents/composers/keyboardNavigation.ts

@@ -83,6 +83,14 @@ export class KeyboardNavigation extends BlockEventComposer {
       return;
     }
 
+    /**
+     * Skip Tab handling for blocks inside table cells — the table's own grid-level
+     * handler (setupKeyboardNavigation) manages cell-to-cell and table-exit navigation.
+     */
+    if (this.isCurrentBlockInsideTableCell) {
+      return;
+    }
+
     const isNavigated = event.shiftKey ? Caret.navigatePrevious(true) : Caret.navigateNext(true);
 
     /**
@@ -174,14 +182,40 @@ export class KeyboardNavigation extends BlockEventComposer {
   private createBlockOnEnter(currentBlock: Block): Block {
     // Case 1: Caret at start - insert block above
     if (currentBlock.currentInput !== undefined && isCaretAtStartOfInput(currentBlock.currentInput) && !currentBlock.hasMedia && (currentBlock.parentId === null || !currentBlock.isEmpty)) {
-      this.Blok.BlockManager.insertDefaultBlockAtIndex(this.Blok.BlockManager.currentBlockIndex);
+      const newBlock = this.Blok.BlockManager.insertDefaultBlockAtIndex(this.Blok.BlockManager.currentBlockIndex);
+
+      /**
+       * When the current block is a child of a toggle, the new block inserted above
+       * should also be a child of the same parent.
+       */
+      if (currentBlock.parentId !== null) {
+        this.Blok.BlockManager.setBlockParent(newBlock, currentBlock.parentId);
+      }
 
       return currentBlock;
     }
 
     // Case 2: Caret at end - insert block below
     if (currentBlock.currentInput && isCaretAtEndOfInput(currentBlock.currentInput)) {
-      return this.Blok.BlockManager.insertDefaultBlockAtIndex(this.Blok.BlockManager.currentBlockIndex + 1);
+      const newBlock = this.Blok.BlockManager.insertDefaultBlockAtIndex(this.Blok.BlockManager.currentBlockIndex + 1);
+
+      /**
+       * When the current block is an open toggle (heading or list item),
+       * the new block should become a child of the toggle rather than a sibling.
+       * Detect via the data-blok-toggle-open DOM attribute set by toggle tools.
+       *
+       * When the current block is already a child of a toggle, the new block
+       * should inherit the same parent so it stays inside the toggle.
+       */
+      const toggleWrapper = currentBlock.holder.querySelector('[data-blok-toggle-open]');
+
+      if (toggleWrapper?.getAttribute('data-blok-toggle-open') === 'true') {
+        this.Blok.BlockManager.setBlockParent(newBlock, currentBlock.id);
+      } else if (currentBlock.parentId !== null) {
+        this.Blok.BlockManager.setBlockParent(newBlock, currentBlock.parentId);
+      }
+
+      return newBlock;
     }
 
     // Case 3: Caret in middle - split block
@@ -486,6 +520,14 @@ export class KeyboardNavigation extends BlockEventComposer {
     const isDownKey = keyCode === keyCodes.DOWN;
     const isRightKey = keyCode === keyCodes.RIGHT && !this.isRtl;
 
+    /**
+     * Skip ArrowDown handling for blocks inside table cells — the table's own
+     * grid-level handler manages row-based navigation and table exit.
+     */
+    if (isDownKey && this.isCurrentBlockInsideTableCell) {
+      return;
+    }
+
     const isNavigated = (() => {
       if (isDownKey) {
         /**

package/src/components/modules/blockEvents/index.ts

@@ -341,9 +341,7 @@ export class BlockEvents extends Module {
    * If Toolbox is not open, then just open it and show plus button
    */
   private activateToolbox(): void {
-    if (!this.Blok.Toolbar.opened) {
-      this.Blok.Toolbar.moveAndOpen();
-    } // else Flipper will leaf through it
+    this.Blok.Toolbar.moveAndOpen();
 
     this.Blok.Toolbar.toolbox.open();
   }

package/src/components/modules/blockManager/blockManager.ts

@@ -127,6 +127,22 @@ export class BlockManager extends Module {
     return this.operations?.previousBlock ?? null;
   }
 
+  /**
+   * Returns next visible Block instance (skips hidden blocks)
+   * @returns {Block|null}
+   */
+  public get nextVisibleBlock(): Block | null {
+    return this.operations?.nextVisibleBlock ?? null;
+  }
+
+  /**
+   * Returns previous visible Block instance (skips hidden blocks)
+   * @returns {Block|null}
+   */
+  public get previousVisibleBlock(): Block | null {
+    return this.operations?.previousVisibleBlock ?? null;
+  }
+
   /**
    * Get array of Block instances
    * @returns {Block[]} {@link Blocks#array}

package/src/components/modules/blockManager/operations.ts

@@ -175,6 +175,35 @@ export class BlockOperations {
     return previousBlock ?? null;
   }
 
+  /**
+   * Get next visible block (skips blocks whose holder has 'hidden' class)
+   * Returns null when no visible block is found after the current one
+   */
+  public get nextVisibleBlock(): Block | null {
+    if (this.currentBlockIndex === -1) {
+      return null;
+    }
+
+    return this.repository.blocks
+      .slice(this.currentBlockIndex + 1)
+      .find(block => !block.holder.classList.contains('hidden')) ?? null;
+  }
+
+  /**
+   * Get previous visible block (skips blocks whose holder has 'hidden' class)
+   * Returns null when no visible block is found before the current one
+   */
+  public get previousVisibleBlock(): Block | null {
+    if (this.currentBlockIndex === -1) {
+      return null;
+    }
+
+    return this.repository.blocks
+      .slice(0, this.currentBlockIndex)
+      .reverse()
+      .find(block => !block.holder.classList.contains('hidden')) ?? null;
+  }
+
   /**
    * Insert new block
    * @param options - Insert options
@@ -256,6 +285,20 @@ export class BlockOperations {
 
     blocksStore.insert(targetIndex, block, replace, appendToWorkingArea);
 
+    /**
+     * Update the raw currentBlockIndex BEFORE firing the mutation event so
+     * that listeners (e.g. TableCellBlocks.handleBlockMutation) see the
+     * index of the newly inserted block. We bypass the setter to avoid
+     * triggering stopCapturing prematurely — that happens after Yjs sync.
+     */
+    const prevIndex = this.currentBlockIndex;
+
+    if (needToFocus) {
+      this.currentBlockIndex = targetIndex;
+    } else if (targetIndex <= this.currentBlockIndex) {
+      this.currentBlockIndex++;
+    }
+
     /**
      * Force call of didMutated event on Block insertion
      */
@@ -277,12 +320,12 @@ export class BlockOperations {
       }, targetIndex);
     }
 
-    if (needToFocus) {
-      this.currentBlockIndexValue = targetIndex;
-    }
-
-    if (!needToFocus && targetIndex <= this.currentBlockIndex) {
-      this.currentBlockIndexValue++;
+    /**
+     * Trigger stopCapturing for the index change now that Yjs sync is done.
+     * This preserves undo group boundaries at the original timing.
+     */
+    if (this.currentBlockIndex !== prevIndex && !this.suppressStopCapturing) {
+      this.dependencies.YjsManager?.stopCapturing();
     }
 
     return block;
@@ -349,6 +392,18 @@ export class BlockOperations {
         parentBlock.contentIds = parentBlock.contentIds.filter(id => id !== block.id);
       }
 
+      // Promote children to root level when a parent block is removed
+      for (const childId of block.contentIds) {
+        const childBlock = this.repository.getBlockById(childId);
+
+        if (childBlock === undefined) {
+          continue;
+        }
+
+        childBlock.parentId = null;
+        childBlock.holder.classList.remove('hidden');
+      }
+
       blocksStore.remove(index);
 
       /**
@@ -416,6 +471,8 @@ export class BlockOperations {
       tool: block.name,
       data: Object.assign({}, existingData, data ?? {}),
       tunes: tunes ?? block.preservedTunes,
+      parentId: block.parentId ?? undefined,
+      contentIds: block.contentIds.length > 0 ? [...block.contentIds] : undefined,
       bindEventsImmediately: true,
     });
 
@@ -455,6 +512,10 @@ export class BlockOperations {
     const blockIndex = this.repository.getBlockIndex(block);
     const newBlockId = generateBlockId();
 
+    // Capture hierarchy before replacement
+    const oldParentId = block.parentId;
+    const oldContentIds = [...block.contentIds];
+
     // Atomic transaction: remove old block + add new block as single undo entry
     this.dependencies.YjsManager.transact(() => {
       this.dependencies.YjsManager.removeBlock(block.id);
@@ -466,7 +527,7 @@ export class BlockOperations {
     });
 
     // DOM update (skip Yjs sync — already done above)
-    return this.insert({
+    const newBlock = this.insert({
       id: newBlockId,
       tool: newTool,
       data,
@@ -474,6 +535,28 @@ export class BlockOperations {
       replace: true,
       skipYjsSync: true,
     }, blocksStore);
+
+    // Transfer hierarchy to new block
+    if (oldParentId !== null) {
+      newBlock.parentId = oldParentId;
+
+      const parentBlock = this.repository.getBlockById(oldParentId);
+
+      if (parentBlock !== undefined) {
+        parentBlock.contentIds = parentBlock.contentIds.map(id => id === block.id ? newBlock.id : id);
+      }
+    }
+
+    for (const childId of oldContentIds) {
+      const childBlock = this.repository.getBlockById(childId);
+
+      if (childBlock !== undefined) {
+        childBlock.parentId = newBlock.id;
+      }
+    }
+    newBlock.contentIds = oldContentIds;
+
+    return newBlock;
   }
 
   /**
@@ -663,12 +746,19 @@ export class BlockOperations {
       });
 
       // Insert DOM block (skip Yjs sync - already done above)
-      return this.insert({
+      const newBlock = this.insert({
         id: newBlockId,
         tool: currentBlock.name,
         data: { text: extractedText },
         skipYjsSync: true,
       }, blocksStore);
+
+      // Inherit parentId from the split block so nested blocks stay nested
+      if (currentBlock.parentId !== null) {
+        this.hierarchy.setBlockParent(newBlock, currentBlock.parentId);
+      }
+
+      return newBlock;
     });
   }
 
@@ -722,7 +812,7 @@ export class BlockOperations {
       }
 
       // Insert DOM block (skip Yjs sync - already done above)
-      return this.insert({
+      const newBlock = this.insert({
         id: newBlockId,
         tool: newBlockType,
         data: newBlockData,
@@ -730,6 +820,13 @@ export class BlockOperations {
         needToFocus: true,
         skipYjsSync: true,
       }, blocksStore);
+
+      // Inherit parentId from the split block so nested blocks stay nested
+      if (currentBlock.parentId !== null) {
+        this.hierarchy.setBlockParent(newBlock, currentBlock.parentId);
+      }
+
+      return newBlock;
     });
   }
 

package/src/components/modules/blockSelection.ts

@@ -336,6 +336,8 @@ export class BlockSelection extends Module {
       tool: block.name,
       data: block.preservedData,
       tunes: block.preservedTunes,
+      parentId: block.parentId,
+      contentIds: block.contentIds,
     }));
 
     this.selectedBlocks.forEach((block) => {

package/src/components/modules/caret.ts

@@ -499,7 +499,7 @@ export class Caret extends Module {
    */
   public navigateNext(force = false): boolean {
     const { BlockManager } = this.Blok;
-    const { currentBlock, nextBlock } = BlockManager;
+    const { currentBlock, nextVisibleBlock: nextBlock } = BlockManager;
 
     if (currentBlock === undefined) {
       return false;
@@ -567,7 +567,7 @@ export class Caret extends Module {
    * @param {boolean} force - pass true to skip check for caret position
    */
   public navigatePrevious(force = false): boolean {
-    const { currentBlock, previousBlock } = this.Blok.BlockManager;
+    const { currentBlock, previousVisibleBlock: previousBlock } = this.Blok.BlockManager;
 
     if (!currentBlock) {
       return false;
@@ -634,7 +634,7 @@ export class Caret extends Module {
    */
   public navigateVerticalNext(): boolean {
     const { BlockManager } = this.Blok;
-    const { currentBlock, nextBlock } = BlockManager;
+    const { currentBlock, nextVisibleBlock: nextBlock } = BlockManager;
 
     if (currentBlock === undefined) {
       return false;
@@ -681,6 +681,35 @@ export class Caret extends Module {
       return true;
     }
 
+    /**
+     * If current block is inside a table cell (has parentId), check if we should
+     * exit the table. This handles two cases:
+     * 1. nextBlock is still in the same table → skip all cell paragraphs
+     * 2. nextBlock is null (last block in flat list) → table is at the end
+     */
+    const shouldExitParent = currentBlock.parentId !== null && (
+      nextBlock === null ||
+      nextBlock.parentId === currentBlock.parentId ||
+      nextBlock.id === currentBlock.parentId
+    );
+
+    if (shouldExitParent && currentBlock.parentId !== null) {
+      const blockAfterTable = this.findFirstBlockAfterParent(currentBlock.parentId);
+
+      if (blockAfterTable !== null) {
+        this.setToBlockAtXPosition(blockAfterTable, caretX, true);
+
+        return true;
+      }
+
+      // No block after table — create one
+      const newBlock = BlockManager.insertAtEnd();
+
+      this.setToBlock(newBlock, this.positions.START);
+
+      return true;
+    }
+
     /**
      * Navigate to next block, preserving horizontal position
      */
@@ -714,7 +743,7 @@ export class Caret extends Module {
    */
   public navigateVerticalPrevious(): boolean {
     const { BlockManager } = this.Blok;
-    const { currentBlock, previousBlock } = BlockManager;
+    const { currentBlock, previousVisibleBlock: previousBlock } = BlockManager;
 
     if (currentBlock === undefined) {
       return false;
@@ -773,6 +802,22 @@ export class Caret extends Module {
     return false;
   }
 
+  /**
+   * Find the first block after a parent block (e.g., a table) by scanning the flat
+   * block array and skipping blocks whose parentId matches.
+   */
+  private findFirstBlockAfterParent(parentBlockId: string): Block | null {
+    const { BlockManager } = this.Blok;
+    const blocks = BlockManager.blocks;
+    const parentIndex = blocks.findIndex(b => b.id === parentBlockId);
+
+    if (parentIndex === -1) {
+      return null;
+    }
+
+    return blocks.slice(parentIndex + 1).find(b => b.parentId !== parentBlockId) ?? null;
+  }
+
   /**
    * Inserts shadow element after passed element where caret can be placed
    * @param {Element} element - element after which shadow caret should be inserted