superdoc 2.23.1-next.9 → 2.24.0-next.2

package/dist/chunks/{create-super-doc-ui-DFNXiKvQ.es.js → create-super-doc-ui-BOrgnNVV.es.js}

@@ -5938,6 +5938,7 @@ function buildTableCommandInput(action, context) {
 		};
 		case "delete-table": return { nodeId };
 		case "merge-cells": {
+			if (!context.canMerge) return null;
 			const range = mergeRange ?? {
 				start: {
 					rowIndex,
@@ -6244,7 +6245,7 @@ function createSuperDocUI(options) {
 	};
 	const resolveTableContext = () => {
 		const snapshot = readHostTableContext();
-		if (!snapshot || snapshot.inTable !== true) return null;
+		if (!snapshot || snapshot.inTable !== true || snapshot.status && snapshot.status !== "ready") return null;
 		const table = snapshot.table;
 		const tableNodeId = typeof table?.nodeId === "string" && table.nodeId.length > 0 ? table.nodeId : null;
 		if (!tableNodeId) return null;
@@ -6256,12 +6257,15 @@ function createSuperDocUI(options) {
 		if (rowIndex == null || columnIndex == null) return null;
 		const cellNodeId = typeof cell?.nodeId === "string" && cell.nodeId.length > 0 ? cell.nodeId : null;
 		const range = snapshot.cellRange;
+		const mergeRange = readMergeRange(range);
+		const metadata = snapshot.tableSelection;
 		return {
 			tableNodeId,
 			rowIndex,
 			columnIndex,
 			cellNodeId,
-			mergeRange: readMergeRange(range)
+			mergeRange,
+			canMerge: metadata == null || metadata.selectionMode === "cells" && metadata.isRectangular === true
 		};
 	};
 	const customCommands = /* @__PURE__ */ new Map();
@@ -9155,7 +9159,7 @@ function createSuperDocUI(options) {
 			reason: SUPERDOC_UI_REASONS.documentReadonly
 		}, "builtin");
 		const context = resolveTableContext();
-		if (!(context != null && (!descriptor.table.requiresCell || context.cellNodeId != null))) return normalizeCommandState({
+		if (!(context != null && (!descriptor.table.requiresCell || context.cellNodeId != null) && (descriptor.table.action !== "merge-cells" || context.canMerge))) return normalizeCommandState({
 			enabled: false,
 			active: false,
 			supported: true,
@@ -13060,7 +13064,13 @@ function createSuperDocUI(options) {
 		return {
 			point,
 			entities: validInput ? entityAt(point) : [],
-			selection: state.selection,
+			selection: (() => {
+				const current = computeSelection();
+				return current.status === "ready" ? current : {
+					...current,
+					tableSelection: null
+				};
+			})(),
 			position: null,
 			insideSelection: false
 		};
@@ -13277,21 +13287,67 @@ function createSuperDocUI(options) {
 		columnIndex: null,
 		cellNodeId: null,
 		rows: null,
-		columns: null
+		columns: null,
+		status: "ready",
+		cellRange: null,
+		tableSelection: null
+	};
+	const publicTableContext = (snapshot) => {
+		const status = snapshot?.status === "pending" || snapshot?.status === "stale" ? snapshot.status : "ready";
+		if (!snapshot || snapshot.inTable !== true || status !== "ready") return {
+			...EMPTY_TABLE_CONTEXT,
+			status
+		};
+		const table = snapshot.table;
+		const row = snapshot.row;
+		const column = snapshot.column;
+		const cell = snapshot.cell;
+		if (typeof table?.nodeId !== "string") return {
+			...EMPTY_TABLE_CONTEXT,
+			status
+		};
+		return {
+			inTable: true,
+			status,
+			tableNodeId: table.nodeId,
+			rowIndex: typeof row?.index === "number" ? row.index : null,
+			columnIndex: typeof column?.index === "number" ? column.index : null,
+			cellNodeId: typeof cell?.nodeId === "string" ? cell.nodeId : null,
+			rows: typeof table.rows === "number" ? table.rows : null,
+			columns: typeof table.columns === "number" ? table.columns : null,
+			cellRange: readMergeRange(snapshot.cellRange),
+			tableSelection: snapshot.tableSelection ?? null
+		};
 	};
 	const tables = {
-		getContext: () => {
-			const context = resolveTableContext();
-			if (!context) return { ...EMPTY_TABLE_CONTEXT };
-			const table = readHostTableContext()?.table;
+		getContext: () => publicTableContext(readHostTableContext()),
+		getContextAsync: async () => {
+			for (let attempt = 0; attempt < 2; attempt += 1) {
+				const token = selectionReadToken();
+				const host = getHost();
+				const read = host?.getTableContextAsync;
+				if (typeof read !== "function") return publicTableContext(readHostTableContext());
+				let snapshot = null;
+				try {
+					snapshot = await read.call(host);
+				} catch {
+					return {
+						...EMPTY_TABLE_CONTEXT,
+						status: "pending"
+					};
+				}
+				if (disposed) return {
+					...EMPTY_TABLE_CONTEXT,
+					status: "pending"
+				};
+				if (token !== selectionReadToken() || host !== getHost()) continue;
+				const context = publicTableContext(snapshot);
+				if (context.status === "stale") continue;
+				return context;
+			}
 			return {
-				inTable: true,
-				tableNodeId: context.tableNodeId,
-				rowIndex: context.rowIndex,
-				columnIndex: context.columnIndex,
-				cellNodeId: context.cellNodeId,
-				rows: typeof table?.rows === "number" ? table.rows : null,
-				columns: typeof table?.columns === "number" ? table.columns : null
+				...EMPTY_TABLE_CONTEXT,
+				status: "stale"
 			};
 		},
 		isInTable: () => resolveTableContext() != null

package/dist/chunks/{create-super-doc-ui-D_FbXpOQ.cjs → create-super-doc-ui-tJenv7pA.cjs}

@@ -5939,6 +5939,7 @@ function buildTableCommandInput(action, context) {
 		};
 		case "delete-table": return { nodeId };
 		case "merge-cells": {
+			if (!context.canMerge) return null;
 			const range = mergeRange ?? {
 				start: {
 					rowIndex,
@@ -6245,7 +6246,7 @@ function createSuperDocUI(options) {
 	};
 	const resolveTableContext = () => {
 		const snapshot = readHostTableContext();
-		if (!snapshot || snapshot.inTable !== true) return null;
+		if (!snapshot || snapshot.inTable !== true || snapshot.status && snapshot.status !== "ready") return null;
 		const table = snapshot.table;
 		const tableNodeId = typeof table?.nodeId === "string" && table.nodeId.length > 0 ? table.nodeId : null;
 		if (!tableNodeId) return null;
@@ -6257,12 +6258,15 @@ function createSuperDocUI(options) {
 		if (rowIndex == null || columnIndex == null) return null;
 		const cellNodeId = typeof cell?.nodeId === "string" && cell.nodeId.length > 0 ? cell.nodeId : null;
 		const range = snapshot.cellRange;
+		const mergeRange = readMergeRange(range);
+		const metadata = snapshot.tableSelection;
 		return {
 			tableNodeId,
 			rowIndex,
 			columnIndex,
 			cellNodeId,
-			mergeRange: readMergeRange(range)
+			mergeRange,
+			canMerge: metadata == null || metadata.selectionMode === "cells" && metadata.isRectangular === true
 		};
 	};
 	const customCommands = /* @__PURE__ */ new Map();
@@ -9156,7 +9160,7 @@ function createSuperDocUI(options) {
 			reason: SUPERDOC_UI_REASONS.documentReadonly
 		}, "builtin");
 		const context = resolveTableContext();
-		if (!(context != null && (!descriptor.table.requiresCell || context.cellNodeId != null))) return normalizeCommandState({
+		if (!(context != null && (!descriptor.table.requiresCell || context.cellNodeId != null) && (descriptor.table.action !== "merge-cells" || context.canMerge))) return normalizeCommandState({
 			enabled: false,
 			active: false,
 			supported: true,
@@ -13061,7 +13065,13 @@ function createSuperDocUI(options) {
 		return {
 			point,
 			entities: validInput ? entityAt(point) : [],
-			selection: state.selection,
+			selection: (() => {
+				const current = computeSelection();
+				return current.status === "ready" ? current : {
+					...current,
+					tableSelection: null
+				};
+			})(),
 			position: null,
 			insideSelection: false
 		};
@@ -13278,21 +13288,67 @@ function createSuperDocUI(options) {
 		columnIndex: null,
 		cellNodeId: null,
 		rows: null,
-		columns: null
+		columns: null,
+		status: "ready",
+		cellRange: null,
+		tableSelection: null
+	};
+	const publicTableContext = (snapshot) => {
+		const status = snapshot?.status === "pending" || snapshot?.status === "stale" ? snapshot.status : "ready";
+		if (!snapshot || snapshot.inTable !== true || status !== "ready") return {
+			...EMPTY_TABLE_CONTEXT,
+			status
+		};
+		const table = snapshot.table;
+		const row = snapshot.row;
+		const column = snapshot.column;
+		const cell = snapshot.cell;
+		if (typeof table?.nodeId !== "string") return {
+			...EMPTY_TABLE_CONTEXT,
+			status
+		};
+		return {
+			inTable: true,
+			status,
+			tableNodeId: table.nodeId,
+			rowIndex: typeof row?.index === "number" ? row.index : null,
+			columnIndex: typeof column?.index === "number" ? column.index : null,
+			cellNodeId: typeof cell?.nodeId === "string" ? cell.nodeId : null,
+			rows: typeof table.rows === "number" ? table.rows : null,
+			columns: typeof table.columns === "number" ? table.columns : null,
+			cellRange: readMergeRange(snapshot.cellRange),
+			tableSelection: snapshot.tableSelection ?? null
+		};
 	};
 	const tables = {
-		getContext: () => {
-			const context = resolveTableContext();
-			if (!context) return { ...EMPTY_TABLE_CONTEXT };
-			const table = readHostTableContext()?.table;
+		getContext: () => publicTableContext(readHostTableContext()),
+		getContextAsync: async () => {
+			for (let attempt = 0; attempt < 2; attempt += 1) {
+				const token = selectionReadToken();
+				const host = getHost();
+				const read = host?.getTableContextAsync;
+				if (typeof read !== "function") return publicTableContext(readHostTableContext());
+				let snapshot = null;
+				try {
+					snapshot = await read.call(host);
+				} catch {
+					return {
+						...EMPTY_TABLE_CONTEXT,
+						status: "pending"
+					};
+				}
+				if (disposed) return {
+					...EMPTY_TABLE_CONTEXT,
+					status: "pending"
+				};
+				if (token !== selectionReadToken() || host !== getHost()) continue;
+				const context = publicTableContext(snapshot);
+				if (context.status === "stale") continue;
+				return context;
+			}
 			return {
-				inTable: true,
-				tableNodeId: context.tableNodeId,
-				rowIndex: context.rowIndex,
-				columnIndex: context.columnIndex,
-				cellNodeId: context.cellNodeId,
-				rows: typeof table?.rows === "number" ? table.rows : null,
-				columns: typeof table?.columns === "number" ? table.columns : null
+				...EMPTY_TABLE_CONTEXT,
+				status: "stale"
 			};
 		},
 		isInTable: () => resolveTableContext() != null

package/dist/collaboration-upgrade-engine.cjs

@@ -19,7 +19,7 @@ var COLLABORATION_UPGRADE_ENGINE_MINIMUM_NODE_MAJOR = 20;
 var PRIVATE_ENGINE_INFO = (0, _superdoc_docx_engine_collaboration_upgrade_engine.getCollaborationUpgradeEngineInfo)();
 var ENGINE_INFO = Object.freeze({
 	...PRIVATE_ENGINE_INFO,
-	superdocVersion: "2.23.1-next.9",
+	superdocVersion: "2.24.0-next.2",
 	roomSchemaVersion: Object.freeze({ ...PRIVATE_ENGINE_INFO.roomSchemaVersion }),
 	supportedBundleVersions: SUPPORTED_COLLABORATION_UPGRADE_BUNDLE_VERSIONS,
 	supportedV1ReaderContractVersions: SUPPORTED_V1_READER_CONTRACT_VERSIONS

package/dist/collaboration-upgrade-engine.es.js

@@ -18,7 +18,7 @@ var COLLABORATION_UPGRADE_ENGINE_MINIMUM_NODE_MAJOR = 20;
 var PRIVATE_ENGINE_INFO = getCollaborationUpgradeEngineInfo$1();
 var ENGINE_INFO = Object.freeze({
 	...PRIVATE_ENGINE_INFO,
-	superdocVersion: "2.23.1-next.9",
+	superdocVersion: "2.24.0-next.2",
 	roomSchemaVersion: Object.freeze({ ...PRIVATE_ENGINE_INFO.roomSchemaVersion }),
 	supportedBundleVersions: SUPPORTED_COLLABORATION_UPGRADE_BUNDLE_VERSIONS,
 	supportedV1ReaderContractVersions: SUPPORTED_V1_READER_CONTRACT_VERSIONS

package/dist/document-api/src/selection/selection.types.d.ts

@@ -1,6 +1,8 @@
 import { SelectionTarget, TextTarget } from '../types/address.js';
 export interface SelectionTableCellsTarget {
     kind: 'tableCells';
+    selectionMode?: 'cells';
+    isRectangular?: true;
     tableId: string;
     start: {
         rowIndex: number;
@@ -12,15 +14,33 @@ export interface SelectionTableCellsTarget {
     };
     story?: SelectionTarget['story'];
 }
-/** Table identity for a caret, rectangular cell selection, or whole-grid selection. */
-export interface TableSelectionInfo extends SelectionTableCellsTarget {
-    /** `cell` includes a caret or text range contained in one cell. */
+/** Table/cell context for the selection; bounds alone are not an editing target. */
+export interface TableSelectionInfo {
+    kind: 'tableCells';
+    tableId: string;
+    story?: SelectionTarget['story'];
+    /** Inclusive logical bounds, including each selected owner's span. */
+    start: {
+        rowIndex: number;
+        columnIndex: number;
+    };
+    end: {
+        rowIndex: number;
+        columnIndex: number;
+    };
+    /** Whole-table identity requires whole-cell selection intent. */
     type: 'table' | 'cell' | 'cells';
-    /** Selected cells in row-major order, using opaque Document API node IDs. */
+    /** Text context preserves exact character targets; cells denotes whole-cell intent. */
+    selectionMode: 'text' | 'cells';
+    /** Whether the exact cells fill the bounding rectangle without holes. */
+    isRectangular: boolean;
+    /** Exact logical owners in row-major order; vertical continuations are deduplicated. */
     cells: {
         nodeId: string;
         rowIndex: number;
         columnIndex: number;
+        rowspan: number;
+        colspan: number;
     }[];
 }
 export type SelectionExtractOoxmlInput = {
@@ -132,10 +152,11 @@ export interface SelectionInfo {
      */
     selectionTarget?: SelectionTarget | null;
     /**
-     * V2 browser table selection with inclusive, zero-based grid coordinates.
-     * Rectangles in unmerged tables clear `target` and `selectionTarget`.
-     * Rectangles in tables containing merged cells return null and empty text.
-     * A single-cell caret/text range preserves its text targets and `empty` value.
+     * V2 browser cell context with inclusive, zero-based logical bounds.
+     * Whole-cell selections clear text targets. Character selections preserve
+     * their targets and include the containing cells, including endpoint cells.
+     * Exact cell IDs and spans describe merged or nonrectangular selections;
+     * only rectangular whole-cell metadata can become a table-cells target.
      */
     tableSelection?: TableSelectionInfo | null;
     /**

package/dist/public/ui-react.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_create_super_doc_ui = require("../chunks/create-super-doc-ui-D_FbXpOQ.cjs");
+const require_create_super_doc_ui = require("../chunks/create-super-doc-ui-tJenv7pA.cjs");
 const require_slice_source = require("../chunks/slice-source-CFaqq0Vo.cjs");
 let react = require("react");
 //#region src/public/ui/react.ts

package/dist/public/ui-react.es.js

@@ -1,4 +1,4 @@
-import { t as createSuperDocUI } from "../chunks/create-super-doc-ui-DFNXiKvQ.es.js";
+import { t as createSuperDocUI } from "../chunks/create-super-doc-ui-BOrgnNVV.es.js";
 import { t as toSliceSource } from "../chunks/slice-source-gfOhG2MW.es.js";
 import { createContext, createElement, useCallback, useContext, useEffect, useRef, useState } from "react";
 //#region src/public/ui/react.ts

package/dist/public/ui-vue.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_create_super_doc_ui = require("../chunks/create-super-doc-ui-D_FbXpOQ.cjs");
+const require_create_super_doc_ui = require("../chunks/create-super-doc-ui-tJenv7pA.cjs");
 const require_slice_source = require("../chunks/slice-source-CFaqq0Vo.cjs");
 let superdoc_entry_vue = require("vue");
 //#region src/public/ui/vue.ts

package/dist/public/ui-vue.es.js

@@ -1,4 +1,4 @@
-import { t as createSuperDocUI } from "../chunks/create-super-doc-ui-DFNXiKvQ.es.js";
+import { t as createSuperDocUI } from "../chunks/create-super-doc-ui-BOrgnNVV.es.js";
 import { t as toSliceSource } from "../chunks/slice-source-gfOhG2MW.es.js";
 import { computed, inject, onScopeDispose, provide, shallowRef, toRaw, toValue, watch } from "vue";
 //#region src/public/ui/vue.ts

package/dist/public/ui.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_create_super_doc_ui = require("../chunks/create-super-doc-ui-D_FbXpOQ.cjs");
+const require_create_super_doc_ui = require("../chunks/create-super-doc-ui-tJenv7pA.cjs");
 exports.BUILT_IN_COMMAND_IDS = require_create_super_doc_ui.BUILT_IN_COMMAND_IDS;
 exports.createSuperDocUI = require_create_super_doc_ui.createSuperDocUI;
 exports.shallowEqual = require_create_super_doc_ui.shallowEqual;

package/dist/public/ui.es.js

@@ -1,2 +1,2 @@
-import { a as BUILT_IN_COMMAND_IDS, t as createSuperDocUI, u as shallowEqual } from "../chunks/create-super-doc-ui-DFNXiKvQ.es.js";
+import { a as BUILT_IN_COMMAND_IDS, t as createSuperDocUI, u as shallowEqual } from "../chunks/create-super-doc-ui-BOrgnNVV.es.js";
 export { BUILT_IN_COMMAND_IDS, createSuperDocUI, shallowEqual };