js.documents 7.20.36 → 8.0.0

package/dist/edit/doc/table.cjs

@@ -1,51 +1,40 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_edit_doc_paragraph = require("./paragraph.cjs");
+let document_schema_js = require("document-schema.js");
 //#region src/edit/doc/table.ts
 const DEFAULT_TABLE_WIDTH_PT = 468;
 var DocTableCell = class {
-	container;
 	node;
-	removed = false;
-	constructor(container, node) {
-		this.container = container;
+	constructor(node) {
 		this.node = node;
 	}
-	live() {
-		if (this.removed) throw new Error("this DocTableCell has been removed from its row and can no longer be used");
-		return this.node;
-	}
-	remove() {
-		const index = this.container.indexOf(this.node);
-		if (index !== -1) this.container.splice(index, 1);
-		this.removed = true;
-	}
 	paragraphs() {
-		return this.live().blocks.filter((block) => block.kind === "paragraph").map((block) => new require_edit_doc_paragraph.DocParagraph(this.live().blocks, block));
+		return this.node.blocks.filter((block) => block.kind === "paragraph").map((block) => new require_edit_doc_paragraph.DocParagraph(this.node.blocks, block));
 	}
 	appendParagraph(init) {
 		const paragraph = require_edit_doc_paragraph.buildParagraph(init);
-		this.live().blocks.push(paragraph);
-		return new require_edit_doc_paragraph.DocParagraph(this.live().blocks, paragraph);
+		this.node.blocks.push(paragraph);
+		return new require_edit_doc_paragraph.DocParagraph(this.node.blocks, paragraph);
 	}
 	get text() {
 		return this.paragraphs().map((p) => p.text).join("\n");
 	}
 	set text(value) {
-		this.live().blocks = [require_edit_doc_paragraph.buildParagraph({ text: value })];
+		this.node.blocks = [require_edit_doc_paragraph.buildParagraph({ text: value })];
 	}
 	get colSpan() {
-		return this.live().colSpan;
+		return this.node.colSpan;
 	}
 	set colSpan(value) {
-		if (value === void 0) delete this.live().colSpan;
-		else this.live().colSpan = value;
+		if (value === void 0) delete this.node.colSpan;
+		else this.node.colSpan = value;
 	}
 	get rowSpan() {
-		return this.live().rowSpan;
+		return this.node.rowSpan;
 	}
 	set rowSpan(value) {
-		if (value === void 0) delete this.live().rowSpan;
-		else this.live().rowSpan = value;
+		if (value === void 0) delete this.node.rowSpan;
+		else this.node.rowSpan = value;
 	}
 };
 var DocTableRow = class {
@@ -54,7 +43,7 @@ var DocTableRow = class {
 		this.node = node;
 	}
 	cells() {
-		return this.node.cells.map((cell) => new DocTableCell(this.node.cells, cell));
+		return this.node.cells.map((cell) => new DocTableCell(cell));
 	}
 };
 function buildCell() {
@@ -86,6 +75,28 @@ var DocTable = class {
 		node.rows.push(row);
 		return new DocTableRow(row);
 	}
+	mergeCells(startRow, startColumn, rowSpan, colSpan) {
+		if (!Number.isInteger(rowSpan) || rowSpan < 1 || !Number.isInteger(colSpan) || colSpan < 1) throw new Error(`mergeCells: rowSpan and colSpan must be positive integers, got rowSpan=${rowSpan}, colSpan=${colSpan}`);
+		const node = this.live();
+		const grid = (0, document_schema_js.walkTableGrid)(node);
+		const anchorPosition = grid[startRow]?.[startColumn];
+		if (anchorPosition === void 0) throw new Error(`mergeCells: row ${startRow}, column ${startColumn} does not exist in this table`);
+		if (startRow + rowSpan > grid.length) throw new Error(`mergeCells: rowSpan ${rowSpan} starting at row ${startRow} exceeds this table's own ${grid.length} rows`);
+		const columnCount = (0, document_schema_js.tableGridColumnCount)(node);
+		if (startColumn + colSpan > columnCount) throw new Error(`mergeCells: colSpan ${colSpan} starting at column ${startColumn} exceeds this table's own ${columnCount} columns`);
+		const covered = [];
+		for (let rowIndex = startRow; rowIndex < startRow + rowSpan; rowIndex++) for (let columnIndex = startColumn; columnIndex < startColumn + colSpan; columnIndex++) {
+			const position = grid[rowIndex]?.[columnIndex];
+			if (position === void 0) throw new Error(`mergeCells: column ${columnIndex} does not exist in row ${rowIndex}`);
+			if (position.anchorRowIndex !== void 0 || (0, document_schema_js.tableCellColumnSpan)(position.cell) !== 1 || (0, document_schema_js.tableCellRowSpan)(position.cell) !== 1) throw new Error(`mergeCells: row ${rowIndex}, column ${columnIndex} already belongs to a merged region`);
+			if (rowIndex !== startRow || columnIndex !== startColumn) covered.push(position.cell);
+		}
+		const anchorCell = new DocTableCell(anchorPosition.cell);
+		if (colSpan > 1) anchorCell.colSpan = colSpan;
+		if (rowSpan > 1) anchorCell.rowSpan = rowSpan;
+		for (const cell of covered) cell.blocks = [];
+		return anchorCell;
+	}
 	remove() {
 		const node = this.live();
 		const index = this.container.indexOf(node);

package/dist/edit/doc/table.d.cts

@@ -6,12 +6,8 @@ interface TableInit {
   readonly columns: number;
 }
 declare class DocTableCell {
-  private readonly container;
   private readonly node;
-  private removed;
-  constructor(container: ContentTableCell[], node: ContentTableCell);
-  private live;
-  remove(): void;
+  constructor(node: ContentTableCell);
   paragraphs(): DocParagraph[];
   appendParagraph(init?: ParagraphInit): DocParagraph;
   get text(): string;
@@ -34,6 +30,7 @@ declare class DocTable {
   private live;
   rows(): DocTableRow[];
   appendRow(): DocTableRow;
+  mergeCells(startRow: number, startColumn: number, rowSpan: number, colSpan: number): DocTableCell;
   remove(): void;
 }
 declare function buildTable(init: TableInit): ContentTable;

package/dist/edit/doc/table.d.ts

@@ -6,12 +6,8 @@ interface TableInit {
   readonly columns: number;
 }
 declare class DocTableCell {
-  private readonly container;
   private readonly node;
-  private removed;
-  constructor(container: ContentTableCell[], node: ContentTableCell);
-  private live;
-  remove(): void;
+  constructor(node: ContentTableCell);
   paragraphs(): DocParagraph[];
   appendParagraph(init?: ParagraphInit): DocParagraph;
   get text(): string;
@@ -34,6 +30,7 @@ declare class DocTable {
   private live;
   rows(): DocTableRow[];
   appendRow(): DocTableRow;
+  mergeCells(startRow: number, startColumn: number, rowSpan: number, colSpan: number): DocTableCell;
   remove(): void;
 }
 declare function buildTable(init: TableInit): ContentTable;

package/dist/edit/doc/table.js

@@ -1,50 +1,39 @@
 import { DocParagraph, buildParagraph } from "./paragraph.js";
+import { tableCellColumnSpan, tableCellRowSpan, tableGridColumnCount, walkTableGrid } from "document-schema.js";
 //#region src/edit/doc/table.ts
 const DEFAULT_TABLE_WIDTH_PT = 468;
 var DocTableCell = class {
-	container;
 	node;
-	removed = false;
-	constructor(container, node) {
-		this.container = container;
+	constructor(node) {
 		this.node = node;
 	}
-	live() {
-		if (this.removed) throw new Error("this DocTableCell has been removed from its row and can no longer be used");
-		return this.node;
-	}
-	remove() {
-		const index = this.container.indexOf(this.node);
-		if (index !== -1) this.container.splice(index, 1);
-		this.removed = true;
-	}
 	paragraphs() {
-		return this.live().blocks.filter((block) => block.kind === "paragraph").map((block) => new DocParagraph(this.live().blocks, block));
+		return this.node.blocks.filter((block) => block.kind === "paragraph").map((block) => new DocParagraph(this.node.blocks, block));
 	}
 	appendParagraph(init) {
 		const paragraph = buildParagraph(init);
-		this.live().blocks.push(paragraph);
-		return new DocParagraph(this.live().blocks, paragraph);
+		this.node.blocks.push(paragraph);
+		return new DocParagraph(this.node.blocks, paragraph);
 	}
 	get text() {
 		return this.paragraphs().map((p) => p.text).join("\n");
 	}
 	set text(value) {
-		this.live().blocks = [buildParagraph({ text: value })];
+		this.node.blocks = [buildParagraph({ text: value })];
 	}
 	get colSpan() {
-		return this.live().colSpan;
+		return this.node.colSpan;
 	}
 	set colSpan(value) {
-		if (value === void 0) delete this.live().colSpan;
-		else this.live().colSpan = value;
+		if (value === void 0) delete this.node.colSpan;
+		else this.node.colSpan = value;
 	}
 	get rowSpan() {
-		return this.live().rowSpan;
+		return this.node.rowSpan;
 	}
 	set rowSpan(value) {
-		if (value === void 0) delete this.live().rowSpan;
-		else this.live().rowSpan = value;
+		if (value === void 0) delete this.node.rowSpan;
+		else this.node.rowSpan = value;
 	}
 };
 var DocTableRow = class {
@@ -53,7 +42,7 @@ var DocTableRow = class {
 		this.node = node;
 	}
 	cells() {
-		return this.node.cells.map((cell) => new DocTableCell(this.node.cells, cell));
+		return this.node.cells.map((cell) => new DocTableCell(cell));
 	}
 };
 function buildCell() {
@@ -85,6 +74,28 @@ var DocTable = class {
 		node.rows.push(row);
 		return new DocTableRow(row);
 	}
+	mergeCells(startRow, startColumn, rowSpan, colSpan) {
+		if (!Number.isInteger(rowSpan) || rowSpan < 1 || !Number.isInteger(colSpan) || colSpan < 1) throw new Error(`mergeCells: rowSpan and colSpan must be positive integers, got rowSpan=${rowSpan}, colSpan=${colSpan}`);
+		const node = this.live();
+		const grid = walkTableGrid(node);
+		const anchorPosition = grid[startRow]?.[startColumn];
+		if (anchorPosition === void 0) throw new Error(`mergeCells: row ${startRow}, column ${startColumn} does not exist in this table`);
+		if (startRow + rowSpan > grid.length) throw new Error(`mergeCells: rowSpan ${rowSpan} starting at row ${startRow} exceeds this table's own ${grid.length} rows`);
+		const columnCount = tableGridColumnCount(node);
+		if (startColumn + colSpan > columnCount) throw new Error(`mergeCells: colSpan ${colSpan} starting at column ${startColumn} exceeds this table's own ${columnCount} columns`);
+		const covered = [];
+		for (let rowIndex = startRow; rowIndex < startRow + rowSpan; rowIndex++) for (let columnIndex = startColumn; columnIndex < startColumn + colSpan; columnIndex++) {
+			const position = grid[rowIndex]?.[columnIndex];
+			if (position === void 0) throw new Error(`mergeCells: column ${columnIndex} does not exist in row ${rowIndex}`);
+			if (position.anchorRowIndex !== void 0 || tableCellColumnSpan(position.cell) !== 1 || tableCellRowSpan(position.cell) !== 1) throw new Error(`mergeCells: row ${rowIndex}, column ${columnIndex} already belongs to a merged region`);
+			if (rowIndex !== startRow || columnIndex !== startColumn) covered.push(position.cell);
+		}
+		const anchorCell = new DocTableCell(anchorPosition.cell);
+		if (colSpan > 1) anchorCell.colSpan = colSpan;
+		if (rowSpan > 1) anchorCell.rowSpan = rowSpan;
+		for (const cell of covered) cell.blocks = [];
+		return anchorCell;
+	}
 	remove() {
 		const node = this.live();
 		const index = this.container.indexOf(node);

package/dist/edit/docx/content.cjs

@@ -189,6 +189,24 @@ function populateCellBlocks(cell, blocks) {
 	else if (firstBlock !== void 0) appendCellBlock(cell, firstBlock);
 	for (const remaining of restBlocks) appendCellBlock(cell, remaining);
 }
+function docxRowCells(positions, positionsByRow) {
+	return positions.flatMap((position) => {
+		if (position.anchorRowIndex === void 0) return [{
+			cell: position.cell,
+			colSpan: (0, document_schema_js.tableCellColumnSpan)(position.cell),
+			verticalMerge: (0, document_schema_js.tableCellRowSpan)(position.cell) > 1 ? "restart" : void 0
+		}];
+		if (position.columnIndex === position.anchorColumnIndex) {
+			const anchor = positionsByRow[position.anchorRowIndex][position.anchorColumnIndex];
+			return [{
+				cell: position.cell,
+				colSpan: (0, document_schema_js.tableCellColumnSpan)(anchor.cell),
+				verticalMerge: "continue"
+			}];
+		}
+		return [];
+	});
+}
 function appendTable(body, block) {
 	const columns = block.columnWidthsPt.length;
 	if (block.rows.length === 0 || columns === 0) return;
@@ -197,39 +215,20 @@ function appendTable(body, block) {
 		columns,
 		columnWidthsTwips: block.columnWidthsPt.map(require_model_units.ptToTwips)
 	});
-	const verticalMerges = /* @__PURE__ */ new Map();
-	block.rows.forEach((row) => {
-		const tableRow = table.appendRow(row.cells.length);
-		if (row.heightPt !== void 0) tableRow.heightPt = row.heightPt;
+	const positionsByRow = (0, document_schema_js.walkTableGrid)(block);
+	block.rows.forEach((row, rowIndex) => {
+		const rowCells = docxRowCells(positionsByRow[rowIndex], positionsByRow);
+		const tableRow = table.appendRow(rowCells.length);
+		tableRow.heightPt = row.heightPt;
 		const domCells = tableRow.cells();
-		let colIndex = 0;
-		row.cells.forEach((cell, cellIndex) => {
+		rowCells.forEach(({ cell, colSpan, verticalMerge }, cellIndex) => {
 			const tableCell = domCells[cellIndex];
 			if (tableCell === void 0) return;
-			const active = verticalMerges.get(colIndex);
-			if (active !== void 0 && active.rowsRemaining > 0) {
-				if (active.gridSpan > 1) tableCell.colSpan = active.gridSpan;
-				tableCell.verticalMerge = "continue";
-				verticalMerges.set(colIndex, {
-					rowsRemaining: active.rowsRemaining - 1,
-					gridSpan: active.gridSpan
-				});
-				colIndex += active.gridSpan;
-				return;
-			}
-			const span = cell.colSpan ?? 1;
-			if (span > 1) tableCell.colSpan = span;
-			if (cell.rowSpan !== void 0 && cell.rowSpan > 1) {
-				tableCell.verticalMerge = "restart";
-				verticalMerges.set(colIndex, {
-					rowsRemaining: cell.rowSpan - 1,
-					gridSpan: span
-				});
-			}
+			if (colSpan > 1) tableCell.colSpan = colSpan;
+			tableCell.verticalMerge = verticalMerge;
 			if (cell.background !== void 0) tableCell.background = (0, document_schema_js.resolveCellFillColor)(cell.background);
-			if (cell.borders !== void 0) tableCell.borders = cell.borders;
+			tableCell.borders = cell.borders;
 			populateCellBlocks(tableCell, cell.blocks);
-			colIndex += span;
 		});
 	});
 }

package/dist/edit/docx/content.js

@@ -10,7 +10,7 @@ import { FLOW_CONTAINER_ORIGIN, drawingOfBlock, embeddedDrawingVectors } from ".
 import { formulaOfBlock, formulaPlaceholderText } from "../../model/formula.js";
 import { NUMBERING_CONTENT_TYPE, NUMBERING_PART_PATH, NUMBERING_REL_TYPE, buildNumberingRoot, declaration } from "./numbering.js";
 import { base64ToBytes } from "ooxml.js";
-import { resolveCellFillColor } from "document-schema.js";
+import { resolveCellFillColor, tableCellColumnSpan, tableCellRowSpan, walkTableGrid } from "document-schema.js";
 //#region src/edit/docx/content.ts
 var ConstructMarkerState = class {
 	nextBookmarkId = 1;
@@ -188,6 +188,24 @@ function populateCellBlocks(cell, blocks) {
 	else if (firstBlock !== void 0) appendCellBlock(cell, firstBlock);
 	for (const remaining of restBlocks) appendCellBlock(cell, remaining);
 }
+function docxRowCells(positions, positionsByRow) {
+	return positions.flatMap((position) => {
+		if (position.anchorRowIndex === void 0) return [{
+			cell: position.cell,
+			colSpan: tableCellColumnSpan(position.cell),
+			verticalMerge: tableCellRowSpan(position.cell) > 1 ? "restart" : void 0
+		}];
+		if (position.columnIndex === position.anchorColumnIndex) {
+			const anchor = positionsByRow[position.anchorRowIndex][position.anchorColumnIndex];
+			return [{
+				cell: position.cell,
+				colSpan: tableCellColumnSpan(anchor.cell),
+				verticalMerge: "continue"
+			}];
+		}
+		return [];
+	});
+}
 function appendTable(body, block) {
 	const columns = block.columnWidthsPt.length;
 	if (block.rows.length === 0 || columns === 0) return;
@@ -196,39 +214,20 @@ function appendTable(body, block) {
 		columns,
 		columnWidthsTwips: block.columnWidthsPt.map(ptToTwips)
 	});
-	const verticalMerges = /* @__PURE__ */ new Map();
-	block.rows.forEach((row) => {
-		const tableRow = table.appendRow(row.cells.length);
-		if (row.heightPt !== void 0) tableRow.heightPt = row.heightPt;
+	const positionsByRow = walkTableGrid(block);
+	block.rows.forEach((row, rowIndex) => {
+		const rowCells = docxRowCells(positionsByRow[rowIndex], positionsByRow);
+		const tableRow = table.appendRow(rowCells.length);
+		tableRow.heightPt = row.heightPt;
 		const domCells = tableRow.cells();
-		let colIndex = 0;
-		row.cells.forEach((cell, cellIndex) => {
+		rowCells.forEach(({ cell, colSpan, verticalMerge }, cellIndex) => {
 			const tableCell = domCells[cellIndex];
 			if (tableCell === void 0) return;
-			const active = verticalMerges.get(colIndex);
-			if (active !== void 0 && active.rowsRemaining > 0) {
-				if (active.gridSpan > 1) tableCell.colSpan = active.gridSpan;
-				tableCell.verticalMerge = "continue";
-				verticalMerges.set(colIndex, {
-					rowsRemaining: active.rowsRemaining - 1,
-					gridSpan: active.gridSpan
-				});
-				colIndex += active.gridSpan;
-				return;
-			}
-			const span = cell.colSpan ?? 1;
-			if (span > 1) tableCell.colSpan = span;
-			if (cell.rowSpan !== void 0 && cell.rowSpan > 1) {
-				tableCell.verticalMerge = "restart";
-				verticalMerges.set(colIndex, {
-					rowsRemaining: cell.rowSpan - 1,
-					gridSpan: span
-				});
-			}
+			if (colSpan > 1) tableCell.colSpan = colSpan;
+			tableCell.verticalMerge = verticalMerge;
 			if (cell.background !== void 0) tableCell.background = resolveCellFillColor(cell.background);
-			if (cell.borders !== void 0) tableCell.borders = cell.borders;
+			tableCell.borders = cell.borders;
 			populateCellBlocks(tableCell, cell.blocks);
-			colIndex += span;
 		});
 	});
 }

package/dist/edit/docx/table.cjs

@@ -60,6 +60,10 @@ var DocxTableCell = class {
 		tcPr.children = tcPr.children.filter((c) => !(c.type === "element" && c.tag === "w:gridSpan"));
 		require_xml_edit.insertInSchemaOrder(tcPr, require_xml_fragment.el("w:gridSpan", { "w:val": String(value) }), TC_PR_CHILD_ORDER);
 	}
+	clearBlockContent() {
+		const properties = this.node.children.filter((child) => child.type === "element" && child.tag === "w:tcPr");
+		this.node.children.splice(0, this.node.children.length, ...properties, require_edit_docx_paragraph.buildParagraph());
+	}
 	get verticalMerge() {
 		const tcPr = this.tcPrElement(false);
 		const vMerge = tcPr === void 0 ? void 0 : require_xml_edit.directChildElement(tcPr, "w:vMerge");
@@ -67,6 +71,7 @@ var DocxTableCell = class {
 		return (0, ooxml_js.attr)(vMerge, "w:val") === "restart" ? "restart" : "continue";
 	}
 	set verticalMerge(value) {
+		if (value === "continue") this.clearBlockContent();
 		if (value === void 0) {
 			const tcPr = this.tcPrElement(false);
 			if (tcPr !== void 0) tcPr.children = tcPr.children.filter((c) => !(c.type === "element" && c.tag === "w:vMerge"));

package/dist/edit/docx/table.d.cts

@@ -14,6 +14,7 @@ declare class DocxTableCell {
   private tcPrElement;
   get colSpan(): number | undefined;
   set colSpan(value: number | undefined);
+  private clearBlockContent;
   get verticalMerge(): DocxVerticalMerge | undefined;
   set verticalMerge(value: DocxVerticalMerge | undefined);
   get background(): Color | undefined;

package/dist/edit/docx/table.d.ts

@@ -14,6 +14,7 @@ declare class DocxTableCell {
   private tcPrElement;
   get colSpan(): number | undefined;
   set colSpan(value: number | undefined);
+  private clearBlockContent;
   get verticalMerge(): DocxVerticalMerge | undefined;
   set verticalMerge(value: DocxVerticalMerge | undefined);
   get background(): Color | undefined;

package/dist/edit/docx/table.js

@@ -59,6 +59,10 @@ var DocxTableCell = class {
 		tcPr.children = tcPr.children.filter((c) => !(c.type === "element" && c.tag === "w:gridSpan"));
 		insertInSchemaOrder(tcPr, el("w:gridSpan", { "w:val": String(value) }), TC_PR_CHILD_ORDER);
 	}
+	clearBlockContent() {
+		const properties = this.node.children.filter((child) => child.type === "element" && child.tag === "w:tcPr");
+		this.node.children.splice(0, this.node.children.length, ...properties, buildParagraph());
+	}
 	get verticalMerge() {
 		const tcPr = this.tcPrElement(false);
 		const vMerge = tcPr === void 0 ? void 0 : directChildElement(tcPr, "w:vMerge");
@@ -66,6 +70,7 @@ var DocxTableCell = class {
 		return attr(vMerge, "w:val") === "restart" ? "restart" : "continue";
 	}
 	set verticalMerge(value) {
+		if (value === "continue") this.clearBlockContent();
 		if (value === void 0) {
 			const tcPr = this.tcPrElement(false);
 			if (tcPr !== void 0) tcPr.children = tcPr.children.filter((c) => !(c.type === "element" && c.tag === "w:vMerge"));

package/dist/edit/odp/content.cjs

@@ -53,7 +53,7 @@ function appendShape(slide, shape) {
 		const { shape: tableFrame, table } = slide.addTable({
 			frame: shape.frame,
 			table: {
-				rows: onlyBlock.rows.length,
+				rows: 0,
 				columns: onlyBlock.columnWidthsPt.length,
 				columnWidthsPt: onlyBlock.columnWidthsPt
 			}

package/dist/edit/odp/content.js

@@ -52,7 +52,7 @@ function appendShape(slide, shape) {
 		const { shape: tableFrame, table } = slide.addTable({
 			frame: shape.frame,
 			table: {
-				rows: onlyBlock.rows.length,
+				rows: 0,
 				columns: onlyBlock.columnWidthsPt.length,
 				columnWidthsPt: onlyBlock.columnWidthsPt
 			}

package/dist/edit/odp/slide.d.cts

@@ -1,7 +1,7 @@
 import { t as ImageInit } from "../../image-D1z0T9Za.cjs";
 import { t as OdpShape } from "../../shape-Kmmxib5z.cjs";
 import { s as OdgVector } from "../../vector-DDP7hgvm.cjs";
-import { a as TableInit, n as OdtTable } from "../../table-COmzfIOe.cjs";
+import { o as TableInit, r as OdtTable } from "../../table-DvKlZmG0.cjs";
 import { Box, ContentFormula, ContentVector } from "document-schema.js";
 import { Package, XmlElement, XmlNode } from "odf.js";
 //#region src/edit/odp/slide.d.ts

package/dist/edit/odp/slide.d.ts

@@ -1,7 +1,7 @@
 import { t as ImageInit } from "../../image-D1z0T9Za.js";
 import { t as OdpShape } from "../../shape-ZAfNsCC5.js";
 import { s as OdgVector } from "../../vector-DDP7hgvm.js";
-import { a as TableInit, n as OdtTable } from "../../table-BmMyqRML.js";
+import { o as TableInit, r as OdtTable } from "../../table-qWkzpadC.js";
 import { Box, ContentFormula, ContentVector } from "document-schema.js";
 import { Package, XmlElement, XmlNode } from "odf.js";
 //#region src/edit/odp/slide.d.ts

package/dist/edit/odt/content.cjs

@@ -132,43 +132,30 @@ function populateCellBlocks(cell, blocks) {
 	for (const remaining of restBlocks) appendCellBlock(cell, remaining);
 }
 function populateOdtTable(table, block) {
-	const verticalMerges = /* @__PURE__ */ new Map();
-	block.rows.forEach((row) => {
+	const gridPositions = (0, document_schema_js.walkTableGrid)(block);
+	block.rows.forEach((row, rowIndex) => {
 		const tableRow = table.appendEmptyRow();
-		if (row.heightPt !== void 0) tableRow.heightPt = row.heightPt;
-		let colIndex = 0;
-		let horizontalCoverRemaining = 0;
-		row.cells.forEach((cell) => {
-			if (horizontalCoverRemaining > 0) {
-				tableRow.appendCoveredCell();
-				horizontalCoverRemaining -= 1;
-				colIndex += 1;
-				return;
-			}
-			const verticalRemaining = verticalMerges.get(colIndex);
-			if (verticalRemaining !== void 0 && verticalRemaining > 0) {
-				tableRow.appendCoveredCell();
-				verticalMerges.set(colIndex, verticalRemaining - 1);
-				colIndex += 1;
+		tableRow.heightPt = row.heightPt;
+		gridPositions[rowIndex].forEach((position) => {
+			const { cell } = position;
+			if (position.anchorRowIndex !== void 0) {
+				applyCellDecoration(tableRow.appendCoveredCell(), cell);
 				return;
 			}
 			const tableCell = tableRow.appendCell();
-			const span = cell.colSpan ?? 1;
-			if (span > 1) {
-				tableCell.colSpan = span;
-				horizontalCoverRemaining = span - 1;
-			}
-			if (cell.rowSpan !== void 0 && cell.rowSpan > 1) {
-				tableCell.rowSpan = cell.rowSpan;
-				for (let c = 0; c < span; c++) verticalMerges.set(colIndex + c, cell.rowSpan - 1);
-			}
-			if (cell.background !== void 0) tableCell.background = (0, document_schema_js.resolveCellFillColor)(cell.background);
-			if (cell.borders !== void 0) tableCell.borders = cell.borders;
+			const colSpan = (0, document_schema_js.tableCellColumnSpan)(cell);
+			if (colSpan > 1) tableCell.colSpan = colSpan;
+			const rowSpan = (0, document_schema_js.tableCellRowSpan)(cell);
+			if (rowSpan > 1) tableCell.rowSpan = rowSpan;
+			applyCellDecoration(tableCell, cell);
 			populateCellBlocks(tableCell, cell.blocks);
-			colIndex += 1;
 		});
 	});
 }
+function applyCellDecoration(target, cell) {
+	if (cell.background !== void 0) target.background = (0, document_schema_js.resolveCellFillColor)(cell.background);
+	if (cell.borders !== void 0) target.borders = cell.borders;
+}
 function appendTable(body, block) {
 	const columns = block.columnWidthsPt.length;
 	if (block.rows.length === 0 || columns === 0) return;

package/dist/edit/odt/content.d.cts

@@ -1,6 +1,6 @@
 import { t as ClockPort } from "../../clock-C7SUuYN0.cjs";
 import { t as OdtParagraph } from "../../paragraph-CRaLSzWz.cjs";
-import { n as OdtTable } from "../../table-COmzfIOe.cjs";
+import { r as OdtTable } from "../../table-DvKlZmG0.cjs";
 import { ContentDocument, ContentParagraph, ContentTable } from "document-schema.js";
 import { Package } from "odf.js";
 //#region src/edit/odt/content.d.ts

package/dist/edit/odt/content.d.ts

@@ -1,6 +1,6 @@
 import { t as ClockPort } from "../../clock-C7SUuYN0.js";
 import { t as OdtParagraph } from "../../paragraph-D4f705GG.js";
-import { n as OdtTable } from "../../table-BmMyqRML.js";
+import { r as OdtTable } from "../../table-qWkzpadC.js";
 import { ContentDocument, ContentParagraph, ContentTable } from "document-schema.js";
 import { Package } from "odf.js";
 //#region src/edit/odt/content.d.ts

package/dist/edit/odt/content.js

@@ -5,7 +5,7 @@ import { formulaOfBlock, formulaPlaceholderText } from "../../model/formula.js";
 import { headingStyleName } from "./paragraph.js";
 import { createEmptyOdtPackage } from "./scaffold.js";
 import { OdtEditor } from "./editor.js";
-import { resolveCellFillColor } from "document-schema.js";
+import { resolveCellFillColor, tableCellColumnSpan, tableCellRowSpan, walkTableGrid } from "document-schema.js";
 import { base64ToBytes } from "odf.js";
 //#region src/edit/odt/content.ts
 function buildOdtPackage(content, options) {
@@ -131,43 +131,30 @@ function populateCellBlocks(cell, blocks) {
 	for (const remaining of restBlocks) appendCellBlock(cell, remaining);
 }
 function populateOdtTable(table, block) {
-	const verticalMerges = /* @__PURE__ */ new Map();
-	block.rows.forEach((row) => {
+	const gridPositions = walkTableGrid(block);
+	block.rows.forEach((row, rowIndex) => {
 		const tableRow = table.appendEmptyRow();
-		if (row.heightPt !== void 0) tableRow.heightPt = row.heightPt;
-		let colIndex = 0;
-		let horizontalCoverRemaining = 0;
-		row.cells.forEach((cell) => {
-			if (horizontalCoverRemaining > 0) {
-				tableRow.appendCoveredCell();
-				horizontalCoverRemaining -= 1;
-				colIndex += 1;
-				return;
-			}
-			const verticalRemaining = verticalMerges.get(colIndex);
-			if (verticalRemaining !== void 0 && verticalRemaining > 0) {
-				tableRow.appendCoveredCell();
-				verticalMerges.set(colIndex, verticalRemaining - 1);
-				colIndex += 1;
+		tableRow.heightPt = row.heightPt;
+		gridPositions[rowIndex].forEach((position) => {
+			const { cell } = position;
+			if (position.anchorRowIndex !== void 0) {
+				applyCellDecoration(tableRow.appendCoveredCell(), cell);
 				return;
 			}
 			const tableCell = tableRow.appendCell();
-			const span = cell.colSpan ?? 1;
-			if (span > 1) {
-				tableCell.colSpan = span;
-				horizontalCoverRemaining = span - 1;
-			}
-			if (cell.rowSpan !== void 0 && cell.rowSpan > 1) {
-				tableCell.rowSpan = cell.rowSpan;
-				for (let c = 0; c < span; c++) verticalMerges.set(colIndex + c, cell.rowSpan - 1);
-			}
-			if (cell.background !== void 0) tableCell.background = resolveCellFillColor(cell.background);
-			if (cell.borders !== void 0) tableCell.borders = cell.borders;
+			const colSpan = tableCellColumnSpan(cell);
+			if (colSpan > 1) tableCell.colSpan = colSpan;
+			const rowSpan = tableCellRowSpan(cell);
+			if (rowSpan > 1) tableCell.rowSpan = rowSpan;
+			applyCellDecoration(tableCell, cell);
 			populateCellBlocks(tableCell, cell.blocks);
-			colIndex += 1;
 		});
 	});
 }
+function applyCellDecoration(target, cell) {
+	if (cell.background !== void 0) target.background = resolveCellFillColor(cell.background);
+	if (cell.borders !== void 0) target.borders = cell.borders;
+}
 function appendTable(body, block) {
 	const columns = block.columnWidthsPt.length;
 	if (block.rows.length === 0 || columns === 0) return;