@stll/folio-core 0.22.2 → 0.23.0

package/dist/prosemirror/selectionMarks.d.ts

@@ -0,0 +1,11 @@
+import { Mark, Node } from "prosemirror-model";
+//#region src/prosemirror/selectionMarks.d.ts
+type CollectMarksInRangeOptions = {
+  doc: Node;
+  from: number;
+  to: number;
+};
+/** Collect one representative per mark type, preferring visible underline state. */
+declare const collectMarksInRange: ({ doc, from, to }: CollectMarksInRangeOptions) => Mark[];
+//#endregion
+export { collectMarksInRange };

package/dist/prosemirror/selectionMarks.js

@@ -0,0 +1,19 @@
+//#region src/prosemirror/selectionMarks.ts
+const UNDERLINE_MARK = "underline";
+const HIDDEN_UNDERLINE_STYLE = "none";
+const shouldReplaceMark = (current, incoming) => current.type.name === UNDERLINE_MARK && current.attrs["style"] === HIDDEN_UNDERLINE_STYLE && incoming.attrs["style"] !== HIDDEN_UNDERLINE_STYLE;
+/** Collect one representative per mark type, preferring visible underline state. */
+const collectMarksInRange = ({ doc, from, to }) => {
+	const seen = /* @__PURE__ */ new Map();
+	doc.nodesBetween(from, to, (node) => {
+		if (!node.isText) return;
+		for (const mark of node.marks) {
+			const name = mark.type.name;
+			const current = seen.get(name);
+			if (!current || shouldReplaceMark(current, mark)) seen.set(name, mark);
+		}
+	});
+	return Array.from(seen.values());
+};
+//#endregion
+export { collectMarksInRange };

package/dist/prosemirror/selectionState.d.ts

@@ -2,9 +2,11 @@ import { document_d_exports } from "../types/document.js";
 import { EditorState } from "prosemirror-state";
 //#region src/prosemirror/selectionState.d.ts
 /**
- * Selection state for toolbar integration
+ * Canonical selection projection shared by toolbar and selection-change APIs.
+ * Adapter-specific context belongs on top of this snapshot rather than in a
+ * second formatting extractor.
  */
