document-cli 1.5.0 → 1.7.0

package/dist/{tui-B-o3iI9a.js → tui-BzdX4QQg.js}

@@ -230,6 +230,7 @@ function selectionKeyFor(screen) {
 		case "slideDetail":
 		case "notesEditor": return `${screen.kind}:${screen.slideIndex}`;
 		case "shapeEditor": return `shapeEditor:${screen.slideIndex}:${screen.shapeIndex}`;
+		case "slideTableDetail": return `slideTableDetail:${screen.slideIndex}:${screen.tableIndex}`;
 		case "spreadsheetGrid":
 		case "printSettingsEditor": return `${screen.kind}:${screen.sheetIndex}`;
 		case "cellDetail": return `cellDetail:${screen.sheetIndex}:${screen.row}:${screen.col}`;
@@ -435,6 +436,38 @@ function mutate(state, doc, apply) {
 		undoStack: pushSnapshot(state.undoStack, snapshot)
 	};
 }
+function mutateGuarded(state, doc, apply) {
+	try {
+		return mutate(state, doc, apply);
+	} catch (error) {
+		return withStatus(state, "warning", error instanceof Error ? error.message : String(error));
+	}
+}
+function mergePptxTableCells(table, startRow, startColumn, rowSpan, colSpan) {
+	if (!Number.isInteger(rowSpan) || rowSpan < 1 || !Number.isInteger(colSpan) || colSpan < 1) throw new Error(`mergeSlideTableCells: rowSpan and colSpan must be positive integers, got rowSpan=${rowSpan}, colSpan=${colSpan}`);
+	const rows = table.rows();
+	if (startRow + rowSpan > rows.length) throw new Error(`mergeSlideTableCells: rowSpan ${rowSpan} starting at row ${startRow} exceeds this table's own ${rows.length} rows`);
+	const anchorRow = rows[startRow];
+	if (anchorRow === void 0) throw new Error(`mergeSlideTableCells: row ${startRow} does not exist in this table`);
+	const columnCount = anchorRow.cells().length;
+	if (startColumn + colSpan > columnCount) throw new Error(`mergeSlideTableCells: colSpan ${colSpan} starting at column ${startColumn} exceeds this table's own ${columnCount} columns`);
+	for (let rowOffset = 0; rowOffset < rowSpan; rowOffset++) {
+		const row = rows[startRow + rowOffset];
+		if (row === void 0) throw new Error(`mergeSlideTableCells: row ${startRow + rowOffset} does not exist in this table`);
+		const cells = row.cells();
+		for (let columnOffset = 0; columnOffset < colSpan; columnOffset++) {
+			const cell = cells[startColumn + columnOffset];
+			if (cell === void 0) throw new Error(`mergeSlideTableCells: column ${startColumn + columnOffset} does not exist in row ${startRow + rowOffset}`);
+			if (rowOffset === 0 && columnOffset === 0) {
+				cell.colSpan = colSpan;
+				cell.rowSpan = rowSpan;
+				continue;
+			}
+			if (columnOffset > 0) cell.horizontalMerge = true;
+			if (rowOffset > 0) cell.verticalMerge = true;
+		}
+	}
+}
 function mutateMarkdown(state, doc, source) {
 	const snapshot = encodeMarkdownText(doc.source);
 	return {
@@ -490,10 +523,6 @@ function shapeAt(doc, containerIndex, shapeIndex) {
 	if (doc.format === "odg") return doc.editor.pages()[containerIndex]?.shapes()[shapeIndex];
 	return doc.editor.slides()[containerIndex]?.shapes()[shapeIndex];
 }
-function rotatableShapeAt(doc, containerIndex, shapeIndex) {
-	if (doc.format === "odg") return doc.editor.pages()[containerIndex]?.shapes()[shapeIndex];
-	return doc.editor.slides()[containerIndex]?.shapes()[shapeIndex];
-}
 function sheetAt(doc, sheetIndex) {
 	return doc.editor.sheets()[sheetIndex];
 }
@@ -526,8 +555,8 @@ function withSheet(state, sheetIndex, apply) {
 		apply(sheet);
 	});
 }
