@jackuait/blok 0.10.11 → 0.10.12

package/dist/chunks/{constants-lxerM-Xa.mjs → constants-C0aZXxoO.mjs}

@@ -130,7 +130,7 @@ var a = {
 	RIGHT: 2,
 	BACKWARD: 3,
 	FORWARD: 4
-}, l = () => "0.10.11", u = /* @__PURE__ */ function(e) {
+}, l = () => "0.10.12", u = /* @__PURE__ */ function(e) {
 	return e.VERBOSE = "VERBOSE", e.INFO = "INFO", e.WARN = "WARN", e.ERROR = "ERROR", e;
 }({}), d = (e, t, n = "log", r, i = "color: inherit") => {
 	let a = typeof console > "u" ? void 0 : console;

package/dist/chunks/{tools-CMNxZqJC.mjs → tools-vS7102lG.mjs}

@@ -1,4 +1,4 @@
-import { $ as e, $t as t, A as n, At as r, B as i, Bt as a, Ct as o, D as s, Et as c, F as l, Ft as u, G as d, Gt as f, H as p, Ht as m, I as h, It as g, J as _, Jt as v, K as y, Kt as b, L as ee, Lt as x, M as te, Mt as S, Nn as ne, Nt as re, O as ie, Ot as C, P as ae, Pt as oe, Q as se, Qt as ce, R as le, Rn as w, Rt as ue, St as de, Tt as fe, U as pe, Ut as me, V as he, W as ge, Wt as _e, X as ve, Xt as ye, Y as be, Yt as xe, Z as Se, Zt as Ce, _n as we, _t as Te, a as Ee, at as De, bt as Oe, c as ke, cn as T, ct as Ae, d as je, dr as E, dt as Me, en as Ne, et as Pe, f as Fe, ft as Ie, g as Le, gt as Re, h as ze, ht as Be, i as Ve, ir as He, it as Ue, j as We, jt as Ge, k as Ke, kt as qe, l as Je, ln as Ye, lt as Xe, mn as Ze, mt as Qe, n as $e, nt as et, o as tt, ot as nt, p as rt, pn as D, pt as it, q as at, qt as ot, r as st, rn as ct, rt as lt, s as ut, sn as dt, st as ft, t as pt, tt as mt, u as O, un as ht, ur as k, ut as gt, v as _t, vn as vt, vt as yt, wt as bt, xt, z as St, zt as Ct } from "./constants-lxerM-Xa.mjs";
+import { $ as e, $t as t, A as n, At as r, B as i, Bt as a, Ct as o, D as s, Et as c, F as l, Ft as u, G as d, Gt as f, H as p, Ht as m, I as h, It as g, J as _, Jt as v, K as y, Kt as b, L as ee, Lt as x, M as te, Mt as S, Nn as ne, Nt as re, O as ie, Ot as C, P as ae, Pt as oe, Q as se, Qt as ce, R as le, Rn as w, Rt as ue, St as de, Tt as fe, U as pe, Ut as me, V as he, W as ge, Wt as _e, X as ve, Xt as ye, Y as be, Yt as xe, Z as Se, Zt as Ce, _n as we, _t as Te, a as Ee, at as De, bt as Oe, c as ke, cn as T, ct as Ae, d as je, dr as E, dt as Me, en as Ne, et as Pe, f as Fe, ft as Ie, g as Le, gt as Re, h as ze, ht as Be, i as Ve, ir as He, it as Ue, j as We, jt as Ge, k as Ke, kt as qe, l as Je, ln as Ye, lt as Xe, mn as Ze, mt as Qe, n as $e, nt as et, o as tt, ot as nt, p as rt, pn as D, pt as it, q as at, qt as ot, r as st, rn as ct, rt as lt, s as ut, sn as dt, st as ft, t as pt, tt as mt, u as O, un as ht, ur as k, ut as gt, v as _t, vn as vt, vt as yt, wt as bt, xt, z as St, zt as Ct } from "./constants-C0aZXxoO.mjs";
 import { t as A } from "./objectSpread2-CWwMYL_U.mjs";
 import { n as j } from "./tw-CqxBf-1Y.mjs";
 //#region src/components/utils/html.ts
@@ -2090,7 +2090,7 @@ var Qt = "outline-hidden py-[7px] mt-[2px] mb-px", $t = "outline-hidden pl-0.5 l
 	constructor(e) {
 		var t;
 		this._activeCellWithBlocks = null, this.cellsPendingCheck = /* @__PURE__ */ new Set(), this.pendingCheckScheduled = !1, this.removedBlockCells = /* @__PURE__ */ new Map(), this.deferredEvents = [], this.isExitingTable = !1, this.handleBlockMutation = (e) => {
-			if (this.isStructuralOpActive()) {
+			if (this.isStructuralOpActive() && !this.api.blocks.isSyncingFromYjs) {
 				this.deferredEvents.push(e);
 				return;
 			}
@@ -2105,28 +2105,36 @@ var Qt = "outline-hidden py-[7px] mt-[2px] mb-px", $t = "outline-hidden pl-0.5 l
 				return;
 			}
 			if (t !== "block-added" || n.target.id === this.tableBlockId) return;
-			let r = n.index;
-			if (r === void 0) return;
-			let i = this.findRemovedEntryForIndex(r);
-			if (i && this.isAdjacentToThisTable(r)) {
-				this.claimBlockForCell(i.cell, n.target.id), this.syncBlockToModel(i.cell, n.target.id), this.cellsPendingCheck.delete(i.cell);
+			let r = this.model.findCellForBlock(n.target.id);
+			if (r) {
+				let e = this.gridElement.querySelector(`[${I}="${r.row}"][${L}="${r.col}"]`);
+				if (e) {
+					this.claimBlockForCell(e, n.target.id), this.cellsPendingCheck.delete(e);
+					return;
+				}
+			}
+			let i = n.index;
+			if (i === void 0) return;
+			let a = this.findRemovedEntryForIndex(i);
+			if (a && this.isAdjacentToThisTable(i)) {
+				this.claimBlockForCell(a.cell, n.target.id), this.syncBlockToModel(a.cell, n.target.id), this.cellsPendingCheck.delete(a.cell);
 				return;
 			}
-			let a = n.target.holder, o = a.closest(`[${z}]`);
-			o && this.stripPlaceholders(o);
-			let s = o && !this.model.findCellForBlock(n.target.id) ? o.closest(`[${F}]`) : null;
-			if (s && this.syncBlockToModel(s, n.target.id), o) return;
-			if (!this.gridElement.contains(a)) {
+			let o = n.target.holder, s = o.closest(`[${z}]`);
+			s && this.stripPlaceholders(s);
+			let c = s && !this.model.findCellForBlock(n.target.id) ? s.closest(`[${F}]`) : null;
+			if (c && this.syncBlockToModel(c, n.target.id), s) return;
+			if (!this.gridElement.contains(o)) {
 				let e = this.api.blocks.getBlockIndex(this.tableBlockId), t = e === void 0 ? null : this.api.blocks.getBlockByIndex(e);
-				if (t && !t.holder.contains(a)) return;
-				let i = this.api.blocks.getCurrentBlockIndex(), o = i >= 0 ? this.api.blocks.getBlockByIndex(i) : null;
-				if (!(o != null && this.getOwnedCellForBlock(o.id) !== null)) return;
-				let s = this.findCellForNewBlock(r);
+				if (t && !t.holder.contains(o)) return;
+				let r = this.api.blocks.getCurrentBlockIndex(), a = r >= 0 ? this.api.blocks.getBlockByIndex(r) : null;
+				if (!(a != null && this.getOwnedCellForBlock(a.id) !== null)) return;
+				let s = this.findCellForNewBlock(i);
 				s && (this.claimBlockForCell(s, n.target.id), this.syncBlockToModel(s, n.target.id), this.cellsPendingCheck.delete(s));
 				return;
 			}
-			let c = this.findCellForNewBlock(r);
-			c && (this.claimBlockForCell(c, n.target.id), this.syncBlockToModel(c, n.target.id), this.cellsPendingCheck.delete(c));
+			let l = this.findCellForNewBlock(i);
+			l && (this.claimBlockForCell(l, n.target.id), this.syncBlockToModel(l, n.target.id), this.cellsPendingCheck.delete(l));
 		}, this.handleCellBlankSpaceClick = (e) => {
 			let t = e.target;
 			if (!t) return;
@@ -2286,6 +2294,24 @@ var Qt = "outline-hidden py-[7px] mt-[2px] mb-px", $t = "outline-hidden pl-0.5 l
 			}), n.push(a);
 		}), n;
 	}
