@jackuait/blok 0.6.0-beta.5 → 0.6.0-beta.7

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

@@ -1,24 +1,24 @@
 {
-  "blockSettings.dragToMove": "తరలించడానికి డ్రాగ్ చేయండి",
-  "blockSettings.clickToOpenMenu": "మెనూ తెరవడానికి క్లిక్ చేయండి",
-  "toolbox.addBelow": "క్రింద జోడించడానికి క్లిక్ చేయండి",
-  "toolbox.optionAddAbove": "పైన జోడించడానికి Option-క్లిక్ చేయండి",
-  "toolbox.ctrlAddAbove": "పైన జోడించడానికి Ctrl-క్లిక్ చేయండి",
+  "blockSettings.dragToMove": "తరలించడానికి లాగండి",
+  "blockSettings.clickToOpenMenu": "జాబితా తెరవడానికి నొక్కండి",
+  "toolbox.addBelow": "క్రింద జోడించడానికి నొక్కండి",
+  "toolbox.optionAddAbove": "పైన జోడించడానికి Option-నొక్కండి",
+  "toolbox.ctrlAddAbove": "పైన జోడించడానికి Ctrl-నొక్కండి",
   "popover.search": "వెతకండి",
   "popover.nothingFound": "ఏమీ కనుగొనబడలేదు",
   "popover.convertTo": "మార్చు",
-  "toolNames.text": "టెక్స్ట్",
+  "toolNames.text": "వచనం",
   "toolNames.heading": "శీర్షిక",
   "toolNames.link": "లింక్",
-  "toolNames.bold": "బోల్డ్",
-  "toolNames.italic": "ఇటాలిక్",
-  "toolNames.bulletedList": "బుల్లెట్ జాబితా",
-  "toolNames.numberedList": "నంబర్ జాబితా",
+  "toolNames.bold": "గాఢం",
+  "toolNames.italic": "వాలు",
+  "toolNames.bulletedList": "చుక్కల జాబితా",
+  "toolNames.numberedList": "అంకెల జాబితా",
   "toolNames.todoList": "చేయవలసిన పనుల జాబితా",
   "tools.link.addLink": "లింక్ జోడించండి",
   "tools.link.invalidLink": "చెల్లని లింక్",
   "tools.stub.error": "లోపం",
-  "tools.stub.blockCannotBeDisplayed": "ఈ బ్లాక్‌ను ప్రదర్శించలేము",
+  "tools.stub.blockCannotBeDisplayed": "ఈ విభాగాన్ని ప్రదర్శించలేము",
   "tools.header.heading1": "శీర్షిక 1",
   "tools.header.heading2": "శీర్షిక 2",
   "tools.header.heading3": "శీర్షిక 3",
@@ -27,33 +27,33 @@
   "tools.header.heading6": "శీర్షిక 6",
   "tools.list.placeholder": "జాబితా",
   "blockSettings.delete": "తొలగించు",
-  "a11y.dragHandle": "బ్లాక్ తరలించడానికి డ్రాగ్ చేయండి లేదా మెనూ కోసం క్లిక్ చేయండి",
-  "a11y.dragHandleRole": "డ్రాగ్ హ్యాండిల్",
-  "a11y.dragStarted": "బ్లాక్ డ్రాగ్ అవుతోంది",
-  "a11y.dragStartedMultiple": "{count} బ్లాక్‌లు డ్రాగ్ అవుతున్నాయి",
-  "a11y.dropPosition": "{total} లో {position} స్థానంలో డ్రాప్ అవుతుంది",
-  "a11y.dropCancelled": "డ్రాగ్ రద్దు చేయబడింది",
-  "a11y.blockMoved": "బ్లాక్ {total} లో {position} స్థానానికి తరలించబడింది",
-  "a11y.blocksMoved": "{count} బ్లాక్‌లు {position} స్థానానికి తరలించబడ్డాయి",
-  "a11y.blockDuplicated": "బ్లాక్ {total} లో {position} స్థానంలో నకలు చేయబడింది",
-  "a11y.blocksDuplicated": "{count} బ్లాక్‌లు {position} స్థానం నుండి నకలు చేయబడ్డాయి",
-  "a11y.movedUp": "బ్లాక్ {total} లో {position} స్థానానికి పైకి తరలించబడింది",
-  "a11y.movedDown": "బ్లాక్ {total} లో {position} స్థానానికి క్రిందికి తరలించబడింది",
-  "a11y.atTop": "బ్లాక్ పైన ఉంది, పైకి తరలించలేము",
-  "a11y.atBottom": "బ్లాక్ క్రింద ఉంది, క్రిందికి తరలించలేము",
-  "tools.paragraph.placeholder": "ఏదైనా రాయండి లేదా ఎంచుకోడానికి / నొక్కండి",
+  "a11y.dragHandle": "విభాగం తరలించడానికి లాగండి లేదా జాబితా కోసం నొక్కండి",
+  "a11y.dragHandleRole": "లాగు పట్టిక",
+  "a11y.dragStarted": "విభాగం తరలుతోంది",
+  "a11y.dragStartedMultiple": "{count} విభాగాలు తరలుతున్నాయి",
+  "a11y.dropPosition": "{total} లో {position} స్థానంలో వదులుతుంది",
+  "a11y.dropCancelled": "లాగడం రద్దు చేయబడింది",
+  "a11y.blockMoved": "విభాగం {total} లో {position} స్థానానికి తరలించబడింది",
+  "a11y.blocksMoved": "{count} విభాగాలు {position} స్థానానికి తరలించబడ్డాయి",
+  "a11y.blockDuplicated": "విభాగం {total} లో {position} స్థానంలో నకలు చేయబడింది",
+  "a11y.blocksDuplicated": "{count} విభాగాలు {position} స్థానం నుండి నకలు చేయబడ్డాయి",
+  "a11y.movedUp": "విభాగం {total} లో {position} స్థానానికి పైకి తరలించబడింది",
+  "a11y.movedDown": "విభాగం {total} లో {position} స్థానానికి క్రిందికి తరలించబడింది",
+  "a11y.atTop": "విభాగం పైన ఉంది, పైకి తరలించలేము",
+  "a11y.atBottom": "విభాగం క్రింద ఉంది, క్రిందికి తరలించలేము",
+  "tools.paragraph.placeholder": "ఏదైనా రాయండి లేదా సాధనం ఎంచుకోడానికి / నొక్కండి",
   "tools.table.title": "పట్టిక",
-  "tools.table.clearSelection": "క్లియర్ చేయండి",
-  "tools.table.headerColumn": "హెడర్ కాలమ్",
-  "tools.table.insertColumnLeft": "ఎడమవైపు కాలమ్ చొప్పించు",
-  "tools.table.insertColumnRight": "కుడివైపు కాలమ్ చొప్పించు",
+  "tools.table.clearSelection": "తుడుచు",
+  "tools.table.headerColumn": "శీర్ష స్తంభం",
+  "tools.table.insertColumnLeft": "ఎడమవైపు స్తంభం చొప్పించు",
+  "tools.table.insertColumnRight": "కుడివైపు స్తంభం చొప్పించు",
   "tools.table.deleteColumn": "తొలగించు",
-  "tools.table.headerRow": "హెడర్ వరుస",
+  "tools.table.headerRow": "శీర్ష వరుస",
   "tools.table.insertRowAbove": "పైన వరుస చొప్పించు",
   "tools.table.insertRowBelow": "క్రింద వరుస చొప్పించు",
   "tools.table.deleteRow": "తొలగించు",
-  "tools.table.clickToAddRow": "కొత్త వరుస జోడించడానికి క్లిక్ చేయండి",
-  "tools.table.dragToAddRemoveRows": "వరుసలు జోడించడానికి లేదా తొలగించడానికి డ్రాగ్ చేయండి",
-  "tools.table.clickToAddColumn": "కొత్త కాలమ్ జోడించడానికి క్లిక్ చేయండి",
-  "tools.table.dragToAddRemoveColumns": "కాలమ్‌లు జోడించడానికి లేదా తొలగించడానికి డ్రాగ్ చేయండి"
+  "tools.table.clickToAddRow": "కొత్త వరుస జోడించడానికి నొక్కండి",
+  "tools.table.dragToAddRemoveRows": "వరుసలు జోడించడానికి లేదా తొలగించడానికి లాగండి",
+  "tools.table.clickToAddColumn": "కొత్త స్తంభం జోడించడానికి నొక్కండి",
+  "tools.table.dragToAddRemoveColumns": "స్తంభాలు జోడించడానికి లేదా తొలగించడానికి లాగండి"
 }

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