-function setCellText(cell, text) {
-	const paragraph = cell.paragraphs()[0] ?? cell.appendParagraph();
+function setTextContainerText(container, text) {
+	const paragraph = container.paragraphs()[0] ?? container.appendParagraph();
 	const runs = paragraph.runs();
 	const firstRun = runs[0];
 	if (firstRun === void 0) {
@@ -537,6 +566,9 @@ function setCellText(cell, text) {
 	firstRun.text = text;
 	for (const extra of runs.slice(1)) extra.remove();
 }
+function setCellText(cell, text) {
+	setTextContainerText(cell, text);
+}
 function appReducer(state, action) {
 	switch (action.type) {
 		case "PUSH_SCREEN": return {
@@ -686,11 +718,21 @@ function appReducer(state, action) {
 		case "APPEND_TABLE": {
 			const doc = wordprocessingDocument(state);
 			if (doc === void 0) return wrongDocument(state, "a docx or odt document");
-			return mutate(state, doc, () => {
-				doc.editor.body.appendTable({
+			return mutateGuarded(state, doc, () => {
+				const table = doc.editor.body.appendTable({
 					rows: action.rows,
 					columns: action.columns
 				});
+				if (action.merge !== void 0) table.mergeCells(action.merge.startRow, action.merge.startColumn, action.merge.rowSpan, action.merge.colSpan);
+			});
+		}
+		case "MERGE_TABLE_CELLS": {
+			const doc = wordprocessingDocument(state);
+			if (doc === void 0) return wrongDocument(state, "a docx or odt document");
+			const table = tableAt(doc, action.tableIndex);
+			if (table === void 0) return withStatus(state, "warning", `There is no table at index ${action.tableIndex}`);
+			return mutateGuarded(state, doc, () => {
+				table.mergeCells(action.startRow, action.startColumn, action.rowSpan, action.colSpan);
 			});
 		}
 		case "SET_TABLE_CELL_TEXT": {
@@ -721,6 +763,18 @@ function appReducer(state, action) {
 				appended.list = membership;
 			});
 		}
+		case "SET_LIST_ITEM_TEXT": {
+			const doc = wordprocessingDocument(state);
+			if (doc === void 0) return wrongDocument(state, "a docx or odt document");
+			if (doc.format !== "odt") return wrongDocument(state, "an odt document (lists are an odt-only concept)");
+			const list = doc.editor.lists()[action.blockIndex];
+			if (list === void 0) return withStatus(state, "warning", `There is no list at index ${action.blockIndex}`);
+			const item = list.items()[action.itemIndex];
+			if (item === void 0) return withStatus(state, "warning", `List ${action.blockIndex} has no item at index ${action.itemIndex}`);
+			return mutate(state, doc, () => {
+				setTextContainerText(item, action.text);
+			});
+		}
 		case "ADD_SLIDE": {
 			const doc = presentationDocument(state);
 			if (doc === void 0) return wrongDocument(state, "a pptx or odp document");
@@ -743,6 +797,22 @@ function appReducer(state, action) {
 				});
 			});
 		}
+		case "MERGE_SLIDE_TABLE_CELLS": {
+			const doc = presentationDocument(state);
+			if (doc === void 0) return wrongDocument(state, "a pptx or odp document");
+			if (doc.format === "odp") {
+				const entry = doc.editor.slides()[action.slideIndex]?.tables()[action.tableIndex];
+				if (entry === void 0) return withStatus(state, "warning", `There is no table at index ${action.tableIndex} on slide ${action.slideIndex}`);
+				return mutateGuarded(state, doc, () => {
+					entry.table.mergeCells(action.startRow, action.startColumn, action.rowSpan, action.colSpan);
+				});
+			}
+			const table = doc.editor.slides()[action.slideIndex]?.tables()[action.tableIndex];
+			if (table === void 0) return withStatus(state, "warning", `There is no table at index ${action.tableIndex} on slide ${action.slideIndex}`);
+			return mutateGuarded(state, doc, () => {
+				mergePptxTableCells(table, action.startRow, action.startColumn, action.rowSpan, action.colSpan);
+			});
+		}
 		case "ADD_TEXTBOX": {
 			const doc = shapeHostDocument(state);
 			if (doc === void 0) return wrongDocument(state, "a pptx, odp or odg document");
@@ -793,16 +863,9 @@ function appReducer(state, action) {
 		case "SET_SHAPE_FRAME": return withShape(state, action.containerIndex, action.shapeIndex, (shape) => {
 			shape.frame = action.frame;
 		});
-		case "SET_SHAPE_ROTATION": {
-			const doc = shapeHostDocument(state);
-			if (doc === void 0) return wrongDocument(state, "a pptx, odp or odg document");
-			if (doc.format === "pptx") return withStatus(state, "warning", "documents.js has no rotation setter for a pptx shape; rotate the shape in odp instead");
-			const shape = rotatableShapeAt(doc, action.containerIndex, action.shapeIndex);
-			if (shape === void 0) return withStatus(state, "warning", `There is no shape ${action.shapeIndex} at index ${action.containerIndex}`);
-			return mutate(state, doc, () => {
-				shape.rotationDeg = action.rotationDeg;
-			});
-		}
+		case "SET_SHAPE_ROTATION": return withShape(state, action.containerIndex, action.shapeIndex, (shape) => {
+			shape.rotationDeg = action.rotationDeg;
+		});
 		case "SET_SLIDE_NOTES": {
 			const doc = presentationDocument(state);
 			if (doc === void 0) return wrongDocument(state, "a pptx or odp document");
@@ -822,6 +885,15 @@ function appReducer(state, action) {
 		case "SET_CELL_VALUE": return withSheet(state, action.sheetIndex, (sheet) => {
 			sheet.cell(action.row, action.column).value = action.value;
 		});
+		case "MERGE_CELLS": {
+			const doc = spreadsheetDocument(state);
+			if (doc === void 0) return wrongDocument(state, "an ods document");
+			const sheet = sheetAt(doc, action.sheetIndex);
+			if (sheet === void 0) return withStatus(state, "warning", `There is no sheet at index ${action.sheetIndex}`);
+			return mutateGuarded(state, doc, () => {
+				sheet.mergeCells(action.startRow, action.startColumn, action.rowSpan, action.colSpan);
+			});
+		}
 		case "SET_SHEET_PRINT_SETTINGS": return withSheet(state, action.sheetIndex, (sheet) => {
 			sheet.printSettings = action.printSettings;
 		});
@@ -1020,6 +1092,11 @@ const COMMANDS = [
 		usage: ":close",
 		description: "Close the open document"
 	},
+	{
+		name: "undo",
+		usage: ":undo",
+		description: "Undo the last change"
+	},
 	{
 		name: "help",
 		usage: ":help",
@@ -1152,6 +1229,9 @@ async function runCommand(line, state, dispatch) {
 		case "close":
 			dispatch({ type: "REQUEST_CLOSE" });
 			return;
+		case "undo":
+			dispatch({ type: "UNDO" });
+			return;
 		case "help":
 			dispatch({
 				type: "OPEN_OVERLAY",
@@ -1430,6 +1510,10 @@ const GLOBAL_KEYS = [
 		keys: "Ctrl+W",
 		description: "Close the open document"
 	},
+	{
+		keys: "Ctrl+Z",
+		description: "Undo the last change"
+	},
 	{
 		keys: "q / Ctrl+C",
 		description: "Quit"
@@ -1590,6 +1674,14 @@ function truncatePreview(text, maxLength) {
 	if (singleLine.length === 0) return "(empty)";
 	return singleLine.length > maxLength ? `${singleLine.slice(0, Math.max(0, maxLength - 1))}…` : singleLine;
 }
+function parsePositiveIntField(raw, fallback) {
+	const parsed = Number.parseInt(raw, 10);
+	return Number.isInteger(parsed) && parsed > 0 ? parsed : fallback;
+}
+function parseNonNegativeIntField(raw, fallback) {
+	const parsed = Number.parseInt(raw, 10);
+	return Number.isInteger(parsed) && parsed >= 0 ? parsed : fallback;
+}
 //#endregion
 //#region src/tui/screens/shared/paragraph-family.tsx
 function paragraphFamilyDocument(openDocument) {
@@ -1653,6 +1745,8 @@ function tableSummary(table) {
 function listSummary(list, index) {
 	return `List ${index} (${list.itemCount} item${list.itemCount === 1 ? "" : "s"})`;
 }
+const DEFAULT_TABLE_ROWS$1 = 2;
+const DEFAULT_TABLE_COLUMNS$1 = 2;
 function ParagraphFamilyBodyList(props) {
 	const { adapter } = props;
 	const state = useAppState();
@@ -1695,9 +1789,88 @@ function ParagraphFamilyBodyList(props) {
 		if (row.kind !== "header") acc.push(rowIndex);
 		return acc;
 	}, []);
+	const [tableWizard, setTableWizard] = useState("closed");
+	const [wizardDraft, setWizardDraft] = useState("");
+	const [wizardRows, setWizardRows] = useState(DEFAULT_TABLE_ROWS$1);
+	const [wizardColumns, setWizardColumns] = useState(DEFAULT_TABLE_COLUMNS$1);
+	const [wizardStartRow, setWizardStartRow] = useState(0);
+	const [wizardStartColumn, setWizardStartColumn] = useState(0);
+	const [wizardRowSpan, setWizardRowSpan] = useState(1);
+	const wizardOpen = tableWizard !== "closed";
+	const closeWizard = () => {
+		setTableWizard("closed");
+	};
+	const commitAppendTable = (merge) => {
+		const newIndex = tables.length;
+		dispatch({
+			type: "APPEND_TABLE",
+			rows: wizardRows,
+			columns: wizardColumns,
+			merge
+		});
+		closeWizard();
+		dispatch({
+			type: "PUSH_SCREEN",
+			screen: {
+				kind: "tableView",
+				blockIndex: newIndex
+			}
+		});
+	};
+	useInput((input) => {
+		if (input === "T") {
+			setWizardDraft(String(DEFAULT_TABLE_ROWS$1));
+			setTableWizard("rows");
+		}
+	}, { isActive: !anyOverlayOpen(state) && !wizardOpen });
+	useInput((input, key) => {
+		if (key.escape) {
+			closeWizard();
+			return;
+		}
+		if (input === "y" || input === "Y") {
+			setWizardDraft("0");
+			setTableWizard("mergeStartRow");
+			return;
+		}
+		if (input === "n" || input === "N" || key.return) commitAppendTable(void 0);
+	}, { isActive: !anyOverlayOpen(state) && tableWizard === "mergePrompt" });
+	const submitWizardRows = (raw) => {
+		setWizardRows(parsePositiveIntField(raw, DEFAULT_TABLE_ROWS$1));
+		setWizardDraft(String(DEFAULT_TABLE_COLUMNS$1));
+		setTableWizard("columns");
+	};
+	const submitWizardColumns = (raw) => {
+		setWizardColumns(parsePositiveIntField(raw, DEFAULT_TABLE_COLUMNS$1));
+		setTableWizard("mergePrompt");
+	};
+	const submitWizardMergeStartRow = (raw) => {
+		setWizardStartRow(Math.min(parseNonNegativeIntField(raw, 0), Math.max(0, wizardRows - 1)));
+		setWizardDraft("0");
+		setTableWizard("mergeStartColumn");
+	};
+	const submitWizardMergeStartColumn = (raw) => {
+		setWizardStartColumn(Math.min(parseNonNegativeIntField(raw, 0), Math.max(0, wizardColumns - 1)));
+		setWizardDraft("1");
+		setTableWizard("mergeRowSpan");
+	};
+	const submitWizardMergeRowSpan = (raw) => {
+		setWizardRowSpan(Math.min(parsePositiveIntField(raw, 1), Math.max(1, wizardRows - wizardStartRow)));
+		setWizardDraft("1");
+		setTableWizard("mergeColSpan");
+	};
+	const submitWizardMergeColSpan = (raw) => {
+		const colSpan = Math.min(parsePositiveIntField(raw, 1), Math.max(1, wizardColumns - wizardStartColumn));
+		commitAppendTable({
+			startRow: wizardStartRow,
+			startColumn: wizardStartColumn,
+			rowSpan: wizardRowSpan,
+			colSpan
+		});
+	};
 	const { selectedIndex } = usePersistedSelection(selectionKeyFor({ kind: "bodyList" }), {
 		itemCount: selectableRowIndices.length,
-		isActive: !anyOverlayOpen(state),
+		isActive: !anyOverlayOpen(state) && !wizardOpen,
 		onBack: () => {
 			dispatch({ type: "POP_SCREEN" });
 		},
@@ -1784,9 +1957,89 @@ function ParagraphFamilyBodyList(props) {
 					});
 				}
 			}),
+			tableWizard === "rows" ? /* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsx(Text, {
+				color: "cyan",
+				children: "Rows: "
+			}), /* @__PURE__ */ jsx(TextField, {
+				value: wizardDraft,
+				isFocused: true,
+				onChange: setWizardDraft,
+				onSubmit: submitWizardRows,
+				onCancel: closeWizard
+			})] }) : void 0,
+			tableWizard === "columns" ? /* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsx(Text, {
+				color: "cyan",
+				children: "Columns: "
+			}), /* @__PURE__ */ jsx(TextField, {
+				value: wizardDraft,
+				isFocused: true,
+				onChange: setWizardDraft,
+				onSubmit: submitWizardColumns,
+				onCancel: closeWizard
+			})] }) : void 0,
+			tableWizard === "mergePrompt" ? /* @__PURE__ */ jsx(Text, {
+				color: "cyan",
+				children: "Merge cells now? y/N"
+			}) : void 0,
+			tableWizard === "mergeStartRow" ? /* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsxs(Text, {
+				color: "cyan",
+				children: [
+					"Merge start row (0-",
+					Math.max(0, wizardRows - 1),
+					"): "
+				]
+			}), /* @__PURE__ */ jsx(TextField, {
+				value: wizardDraft,
+				isFocused: true,
+				onChange: setWizardDraft,
+				onSubmit: submitWizardMergeStartRow,
+				onCancel: closeWizard
+			})] }) : void 0,
+			tableWizard === "mergeStartColumn" ? /* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsxs(Text, {
+				color: "cyan",
+				children: [
+					"Merge start column (0-",
+					Math.max(0, wizardColumns - 1),
+					"): "
+				]
+			}), /* @__PURE__ */ jsx(TextField, {
+				value: wizardDraft,
+				isFocused: true,
+				onChange: setWizardDraft,
+				onSubmit: submitWizardMergeStartColumn,
+				onCancel: closeWizard
+			})] }) : void 0,
+			tableWizard === "mergeRowSpan" ? /* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsxs(Text, {
+				color: "cyan",
+				children: [
+					"Merge row span (1-",
+					Math.max(1, wizardRows - wizardStartRow),
+					"): "
+				]
+			}), /* @__PURE__ */ jsx(TextField, {
+				value: wizardDraft,
+				isFocused: true,
+				onChange: setWizardDraft,
+				onSubmit: submitWizardMergeRowSpan,
+				onCancel: closeWizard
+			})] }) : void 0,
+			tableWizard === "mergeColSpan" ? /* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsxs(Text, {
+				color: "cyan",
+				children: [
+					"Merge column span (1-",
+					Math.max(1, wizardColumns - wizardStartColumn),
+					"): "
+				]
+			}), /* @__PURE__ */ jsx(TextField, {
+				value: wizardDraft,
+				isFocused: true,
+				onChange: setWizardDraft,
+				onSubmit: submitWizardMergeColSpan,
+				onCancel: closeWizard
+			})] }) : void 0,
 			/* @__PURE__ */ jsx(Text, {
 				dimColor: true,
-				children: "Enter to open, a to append a paragraph, Esc back"
+				children: "Enter to open, a to append a paragraph, T to append a table, Esc back"
 			})
 		]
 	});