+	reclaimReferencedBlocks() {
+		this.model.snapshot().content.forEach((e, t) => {
+			e.forEach((e, n) => {
+				if (!R(e) || e.blocks.length === 0) return;
+				let r = this.gridElement.querySelector(`[${I}="${t}"][${L}="${n}"]`);
+				if (!r) return;
+				let i = r.querySelector(`[${z}]`);
+				if (i) for (let t of e.blocks) {
+					let e = this.api.blocks.getBlockIndex, n = this.api.blocks.getBlockByIndex;
+					if (typeof e != "function" || typeof n != "function") return;
+					let a = e(t);
+					if (a === void 0) continue;
+					let o = n(a);
+					o && (i.contains(o.holder) || this.claimBlockForCell(r, t));
+				}
+			});
+		});
+	}
 	stripPlaceholders(e) {
 		e.querySelectorAll("[data-blok-placeholder-active]").forEach((e) => {
 			e.removeAttribute("data-blok-placeholder-active");
@@ -4943,15 +4969,27 @@ var Ir = (e) => {
 	}
 	save(e) {
 		var t;
-		let n = this.model.snapshot(), r = (t = this.blockId) == null ? "" : t;
-		return n.content = n.content.map((e) => e.map((e) => {
+		let n = this.model.snapshot(), r = (t = this.blockId) == null ? "" : t, i = this.gridElement;
+		return n.content = n.content.map((e, t) => e.map((e, n) => {
 			if (!R(e)) return e;
-			let t = e.blocks.filter((e) => {
+			let a = e.blocks.filter((e) => {
 				var t, n, i;
 				let a = (t = (n = this.api.blocks).getById) == null ? void 0 : t.call(n, e);
 				return a != null && ((i = a.parentId) == null ? "" : i) === r;
 			});
-			return A(A({}, e), {}, { blocks: t });
+			if (a.length === 0 && i) {
+				let a = i.querySelector(`[${I}="${t}"][${L}="${n}"]`), o = a == null ? void 0 : a.querySelector(`[${z}]`), s = o ? Array.from(o.querySelectorAll("[data-blok-id]")).map((e) => {
+					var t;
+					return (t = e.getAttribute("data-blok-id")) == null ? "" : t;
+				}).filter((e) => {
+					var t, n, i;
+					if (!e) return !1;
+					let a = (t = (n = this.api.blocks).getById) == null ? void 0 : t.call(n, e);
+					return a != null && ((i = a.parentId) == null ? "" : i) === r;
+				}) : [];
+				if (s.length > 0) return A(A({}, e), {}, { blocks: s });
+			}
+			return A(A({}, e), {}, { blocks: a });
 		})), n;
 	}
 	validate(e) {
@@ -4978,7 +5016,9 @@ var Ir = (e) => {
 			yi(f, e.content), bi(f, e.content);
 			return;
 		}
-		if (o !== this.setDataGeneration || (this.runStructuralOp(() => {
+		if (o !== this.setDataGeneration) return;
+		let p = this.api.blocks.isSyncingFromYjs;
+		if (this.runStructuralOp(() => {
 			var e, t, n, r;
 			let i = (e = (t = (n = this.cellBlocks) == null ? void 0 : n.initializeCells((r = this.initialContent) == null ? [] : r)) == null ? this.initialContent : t) == null ? [] : e;
 			if (o === this.setDataGeneration) {
@@ -4987,14 +5027,20 @@ var Ir = (e) => {
 						let t = e.querySelectorAll(`[${F}]`).length;
 						return Array.from({ length: t }, () => ({ blocks: [] }));
 					});
-					this.model.replaceAll(A(A({}, this.model.snapshot()), {}, { content: e })), U(f, this.cellBlocks);
+					this.model.replaceAll(A(A({}, this.model.snapshot()), {}, { content: e }));
 				} else this.model.replaceAll(A(A({}, this.model.snapshot()), {}, { content: i }));
 				this.initialContent = null;
 			}
-		}, !0), o !== this.setDataGeneration)) return;
+		}, !0), o !== this.setDataGeneration) return;
 		this.initSubsystems(f), l !== null && this.cellSelection !== null && this.cellSelection.selectRange(l), u !== null && this.rowColControls !== null && this.rowColControls.restoreVisibleGrips(u.col, u.row);
-		let p = this.model.snapshot();
-		yi(f, p.content), bi(f, p.content);
+		let m = this.model.snapshot();
+		if (yi(f, m.content), bi(f, m.content), p) {
+			var h;
+			(h = this.cellBlocks) == null || h.reclaimReferencedBlocks(), Promise.resolve().then(() => {
+				var e;
+				o === this.setDataGeneration && ((e = this.cellBlocks) == null || e.reclaimReferencedBlocks());
+			});
+		}
 	}
 	onPaste(e) {
 		var t, n;
@@ -6332,7 +6378,9 @@ var go = {
 	caution: "red"
 }, _o = class {
 	constructor({ data: e, api: t, readOnly: n, block: r }) {
-		this._dom = null, this._emojiPicker = null, this._colorPicker = null, this.api = t, this.readOnly = n, this._data = this.normalizeData(e), r && (this.blockId = r.id);
+		this._dom = null, this._emojiPicker = null, this._colorPicker = null, this._pendingChildText = null, this.api = t, this.readOnly = n;
+		let i = typeof e.__importedText == "string" ? e.__importedText : null;
+		i !== null && i.length > 0 && (this._pendingChildText = i), this._data = this.normalizeData(e), r && (this.blockId = r.id);
 	}
 	normalizeData(e) {
 		let t = e;
@@ -6369,8 +6417,10 @@ var go = {
 		if (Rt(this._dom.childContainer, e), e.length === 0) {
 			let e = this.api.blocks.getBlockIndex(this.blockId);
 			if (e !== void 0) {
-				let t = this.api.blocks.insertInsideParent(this.blockId, e + 1);
-				this._dom.childContainer.appendChild(t.holder), this.api.caret.setToBlock(t.id, "start");
+				let t = this._pendingChildText;
+				this._pendingChildText = null;
+				let n = t !== null && t.length > 0 ? { text: t } : void 0, r = this.api.blocks.insertInsideParent(this.blockId, e + 1, n);
+				this._dom.childContainer.appendChild(r.holder), this.api.caret.setToBlock(r.id, t === null ? "start" : "end");
 			}
 		}
 	}
@@ -6497,10 +6547,11 @@ var go = {
 		};
 	}
 	static get conversionConfig() {
-		return { import: () => ({
+		return { import: (e) => ({
 			emoji: Wa,
 			textColor: null,
-			backgroundColor: null
+			backgroundColor: null,
+			__importedText: e
 		}) };
 	}
 	static get pasteConfig() {

package/dist/full.mjs

@@ -1,7 +1,7 @@
-import { n as e, t } from "./chunks/blok-CX_pZ_qq.mjs";
-import { ur as n } from "./chunks/constants-lxerM-Xa.mjs";
+import { n as e, t } from "./chunks/blok-Cb7w54t6.mjs";
+import { ur as n } from "./chunks/constants-C0aZXxoO.mjs";
 import { t as r } from "./chunks/objectSpread2-CWwMYL_U.mjs";
-import { a as i, b as a, c as o, g as s, i as c, l, n as u, o as d, s as f, t as p, v as m, y as h } from "./chunks/tools-CMNxZqJC.mjs";
+import { a as i, b as a, c as o, g as s, i as c, l, n as u, o as d, s as f, t as p, v as m, y as h } from "./chunks/tools-vS7102lG.mjs";
 //#region src/full.ts
 var g = {
 	paragraph: {

package/dist/react.mjs

@@ -1,5 +1,5 @@
-import { t as e } from "./chunks/blok-CX_pZ_qq.mjs";
-import "./chunks/constants-lxerM-Xa.mjs";
+import { t as e } from "./chunks/blok-Cb7w54t6.mjs";
+import "./chunks/constants-C0aZXxoO.mjs";
 import { t } from "./chunks/objectSpread2-CWwMYL_U.mjs";
 import { t as n } from "./chunks/objectWithoutProperties-Dci1-l7D.mjs";
 import { forwardRef as r, useEffect as i, useMemo as a, useRef as o, useState as s } from "react";

package/dist/tools.mjs

@@ -1,3 +1,3 @@
-import { m as e } from "./chunks/constants-lxerM-Xa.mjs";
-import { _ as t, a as n, b as r, c as i, d as a, f as o, g as s, h as c, i as l, l as u, m as d, n as f, o as p, p as m, r as h, s as g, t as _, u as v, v as y, y as b } from "./chunks/tools-CMNxZqJC.mjs";
+import { m as e } from "./chunks/constants-C0aZXxoO.mjs";
+import { _ as t, a as n, b as r, c as i, d as a, f as o, g as s, h as c, i as l, l as u, m as d, n as f, o as p, p as m, r as h, s as g, t as _, u as v, v as y, y as b } from "./chunks/tools-vS7102lG.mjs";
 export { u as Bold, c as Callout, v as Code, e as Convert, d as Database, m as DatabaseRow, o as Divider, b as Header, h as InlineCode, i as Italic, g as Link, y as List, p as Marker, r as Paragraph, a as Quote, l as Strikethrough, t as Table, s as Toggle, n as Underline, _ as defaultBlockTools, f as defaultInlineTools };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jackuait/blok",
-  "version": "0.10.11",
+  "version": "0.10.12",
   "description": "Blok — headless, highly extensible rich text editor built for developers who need to implement a block-based editing experience (similar to Notion) without building it from scratch",
   "module": "dist/blok.mjs",
   "types": "./types/index.d.ts",

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

@@ -436,11 +436,16 @@ export class BlocksAPI extends Module {
    * @param insertIndex - flat block index where the new block should appear
    * @returns BlockAPI for the newly created child block
    */
-  private insertInsideParent = (parentId: string, insertIndex: number): BlockAPIInterface => {
-    // Force new undo group so this insertion is separate from previous typing.
-    this.Blok.YjsManager.stopCapturing();
+  private insertInsideParent = (parentId: string, insertIndex: number, childData?: BlockToolData): BlockAPIInterface => {
+    // Force new undo group so this insertion is separate from previous typing,
+    // UNLESS an enclosing atomic operation (e.g. tool conversion) has asked the
+    // block manager to suppress stopCapturing so everything merges into a
+    // single undo entry.
+    if (!this.Blok.BlockManager.suppressStopCapturing) {
+      this.Blok.YjsManager.stopCapturing();
+    }
 
-    const newBlock = this.Blok.BlockManager.insertInsideParent(parentId, insertIndex);
+    const newBlock = this.Blok.BlockManager.insertInsideParent(parentId, insertIndex, childData);
 
     // NOTE: Do NOT call stopCapturing in a trailing microtask. The operations layer
     // uses extendThroughRAF on its atomic wrapper to keep isSyncingFromYjs true

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

@@ -56,6 +56,26 @@ export class KeyboardNavigation extends BlockEventComposer {
     return Boolean(currentBlock?.holder?.closest('[data-blok-table-cell-blocks]'));
   }
 
+  /**
+   * Resolve the table-cell-blocks container element that owns the given block,
+   * or null if the block is not inside a table cell.
+   */
+  private getTableCellContainer(block: Block | null | undefined): HTMLElement | null {
+    return block?.holder?.closest<HTMLElement>('[data-blok-table-cell-blocks]') ?? null;
+  }
+
+  /**
+   * True when `a` and `b` live inside the same table cell (same
+   * `[data-blok-table-cell-blocks]` container). Used to decide whether
+   * a Backspace/Delete merge would cross a cell boundary.
+   */
+  private areBlocksInSameTableCell(a: Block | null | undefined, b: Block | null | undefined): boolean {
+    const cellA = this.getTableCellContainer(a);
+    const cellB = this.getTableCellContainer(b);
+
+    return cellA !== null && cellA === cellB;
+  }
+
   /**
    * Fully close the toolbar if the current block is NOT inside a table cell.
    * Used for destructive operations (Backspace, Delete, merge) where the
@@ -363,10 +383,12 @@ export class KeyboardNavigation extends BlockEventComposer {
 
     /**
      * Don't merge across table cell boundaries.
-     * When the caret is at the start of the first input in a table cell, Backspace should be a no-op
-     * rather than merging the previous cell's last block into the current cell.
+     * When the caret is at the start of the FIRST block in a table cell, Backspace
+     * must be a no-op rather than merging the previous cell's last block into the
+     * current cell. Merges within the same cell (e.g. the user hit Enter to split a
+     * paragraph and now wants to undo it) must still work.
      */
-    if (this.isCurrentBlockInsideTableCell) {
+    if (this.isCurrentBlockInsideTableCell && !this.areBlocksInSameTableCell(currentBlock, previousBlock)) {
       return;
     }
 
@@ -475,10 +497,11 @@ export class KeyboardNavigation extends BlockEventComposer {
 
     /**
      * Don't merge across table cell boundaries.
-     * When the caret is at the end of the last input in a table cell, Delete should be a no-op
-     * rather than merging the next cell's first block into the current cell.
+     * When the caret is at the end of the LAST block in a table cell, Delete must
+     * be a no-op rather than pulling the next cell's first block into the current
+     * cell. Merges within the same cell must still work.
      */
-    if (this.isCurrentBlockInsideTableCell) {
+    if (this.isCurrentBlockInsideTableCell && !this.areBlocksInSameTableCell(currentBlock, nextBlock)) {
       return;
     }
 

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

@@ -799,13 +799,23 @@ export class BlockManager extends Module {
    * @param insertIndex - flat block index where the new block should appear
    * @returns the newly created child block
    */
-  public insertInsideParent(parentId: string, insertIndex: number): Block {
+  public insertInsideParent(parentId: string, insertIndex: number, childData?: BlockToolData): Block {
     this._currentBlockIndex = this.operations.currentBlockIndexValue;
-    const result = this.operations.insertInsideParent(parentId, insertIndex, this.blocksStore);
+    const result = this.operations.insertInsideParent(parentId, insertIndex, this.blocksStore, childData);
     this._currentBlockIndex = this.operations.currentBlockIndexValue;
     return result;
   }
 
+  /**
+   * True when an atomic operation (convert, split, drag, etc.) is in progress
+   * and callers should NOT break the current undo group with `stopCapturing()`.
+   * Consumed by api-layer wrappers like `insertInsideParent` that normally
+   * force a new undo entry.
+   */
+  public get suppressStopCapturing(): boolean {
+    return this.operations?.suppressStopCapturing ?? false;
+  }
+
   /**
    * Splits a block by updating the current block's data and inserting a new block.
    * Both operations are grouped into a single undo entry.