-type SelectionState = {
+type SelectionSnapshot = {
   /** Whether there's an active selection (not just cursor) */
   hasSelection: boolean;
   /** Whether selection spans multiple paragraphs */
@@ -20,10 +22,14 @@ type SelectionState = {
   /** End paragraph index */
   endParagraphIndex: number;
 };
+/** Compatibility name for the public toolbar selection contract. */
+type SelectionState = SelectionSnapshot;
 /**
- * Extract selection state from editor state.
- * Used by PagedEditor integration in DocxEditor for toolbar state.
+ * Extract the canonical selection snapshot from editor state.
+ * Used by both the toolbar callback and the selection tracker plugin.
  */
+declare function extractSelectionSnapshot(state: EditorState): SelectionSnapshot;
+/** Compatibility entry point used by existing React and Vue integrations. */
 declare function extractSelectionState(state: EditorState): SelectionState | null;
 //#endregion
-export { SelectionState, extractSelectionState };
+export { SelectionSnapshot, SelectionState, extractSelectionSnapshot, extractSelectionState };

package/dist/prosemirror/selectionState.js

@@ -1,112 +1,137 @@
+import { FONT_THEME_VALUES } from "../types/documentEnumValues.js";
+import { expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectHighlightMarkAttrs, expectParagraphAttrs, expectStrikeMarkAttrs, expectTextColorMarkAttrs, expectUnderlineMarkAttrs } from "./attrs/index.js";
 import { directionIsRtl } from "./paragraphDirection.js";
+import { collectMarksInRange } from "./selectionMarks.js";
 //#region src/prosemirror/selectionState.ts
+const isFontTheme = (value) => value !== void 0 && FONT_THEME_VALUES.some((theme) => theme === value);
 /**
-* Extract selection state from editor state.
-* Used by PagedEditor integration in DocxEditor for toolbar state.
+* Extract the canonical selection snapshot from editor state.
+* Used by both the toolbar callback and the selection tracker plugin.
 */
-function extractSelectionState(state) {
+function extractSelectionSnapshot(state) {
 	const { selection, doc } = state;
 	const { from, to, empty } = selection;
 	const $from = doc.resolve(from);
+	const { startParagraphIndex, endParagraphIndex } = paragraphIndexes(doc, from, to);
+	const paragraph = $from.parent;
+	const paragraphAttrs = paragraph.type.name === "paragraph" ? expectParagraphAttrs(paragraph) : null;
+	const marks = selectionMarks(state);
+	let textFormatting = extractTextFormatting(marks);
+	if (paragraph.type.name === "paragraph" && paragraph.textContent.length === 0 && marks.length === 0 && paragraphAttrs?.defaultTextFormatting) textFormatting = { ...paragraphAttrs.defaultTextFormatting };
+	const paragraphFormatting = {};
+	let styleId = null;
+	if (paragraphAttrs) {
+		if (paragraphAttrs.alignment !== void 0) paragraphFormatting.alignment = paragraphAttrs.alignment;
+		if (paragraphAttrs.lineSpacing !== void 0) {
+			paragraphFormatting.lineSpacing = paragraphAttrs.lineSpacing;
+			if (paragraphAttrs.lineSpacingRule !== void 0) paragraphFormatting.lineSpacingRule = paragraphAttrs.lineSpacingRule;
+		}
+		if (paragraphAttrs.snapToGrid !== void 0) paragraphFormatting.snapToGrid = paragraphAttrs.snapToGrid;
+		if (paragraphAttrs.numPr !== void 0) paragraphFormatting.numPr = paragraphAttrs.numPr;
+		if (paragraphAttrs.indentLeft !== void 0) paragraphFormatting.indentLeft = paragraphAttrs.indentLeft;
+		if (paragraphAttrs.indentRight !== void 0) paragraphFormatting.indentRight = paragraphAttrs.indentRight;
+		if (paragraphAttrs.indentFirstLine !== void 0) paragraphFormatting.indentFirstLine = paragraphAttrs.indentFirstLine;
+		if (paragraphAttrs.hangingIndent !== void 0) paragraphFormatting.hangingIndent = paragraphAttrs.hangingIndent;
+		if (paragraphAttrs.tabs !== void 0) paragraphFormatting.tabs = paragraphAttrs.tabs;
+		if (directionIsRtl(paragraphAttrs.direction)) paragraphFormatting.bidi = true;
+		if (paragraphAttrs.styleId !== void 0) styleId = paragraphAttrs.styleId;
+	}
+	return {
+		hasSelection: !empty,
+		isMultiParagraph: startParagraphIndex !== endParagraphIndex,
+		textFormatting,
+		paragraphFormatting,
+		styleId,
+		startParagraphIndex,
+		endParagraphIndex
+	};
+}
+/** Compatibility entry point used by existing React and Vue integrations. */
+function extractSelectionState(state) {
+	return extractSelectionSnapshot(state);
+}
+function paragraphIndexes(doc, from, to) {
 	let startParagraphIndex = 0;
 	let endParagraphIndex = 0;
 	doc.forEach((_node, offset, index) => {
 		if (offset <= from) startParagraphIndex = index;
 		if (offset <= to) endParagraphIndex = index;
 	});
-	let textFormatting = {};
-	const paragraph = $from.parent;
-	const isEmptyParagraph = paragraph.type.name === "paragraph" && paragraph.textContent.length === 0;
-	const paragraphDefaultFormatting = paragraph.attrs["defaultTextFormatting"];
-	const marks = empty ? state.storedMarks || selection.$from.marks() : collectMarksInRange(doc, from, to);
-	if (isEmptyParagraph && marks.length === 0 && paragraphDefaultFormatting) textFormatting = { ...paragraphDefaultFormatting };
+	return {
+		startParagraphIndex,
+		endParagraphIndex
+	};
+}
+function selectionMarks(state) {
+	const { selection, doc } = state;
+	const { from, to, empty } = selection;
+	return empty ? state.storedMarks || selection.$from.marks() : collectMarksInRange({
+		doc,
+		from,
+		to
+	});
+}
+function extractTextFormatting(marks) {
+	const formatting = {};
 	for (const mark of marks) switch (mark.type.name) {
 		case "bold":
-			textFormatting.bold = true;
+			formatting.bold = true;
 			break;
 		case "italic":
-			textFormatting.italic = true;
+			formatting.italic = true;
 			break;
-		case "underline":
-			textFormatting.underline = {
-				style: mark.attrs["style"] || "single",
-				color: mark.attrs["color"]
+		case "underline": {
+			const attrs = expectUnderlineMarkAttrs(mark);
+			if (attrs.style !== "none") formatting.underline = {
+				style: attrs.style ?? "single",
+				...attrs.color !== void 0 ? { color: attrs.color } : {}
 			};
 			break;
+		}
 		case "strike":
-			if (mark.attrs["double"]) textFormatting.doubleStrike = true;
-			else textFormatting.strike = true;
+			if (expectStrikeMarkAttrs(mark).double) formatting.doubleStrike = true;
+			else formatting.strike = true;
 			break;
-		case "textColor":
-			textFormatting.color = {
-				rgb: mark.attrs["rgb"],
-				themeColor: mark.attrs["themeColor"]
+		case "textColor": {
+			const attrs = expectTextColorMarkAttrs(mark);
+			formatting.color = {
+				...attrs.rgb !== void 0 ? { rgb: attrs.rgb } : {},
+				...attrs.themeColor !== void 0 ? { themeColor: attrs.themeColor } : {},
+				...attrs.themeTint !== void 0 ? { themeTint: attrs.themeTint } : {},
+				...attrs.themeShade !== void 0 ? { themeShade: attrs.themeShade } : {}
 			};
 			break;
+		}
 		case "highlight":
-			textFormatting.highlight = mark.attrs["color"];
+			formatting.highlight = expectHighlightMarkAttrs(mark).color;
 			break;
 		case "fontSize":
-			textFormatting.fontSize = mark.attrs["size"];
+			formatting.fontSize = expectFontSizeMarkAttrs(mark).size;
 			break;
-		case "fontFamily":
-			textFormatting.fontFamily = {
-				ascii: mark.attrs["ascii"],
-				hAnsi: mark.attrs["hAnsi"]
+		case "fontFamily": {
+			const attrs = expectFontFamilyMarkAttrs(mark);
+			formatting.fontFamily = {
+				...attrs.ascii !== void 0 ? { ascii: attrs.ascii } : {},
+				...attrs.hAnsi !== void 0 ? { hAnsi: attrs.hAnsi } : {},
+				...attrs.eastAsia !== void 0 ? { eastAsia: attrs.eastAsia } : {},
+				...attrs.cs !== void 0 ? { cs: attrs.cs } : {},
+				...attrs.hint !== void 0 ? { hint: attrs.hint } : {},
+				...isFontTheme(attrs.asciiTheme) ? { asciiTheme: attrs.asciiTheme } : {},
+				...attrs.hAnsiTheme !== void 0 ? { hAnsiTheme: attrs.hAnsiTheme } : {},
+				...attrs.eastAsiaTheme !== void 0 ? { eastAsiaTheme: attrs.eastAsiaTheme } : {},
+				...attrs.csTheme !== void 0 ? { csTheme: attrs.csTheme } : {}
 			};
 			break;
+		}
 		case "superscript":
-			textFormatting.vertAlign = "superscript";
+			formatting.vertAlign = "superscript";
 			break;
 		case "subscript":
-			textFormatting.vertAlign = "subscript";
+			formatting.vertAlign = "subscript";
 			break;
 		default: break;
 	}
-	const paragraphFormatting = {};
-	let styleId = null;
-	if (paragraph.type.name === "paragraph") {
-		if (paragraph.attrs["alignment"]) paragraphFormatting.alignment = paragraph.attrs["alignment"];
-		if (paragraph.attrs["lineSpacing"]) {
-			paragraphFormatting.lineSpacing = paragraph.attrs["lineSpacing"];
-			paragraphFormatting.lineSpacingRule = paragraph.attrs["lineSpacingRule"];
-		}
-		if (typeof paragraph.attrs["snapToGrid"] === "boolean") paragraphFormatting.snapToGrid = paragraph.attrs["snapToGrid"];
-		if (paragraph.attrs["numPr"]) paragraphFormatting.numPr = paragraph.attrs["numPr"];
-		if (paragraph.attrs["indentLeft"]) paragraphFormatting.indentLeft = paragraph.attrs["indentLeft"];
-		if (paragraph.attrs["indentRight"]) paragraphFormatting.indentRight = paragraph.attrs["indentRight"];
-		if (paragraph.attrs["indentFirstLine"]) paragraphFormatting.indentFirstLine = paragraph.attrs["indentFirstLine"];
-		if (paragraph.attrs["hangingIndent"]) paragraphFormatting.hangingIndent = paragraph.attrs["hangingIndent"];
-		if (paragraph.attrs["tabs"]) paragraphFormatting.tabs = paragraph.attrs["tabs"];
-		if (directionIsRtl(paragraph.attrs["direction"])) paragraphFormatting.bidi = true;
-		if (paragraph.attrs["styleId"]) styleId = paragraph.attrs["styleId"];
-	}
-	return {
-		hasSelection: !empty,
-		isMultiParagraph: startParagraphIndex !== endParagraphIndex,
-		textFormatting,
-		paragraphFormatting,
-		styleId,
-		startParagraphIndex,
-		endParagraphIndex
-	};
-}
-/**
-* Collect the first occurrence of each mark type found on any text node within
-* the range. Mirrors the "any inline child has this mark" semantics that
-* prosemirror-commands' toggleMark uses to decide add-vs-remove, so the
-* toolbar's active state stays consistent with what a toggle click will do.
-*/
-function collectMarksInRange(doc, from, to) {
-	const seen = /* @__PURE__ */ new Map();
-	doc.nodesBetween(from, to, (node) => {
-		if (!node.isText) return;
-		for (const mark of node.marks) {
-			const name = mark.type.name;
-			if (!seen.has(name)) seen.set(name, mark);
-		}
-	});
-	return Array.from(seen.values());
+	return formatting;
 }
 //#endregion
-export { extractSelectionState };
+export { extractSelectionSnapshot, extractSelectionState };

package/dist/prosemirror/styles/resolvedStyleAttrs.js

@@ -27,6 +27,7 @@ function paragraphAttrsFromResolvedStyle(resolved) {
 		spaceAfter: ppr?.spaceAfter ?? null,
 		lineSpacing: ppr?.lineSpacing ?? null,
 		lineSpacingRule: ppr?.lineSpacingRule ?? null,
+		lineSpacingExplicit: null,
 		snapToGrid: ppr?.snapToGrid ?? null,
 		indentLeft: ppr?.indentLeft ?? null,
 		indentRight: ppr?.indentRight ?? null,

package/dist/utils/formatToStyle.js

@@ -108,7 +108,7 @@ function paragraphToStyle(formatting, theme) {
 	}
 	if (formatting.indentLeft !== void 0) style.marginLeft = formatPx(twipsToPixels(formatting.indentLeft));
 	if (formatting.indentRight !== void 0) style.marginRight = formatPx(twipsToPixels(formatting.indentRight));
-	if (formatting.indentFirstLine !== void 0) style.textIndent = formatPx(twipsToPixels(formatting.indentFirstLine));
+	if (formatting.indentFirstLine !== void 0) style.textIndent = formatPx(twipsToPixels(formatting.hangingIndent ? -Math.abs(formatting.indentFirstLine) : formatting.indentFirstLine));
 	if (formatting.borders) {
 		if (formatting.borders.top) Object.assign(style, borderToStyle(formatting.borders.top, "Top", theme));
 		if (formatting.borders.bottom) Object.assign(style, borderToStyle(formatting.borders.bottom, "Bottom", theme));

package/dist/utils/tableOperations.d.ts

@@ -1,5 +1,10 @@
 import { document_d_exports } from "../types/document.js";
 //#region src/utils/tableOperations.d.ts
+type TablePropertiesCommand = {
+  width?: number | null;
+  widthType?: document_d_exports.TableWidthType | null;
+  justification?: "left" | "center" | "right" | null;
+};
 type TableAction = "addRowAbove" | "addRowBelow" | "addColumnLeft" | "addColumnRight" | "deleteRow" | "deleteColumn" | "mergeCells" | "splitCell" | "deleteTable" | "selectTable" | "selectRow" | "selectColumn" | "borderAll" | "borderOutside" | "borderInside" | "borderNone" | "borderTop" | "borderBottom" | "borderLeft" | "borderRight" | {
   type: "cellFillColor";
   color: string | null;
@@ -43,11 +48,7 @@ type TableAction = "addRowAbove" | "addRowBelow" | "addColumnLeft" | "addColumnR
   type: "autoFitContents";
 } | {
   type: "tableProperties";
-  props: {
-    width?: number | null;
-    widthType?: string | null;
-    justification?: "left" | "center" | "right" | null;
-  };
+  props: TablePropertiesCommand;
 } | {
   type: "openTableProperties";
 } | {
@@ -83,4 +84,4 @@ declare const deleteColumn: (table: document_d_exports.Table, columnIndex: numbe
 declare const mergeCells: (table: document_d_exports.Table, selection: TableSelection) => document_d_exports.Table;
 declare const splitCell: (table: document_d_exports.Table, rowIndex: number, columnIndex: number) => document_d_exports.Table;
 //#endregion
-export { TableAction, TableContext, TableSelection, addColumn, addRow, createTableContext, deleteColumn, deleteRow, getCellAt, getColumnCount, mergeCells, splitCell };
+export { TableAction, TableContext, TablePropertiesCommand, TableSelection, addColumn, addRow, createTableContext, deleteColumn, deleteRow, getCellAt, getColumnCount, mergeCells, splitCell };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.22.2",
+  "version": "0.23.0",
   "description": "Headless, framework-neutral core of folio: the OOXML (.docx) parser, document model, ProseMirror integration, and page-layout engine. No React.",
   "keywords": [
     "document-model",
@@ -113,13 +113,13 @@
     "perf": "bun scripts/profile-editor.ts"
   },
   "dependencies": {
-    "@stll/docx-core": "^0.15.1",
+    "@stll/docx-core": "^0.15.2",
     "@stll/docx-utils": "^0.1.0",
     "@stll/template-conditions": "^0.1.0",
     "better-result": "3.0.1",
     "csstype": "^3.1.3",
     "dompurify": "^3.4.13",
-    "fast-xml-parser": "^5.9.3",
+    "fast-xml-parser": "^5.10.1",
     "hyphen": "1.14.1",
     "jszip": "3.10.1",
     "marked": "^18.0.5",