@@ -2063,7 +2316,7 @@ function RunEditorScreen() {
 }
 //#endregion
 //#region src/tui/screens/editors/docx/table-view.tsx
-const CELL_WIDTH$1 = 16;
+const CELL_WIDTH$2 = 16;
 function TableViewScreen() {
 	const state = useAppState();
 	const dispatch = useAppDispatch();
@@ -2071,6 +2324,7 @@ function TableViewScreen() {
 		row: 0,
 		column: 0
 	});
+	const [mergeAnchor, setMergeAnchor] = useState(void 0);
 	const screen = currentScreen(state);
 	const doc = paragraphFamilyDocument(state.openDocument);
 	const table = screen.kind === "tableView" && doc !== void 0 ? liveTableAt(doc, screen.blockIndex) : void 0;
@@ -2079,6 +2333,22 @@ function TableViewScreen() {
 	const columnCount = rows[0]?.cells().length ?? 0;
 	const clampedRow = rowCount === 0 ? 0 : Math.min(cursor.row, rowCount - 1);
 	const clampedColumn = columnCount === 0 ? 0 : Math.min(cursor.column, columnCount - 1);
+	const commitMerge = (anchor) => {
+		if (screen.kind !== "tableView") return;
+		const startRow = Math.min(anchor.row, clampedRow);
+		const startColumn = Math.min(anchor.column, clampedColumn);
+		const rowSpan = Math.abs(clampedRow - anchor.row) + 1;
+		const colSpan = Math.abs(clampedColumn - anchor.column) + 1;
+		dispatch({
+			type: "MERGE_TABLE_CELLS",
+			tableIndex: screen.blockIndex,
+			startRow,
+			startColumn,
+			rowSpan,
+			colSpan
+		});
+		setMergeAnchor(void 0);
+	};
 	useInput((input, key) => {
 		if (table === void 0 || screen.kind !== "tableView") return;
 		if (key.upArrow || input === "k") {
@@ -2110,18 +2380,36 @@ function TableViewScreen() {
 			return;
 		}
 		if (key.escape) {
+			if (mergeAnchor !== void 0) {
+				setMergeAnchor(void 0);
+				return;
+			}
 			dispatch({ type: "POP_SCREEN" });
 			return;
 		}
-		if (key.return && rowCount > 0 && columnCount > 0) dispatch({
-			type: "PUSH_SCREEN",
-			screen: {
-				kind: "tableCellDetail",
-				blockIndex: screen.blockIndex,
+		if (input === "m" && rowCount > 0 && columnCount > 0) {
+			if (mergeAnchor === void 0) setMergeAnchor({
 				row: clampedRow,
-				col: clampedColumn
+				column: clampedColumn
+			});
+			else commitMerge(mergeAnchor);
+			return;
+		}
+		if (key.return && rowCount > 0 && columnCount > 0) {
+			if (mergeAnchor !== void 0) {
+				commitMerge(mergeAnchor);
+				return;
 			}
-		});
+			dispatch({
+				type: "PUSH_SCREEN",
+				screen: {
+					kind: "tableCellDetail",
+					blockIndex: screen.blockIndex,
+					row: clampedRow,
+					col: clampedColumn
+				}
+			});
+		}
 	}, { isActive: !anyOverlayOpen(state) });
 	if (screen.kind !== "tableView") return /* @__PURE__ */ jsx(Text, {
 		color: "red",
@@ -2159,10 +2447,11 @@ function TableViewScreen() {
 				children: "This table has no rows."
 			}) : rows.map((row, rowIndex) => /* @__PURE__ */ jsx(Box, { children: row.cells().map((cell, columnIndex) => {
 				const isSelected = rowIndex === clampedRow && columnIndex === clampedColumn;
+				const isAnchor = rowIndex === mergeAnchor?.row && columnIndex === mergeAnchor?.column;
 				return /* @__PURE__ */ jsx(Box, {
-					width: CELL_WIDTH$1,
+					width: CELL_WIDTH$2,
 					borderStyle: "single",
-					borderColor: isSelected ? "cyan" : "gray",
+					borderColor: isSelected ? "cyan" : isAnchor ? "yellow" : "gray",
 					children: /* @__PURE__ */ jsx(Text, {
 						color: isSelected ? "cyan" : void 0,
 						inverse: isSelected,
@@ -2172,7 +2461,7 @@ function TableViewScreen() {
 			}) }, rowIndex)),
 			/* @__PURE__ */ jsx(Text, {
 				dimColor: true,
-				children: "Arrows/hjkl move, Enter to edit a cell, Esc back"
+				children: mergeAnchor === void 0 ? "Arrows/hjkl move, Enter to edit a cell, m to anchor a merge, Esc back" : "Arrows/hjkl to the opposite corner, m/Enter to merge, Esc to cancel"
 			})
 		]
 	});
@@ -3019,6 +3308,10 @@ function requireShapeOrVectorDetailScreen(state) {
 	if (screen.kind !== "shapeOrVectorDetail") throw new Error(`OdgShapeOrVectorDetailScreen rendered while the top of the stack is '${screen.kind}', not 'shapeOrVectorDetail' -- app.tsx's ScreenBody switch only mounts this component for that screen kind, so this cannot happen without a routing bug.`);
 	return screen;
 }
+function vectorsParityMatch(liveVectors, contentVectors) {
+	if (liveVectors.length !== contentVectors.length) return false;
+	return liveVectors.every((live, index) => live.kind === contentVectors[index]?.kind);
+}
 function buildPageItems(doc, pageIndex) {
 	const page = doc.editor.pages()[pageIndex];
 	if (page === void 0) return [];
@@ -3026,9 +3319,12 @@ function buildPageItems(doc, pageIndex) {
 	if (content.kind !== "drawing") throw new Error(`readOdgContent(doc.editor.toPackage()) returned a '${content.kind}' ContentDocument for an odg-format open document -- an odg package should always read back as the 'drawing' variant, so this indicates a real inconsistency in documents.js's own reader, not a state this screen should paper over.`);
 	const contentPage = content.pages[pageIndex];
 	if (contentPage === void 0) throw new Error(`readOdgContent found no page at index ${pageIndex}, but doc.editor.pages() has a page there -- the two read the same live package, so they should always agree on page count.`);
-	const vectorItems = contentPage.vectors.map((vector) => ({
+	const liveVectors = page.vectors();
+	const parityOk = vectorsParityMatch(liveVectors, contentPage.vectors);
+	const vectorItems = contentPage.vectors.map((vector, index) => ({
 		kind: "vector",
-		vector
+		vector,
+		liveVector: parityOk ? liveVectors[index] : void 0
 	}));
 	const shapeItems = page.shapes().map((shape, index) => {
 		return {
@@ -3320,15 +3616,19 @@ function warnVectorIsViewOnly(dispatch, label) {
 	dispatch({
 		type: "SET_STATUS",
 		severity: "info",
-		text: `${label} added -- documents.js exposes no way to enumerate an existing odg vector, so it will show in this list read-only and cannot be edited or removed from the TUI.`
+		text: `${label} added -- but this page also has a vector element documents.js's OdgPage.vectors() cannot wrap, so every vector on it (including this one) shows read-only in this list rather than risk pairing the wrong live handle to the wrong row.`
 	});
 }
+function warnIfVectorAddedReadOnly(doc, pageIndex, dispatch, label) {
+	const added = buildPageItems(doc, pageIndex).filter((item) => item.kind === "vector").at(-1);
+	if (added !== void 0 && added.liveVector === void 0) warnVectorIsViewOnly(dispatch, label);
+}
 function inferImageFormat(path) {
 	const extension = path.slice(path.lastIndexOf(".") + 1).toLowerCase();
 	if (extension === "png") return "png";
 	if (extension === "jpg" || extension === "jpeg") return "jpeg";
 }
-async function applyAddKind(kind, pageIndex, values, dispatch) {
+async function applyAddKind(kind, pageIndex, doc, values, dispatch) {
 	switch (kind) {
 		case "rect":
 			dispatch({
@@ -3340,7 +3640,7 @@ async function applyAddKind(kind, pageIndex, values, dispatch) {
 					stroke: parseStrokeField(requireFieldValue(values, "stroke"))
 				}
 			});
-			warnVectorIsViewOnly(dispatch, "Rectangle");
+			warnIfVectorAddedReadOnly(doc, pageIndex, dispatch, "Rectangle");
 			return;
 		case "ellipse":
 			dispatch({
@@ -3352,7 +3652,7 @@ async function applyAddKind(kind, pageIndex, values, dispatch) {
 					stroke: parseStrokeField(requireFieldValue(values, "stroke"))
 				}
 			});
-			warnVectorIsViewOnly(dispatch, "Ellipse");
+			warnIfVectorAddedReadOnly(doc, pageIndex, dispatch, "Ellipse");
 			return;
 		case "line":
 			dispatch({
@@ -3377,7 +3677,7 @@ async function applyAddKind(kind, pageIndex, values, dispatch) {
 					}
 				}
 			});
-			warnVectorIsViewOnly(dispatch, "Line");
+			warnIfVectorAddedReadOnly(doc, pageIndex, dispatch, "Line");
 			return;
 		case "path": {
 			const frame = readFrame(values);
@@ -3391,7 +3691,7 @@ async function applyAddKind(kind, pageIndex, values, dispatch) {
 					stroke: parseStrokeField(requireFieldValue(values, "stroke"))
 				}
 			});
-			warnVectorIsViewOnly(dispatch, "Path");
+			warnIfVectorAddedReadOnly(doc, pageIndex, dispatch, "Path");
 			return;
 		}
 		case "textbox":
@@ -3520,7 +3820,7 @@ function AddItemFlow(props) {
 		fields: fieldsForAddKind(kind),
 		onCancel: props.onCancel,
 		onComplete: (values) => {
-			applyAddKind(kind, props.pageIndex, values, dispatch).then(props.onCreated);
+			applyAddKind(kind, props.pageIndex, props.doc, values, dispatch).then(props.onCreated);
 		}
 	});
 }
@@ -3574,6 +3874,7 @@ function OdgPageDetailScreen() {
 	});
 	if (isAdding) return /* @__PURE__ */ jsx(AddItemFlow, {
 		pageIndex,
+		doc,
 		isActive: !overlayOpen,
 		onCancel: () => {
 			setIsAdding(false);
@@ -3607,19 +3908,75 @@ function OdgPageDetailScreen() {
 }
 //#endregion
 //#region src/tui/screens/editors/odg/shape-or-vector-detail.tsx
+function buildVectorRows(vector, liveVector, dispatch) {
+	const rows = [];
+	if (vector.kind !== "line" && liveVector.kind !== "line") {
+		const fillTarget = liveVector;
+		rows.push({
+			label: `Fill: ${vector.fill === void 0 ? "none" : formatColor$1(vector.fill)}`,
+			currentValue: vector.fill === void 0 ? "" : `${vector.fill.r} ${vector.fill.g} ${vector.fill.b}`,
+			commit: (raw) => {
+				dispatch({
+					type: "SET_VECTOR_FILL",
+					vector: fillTarget,
+					fill: parseColorField(raw)
+				});
+			}
+		});
+	}
+	rows.push({
+		label: `Stroke: ${vector.stroke === void 0 ? "none" : `${formatColor$1(vector.stroke.color)} ${formatPt(vector.stroke.widthPt)}pt`}`,
+		currentValue: vector.stroke === void 0 ? "" : `${vector.stroke.color.r} ${vector.stroke.color.g} ${vector.stroke.color.b} ${vector.stroke.widthPt}`,
+		commit: (raw) => {
+			const stroke = parseStrokeField(raw);
+			if (stroke === void 0) {
+				dispatch({
+					type: "SET_STATUS",
+					severity: "warning",
+					text: "A vector stroke cannot be cleared to none through this editor -- enter \"r g b widthPt\" (0-1 colour, pt width) instead"
+				});
+				return;
+			}
+			dispatch({
+				type: "SET_VECTOR_STROKE",
+				vector: liveVector,
+				stroke
+			});
+		}
+	});
+	return rows;
+}
 function VectorDetail(props) {
-	return /* @__PURE__ */ jsxs(Box, {
+	const dispatch = useAppDispatch();
+	const [editingField, setEditingField] = useState(void 0);
+	const [draft, setDraft] = useState("");
+	const { vector, liveVector, isActive } = props;
+	const rows = liveVector === void 0 ? [] : buildVectorRows(vector, liveVector, dispatch);
+	const { selectedIndex } = useNavigationInput({
+		itemCount: rows.length,
+		isActive: isActive && editingField === void 0,
+		onBack: () => {
+			dispatch({ type: "POP_SCREEN" });
+		},
+		onSelect: (index) => {
+			const row = rows[index];
+			if (row === void 0) return;
+			setDraft(row.currentValue);
+			setEditingField(index);
+		}
+	});
+	if (liveVector === void 0) return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
 		children: [
 			/* @__PURE__ */ jsxs(Text, {
 				bold: true,
-				children: [vectorKindLabel(props.vector.kind), " (view-only)"]
+				children: [vectorKindLabel(vector.kind), " (view-only)"]
 			}),
-			/* @__PURE__ */ jsxs(Text, { children: ["Geometry: ", describeVectorGeometry(props.vector)] }),
-			/* @__PURE__ */ jsx(Text, { children: describeFillStroke(props.vector) }),
+			/* @__PURE__ */ jsxs(Text, { children: ["Geometry: ", describeVectorGeometry(vector)] }),
+			/* @__PURE__ */ jsx(Text, { children: describeFillStroke(vector) }),
 			/* @__PURE__ */ jsx(Text, {
 				color: "yellow",
-				children: "documents.js's OdgPage has no accessor for an existing rect/ellipse/line/path vector, so there is no live handle to edit or remove this one from the TUI -- open the file in a real ODF editor to change it."
+				children: "This page's live vectors (documents.js's `OdgPage.vectors()`) don't line up one-to-one with what odf.js's own reader found here -- likely a `draw:circle`/`polygon`/`polyline`/`custom-shape` element the live accessor has no wrapper for, sitting alongside a plain rect/ellipse/line/path it does. Rather than risk pairing the wrong live handle to this row, every vector on this page is shown read-only until that mismatch is resolved outside this TUI. Open the file in a real ODF editor to change it."
 			}),
 			/* @__PURE__ */ jsx(Text, {
 				dimColor: true,
@@ -3627,6 +3984,53 @@ function VectorDetail(props) {
 			})
 		]
 	});
+	if (editingField !== void 0) {
+		const row = rows[editingField];
+		if (row === void 0) throw new Error(`VectorDetail is editing field index ${editingField}, but there are only ${rows.length} rows -- selecting a row always sets editingField to a valid index from that same rows array, so this indicates a bug in that selection.`);
+		return /* @__PURE__ */ jsxs(Box, {
+			flexDirection: "column",
+			borderStyle: "round",
+			paddingX: 1,
+			children: [/* @__PURE__ */ jsx(Text, {
+				bold: true,
+				children: row.label
+			}), /* @__PURE__ */ jsx(TextField, {
+				value: draft,
+				isFocused: true,
+				onChange: setDraft,
+				onCancel: () => {
+					setEditingField(void 0);
+				},
+				onSubmit: (value) => {
+					row.commit(value);
+					setEditingField(void 0);
+				}
+			})]
+		});
+	}
+	return /* @__PURE__ */ jsxs(Box, {
+		flexDirection: "column",
+		children: [
+			/* @__PURE__ */ jsx(Text, {
+				bold: true,
+				children: vectorKindLabel(vector.kind)
+			}),
+			/* @__PURE__ */ jsxs(Text, { children: ["Geometry: ", describeVectorGeometry(vector)] }),
+			/* @__PURE__ */ jsx(ListView, {
+				items: rows,
+				selectedIndex,
+				reservedRows: 5,
+				renderItem: (row, isSelected) => /* @__PURE__ */ jsxs(Text, {
+					color: isSelected ? "cyan" : void 0,
+					children: [isSelected ? "> " : "  ", row.label]
+				})
+			}),
+			/* @__PURE__ */ jsx(Text, {
+				dimColor: true,
+				children: "Enter to edit a field, Esc to go back"
+			})
+		]
+	});
 }
 function ShapeDetail(props) {
 	const dispatch = useAppDispatch();
@@ -3796,7 +4200,7 @@ function OdgShapeOrVectorDetailScreen() {
 	const item = items[itemIndex];
 	useInput((input, key) => {
 		if (key.escape || key.leftArrow || input === "h") dispatch({ type: "POP_SCREEN" });
-	}, { isActive: !overlayOpen && item?.kind !== "shape" });
+	}, { isActive: !overlayOpen && item === void 0 });
 	if (item === void 0) return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
 		children: [/* @__PURE__ */ jsxs(Text, {
@@ -3813,7 +4217,11 @@ function OdgShapeOrVectorDetailScreen() {
 			children: "Esc to go back"
 		})]
 	});
-	if (item.kind === "vector") return /* @__PURE__ */ jsx(VectorDetail, { vector: item.vector });
+	if (item.kind === "vector") return /* @__PURE__ */ jsx(VectorDetail, {
+		vector: item.vector,
+		liveVector: item.liveVector,
+		isActive: !overlayOpen
+	});
 	const vectorCount = items.filter((entry) => entry.kind === "vector").length;
 	return /* @__PURE__ */ jsx(ShapeDetail, {
 		pageIndex,
@@ -3955,10 +4363,6 @@ function formatRotationDeg(value) {
 	return value === void 0 ? "(unset)" : `${Math.round(value * ROTATION_DISPLAY_PRECISION) / ROTATION_DISPLAY_PRECISION}°`;
 }
 function RotationField(props) {
-	if (!props.isEditable) return /* @__PURE__ */ jsx(Text, {
-		dimColor: true,
-		children: "[R] Rotation: not available for pptx shapes"
-	});
 	if (props.isEditing) return /* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsx(Text, {
 		color: "cyan",
 		children: "[R] Rotation (deg, blank to unset): "
@@ -3992,7 +4396,6 @@ const FIELD_LABELS = {
 	width: "Width (pt)",
 	height: "Height (pt)"
 };
-const ROTATION_UNAVAILABLE_MESSAGE = "documents.js has no rotation setter for a pptx shape; rotate the shape in odp instead";
 const POINT_DISPLAY_PRECISION = 100;
 function formatPoints(value) {
 	return value === void 0 ? "(unset)" : `${Math.round(value * POINT_DISPLAY_PRECISION) / POINT_DISPLAY_PRECISION}pt`;
@@ -4012,9 +4415,9 @@ function describeFieldValue(key, shape) {
 function roundForDisplay(value) {
 	return Math.round(value * POINT_DISPLAY_PRECISION) / POINT_DISPLAY_PRECISION;
 }
-function initialDraftFor(key, shape, rotatableShape) {
+function initialDraftFor(key, shape) {
 	if (key === "rotation") {
-		const value = rotatableShape?.rotationDeg;
+		const value = shape.rotationDeg;
 		return value === void 0 ? "" : String(roundForDisplay(value));
 	}
 	if (key === "text") return shape.text;
@@ -4027,10 +4430,9 @@ function initialDraftFor(key, shape, rotatableShape) {
 	}
 }
 function FieldRow(props) {
-	const { fieldKey, shape, rotatableShape, isOdp, isSelected, isEditing, draft, onDraftChange, onSubmit, onCancel } = props;
+	const { fieldKey, shape, isSelected, isEditing, draft, onDraftChange, onSubmit, onCancel } = props;
 	if (fieldKey === "rotation") return /* @__PURE__ */ jsx(RotationField, {
-		rotationDeg: rotatableShape?.rotationDeg,
-		isEditable: isOdp,
+		rotationDeg: shape.rotationDeg,
 		isSelected,
 		isEditing,
 		draftValue: draft,
@@ -4079,9 +4481,7 @@ function ShapeEditorScreen(props) {
 	const overlayOpen = anyOverlayOpen(state);
 	const doc = assertPresentationDocument(state.openDocument);
 	const { slideIndex, shapeIndex } = props.screen;
-	const isOdp = doc.format === "odp";
 	const shape = doc.editor.slides()[slideIndex]?.shapes()[shapeIndex];
-	const rotatableShape = doc.format === "odp" ? doc.editor.slides()[slideIndex]?.shapes()[shapeIndex] : void 0;
 	const [editingField, setEditingField] = useState(void 0);
 	const [draft, setDraft] = useState("");
 	const { selectedIndex } = useNavigationInput({
@@ -4094,20 +4494,12 @@ function ShapeEditorScreen(props) {
 			if (shape === void 0) return;
 			const key = FIELD_KEYS[index];
 			if (key === void 0) return;
-			if (key === "rotation" && !isOdp) {
-				dispatch({
-					type: "SET_STATUS",
-					severity: "warning",
-					text: ROTATION_UNAVAILABLE_MESSAGE
-				});
-				return;
-			}
 			dispatch({
 				type: "SET_SELECTION",
 				key: selectionKeyFor(props.screen),
 				index
 			});
-			setDraft(initialDraftFor(key, shape, rotatableShape));
+			setDraft(initialDraftFor(key, shape));
 			setEditingField(key);
 		}
 	});
@@ -4232,8 +4624,6 @@ function ShapeEditorScreen(props) {
 				renderItem: (key, isSelected) => /* @__PURE__ */ jsx(FieldRow, {
 					fieldKey: key,
 					shape,
-					rotatableShape,
-					isOdp,
 					isSelected,
 					isEditing: editingField === key,
 					draft,
@@ -4250,6 +4640,30 @@ function ShapeEditorScreen(props) {
 	});
 }
 //#endregion
+//#region src/tui/screens/shared/slide-table.ts
+function resolveSlideTable(doc, slideIndex, tableIndex) {
+	const content = doc.format === "odp" ? readOdpContent(doc.editor.toPackage()) : readPptxContent(doc.editor.toPackage());
+	if (content.kind !== "presentation") throw new Error("readPptxContent/readOdpContent always resolve a presentation package to the presentation ContentDocument variant.");
+	const slide = content.slides[slideIndex];
+	if (slide === void 0) return;
+	return slide.shapes.flatMap((shape) => shape.blocks.filter((block) => block.kind === "table"))[tableIndex];
+}
+function slideTableCellText(cell) {
+	return cell.blocks.filter((block) => block.kind === "paragraph").map((paragraph) => paragraph.runs.map((run) => run.text).join("")).join("\n");
+}
+function summarizeGridTable(table, index) {
+	const rows = table.rows();
+	return {
+		index,
+		rowCount: rows.length,
+		columnCount: rows[0]?.cells().length ?? 0
+	};
+}
+function summarizeSlideTables(doc, slideIndex) {
+	if (doc.format === "odp") return (doc.editor.slides()[slideIndex]?.tables() ?? []).map((entry, index) => summarizeGridTable(entry.table, index));
+	return (doc.editor.slides()[slideIndex]?.tables() ?? []).map((table, index) => summarizeGridTable(table, index));
+}
+//#endregion
 //#region src/tui/screens/editors/pptx/slide-detail.tsx
 const IMAGE_EXTENSION_TO_FORMAT = {
 	png: "png",
@@ -4258,10 +4672,6 @@ const IMAGE_EXTENSION_TO_FORMAT = {
 };
 const DEFAULT_TABLE_ROWS = 2;
 const DEFAULT_TABLE_COLUMNS = 2;
-function parsePositiveIntField(raw, fallback) {
-	const parsed = Number.parseInt(raw, 10);
-	return Number.isInteger(parsed) && parsed > 0 ? parsed : fallback;
-}
 function imageFormatFromPath(path) {
 	const dotIndex = path.lastIndexOf(".");
 	if (dotIndex < 0) return;
@@ -4282,34 +4692,63 @@ function SlideDetailScreen(props) {
 	const doc = assertPresentationDocument(state.openDocument);
 	const { slideIndex } = props.screen;
 	const slide = doc.editor.slides()[slideIndex];
-	const rows = (slide === void 0 ? [] : slide.shapes()).map((shape, index) => ({
+	const shapes = slide === void 0 ? [] : slide.shapes();
+	const tableSummaries = slide === void 0 ? [] : summarizeSlideTables(doc, slideIndex);
+	const rows = [...shapes.map((shape, index) => ({
+		kind: "shape",
 		index,
 		text: shape.text,
 		frame: shape.frame
-	}));
+	})), ...tableSummaries.length > 0 ? [{
+		kind: "tablesHeader",
+		count: tableSummaries.length
+	}, ...tableSummaries.map((summary) => ({
+		kind: "table",
+		index: summary.index,
+		rowCount: summary.rowCount,
+		columnCount: summary.columnCount
+	}))] : []];
+	const selectableRowIndices = rows.reduce((acc, row, index) => {
+		if (row.kind !== "tablesHeader") acc.push(index);
+		return acc;
+	}, []);
 	const [addMode, setAddMode] = useState("closed");
 	const [draft, setDraft] = useState("");
 	const [imageError, setImageError] = useState(void 0);
 	const [tableRows, setTableRows] = useState(DEFAULT_TABLE_ROWS);
 	const formIsOpen = addMode !== "closed";
 	const { selectedIndex } = useNavigationInput({
-		itemCount: rows.length,
+		itemCount: selectableRowIndices.length,
 		isActive: !overlayOpen && !formIsOpen,
 		onBack: () => {
 			dispatch({ type: "POP_SCREEN" });
 		},
 		onSelect: (index) => {
-			dispatch({
-				type: "SET_SELECTION",
-				key: selectionKeyFor(props.screen),
-				index
-			});
-			dispatch({
+			const rowIndex = selectableRowIndices[index];
+			const row = rowIndex === void 0 ? void 0 : rows[rowIndex];
+			if (row === void 0) return;
+			if (row.kind === "shape") {
+				dispatch({
+					type: "SET_SELECTION",
+					key: selectionKeyFor(props.screen),
+					index
+				});
+				dispatch({
+					type: "PUSH_SCREEN",
+					screen: {
+						kind: "shapeEditor",
+						slideIndex,
+						shapeIndex: row.index
+					}
+				});
+				return;
+			}
+			if (row.kind === "table") dispatch({
 				type: "PUSH_SCREEN",
 				screen: {
-					kind: "shapeEditor",
+					kind: "slideTableDetail",
 					slideIndex,
-					shapeIndex: index
+					tableIndex: row.index
 				}
 			});
 		},
@@ -4317,6 +4756,7 @@ function SlideDetailScreen(props) {
 			setAddMode("chooseKind");
 		}
 	});
+	const listSelectedIndex = selectableRowIndices[selectedIndex] ?? -1;
 	useInput((input, key) => {
 		if (key.escape) {
 			setAddMode("closed");
@@ -4399,9 +4839,9 @@ function SlideDetailScreen(props) {
 					"Slide ",
 					slideIndex + 1,
 					" -- ",
-					rows.length,
+					shapes.length,
 					" shape",
-					rows.length === 1 ? "" : "s"
+					shapes.length === 1 ? "" : "s"
 				]
 			}),
 			slide === void 0 ? /* @__PURE__ */ jsx(Text, {
@@ -4409,20 +4849,45 @@ function SlideDetailScreen(props) {
 				children: "This slide no longer exists -- press Esc to go back"
 			}) : /* @__PURE__ */ jsx(ListView, {
 				items: rows,
-				selectedIndex,
+				selectedIndex: listSelectedIndex,
 				emptyMessage: "No shapes yet -- press 'a' to add one",
-				renderItem: (row, isSelected) => /* @__PURE__ */ jsxs(Text, {
-					color: isSelected ? "cyan" : void 0,
-					inverse: isSelected,
-					children: [
-						row.index + 1,
-						". ",
-						describeSlideFamilyShape({
-							text: row.text,
-							frame: row.frame
-						})
-					]
-				})
+				renderItem: (row, isSelected) => {
+					if (row.kind === "tablesHeader") return /* @__PURE__ */ jsxs(Text, {
+						bold: true,
+						dimColor: true,
+						children: [
+							"Tables (",
+							row.count,
+							")"
+						]
+					});
+					if (row.kind === "table") return /* @__PURE__ */ jsxs(Text, {
+						color: isSelected ? "cyan" : void 0,
+						inverse: isSelected,
+						children: [
+							"  ",
+							"Table ",
+							row.index + 1,
+							" (",
+							row.rowCount,
+							"x",
+							row.columnCount,
+							")"
+						]
+					});
+					return /* @__PURE__ */ jsxs(Text, {
+						color: isSelected ? "cyan" : void 0,
+						inverse: isSelected,
+						children: [
+							row.index + 1,
+							". ",
+							describeSlideFamilyShape({
+								text: row.text,
+								frame: row.frame
+							})
+						]
+					});
+				}
 			}),
 			addMode === "chooseKind" ? /* @__PURE__ */ jsx(Text, {
 				color: "cyan",
@@ -4490,6 +4955,146 @@ function SlideDetailScreen(props) {
 	});
 }
 //#endregion
+//#region src/tui/screens/editors/pptx/slide-table-detail.tsx
+const CELL_WIDTH$1 = 16;
+function SlideTableDetailScreen(props) {
+	const state = useAppState();
+	const dispatch = useAppDispatch();
+	const doc = assertPresentationDocument(state.openDocument);
+	const { slideIndex, tableIndex } = props.screen;
+	const [cursor, setCursor] = useState({
+		row: 0,
+		column: 0
+	});
+	const [mergeAnchor, setMergeAnchor] = useState(void 0);
+	const table = resolveSlideTable(doc, slideIndex, tableIndex);
+	const rows = table?.rows ?? [];
+	const rowCount = rows.length;
+	const columnCount = rows[0]?.cells.length ?? 0;
+	const clampedRow = rowCount === 0 ? 0 : Math.min(cursor.row, rowCount - 1);
+	const clampedColumn = columnCount === 0 ? 0 : Math.min(cursor.column, columnCount - 1);
+	const commitMerge = (anchor) => {
+		const startRow = Math.min(anchor.row, clampedRow);
+		const startColumn = Math.min(anchor.column, clampedColumn);
+		const rowSpan = Math.abs(clampedRow - anchor.row) + 1;
+		const colSpan = Math.abs(clampedColumn - anchor.column) + 1;
+		dispatch({
+			type: "MERGE_SLIDE_TABLE_CELLS",
+			slideIndex,
+			tableIndex,
+			startRow,
+			startColumn,
+			rowSpan,
+			colSpan
+		});
+		setMergeAnchor(void 0);
+	};
+	useInput((input, key) => {
+		if (table === void 0) return;
+		if (key.upArrow || input === "k") {
+			setCursor({
+				row: Math.max(0, clampedRow - 1),
+				column: clampedColumn
+			});
+			return;
+		}
+		if (key.downArrow || input === "j") {
+			setCursor({
+				row: rowCount === 0 ? 0 : Math.min(rowCount - 1, clampedRow + 1),
+				column: clampedColumn
+			});
+			return;
+		}
+		if (key.leftArrow || input === "h") {
+			setCursor({
+				row: clampedRow,
+				column: Math.max(0, clampedColumn - 1)
+			});
+			return;
+		}
+		if (key.rightArrow || input === "l") {
+			setCursor({
+				row: clampedRow,
+				column: columnCount === 0 ? 0 : Math.min(columnCount - 1, clampedColumn + 1)
+			});
+			return;
+		}
+		if (key.escape) {
+			if (mergeAnchor !== void 0) {
+				setMergeAnchor(void 0);
+				return;
+			}
+			dispatch({ type: "POP_SCREEN" });
+			return;
+		}
+		if (input === "m" || key.return) {
+			if (mergeAnchor === void 0) {
+				setMergeAnchor({
+					row: clampedRow,
+					column: clampedColumn
+				});
+				return;
+			}
+			commitMerge(mergeAnchor);
+		}
+	}, { isActive: !anyOverlayOpen(state) });
+	if (table === void 0) return /* @__PURE__ */ jsxs(Box, {
+		flexDirection: "column",
+		children: [/* @__PURE__ */ jsxs(Text, {
+			bold: true,
+			children: [
+				"Slide ",
+				slideIndex + 1,
+				", table ",
+				tableIndex + 1
+			]
+		}), /* @__PURE__ */ jsx(Text, {
+			color: "yellow",
+			children: "This table no longer exists -- press Esc to go back"
+		})]
+	});
+	return /* @__PURE__ */ jsxs(Box, {
+		flexDirection: "column",
+		children: [
+			/* @__PURE__ */ jsxs(Text, {
+				bold: true,
+				children: [
+					"Slide ",
+					slideIndex + 1,
+					", table ",
+					tableIndex + 1,
+					" (",
+					rowCount,
+					"x",
+					columnCount,
+					")"
+				]
+			}),
+			rows.length === 0 ? /* @__PURE__ */ jsx(Text, {
+				dimColor: true,
+				children: "This table has no rows."
+			}) : rows.map((row, rowIndex) => /* @__PURE__ */ jsx(Box, { children: row.cells.map((cell, columnIndex) => {
+				const isCursor = rowIndex === clampedRow && columnIndex === clampedColumn;
+				const isAnchor = rowIndex === mergeAnchor?.row && columnIndex === mergeAnchor?.column;
+				return /* @__PURE__ */ jsx(Box, {
+					width: CELL_WIDTH$1,
+					borderStyle: "single",
+					borderColor: isCursor ? "cyan" : isAnchor ? "yellow" : "gray",
+					children: /* @__PURE__ */ jsx(Text, {
+						color: isCursor ? "cyan" : void 0,
+						inverse: isCursor,
+						children: truncatePreview(slideTableCellText(cell), 14)
+					})
+				}, columnIndex);
+			}) }, rowIndex)),
+			/* @__PURE__ */ jsx(Text, {
+				dimColor: true,
+				children: mergeAnchor === void 0 ? "Arrows/hjkl move, m to anchor a merge, Esc back" : "Arrows/hjkl to the opposite corner, m/Enter to merge, Esc to cancel"
+			})
+		]
+	});
+}
+//#endregion
 //#region src/tui/screens/editors/pptx/index.tsx
 function PptxSlideListScreen() {
 	const doc = useAppState().openDocument;
@@ -5108,7 +5713,8 @@ const RESERVED_LETTERS = /* @__PURE__ */ new Set([
 	"k",
 	"l",
 	"p",
-	"t"
+	"t",
+	"m"
 ]);
 function windowStart(cursor, total, viewport) {
 	const maxStart = Math.max(0, total - viewport);
@@ -5131,6 +5737,7 @@ function OdsSpreadsheetGridScreen() {
 	const [cursorColumn, setCursorColumn] = useState(0);
 	const [viewMode, setViewMode] = useState("grid");
 	const [editSession, setEditSession] = useState(void 0);
+	const [mergeAnchor, setMergeAnchor] = useState(void 0);
 	const { columns: terminalColumns, rows: terminalRows } = useWindowSize();
 	const sheet = resolveSheet(doc.editor, sheetIndex);
 	const { rowCount, columnCount } = sheetExtent(sheet);
@@ -5149,6 +5756,21 @@ function OdsSpreadsheetGridScreen() {
 			seedKind
 		});
 	}
+	function commitMerge(anchor) {
+		const startRow = Math.min(anchor.row, clampedRow);
+		const startColumn = Math.min(anchor.column, clampedColumn);
+		const rowSpan = Math.abs(clampedRow - anchor.row) + 1;
+		const colSpan = Math.abs(clampedColumn - anchor.column) + 1;
+		dispatch({
+			type: "MERGE_CELLS",
+			sheetIndex,
+			startRow,
+			startColumn,
+			rowSpan,
+			colSpan
+		});
+		setMergeAnchor(void 0);
+	}
 	useInput((input) => {
 		if (input === "t") {
 			setViewMode((mode) => mode === "grid" ? "compact" : "grid");
@@ -5196,10 +5818,26 @@ function OdsSpreadsheetGridScreen() {
 			return;
 		}
 		if (key.escape) {
+			if (mergeAnchor !== void 0) {
+				setMergeAnchor(void 0);
+				return;
+			}
 			dispatch({ type: "POP_SCREEN" });
 			return;
 		}
+		if (input === "m") {
+			if (mergeAnchor === void 0) setMergeAnchor({
+				row: clampedRow,
+				column: clampedColumn
+			});
+			else commitMerge(mergeAnchor);
+			return;
+		}
 		if (key.return) {
+			if (mergeAnchor !== void 0) {
+				commitMerge(mergeAnchor);
+				return;
+			}
 			const cell = cells.get(cellKey(clampedRow, clampedColumn));
 			const seedKind = cell === void 0 || cell.value.kind === "empty" ? "string" : cell.value.kind;
 			beginEdit(cell === void 0 ? "" : rawEditableText(cell.value), seedKind);
@@ -5282,10 +5920,11 @@ function OdsSpreadsheetGridScreen() {
 					children: [`${row + 1}`.padStart(4), " "]
 				}), visibleColumns.map((column) => {
 					const isCursor = row === clampedRow && column === clampedColumn;
+					const isAnchor = row === mergeAnchor?.row && column === mergeAnchor?.column;
 					const cell = cells.get(cellKey(row, column));
 					return /* @__PURE__ */ jsx(Text, {
 						inverse: isCursor,
-						color: isCursor ? "cyan" : void 0,
+						color: isCursor ? "cyan" : isAnchor ? "yellow" : void 0,
 						children: padCell(cell === void 0 ? "" : cell.displayText, CELL_WIDTH)
 					}, column);
 				})] }, row))]
@@ -5323,13 +5962,9 @@ function OdsSpreadsheetGridScreen() {
 					setEditSession(void 0);
 				}
 			}),
-			/* @__PURE__ */ jsxs(Text, {
+			/* @__PURE__ */ jsx(Text, {
 				dimColor: true,
-				children: [
-					"hjkl/arrows move, Enter/type to edit, p print settings, t ",
-					viewMode === "grid" ? "compact list" : "grid",
-					" view, Esc back"
-				]
+				children: mergeAnchor === void 0 ? `hjkl/arrows move, Enter/type to edit, m to anchor a merge, p print settings, t ${viewMode === "grid" ? "compact list" : "grid"} view, Esc back` : "hjkl/arrows to the opposite corner, m/Enter to merge, Esc to cancel"
 			})
 		]
 	});
@@ -5339,28 +5974,40 @@ function OdsSpreadsheetGridScreen() {
 function ListEditorScreen() {
 	const state = useAppState();
 	const dispatch = useAppDispatch();
+	const overlayOpen = anyOverlayOpen(state);
 	const [isAdding, setIsAdding] = useState(false);
 	const [newItemText, setNewItemText] = useState("");
+	const [editingIndex, setEditingIndex] = useState(void 0);
 	const screen = currentScreen(state);
 	const doc = paragraphFamilyDocument(state.openDocument);
 	const list = screen.kind === "listEditor" && doc?.format === "odt" ? doc.editor.lists()[screen.blockIndex] : void 0;
-	const itemCount = list === void 0 ? 0 : list.items().length;
-	useInput((input, key) => {
-		if (list === void 0 || screen.kind !== "listEditor") return;
-		if (key.escape) {
+	const items = list === void 0 ? [] : list.items();
+	const rows = items.map((item, index) => ({
+		item,
+		index
+	}));
+	const itemCount = items.length;
+	const isNavigationActive = !overlayOpen && !isAdding && editingIndex === void 0;
+	const { selectedIndex } = useNavigationInput({
+		itemCount,
+		isActive: isNavigationActive,
+		onBack: () => {
 			dispatch({ type: "POP_SCREEN" });
-			return;
-		}
-		if (input === "a") {
+		},
+		onSelect: (index) => {
+			setEditingIndex(index);
+		},
+		onAppend: () => {
 			setIsAdding(true);
-			return;
 		}
+	});
+	useInput((input, key) => {
 		if (key.tab || input === ">" || input === "<") dispatch({
 			type: "SET_STATUS",
 			severity: "warning",
 			text: "Indenting a list item needs a new reducer action this pass didn't add -- OdtListItem.addNestedList() has no wiring yet"
 		});
-	}, { isActive: !anyOverlayOpen(state) && !isAdding });
+	}, { isActive: isNavigationActive });
 	if (screen.kind !== "listEditor") return /* @__PURE__ */ jsx(Text, {
 		color: "red",
 		children: "ListEditorScreen rendered outside a listEditor screen."
@@ -5377,6 +6024,36 @@ function ListEditorScreen() {
 			"."
 		]
 	});
+	if (editingIndex !== void 0) {
+		const item = items[editingIndex];
+		if (item === void 0) throw new Error(`ListEditorScreen is editing item index ${editingIndex}, but list ${screen.blockIndex} only has ${items.length} items -- selecting a row always sets editingIndex to a valid index from that same items array, so this indicates a bug in that selection.`);
+		return /* @__PURE__ */ jsxs(Box, {
+			flexDirection: "column",
+			children: [/* @__PURE__ */ jsxs(Text, {
+				bold: true,
+				children: [
+					"List ",
+					screen.blockIndex,
+					", item ",
+					editingIndex + 1
+				]
+			}), /* @__PURE__ */ jsx(RunTextEditor, {
+				initialText: item.text,
+				onCommit: (text) => {
+					dispatch({
+						type: "SET_LIST_ITEM_TEXT",
+						blockIndex: screen.blockIndex,
+						itemIndex: editingIndex,
+						text
+					});
+					setEditingIndex(void 0);
+				},
+				onCancel: () => {
+					setEditingIndex(void 0);
+				}
+			})]
+		});
+	}
 	return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
 		children: [
@@ -5392,13 +6069,23 @@ function ListEditorScreen() {
 					")"
 				]
 			}),
-			itemCount === 0 ? /* @__PURE__ */ jsx(Text, {
-				dimColor: true,
-				children: "This list has no items yet."
-			}) : Array.from({ length: itemCount }, (_, index) => /* @__PURE__ */ jsxs(Text, {
-				dimColor: true,
-				children: [index + 1, ". (item content is not readable through documents.js's OdtListItem API)"]
-			}, index)),
+			/* @__PURE__ */ jsx(ListView, {
+				items: rows,
+				selectedIndex,
+				emptyMessage: "This list has no items yet -- press 'a' to add one.",
+				renderItem: (row, isSelected) => {
+					const trimmed = row.item.text.trim();
+					return /* @__PURE__ */ jsxs(Text, {
+						color: isSelected ? "cyan" : void 0,
+						inverse: isSelected,
+						children: [
+							row.index + 1,
+							". ",
+							trimmed.length === 0 ? "(empty)" : row.item.text
+						]
+					});
+				}
+			}),
 			isAdding ? /* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsx(Text, {
 				color: "cyan",
 				children: "+ "
@@ -5422,7 +6109,7 @@ function ListEditorScreen() {
 				}
 			})] }) : /* @__PURE__ */ jsx(Text, {
 				dimColor: true,
-				children: "a to add an item, Esc back"
+				children: "Enter to edit an item, a to add, Esc back"
 			})
 		]
 	});
@@ -6329,6 +7016,7 @@ function ScreenBody({ screen }) {
 		case "slideList": return format === "odp" ? /* @__PURE__ */ jsx(OdpSlideListScreen, {}) : /* @__PURE__ */ jsx(PptxSlideListScreen, {});
 		case "slideDetail": return /* @__PURE__ */ jsx(SlideDetailScreen, { screen });
 		case "shapeEditor": return /* @__PURE__ */ jsx(ShapeEditorScreen, { screen });
+		case "slideTableDetail": return /* @__PURE__ */ jsx(SlideTableDetailScreen, { screen });
 		case "notesEditor": return /* @__PURE__ */ jsx(NotesEditorScreen, { screen });
 		case "sheetList": return /* @__PURE__ */ jsx(OdsSheetListScreen, {});
 		case "spreadsheetGrid": return /* @__PURE__ */ jsx(OdsSpreadsheetGridScreen, {});
@@ -6441,6 +7129,10 @@ function AppShell({ startPath }) {
 			dispatch({ type: "REQUEST_CLOSE" });
 			return;
 		}
+		if (key.ctrl && input === "z") {
+			dispatch({ type: "UNDO" });
+			return;
+		}
 		if (input === ":") {
 			dispatch({
 				type: "OPEN_OVERLAY",