@@ -1,9 +1,9 @@
 {
   "blockSettings.dragToMove": "ลากเพื่อย้าย",
   "blockSettings.clickToOpenMenu": "คลิกเพื่อเปิดเมนู",
-  "toolbox.addBelow": "เพิ่มบล็อก",
-  "toolbox.optionAddAbove": "⌥ — เพิ่มด้านบน",
-  "toolbox.ctrlAddAbove": "Ctrl — เพิ่มด้านบน",
+  "toolbox.addBelow": "คลิกเพื่อเพิ่มด้านล่าง",
+  "toolbox.optionAddAbove": "⌥ คลิกเพื่อเพิ่มด้านบน",
+  "toolbox.ctrlAddAbove": "Ctrl คลิกเพื่อเพิ่มด้านบน",
   "popover.search": "ค้นหา",
   "popover.nothingFound": "ไม่พบผลลัพธ์",
   "popover.convertTo": "แปลงเป็น",
@@ -35,13 +35,13 @@
   "a11y.dropCancelled": "ยกเลิกการลาก",
   "a11y.blockMoved": "ย้ายบล็อกไปตำแหน่ง {position} จาก {total}",
   "a11y.blocksMoved": "ย้าย {count} บล็อกไปตำแหน่ง {position}",
-  "a11y.blockDuplicated": "คัดลอกบล็อกไปตำแหน่ง {position} จาก {total}",
+  "a11y.blockDuplicated": "คัดลอกบล็อกที่ตำแหน่ง {position} จาก {total}",
   "a11y.blocksDuplicated": "คัดลอก {count} บล็อก เริ่มจากตำแหน่ง {position}",
   "a11y.movedUp": "ย้ายบล็อกขึ้น ตำแหน่ง {position} จาก {total}",
   "a11y.movedDown": "ย้ายบล็อกลง ตำแหน่ง {position} จาก {total}",
   "a11y.atTop": "บล็อกอยู่บนสุดแล้ว ไม่สามารถย้ายขึ้นได้",
   "a11y.atBottom": "บล็อกอยู่ล่างสุดแล้ว ไม่สามารถย้ายลงได้",
-  "tools.paragraph.placeholder": "เขียนอะไรสักอย่าง หรือกด / เพื่อเลือก",
+  "tools.paragraph.placeholder": "เขียนอะไรสักอย่าง หรือกด / เพื่อเลือกเครื่องมือ",
   "tools.table.title": "ตาราง",
   "tools.table.clearSelection": "ล้าง",
   "tools.table.headerColumn": "คอลัมน์หัวข้อ",

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

@@ -1,12 +1,12 @@
 {
   "blockSettings.dragToMove": "Kéo để di chuyển",
   "blockSettings.clickToOpenMenu": "Nhấp để mở menu",
-  "toolbox.addBelow": "Thêm khối",
-  "toolbox.optionAddAbove": "⌥ Thêm ở trên",
-  "toolbox.ctrlAddAbove": "Ctrl Thêm ở trên",
+  "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",
   "popover.search": "Tìm kiếm",
   "popover.nothingFound": "Không tìm thấy",
-  "popover.convertTo": "Chuyển đổi",
+  "popover.convertTo": "Chuyển sang",
   "toolNames.text": "Văn bản",
   "toolNames.heading": "Tiêu đề",
   "toolNames.link": "Liên kết",
@@ -26,7 +26,7 @@
   "tools.header.heading5": "Tiêu đề 5",
   "tools.header.heading6": "Tiêu đề 6",
   "tools.list.placeholder": "Danh sách",
-  "tools.paragraph.placeholder": "Viết gì đó hoặc nhấn / để chọn",
+  "tools.paragraph.placeholder": "Viết gì đó hoặc nhấn / để chọn công cụ",
   "tools.table.title": "Bảng",
   "tools.table.clearSelection": "Xóa",
   "tools.table.headerColumn": "Cột tiêu đề",
@@ -46,14 +46,14 @@
   "a11y.dragHandleRole": "tay nắm kéo",
   "a11y.dragStarted": "Đang kéo khối",
   "a11y.dragStartedMultiple": "Đang kéo {count} khối",
-  "a11y.dropPosition": "Sẽ thả vào vị trí {position} trên {total}",
+  "a11y.dropPosition": "Sẽ thả vào vị trí {position} trong {total}",
   "a11y.dropCancelled": "Đã hủy kéo",
-  "a11y.blockMoved": "Khối đã được di chuyển đến vị trí {position} trên {total}",
+  "a11y.blockMoved": "Khối đã được di chuyển đến vị trí {position} trong {total}",
   "a11y.blocksMoved": "{count} khối đã được di chuyển đến vị trí {position}",
-  "a11y.blockDuplicated": "Khối đã được sao chép tại vị trí {position} trên {total}",
+  "a11y.blockDuplicated": "Khối đã được sao chép tại vị trí {position} trong {total}",
   "a11y.blocksDuplicated": "{count} khối đã được sao chép từ vị trí {position}",
-  "a11y.movedUp": "Khối đã di chuyển lên, vị trí {position} trên {total}",
-  "a11y.movedDown": "Khối đã di chuyển xuống, vị trí {position} trên {total}",
+  "a11y.movedUp": "Khối đã di chuyển lên đến vị trí {position} trong {total}",
+  "a11y.movedDown": "Khối đã di chuyển xuống đến vị trí {position} trong {total}",
   "a11y.atTop": "Khối đang ở trên cùng, không thể di chuyển lên",
   "a11y.atBottom": "Khối đang ở dưới cùng, không thể di chuyển xuống"
 }

package/src/components/modules/api/history.ts

@@ -0,0 +1,64 @@
+/**
+ * @module HistoryAPI
+ * @copyright <CodeX> 2018
+ *
+ * Provides public methods for undo/redo operations
+ */
+import type { History } from '../../../../types/api';
+import { Module } from '../../__module';
+
+/**
+ * @class HistoryAPI
+ */
+export class HistoryAPI extends Module {
+  /**
+   * Available methods
+   * @returns {History}
+   */
+  public get methods(): History {
+    return {
+      undo: (): void => this.undo(),
+      redo: (): void => this.redo(),
+      canUndo: (): boolean => this.canUndo(),
+      canRedo: (): boolean => this.canRedo(),
+      clear: (): void => this.clear(),
+    };
+  }
+
+  /**
+   * Undo the last operation
+   */
+  public undo(): void {
+    this.Blok.YjsManager.undo();
+  }
+
+  /**
+   * Redo the last undone operation
+   */
+  public redo(): void {
+    this.Blok.YjsManager.redo();
+  }
+
+  /**
+   * Check if undo is available
+   * @returns {boolean} true if undo is available
+   */
+  public canUndo(): boolean {
+    return this.Blok.YjsManager.canUndo();
+  }
+
+  /**
+   * Check if redo is available
+   * @returns {boolean} true if redo is available
+   */
+  public canRedo(): boolean {
+    return this.Blok.YjsManager.canRedo();
+  }
+
+  /**
+   * Clear all history
+   */
+  public clear(): void {
+    this.Blok.YjsManager.clear();
+  }
+}

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

@@ -21,6 +21,7 @@ export class API extends Module {
       caret: this.Blok.CaretAPI.methods,
       tools: this.Blok.ToolsAPI.methods,
       events: this.Blok.EventsAPI.methods,
+      history: this.Blok.HistoryAPI.methods,
       listeners: this.Blok.ListenersAPI.methods,
       notifier: this.Blok.NotifierAPI.methods,
       sanitizer: this.Blok.SanitizerAPI.methods,

package/src/components/modules/api/readonly.ts

@@ -12,9 +12,10 @@ export class ReadOnlyAPI extends Module {
   public get methods(): ReadOnly {
     const getIsEnabled = (): boolean => this.isEnabled;
 
-     
+
     return {
       toggle: (state): Promise<boolean> => this.toggle(state),
+      set: (state): Promise<boolean> => this.set(state),
       get isEnabled(): boolean {
         return getIsEnabled();
       },
@@ -30,6 +31,15 @@ export class ReadOnlyAPI extends Module {
     return this.Blok.ReadOnly.toggle(state);
   }
 
+  /**
+   * Set read-only mode to the specified boolean state
+   * @param {boolean} state - read-only state to set
+   * @returns {Promise<boolean>} the new read-only state
+   */
+  public set(state: boolean): Promise<boolean> {
+    return this.Blok.ReadOnly.set(state);
+  }
+
   /**
    * Returns current read-only state
    */

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

@@ -7,6 +7,7 @@
 import type { BlockToolData, OutputBlockData, PasteEvent } from '../../../../types';
 import type { BlockTuneData } from '../../../../types/block-tunes/block-tune-data';
 import type { BlockMutationEventMap, BlockMutationType } from '../../../../types/events/block';
+import { BlockAddedMutationType } from '../../../../types/events/block/BlockAdded';
 import { BlockChangedMutationType } from '../../../../types/events/block/BlockChanged';
 import { BlockRemovedMutationType } from '../../../../types/events/block/BlockRemoved';
 import { Module } from '../../__module';
@@ -307,6 +308,12 @@ export class BlockManager extends Module {
         replaceBlock: (index, newBlock) => {
           this.blocksStore.replace(index, newBlock);
         },
+        onBlockRemoved: (block, index) => {
+          this.blockDidMutated(BlockRemovedMutationType, block, { index });
+        },
+        onBlockAdded: (block, index) => {
+          this.blockDidMutated(BlockAddedMutationType, block, { index });
+        },
       },
       this.blocksStore
     );

package/src/components/modules/blockManager/yjs-sync.ts

@@ -43,6 +43,10 @@ export interface SyncHandlers {
   updateIndentation: (block: Block) => void;
   /** Called to replace a block at a specific index with a new block instance */
   replaceBlock: (index: number, newBlock: Block) => void;
+  /** Called when a block is removed during undo/redo (before DOM removal) */
+  onBlockRemoved: (block: Block, index: number) => void;
+  /** Called when a block is added during undo/redo (after insertion) */
+  onBlockAdded: (block: Block, index: number) => void;
 }
 
 /**
@@ -273,10 +277,12 @@ export class BlockYjsSync {
         bindEventsImmediately: true,
       });
 
-      // Insert into blocks store at correct position - caller must handle this
-      // This is a limitation - we need the blocksStore.insert method
       this.blocksStore.insert(targetIndex, block);
 
+      // Emit block-added event so listeners (e.g., TableCellBlocks) can
+      // claim the block for the correct cell during undo/redo
+      this.handlers.onBlockAdded(block, targetIndex);
+
       // Apply indentation if needed
       if (parentId !== undefined) {
         this.handlers.updateIndentation(block);
@@ -300,6 +306,10 @@ export class BlockYjsSync {
       return;
     }
 
+    // Emit block-removed event BEFORE removal so listeners can inspect
+    // the block's DOM position (e.g., which table cell it's in)
+    this.handlers.onBlockRemoved(block, index);
+
     // Remove from DOM
     this.blocksStore.remove(index);
 

package/src/components/modules/index.ts

@@ -1,6 +1,7 @@
 import { BlocksAPI } from './api/blocks';
 import { CaretAPI } from './api/caret';
 import { EventsAPI } from './api/events';
+import { HistoryAPI } from './api/history';
 import { I18nAPI } from './api/i18n';
 import { API } from './api/index';
 import { InlineToolbarAPI } from './api/inlineToolbar';
@@ -44,6 +45,7 @@ export {
   BlocksAPI,
   CaretAPI,
   EventsAPI,
+  HistoryAPI,
   I18nAPI,
   API,
   InlineToolbarAPI,
@@ -91,6 +93,7 @@ export const Modules = {
   BlocksAPI,
   CaretAPI,
   EventsAPI,
+  HistoryAPI,
   I18nAPI,
   API,
   InlineToolbarAPI,

package/src/components/modules/readonly.ts

@@ -125,6 +125,17 @@ export class ReadOnly extends Module {
     return this.readOnlyEnabled;
   }
 
+  /**
+   * Set read-only mode to the specified boolean state
+   * Unlike toggle(), this method requires a parameter and does not have default toggle behavior
+   * Call all Modules `toggleReadOnly` method and re-render Blok
+   * @param state - read-only state to set (required)
+   * @returns the new read-only state
+   */
+  public async set(state: boolean): Promise<boolean> {
+    return this.toggle(state);
+  }
+
   /**
    * Throws an error about tools which don't support read-only mode
    */

package/src/components/modules/rectangleSelection.ts

@@ -140,11 +140,15 @@ export class RectangleSelection extends Module {
     const pointerX = pageX - scrollLeft;
 
     /**
-     * Check if pointer is within editor's horizontal bounds.
+     * Check if pointer is within the content area's horizontal bounds.
      * This determines whether we should close the toolbar when starting selection.
-     * Clicks outside the horizontal bounds (to the left or right) should NOT close the toolbar.
+     * Clicks outside the content area (to the left or right, in the margin/toolbar zone)
+     * should NOT close the toolbar. Use the first block's content element for bounds,
+     * falling back to the redactor bounds if no content element exists.
      */
-    const withinEditorHorizontally = pointerX >= editorRect.left && pointerX <= editorRect.right;
+    const contentElement = redactor.querySelector('[data-blok-testid="block-content"]');
+    const contentRect = contentElement ? contentElement.getBoundingClientRect() : editorRect;
+    const withinEditorHorizontally = pointerX >= contentRect.left && pointerX <= contentRect.right;
 
     const elemWhereSelectionStart = document.elementFromPoint(pageX - scrollLeft, pointerY);
 

package/src/components/modules/saver.ts

@@ -125,7 +125,9 @@ export class Saver extends Module {
     const extractedBlocks: OutputData['blocks'] = [];
 
     allExtractedData.forEach(({ id, tool, data, tunes, isValid, parentId, contentIds }) => {
-      if (!isValid) {
+      const hasParent = parentId !== undefined && parentId !== null;
+
+      if (!isValid && !hasParent) {
         log(`Block «${tool}» skipped because saved data is invalid`);
 
         return;
@@ -151,7 +153,6 @@ export class Saver extends Module {
       }
 
       const isTunesEmpty = tunes === undefined || isEmpty(tunes);
-      const hasParent = parentId !== undefined && parentId !== null;
       const hasContent = contentIds !== undefined && contentIds.length > 0;
 
       const output: OutputData['blocks'][number] = {

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

@@ -85,6 +85,13 @@ export class Toolbar extends Module<ToolbarNodes> {
    */
   private explicitlyClosed: boolean = false;
 
+  /**
+   * Flag to track if the current hovered block was resolved from a table cell block.
+   * When true, the toolbar suppresses plus button, settings toggler, and
+   * prevents overriding the current block when the toolbox opens.
+   */
+  private hoveredBlockIsFromTableCell: boolean = false;
+
   /**
    * Toolbox class instance
    * It will be created in requestIdleCallback so it can be null in some period of time
@@ -215,8 +222,10 @@ export class Toolbar extends Module<ToolbarNodes> {
 
         /**
          * Set current block to cover the case when the Toolbar showed near hovered Block but caret is set to another Block.
+         * Skip this when the hovered block was resolved from a table cell, so the toolbox
+         * can detect the original cell block and hide restricted tools (e.g., table, header).
          */
-        if (this.hoveredBlock) {
+        if (this.hoveredBlock && !this.hoveredBlockIsFromTableCell) {
           this.Blok.BlockManager.currentBlock = this.hoveredBlock;
         }
 
@@ -328,11 +337,12 @@ export class Toolbar extends Module<ToolbarNodes> {
 
     const targetBlock = this.resolveTableCellBlock(unresolvedBlock);
 
-    if (!targetBlock) {
-      this.close();
-
-      return;
-    }
+    /**
+     * Track whether the original block was inside a table cell.
+     * When true, the toolbar suppresses plus button and settings toggler,
+     * and the toolbox uses the original current block for cell detection.
+     */
+    this.hoveredBlockIsFromTableCell = targetBlock !== unresolvedBlock;
 
     /** Clean up draggable on previous block if any */
     if (this.hoveredBlock && this.hoveredBlock !== targetBlock) {
@@ -351,6 +361,25 @@ export class Toolbar extends Module<ToolbarNodes> {
       return;
     }
 
+    /**
+     * Suppress toolbar buttons when the block is inside a table cell.
+     * The toolbar still positions itself for toolbox/slash-search purposes,
+     * but plus button and settings toggler remain hidden.
+     */
+    if (this.hoveredBlockIsFromTableCell) {
+      plusButton.style.display = 'none';
+
+      if (settingsToggler) {
+        settingsToggler.style.display = 'none';
+      }
+    } else {
+      plusButton.style.display = '';
+
+      if (settingsToggler) {
+        settingsToggler.style.display = '';
+      }
+    }
+
     const targetBlockHolder = targetBlock.holder;
     const { isMobile } = this.Blok.UI;
 
@@ -521,18 +550,24 @@ export class Toolbar extends Module<ToolbarNodes> {
      * to prevent toolbar from reopening on subsequent block-hovered events
      */
     this.hoveredBlock = null;
+    this.hoveredBlockIsFromTableCell = false;
     // Only set explicitlyClosed if not explicitly disabled (e.g., when called from toolbox after block insertion)
     if (options?.setExplicitlyClosed !== false) {
       this.explicitlyClosed = true;
     }
 
     /**
-     * Restore plus button visibility in case it was hidden by other interactions
+     * Restore plus button and settings toggler visibility
+     * in case they were hidden for table cell blocks
      */
     if (this.nodes.plusButton) {
       this.nodes.plusButton.style.display = '';
     }
 
+    if (this.nodes.settingsToggler) {
+      this.nodes.settingsToggler.style.display = '';
+    }
+
     /**
      * Reset the content offset transform
      */
@@ -566,9 +601,9 @@ export class Toolbar extends Module<ToolbarNodes> {
    * Uses the DOM attribute directly to avoid cross-module dependency on the table tool.
    *
    * @param block - the block to resolve
-   * @returns the parent table block if inside a cell, the original block otherwise, or null if resolution fails
+   * @returns the parent table block if inside a cell, the original block otherwise
    */
-  private resolveTableCellBlock(block: Block): Block | null {
+  private resolveTableCellBlock(block: Block): Block {
     const cellBlocksContainer = block.holder.closest('[data-blok-table-cell-blocks]');
 
     if (!cellBlocksContainer) {
@@ -578,10 +613,10 @@ export class Toolbar extends Module<ToolbarNodes> {
     const tableBlockHolder = cellBlocksContainer.closest('[data-blok-testid="block-wrapper"]');
 
     if (!tableBlockHolder) {
-      return null;
+      return block;
     }
 
-    return this.Blok.BlockManager.getBlockByChildNode(tableBlockHolder) ?? null;
+    return this.Blok.BlockManager.getBlockByChildNode(tableBlockHolder) ?? block;
   }
 
   /**

package/src/components/modules/toolbar/plus-button.ts

@@ -173,12 +173,33 @@ export class PlusButtonHandler {
     const hoveredBlockIndex = hoveredBlock !== null
       ? BlockManager.getBlockIndex(hoveredBlock)
       : BlockManager.currentBlockIndex;
-    const insertIndex = insertAbove ? hoveredBlockIndex : hoveredBlockIndex + 1;
+    const baseInsertIndex = insertAbove ? hoveredBlockIndex : hoveredBlockIndex + 1;
+
+    // When inserting below, skip past any blocks nested inside another block's
+    // DOM (e.g. paragraph blocks inside table cells). The block array may
+    // interleave nested blocks from multiple parents, so check whether each
+    // block's holder lives inside any block-wrapper ancestor rather than only
+    // the hovered block's holder.
+    const blocksAfterInsert = BlockManager.blocks.slice(baseInsertIndex);
+    const isNested = (block: Block): boolean =>
+      block.holder.parentElement?.closest('[data-blok-testid="block-wrapper"]') !== null;
+    const firstNonNestedOffset = !insertAbove && hoveredBlock && blocksAfterInsert.length > 0
+      ? blocksAfterInsert.findIndex((block) => !isNested(block))
+      : 0;
+    const insertIndex = baseInsertIndex + (firstNonNestedOffset === -1 ? blocksAfterInsert.length : firstNonNestedOffset);
 
     const targetBlock = isEmptyParagraph || startsWithSlash
       ? hoveredBlock
       : BlockManager.insertDefaultBlockAtIndex(insertIndex, true);
 
+    // The DOM insertion may place the new block's holder inside a nested
+    // container (e.g. a table cell) because the previous block in the array
+    // is inside another block's DOM. Move the holder to be a sibling after
+    // the hovered block so it becomes a top-level block.
+    if (targetBlock !== hoveredBlock && isNested(targetBlock)) {
+      hoveredBlock?.holder.after(targetBlock.holder);
+    }
+
     // Insert "/" or position caret after existing one
     if (startsWithSlash) {
       Caret.setToBlock(targetBlock, Caret.positions.DEFAULT, 1);

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

@@ -189,6 +189,29 @@ export class YjsManager extends Module {
     this.undoHistory.redo();
   }
 
+  /**
+   * Check if undo is available.
+   * @returns true if undo is available
+   */
+  public canUndo(): boolean {
+    return this.undoHistory.canUndo();
+  }
+
+  /**
+   * Check if redo is available.
+   * @returns true if redo is available
+   */
+  public canRedo(): boolean {
+    return this.undoHistory.canRedo();
+  }
+
+  /**
+   * Clear all history.
+   */
+  public clear(): void {
+    this.undoHistory.clear();
+  }
+
   /**
    * Stop capturing changes into current undo group.
    * Call this to force next change into a new undo entry.