@stll/folio-core 0.22.2 → 0.23.0

package/dist/prosemirror/extensions/marks/markUtils.js

@@ -1,5 +1,20 @@
+import { FONT_THEME_VALUES } from "../../../types/documentEnumValues.js";
+import { mergeFontFamily } from "../../../utils/fontFamilyMerge.js";
+import { expectFontFamilyMarkAttrs } from "../../attrs/index.js";
 import { applyRunFormattingOverrideMark, buildRunFormattingOverrideAttrs } from "./RunFormattingOverrideExtension.js";
 //#region src/prosemirror/extensions/marks/markUtils.ts
+const isFontTheme = (value) => value !== void 0 && FONT_THEME_VALUES.some((theme) => theme === value);
+const fontFamilyAttrsToFormatting = ({ ascii, hAnsi, eastAsia, cs, hint, asciiTheme, hAnsiTheme, eastAsiaTheme, csTheme }) => ({
+	...ascii !== void 0 ? { ascii } : {},
+	...hAnsi !== void 0 ? { hAnsi } : {},
+	...eastAsia !== void 0 ? { eastAsia } : {},
+	...cs !== void 0 ? { cs } : {},
+	...hint !== void 0 ? { hint } : {},
+	...isFontTheme(asciiTheme) ? { asciiTheme } : {},
+	...hAnsiTheme !== void 0 ? { hAnsiTheme } : {},
+	...eastAsiaTheme !== void 0 ? { eastAsiaTheme } : {},
+	...csTheme !== void 0 ? { csTheme } : {}
+});
 function marksToTextFormatting(marks) {
 	const formatting = {};
 	for (const mark of marks) switch (mark.type.name) {
@@ -10,7 +25,10 @@ function marksToTextFormatting(marks) {
 			formatting.italic = true;
 			break;
 		case "underline":
-			formatting.underline = { style: typeof mark.attrs["style"] === "string" ? mark.attrs["style"] : "single" };
+			formatting.underline = {
+				style: typeof mark.attrs["style"] === "string" ? mark.attrs["style"] : "single",
+				...mark.attrs["color"] !== null && mark.attrs["color"] !== void 0 ? { color: mark.attrs["color"] } : {}
+			};
 			break;
 		case "strike":
 			formatting.strike = true;
@@ -34,17 +52,9 @@ function marksToTextFormatting(marks) {
 		case "fontSize":
 			formatting.fontSize = Number(mark.attrs["size"]);
 			break;
-		case "fontFamily": {
-			const ascii = mark.attrs["ascii"] !== null && mark.attrs["ascii"] !== void 0 ? String(mark.attrs["ascii"]) : void 0;
-			const hAnsi = mark.attrs["hAnsi"] !== null && mark.attrs["hAnsi"] !== void 0 ? String(mark.attrs["hAnsi"]) : void 0;
-			const hint = mark.attrs["hint"];
-			formatting.fontFamily = {
-				...ascii !== void 0 ? { ascii } : {},
-				...hAnsi !== void 0 ? { hAnsi } : {},
-				...hint === "default" || hint === "eastAsia" || hint === "cs" ? { hint } : {}
-			};
+		case "fontFamily":
+			formatting.fontFamily = fontFamilyAttrsToFormatting(expectFontFamilyMarkAttrs(mark));
 			break;
-		}
 		case "language": {
 			const val = mark.attrs["val"];
 			const eastAsia = mark.attrs["eastAsia"];
@@ -93,21 +103,82 @@ function dispatchStoredMarks(state, dispatch, marks) {
 	tr.setStoredMarks(marks);
 	dispatch(tr);
 }
+function compactAttrs(attrs) {
+	if (!attrs) return {};
+	const result = {};
+	for (const [key, value] of Object.entries(attrs)) if (value !== null && value !== void 0) result[key] = value;
+	return result;
+}
+function mergeMarkAttrs(markType, currentMark, nextAttrs) {
+	const next = compactAttrs(nextAttrs);
+	switch (markType.name) {
+		case "fontFamily": return mergeFontFamily(currentMark ? fontFamilyAttrsToFormatting(expectFontFamilyMarkAttrs(currentMark)) : void 0, fontFamilyAttrsToFormatting(expectFontFamilyMarkAttrs(markType.create(next))));
+		case "underline": return {
+			...compactAttrs(currentMark?.attrs),
+			...next
+		};
+		default: return nextAttrs;
+	}
+}
+function markRequiresAttrMerge(markType) {
+	return markType.name === "fontFamily" || markType.name === "underline";
+}
+function createMarkWithMergedAttrs(markType, currentMark, nextAttrs) {
+	if (!markRequiresAttrMerge(markType)) return markType.create(nextAttrs);
+	return markType.create(mergeMarkAttrs(markType, currentMark, nextAttrs));
+}
 function setMark(markType, attrs) {
 	return (state, dispatch) => {
 		const { from, to, empty } = state.selection;
-		const mark = markType.create(attrs);
 		if (empty) {
 			if (dispatch) {
 				const current = state.storedMarks ?? state.selection.$from.marks();
-				dispatchStoredMarks(state, dispatch, [...markType.isInSet(current) ? current.filter((m) => m.type !== markType) : current, mark]);
+				const currentMark = markType.isInSet(current);
+				const marks = markType.isInSet(current) ? current.filter((m) => m.type !== markType) : current;
+				const mark = createMarkWithMergedAttrs(markType, currentMark, attrs);
+				dispatchStoredMarks(state, dispatch, [...marks, mark]);
 			}
 			return true;
 		}
-		if (dispatch) dispatch(state.tr.addMark(from, to, mark).scrollIntoView());
+		if (dispatch) {
+			if (!markRequiresAttrMerge(markType)) {
+				dispatch(state.tr.addMark(from, to, markType.create(attrs)).scrollIntoView());
+				return true;
+			}
+			let tr = state.tr;
+			state.doc.nodesBetween(from, to, (node, pos) => {
+				if (!node.isText) return;
+				const start = Math.max(from, pos);
+				const end = Math.min(to, pos + node.nodeSize);
+				const mark = createMarkWithMergedAttrs(markType, markType.isInSet(node.marks), attrs);
+				tr = tr.addMark(start, end, mark);
+			});
+			dispatch(tr.scrollIntoView());
+		}
 		return true;
 	};
 }
+function selectionHasVisibleUnderline(state, markType) {
+	const { from, to, empty, $from } = state.selection;
+	if (empty) {
+		const mark = markType.isInSet(state.storedMarks ?? $from.marks());
+		return mark !== void 0 && mark.attrs["style"] !== "none";
+	}
+	let hasVisibleUnderline = false;
+	state.doc.nodesBetween(from, to, (node) => {
+		if (!node.isText) return true;
+		const mark = markType.isInSet(node.marks);
+		if (mark && mark.attrs["style"] !== "none") {
+			hasVisibleUnderline = true;
+			return false;
+		}
+		return true;
+	});
+	return hasVisibleUnderline;
+}
+function toggleUnderlineMark(markType) {
+	return (state, dispatch) => setMark(markType, { style: selectionHasVisibleUnderline(state, markType) ? "none" : "single" })(state, dispatch);
+}
 function removeMark(markType) {
 	return (state, dispatch) => {
 		const { from, to, empty } = state.selection;
@@ -197,8 +268,13 @@ function textFormattingToMarks(formatting, schema) {
 	if (formatting.fontFamily && schema.marks["fontFamily"]) marks.push(schema.marks["fontFamily"].create({
 		ascii: formatting.fontFamily.ascii,
 		hAnsi: formatting.fontFamily.hAnsi,
+		eastAsia: formatting.fontFamily.eastAsia,
+		cs: formatting.fontFamily.cs,
 		hint: formatting.fontFamily.hint,
-		asciiTheme: formatting.fontFamily.asciiTheme
+		asciiTheme: formatting.fontFamily.asciiTheme,
+		hAnsiTheme: formatting.fontFamily.hAnsiTheme,
+		eastAsiaTheme: formatting.fontFamily.eastAsiaTheme,
+		csTheme: formatting.fontFamily.csTheme
 	}));
 	if (formatting.language && schema.marks["language"]) marks.push(schema.marks["language"].create(formatting.language));
 	if (formatting.vertAlign === "superscript" && schema.marks["superscript"]) marks.push(schema.marks["superscript"].create());
@@ -245,4 +321,4 @@ function createRemoveMarkCommand(markType) {
 	return removeMark(markType);
 }
 //#endregion
-export { clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMarkAttr, isMarkActive, removeMark, setMark, textFormattingToMarks };
+export { clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMarkAttr, isMarkActive, removeMark, setMark, textFormattingToMarks, toggleUnderlineMark };

package/dist/prosemirror/extensions/nodes/ShapeExtension.d.ts

@@ -1,5 +1,5 @@
-import { NodeExtension } from "../types.js";
 import { ShapeAttrs as ShapeAttrs$1 } from "../../schema/nodes.js";
+import { NodeExtension } from "../types.js";
 //#region src/prosemirror/extensions/nodes/ShapeExtension.d.ts
 type ShapeAttrs = ShapeAttrs$1;
 declare function sanitizeColor(value: string | null | undefined): string | null;

package/dist/prosemirror/extensions/nodes/TextBoxExtension.d.ts

@@ -1,7 +1,7 @@
 import { document_d_exports } from "../../../types/document.js";
 import { OutlineStyleAttr } from "../../../types/documentEnumValues.js";
-import { NodeExtension } from "../types.js";
 import { ImagePositionAttrs, TextBoxAttrs as TextBoxAttrs$1 } from "../../schema/nodes.js";
+import { NodeExtension } from "../types.js";
 //#region src/prosemirror/extensions/nodes/TextBoxExtension.d.ts
 type TextBoxAttrs = {
   /** Width in pixels */

package/dist/prosemirror/extensions/types.d.ts

@@ -1,6 +1,50 @@
+import { document_d_exports } from "../../types/document.js";
+import { TextColorAttrs } from "../schema/marks.js";
+import "../schema/index.js";
+import { TablePropertiesCommand } from "../../utils/tableOperations.js";
+import { ResolvedStyleAttrs } from "./core/ParagraphExtension.js";
+import { BorderPreset, TableBorderPreset } from "./nodes/TableExtension.js";
 import { Command, Plugin } from "prosemirror-state";
 import { MarkSpec, NodeSpec, Schema } from "prosemirror-model";
 //#region src/prosemirror/extensions/types.d.ts
+type TableCellBorderCommandSpec = {
+  style: string;
+  size?: number;
+  color?: {
+    rgb: string;
+  };
+};
+type TableBorderCommandSpec = {
+  style: string;
+  size: number;
+  color: {
+    rgb: string;
+  };
+};
+type TableCellMarginsCommand = {
+  top?: number;
+  bottom?: number;
+  left?: number;
+  right?: number;
+};
+type TableStyleCommand = {
+  styleId: string;
+  tableBorders?: Partial<Record<"top" | "bottom" | "left" | "right" | "insideH" | "insideV", TableCellBorderCommandSpec>>;
+  conditionals?: Record<string, {
+    backgroundColor?: string;
+    borders?: Partial<Record<"top" | "bottom" | "left" | "right", TableCellBorderCommandSpec | null>>;
+    bold?: boolean;
+    color?: string;
+  }>;
+  look?: {
+    firstRow?: boolean;
+    lastRow?: boolean;
+    firstCol?: boolean;
+    lastCol?: boolean;
+    noHBand?: boolean;
+    noVBand?: boolean;
+  };
+};
 type ExtensionPriority = number;
 declare const Priority: {
   readonly Highest: 0;
@@ -12,7 +56,96 @@ declare const Priority: {
 type ExtensionContext = {
   schema: Schema;
 };
+type FolioCommandArguments = {
+  toggleBold: [];
+  toggleItalic: [];
+  toggleUnderline: [];
+  toggleStrike: [];
+  toggleSuperscript: [];
+  toggleSubscript: [];
+  setTextColor: [attrs: TextColorAttrs];
+  clearTextColor: [];
+  setHighlight: [color: string];
+  clearHighlight: [];
+  setFontSize: [size: number];
+  clearFontSize: [];
+  setFontFamily: [fontName: string];
+  clearFontFamily: [];
+  setUnderlineStyle: [style: string, color?: TextColorAttrs];
+  setHyperlink: [href: string, tooltip?: string];
+  removeHyperlink: [];
+  insertHyperlink: [text: string, href: string, tooltip?: string];
+  setAlignment: [alignment: document_d_exports.ParagraphAlignment];
+  alignLeft: [];
+  alignCenter: [];
+  alignRight: [];
+  alignJustify: [];
+  setLineSpacing: [value: number, rule?: document_d_exports.LineSpacingRule];
+  singleSpacing: [];
+  oneAndHalfSpacing: [];
+  doubleSpacing: [];
+  increaseIndent: [amount?: number];
+  decreaseIndent: [amount?: number];
+  setIndentLeft: [twips: number];
+  setIndentRight: [twips: number];
+  setIndentFirstLine: [twips: number, hanging?: boolean];
+  toggleBulletList: [];
+  toggleNumberedList: [];
+  increaseListLevel: [];
+  decreaseListLevel: [];
+  removeList: [];
+  setSpaceBefore: [twips: number];
+  setSpaceAfter: [twips: number];
+  applyStyle: [styleId: string, resolvedAttrs?: ResolvedStyleAttrs];
+  clearStyle: [];
+  insertSectionBreak: [breakType: "nextPage" | "continuous" | "oddPage" | "evenPage"];
+  removeSectionBreak: [];
+  addTabStop: [position: number, alignment?: document_d_exports.TabStopAlignment, leader?: document_d_exports.TabLeader];
+  removeTabStop: [position: number];
+  toggleBidi: [];
+  setRtl: [];
+  setLtr: [];
+  setTabs: [tabs: document_d_exports.TabStop[]];
+  generateTOC: [];
+  insertTable: [rows: number, cols: number];
+  addRowAbove: [];
+  addRowBelow: [];
+  deleteRow: [];
+  addColumnLeft: [];
+  addColumnRight: [];
+  deleteColumn: [];
+  deleteTable: [];
+  selectTable: [];
+  selectRow: [];
+  selectColumn: [];
+  mergeCells: [];
+  splitCell: [];
+  setCellBorder: [side: "top" | "bottom" | "left" | "right" | "all", spec: TableCellBorderCommandSpec | null, clearOthers?: boolean];
+  setTableBorderPreset: [preset: TableBorderPreset];
+  setTableBorders: [preset: BorderPreset, borderSpec?: TableBorderCommandSpec];
+  removeTableBorders: [];
+  setAllTableBorders: [borderSpec?: TableBorderCommandSpec];
+  setOutsideTableBorders: [borderSpec?: TableBorderCommandSpec];
+  setInsideTableBorders: [borderSpec?: TableBorderCommandSpec];
+  setCellVerticalAlign: [align: "top" | "center" | "bottom"];
+  setCellMargins: [margins: TableCellMarginsCommand];
+  setCellTextDirection: [direction: string | null];
+  toggleNoWrap: [];
+  setRowHeight: [height: number | null, rule?: "auto" | "atLeast" | "exact"];
+  toggleHeaderRow: [];
+  distributeColumns: [];
+  autoFitContents: [];
+  setTableProperties: [props: TablePropertiesCommand];
+  applyTableStyle: [styleData: TableStyleCommand];
+  setCellFillColor: [color: string | null];
+  setTableBorderColor: [color: string];
+  setTableBorderWidth: [size: number];
+};
+type FolioCommandName = keyof FolioCommandArguments;
+type CommandFactory<Args extends readonly unknown[] = readonly unknown[]> = (...args: Args) => Command;
+type FolioCommandMap = Partial<{ [Name in FolioCommandName]: CommandFactory<FolioCommandArguments[Name]>; }>;
 type CommandMap = Record<string, (...args: any[]) => Command>;
+type ExtensionCommandMap = CommandMap & FolioCommandMap;
 type KeyboardShortcutMap = Record<string, Command>;
 type ExtensionRuntime = {
   commands?: CommandMap;
@@ -97,4 +230,4 @@ type MarkExtensionDefinitionWithoutDefaults<TOptions extends ExtensionOptions =
 };
 type MarkExtensionDefinition<TOptions extends ExtensionOptions = ExtensionOptions> = MarkExtensionDefinitionWithDefaults<TOptions> | MarkExtensionDefinitionWithoutDefaults<TOptions>;
 //#endregion
-export { AnyExtension, CommandMap, Extension, ExtensionConfig, ExtensionContext, ExtensionDefinition, ExtensionPriority, ExtensionRuntime, KeyboardShortcutMap, MarkExtension, MarkExtensionConfig, MarkExtensionDefinition, NodeExtension, NodeExtensionConfig, NodeExtensionDefinition, Priority };
+export { AnyExtension, CommandFactory, CommandMap, Extension, ExtensionCommandMap, ExtensionConfig, ExtensionContext, ExtensionDefinition, ExtensionPriority, ExtensionRuntime, FolioCommandArguments, FolioCommandMap, FolioCommandName, KeyboardShortcutMap, MarkExtension, MarkExtensionConfig, MarkExtensionDefinition, NodeExtension, NodeExtensionConfig, NodeExtensionDefinition, Priority, TableBorderCommandSpec, TableCellBorderCommandSpec, TableCellMarginsCommand, type TablePropertiesCommand, TableStyleCommand };

package/dist/prosemirror/index.d.ts

@@ -1,15 +1,15 @@
 import { FontFamilyAttrs, FontSizeAttrs, HyperlinkAttrs, TextColorAttrs, UnderlineAttrs } from "./schema/marks.js";
 import { ImageAttrs, ParagraphAttrs } from "./schema/nodes.js";
 import { schema, singletonManager } from "./schema/index.js";
+import { getParagraphAlignment, getParagraphBidi, getStyleId } from "./extensions/core/ParagraphExtension.js";
+import { BorderPreset, TableBorderPreset, TableContextInfo, getTableContext, isInTable as isInTableCell } from "./extensions/nodes/TableExtension.js";
 import { PAINTABLE_MARK_NAMES, applyFormatMarks, captureFormatMarks } from "./commands/formatPainter.js";
 import { clearFormatting, getMarkAttr, isMarkActive } from "./extensions/marks/markUtils.js";
 import { getHyperlinkAttrs, getSelectedText, isHyperlinkActive } from "./extensions/marks/HyperlinkExtension.js";
 import { clearFontFamily, clearFontSize, clearHighlight, clearTextColor, insertHyperlink, removeHyperlink, setFontFamily, setFontSize, setHighlight, setHyperlink, setTextColor, toggleBold, toggleItalic, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline } from "./commands/formatting.js";
 import { insertImageFromFile } from "./commands/image.js";
-import { getParagraphAlignment, getParagraphBidi, getStyleId } from "./extensions/core/ParagraphExtension.js";
 import { getListInfo, isInList } from "./extensions/features/ListExtension.js";
 import { addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyStyle, clearStyle, decreaseIndent, decreaseListLevel, generateTOC, increaseIndent, increaseListLevel, removeList, removeTabStop, setAlignment, setIndentFirstLine, setIndentLeft, setIndentRight, setLineSpacing, setLtr, setRtl, toggleBidi, toggleBulletList, toggleNumberedList } from "./commands/paragraph.js";
-import { BorderPreset, TableBorderPreset, TableContextInfo, getTableContext, isInTable as isInTableCell } from "./extensions/nodes/TableExtension.js";
 import { addColumnLeft, addColumnRight, addRowAbove, addRowBelow, applyTableStyle, autoFitContents, deleteColumn, deleteRow, deleteTable, distributeColumns, insertTable, mergeCells, removeTableBorders, selectColumn, selectRow, selectTable, setAllTableBorders, setCellBorder, setCellFillColor, setCellMargins, setCellTextDirection, setCellVerticalAlign, setInsideTableBorders, setOutsideTableBorders, setRowHeight, setTableBorderColor, setTableBorderPreset, setTableBorderWidth, setTableBorders, setTableProperties, splitCell, toggleHeaderRow, toggleNoWrap } from "./commands/table.js";
 import { insertPageBreak } from "./commands/pageBreak.js";
 import "./commands/index.js";

package/dist/prosemirror/plugins/selectionTracker.js

@@ -1,3 +1,5 @@
+import { expectCommentMarkAttrs, expectTrackedChangeMarkAttrs } from "../attrs/index.js";
+import { extractSelectionSnapshot } from "../selectionState.js";
 import { Plugin, PluginKey } from "prosemirror-state";
 //#region src/prosemirror/plugins/selectionTracker.ts
 /**
@@ -17,56 +19,41 @@ const selectionTrackerKey = new PluginKey("selectionTracker");
 * Extract selection context from editor state
 */
 function extractSelectionContext(state) {
-	const { selection, doc } = state;
-	const { from, to, empty } = selection;
-	const $from = doc.resolve(from);
-	let startParagraphIndex = 0;
-	let endParagraphIndex = 0;
-	doc.forEach((_node, offset, index) => {
-		if (offset > to) return;
-		if (offset <= from) startParagraphIndex = index;
-		if (offset <= to) endParagraphIndex = index;
-	});
-	const textFormatting = extractTextFormatting(state);
-	const paragraph = $from.parent;
-	const paragraphFormatting = {};
-	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["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 (paragraph.attrs["numPr"]) paragraphFormatting.numPr = paragraph.attrs["numPr"];
-		if (paragraph.attrs["styleId"]) paragraphFormatting.styleId = paragraph.attrs["styleId"];
-	}
-	const numPr = paragraph.attrs["numPr"];
+	const { selection } = state;
+	const { empty } = selection;
+	const snapshot = extractSelectionSnapshot(state);
+	const paragraphFormatting = snapshot.styleId === null ? snapshot.paragraphFormatting : {
+		...snapshot.paragraphFormatting,
+		styleId: snapshot.styleId
+	};
+	const numPr = snapshot.paragraphFormatting.numPr;
 	const inList = !!numPr?.numId;
 	let listType;
 	if (numPr?.numId === 1) listType = "bullet";
 	else if (numPr?.numId) listType = "numbered";
 	const listLevel = numPr?.ilvl;
-	const allMarks = state.storedMarks || (empty ? $from.marks() : []);
+	const allMarks = state.storedMarks || (empty ? selection.$from.marks() : []);
 	const activeCommentIds = [];
 	let inInsertion = false;
 	let inDeletion = false;
 	for (const mark of allMarks) {
-		if (mark.type.name === "comment" && mark.attrs["commentId"]) activeCommentIds.push(mark.attrs["commentId"]);
-		if (mark.type.name === "insertion") inInsertion = true;
-		if (mark.type.name === "deletion") inDeletion = true;
+		if (mark.type.name === "comment") activeCommentIds.push(expectCommentMarkAttrs(mark).commentId);
+		if (mark.type.name === "insertion") {
+			expectTrackedChangeMarkAttrs(mark);
+			inInsertion = true;
+		}
+		if (mark.type.name === "deletion") {
+			expectTrackedChangeMarkAttrs(mark);
+			inDeletion = true;
+		}
 	}
 	return {
-		hasSelection: !empty,
-		isMultiParagraph: startParagraphIndex !== endParagraphIndex,
-		textFormatting,
+		hasSelection: snapshot.hasSelection,
+		isMultiParagraph: snapshot.isMultiParagraph,
+		textFormatting: snapshot.textFormatting,
 		paragraphFormatting,
-		startParagraphIndex,
-		endParagraphIndex,
+		startParagraphIndex: snapshot.startParagraphIndex,
+		endParagraphIndex: snapshot.endParagraphIndex,
 		inList,
 		...listType !== void 0 ? { listType } : {},
 		...listLevel !== void 0 ? { listLevel } : {},
@@ -76,62 +63,6 @@ function extractSelectionContext(state) {
 	};
 }
 /**
-* Extract text formatting from current selection/cursor marks
-*/
-function extractTextFormatting(state) {
-	const { selection } = state;
-	const { empty, $from } = selection;
-	const marks = state.storedMarks || (empty ? $from.marks() : []);
-	const formatting = {};
-	for (const mark of marks) switch (mark.type.name) {
-		case "bold":
-			formatting.bold = true;
-			break;
-		case "italic":
-			formatting.italic = true;
-			break;
-		case "underline":
-			formatting.underline = {
-				style: mark.attrs["style"] || "single",
-				color: mark.attrs["color"]
-			};
-			break;
-		case "strike":
-			if (mark.attrs["double"]) formatting.doubleStrike = true;
-			else formatting.strike = true;
-			break;
-		case "textColor":
-			formatting.color = {
-				rgb: mark.attrs["rgb"],
-				themeColor: mark.attrs["themeColor"],
-				themeTint: mark.attrs["themeTint"],
-				themeShade: mark.attrs["themeShade"]
-			};
-			break;
-		case "highlight":
-			formatting.highlight = mark.attrs["color"];
-			break;
-		case "fontSize":
-			formatting.fontSize = mark.attrs["size"];
-			break;
-		case "fontFamily":
-			formatting.fontFamily = {
-				ascii: mark.attrs["ascii"],
-				hAnsi: mark.attrs["hAnsi"],
-				asciiTheme: mark.attrs["asciiTheme"]
-			};
-			break;
-		case "superscript":
-			formatting.vertAlign = "superscript";
-			break;
-		case "subscript":
-			formatting.vertAlign = "subscript";
-			break;
-		default: break;
-	}
-	return formatting;
-}
-/**
 * Create selection tracker plugin
 */
 function createSelectionTrackerPlugin(onSelectionChange) {

package/dist/prosemirror/revisionCarriers.js

@@ -1,3 +1,4 @@
+import { expectParagraphAttrs } from "./attrs/index.js";
 //#region src/prosemirror/revisionCarriers.ts
 const isObjectRecord = (value) => typeof value === "object" && value !== null;
 const revisionMetadata = (value) => {
@@ -34,6 +35,7 @@ const getFolioNodeRevisionCarriers = (node, nodePos) => {
 	if (node.type.name === "paragraph") {
 		const from = nodePos + node.nodeSize - 1;
 		const to = nodePos + node.nodeSize;
+		const paragraphAttrs = expectParagraphAttrs(node);
 		const paragraphMark = node.attrs["pPrMark"];
 		if (isObjectRecord(paragraphMark) && (paragraphMark["kind"] === "ins" || paragraphMark["kind"] === "del")) {
 			const metadata = revisionMetadata(paragraphMark["info"]);
@@ -47,7 +49,7 @@ const getFolioNodeRevisionCarriers = (node, nodePos) => {
 		}
 		appendPropertyCarriers({
 			carriers,
-			changes: node.attrs["_propertyChanges"],
+			changes: paragraphAttrs._propertyChanges,
 			type: "paragraphPropertiesChanged",
 			node,
 			from,

package/dist/prosemirror/schema/index.d.ts

@@ -1,6 +1,6 @@
 import { CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, LanguageAttrs, RunFormattingOverrideAttrs, RunPropertyChangeMarkAttrs, RunShadingAttrs, StrikeAttrs, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, UnderlineAttrs } from "./marks.js";
+import { BlockSdtAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, ImagePositionAttrs, MathAttrs, ParagraphAttrs, ParagraphPropertyChangeAttrs, SdtAttrs, ShapeAttrs, SymbolAttrs, TabAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAttrs } from "./nodes.js";
 import { ExtensionManager } from "../extensions/ExtensionManager.js";
-import { BlockSdtAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, ImagePositionAttrs, MathAttrs, ParagraphAttrs, SdtAttrs, ShapeAttrs, SymbolAttrs, TabAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAttrs } from "./nodes.js";
 //#region src/prosemirror/schema/index.d.ts
 declare const singletonManager: ExtensionManager;
 declare const schema: import("prosemirror-model").Schema<any, any>;
@@ -11,4 +11,4 @@ type DocxSchema = typeof schema;
 type DocxNode = ReturnType<typeof schema.node>;
 type DocxMark = ReturnType<typeof schema.mark>;
 //#endregion
-export { type BlockSdtAttrs, type CharacterSpacingAttrs, type CharacterStyleAttrs, type CommentAttrs, DocxMark, DocxNode, DocxSchema, type EmphasisMarkAttrs, type FieldAttrs, type FontFamilyAttrs, type FontSizeAttrs, type FootnoteRefAttrs, type HardBreakAttrs, type HighlightAttrs, type HyperlinkAttrs, type ImageAttrs, type ImagePositionAttrs, type LanguageAttrs, type MathAttrs, type ParagraphAttrs, type RunFormattingOverrideAttrs, type RunPropertyChangeMarkAttrs, type RunShadingAttrs, type SdtAttrs, type ShapeAttrs, type StrikeAttrs, type SymbolAttrs, type TabAttrs, type TableAttrs, type TableCellAttrs, type TableRowAttrs, type TextBoxAttrs, type TextColorAttrs, type TextEffectAttrs, type TrackedChangeMarkAttrs, type UnderlineAttrs, schema, singletonManager };
+export { type BlockSdtAttrs, type CharacterSpacingAttrs, type CharacterStyleAttrs, type CommentAttrs, DocxMark, DocxNode, DocxSchema, type EmphasisMarkAttrs, type FieldAttrs, type FontFamilyAttrs, type FontSizeAttrs, type FootnoteRefAttrs, type HardBreakAttrs, type HighlightAttrs, type HyperlinkAttrs, type ImageAttrs, type ImagePositionAttrs, type LanguageAttrs, type MathAttrs, type ParagraphAttrs, type ParagraphPropertyChangeAttrs, type RunFormattingOverrideAttrs, type RunPropertyChangeMarkAttrs, type RunShadingAttrs, type SdtAttrs, type ShapeAttrs, type StrikeAttrs, type SymbolAttrs, type TabAttrs, type TableAttrs, type TableCellAttrs, type TableRowAttrs, type TextBoxAttrs, type TextColorAttrs, type TextEffectAttrs, type TrackedChangeMarkAttrs, type UnderlineAttrs, schema, singletonManager };

package/dist/prosemirror/schema/index.js

@@ -14,6 +14,93 @@ import { createStarterKit } from "../extensions/StarterKit.js";
 const mgr = new ExtensionManager(createStarterKit());
 mgr.buildSchema();
 mgr.initializeRuntime();
+const completeCommandNames = (names) => names;
+const requiredCommands = completeCommandNames([
+	"toggleBold",
+	"toggleItalic",
+	"toggleUnderline",
+	"toggleStrike",
+	"toggleSuperscript",
+	"toggleSubscript",
+	"setTextColor",
+	"clearTextColor",
+	"setHighlight",
+	"clearHighlight",
+	"setFontSize",
+	"clearFontSize",
+	"setFontFamily",
+	"clearFontFamily",
+	"setUnderlineStyle",
+	"setHyperlink",
+	"removeHyperlink",
+	"insertHyperlink",
+	"setAlignment",
+	"alignLeft",
+	"alignCenter",
+	"alignRight",
+	"alignJustify",
+	"setLineSpacing",
+	"singleSpacing",
+	"oneAndHalfSpacing",
+	"doubleSpacing",
+	"increaseIndent",
+	"decreaseIndent",
+	"setIndentLeft",
+	"setIndentRight",
+	"setIndentFirstLine",
+	"toggleBulletList",
+	"toggleNumberedList",
+	"increaseListLevel",
+	"decreaseListLevel",
+	"removeList",
+	"setSpaceBefore",
+	"setSpaceAfter",
+	"applyStyle",
+	"clearStyle",
+	"insertSectionBreak",
+	"removeSectionBreak",
+	"addTabStop",
+	"removeTabStop",
+	"toggleBidi",
+	"setRtl",
+	"setLtr",
+	"setTabs",
+	"generateTOC",
+	"insertTable",
+	"addRowAbove",
+	"addRowBelow",
+	"deleteRow",
+	"addColumnLeft",
+	"addColumnRight",
+	"deleteColumn",
+	"deleteTable",
+	"selectTable",
+	"selectRow",
+	"selectColumn",
+	"mergeCells",
+	"splitCell",
+	"setCellBorder",
+	"setTableBorderPreset",
+	"setTableBorders",
+	"removeTableBorders",
+	"setAllTableBorders",
+	"setOutsideTableBorders",
+	"setInsideTableBorders",
+	"setCellVerticalAlign",
+	"setCellMargins",
+	"setCellTextDirection",
+	"toggleNoWrap",
+	"setRowHeight",
+	"toggleHeaderRow",
+	"distributeColumns",
+	"autoFitContents",
+	"setTableProperties",
+	"applyTableStyle",
+	"setCellFillColor",
+	"setTableBorderColor",
+	"setTableBorderWidth"
+]);
+for (const commandName of requiredCommands) mgr.requireCommand(commandName);
 const singletonManager = mgr;
 const schema = mgr.getSchema();
 //#endregion

package/dist/prosemirror/schema/nodes.d.ts

@@ -32,6 +32,7 @@ type ParagraphAttrs = {
   spaceAfter?: number;
   lineSpacing?: number;
   lineSpacingRule?: document_d_exports.LineSpacingRule;
+  lineSpacingExplicit?: boolean;
   snapToGrid?: boolean;
   spacingExplicit?: SpacingExplicit;
   /** Layout provenance: document defaults survive on empty paragraphs. */
@@ -176,7 +177,7 @@ type ParagraphAttrs = {
    *  them in UI today, but stripping them on every edit would corrupt the
    *  `w:pPrChange` history Word relies on for "show previous formatting"
    *  and for reverting an accepted property change. */
-  _propertyChanges?: document_d_exports.ParagraphPropertyChange[];
+  _propertyChanges?: ParagraphPropertyChangeAttrs[];
   /** Paragraph-mark insertion / deletion (`<w:pPr><w:rPr><w:ins/>` /
    *  `<w:del/>`). Word emits this when the paragraph break itself was
    *  authored in track-changes mode — pressing Enter mid-paragraph
@@ -191,6 +192,17 @@ type ParagraphAttrs = {
    */
   _suggestedInsert?: SuggestedStructuralMarker | null;
 };
+/**
+ * ProseMirror property-change attrs may also carry the editor's list-marker
+ * snapshot fields alongside the canonical paragraph formatting fields.
+ * Keeping that shape typed here lets layout consume validated attrs directly.
+ */
+type ParagraphPropertyChangeAttrs = Omit<document_d_exports.ParagraphPropertyChange, "previousFormatting" | "currentFormatting"> & {
+  previousFormatting?: Omit<document_d_exports.ParagraphFormatting, "numPr"> & {
+    numPr?: document_d_exports.ParagraphFormatting["numPr"] | null;
+  } & Partial<Pick<ParagraphAttrs, "listIsBullet" | "listIsLegal" | "listNumFmt" | "listMarker" | "listMarkerHidden" | "listMarkerFontFamily" | "listMarkerFontSize" | "listMarkerBold" | "listMarkerAlignment" | "listMarkerSuffix" | "listLevelNumFmts" | "listLevelStarts" | "listAbstractNumId" | "listStartOverride" | "lineSpacingExplicit" | "direction" | "_autospacingBase">>;
+  currentFormatting?: document_d_exports.ParagraphFormatting;
+};
 /**
  * Image position for floating images (horizontal and vertical positioning)
  */
@@ -688,4 +700,4 @@ type TableCellAttrs = {
   _docxVMergeContinuationCells?: document_d_exports.TableCell[];
 };
 //#endregion
-export { BlockSdtAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, ImagePositionAttrs, MathAttrs, ParagraphAttrs, SdtAttrs, ShapeAttrs, SuggestedStructuralMarker, SymbolAttrs, TabAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAnchorAttrs, TextBoxAttrs };
+export { BlockSdtAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, ImagePositionAttrs, MathAttrs, ParagraphAttrs, ParagraphPropertyChangeAttrs, SdtAttrs, ShapeAttrs, SuggestedStructuralMarker, SymbolAttrs, TabAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAnchorAttrs, TextBoxAttrs };