@stll/folio-core 0.22.2 → 0.23.0

package/dist/prosemirror/commands/propertyChangeScope.js

@@ -27,6 +27,7 @@ const PPR_CHANGE_SCOPED_ATTR_KEYS = [
 	"spaceAfter",
 	"lineSpacing",
 	"lineSpacingRule",
+	"lineSpacingExplicit",
 	"snapToGrid",
 	"spacingExplicit",
 	"indentLeft",
@@ -111,7 +112,7 @@ function paragraphRejectAttrPatch(previousFormatting) {
 	const prev = previousFormatting ?? {};
 	const patch = {};
 	for (const key of PPR_CHANGE_SCOPED_ATTR_KEYS) patch[key] = Object.hasOwn(prev, key) ? prev[key] ?? null : null;
-	if (!Object.hasOwn(prev, "direction")) patch["direction"] = directionFromBidi(prev["bidi"]);
+	if (!Object.hasOwn(prev, "direction")) patch["direction"] = directionFromBidi(prev.bidi);
 	if (!Object.hasOwn(prev, "_autospacingBase")) patch["_autospacingBase"] = autospacingBaseFromFormatting(prev);
 	for (const [key, value] of Object.entries(prev)) {
 		if (PPR_CHANGE_SCOPED_ATTR_KEY_SET.has(key) || PPR_PARSER_ONLY_KEYS.has(key)) continue;
@@ -131,21 +132,21 @@ function paragraphRejectOriginalFormatting(previousFormatting, liveOriginal) {
 	const result = {};
 	for (const key of PPR_CHANGE_SCOPED_FORMATTING_KEYS) {
 		const value = Object.hasOwn(prev, key) ? prev[key] : void 0;
-		if (value != null) result[key] = value;
+		if (value != null) Object.assign(result, { [key]: value });
 	}
 	const live = isRecord(liveOriginal) ? liveOriginal : {};
-	if (live["runProperties"] != null) result["runProperties"] = live["runProperties"];
-	if (live["runInWithNext"] != null) result["runInWithNext"] = live["runInWithNext"];
+	if (live["runProperties"] != null) Object.assign(result, { runProperties: live["runProperties"] });
+	if (live["runInWithNext"] != null) Object.assign(result, { runInWithNext: live["runInWithNext"] });
 	if (Object.keys(result).length === 0) return null;
 	return result;
 }
 function autospacingBaseFromFormatting(prev) {
-	const before = prev["beforeAutospacing"] === true;
-	const after = prev["afterAutospacing"] === true;
+	const before = prev.beforeAutospacing === true;
+	const after = prev.afterAutospacing === true;
 	if (!before && !after) return null;
 	const base = {};
-	if (before) setAutospacingBaseValue(base, "before", prev["spaceBefore"]);
-	if (after) setAutospacingBaseValue(base, "after", prev["spaceAfter"]);
+	if (before) setAutospacingBaseValue(base, "before", prev.spaceBefore);
+	if (after) setAutospacingBaseValue(base, "after", prev.spaceAfter);
 	return base;
 }
 /**

package/dist/prosemirror/commands/table.d.ts

@@ -1,4 +1,6 @@
+import { TablePropertiesCommand } from "../../utils/tableOperations.js";
 import { BorderPreset, TableBorderPreset, TableContextInfo, getTableContext, isInTable as isInTableCell } from "../extensions/nodes/TableExtension.js";
+import { TableBorderCommandSpec, TableCellBorderCommandSpec, TableCellMarginsCommand, TableStyleCommand } from "../extensions/types.js";
 import { EditorState, Transaction } from "prosemirror-state";
 //#region src/prosemirror/commands/table.d.ts
 declare function insertTable(rows: number, cols: number): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
@@ -14,67 +16,23 @@ declare function selectRow(state: EditorState, dispatch?: (tr: Transaction) => v
 declare function selectColumn(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
 declare function mergeCells(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
 declare function splitCell(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
-declare function setCellBorder(side: "top" | "bottom" | "left" | "right" | "all", spec: {
-  style: string;
-  size?: number;
-  color?: {
-    rgb: string;
-  };
-} | null, clearOthers?: boolean): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
+declare function setCellBorder(side: "top" | "bottom" | "left" | "right" | "all", spec: TableCellBorderCommandSpec | null, clearOthers?: boolean): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
 declare function setTableBorderPreset(preset: TableBorderPreset): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
-declare function setTableBorders(preset: BorderPreset, borderSpec?: {
-  style: string;
-  size: number;
-  color: {
-    rgb: string;
-  };
-}): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
+declare function setTableBorders(preset: BorderPreset, borderSpec?: TableBorderCommandSpec): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
 declare function removeTableBorders(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
-declare function setAllTableBorders(state: EditorState, dispatch?: (tr: Transaction) => void, borderSpec?: {
-  style: string;
-  size: number;
-  color: {
-    rgb: string;
-  };
-}): boolean;
-declare function setOutsideTableBorders(state: EditorState, dispatch?: (tr: Transaction) => void, borderSpec?: {
-  style: string;
-  size: number;
-  color: {
-    rgb: string;
-  };
-}): boolean;
-declare function setInsideTableBorders(state: EditorState, dispatch?: (tr: Transaction) => void, borderSpec?: {
-  style: string;
-  size: number;
-  color: {
-    rgb: string;
-  };
-}): boolean;
+declare function setAllTableBorders(state: EditorState, dispatch?: (tr: Transaction) => void, borderSpec?: TableBorderCommandSpec): boolean;
+declare function setOutsideTableBorders(state: EditorState, dispatch?: (tr: Transaction) => void, borderSpec?: TableBorderCommandSpec): boolean;
+declare function setInsideTableBorders(state: EditorState, dispatch?: (tr: Transaction) => void, borderSpec?: TableBorderCommandSpec): boolean;
 declare function setCellVerticalAlign(align: "top" | "center" | "bottom"): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
-declare function setCellMargins(margins: {
-  top?: number;
-  bottom?: number;
-  left?: number;
-  right?: number;
-}): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
+declare function setCellMargins(margins: TableCellMarginsCommand): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
 declare function setCellTextDirection(direction: string | null): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
 declare function toggleNoWrap(): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
 declare function setRowHeight(height: number | null, rule?: "auto" | "atLeast" | "exact"): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
 declare function toggleHeaderRow(): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
 declare function distributeColumns(): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
 declare function autoFitContents(): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
-declare function setTableProperties(props: {
-  width?: number | null;
-  widthType?: string | null;
-  justification?: "left" | "center" | "right" | null;
-}): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
-declare function applyTableStyle(styleData: {
-  styleId: string;
-  tableBorders?: Record<string, unknown>;
-  conditionals?: Record<string, unknown>;
-  look?: Record<string, boolean>;
-}): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
+declare function setTableProperties(props: TablePropertiesCommand): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
+declare function applyTableStyle(styleData: TableStyleCommand): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
 declare function setCellFillColor(color: string | null): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
 declare function setTableBorderColor(color: string): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
 declare function setTableBorderWidth(size: number): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;

package/dist/prosemirror/commands/table.js

@@ -1,105 +1,105 @@
 import { getTableContext, isInTable as isInTableCell } from "../extensions/nodes/TableExtension.js";
 import { singletonManager } from "../schema/index.js";
 //#region src/prosemirror/commands/table.ts
-const cmds = singletonManager.getCommands();
+const cmds = singletonManager;
 function insertTable(rows, cols) {
-	return cmds["insertTable"](rows, cols);
+	return cmds.requireCommand("insertTable")(rows, cols);
 }
 function addRowAbove(state, dispatch) {
-	return cmds["addRowAbove"]()(state, dispatch);
+	return cmds.requireCommand("addRowAbove")()(state, dispatch);
 }
 function addRowBelow(state, dispatch) {
-	return cmds["addRowBelow"]()(state, dispatch);
+	return cmds.requireCommand("addRowBelow")()(state, dispatch);
 }
 function deleteRow(state, dispatch) {
-	return cmds["deleteRow"]()(state, dispatch);
+	return cmds.requireCommand("deleteRow")()(state, dispatch);
 }
 function addColumnLeft(state, dispatch) {
-	return cmds["addColumnLeft"]()(state, dispatch);
+	return cmds.requireCommand("addColumnLeft")()(state, dispatch);
 }
 function addColumnRight(state, dispatch) {
-	return cmds["addColumnRight"]()(state, dispatch);
+	return cmds.requireCommand("addColumnRight")()(state, dispatch);
 }
 function deleteColumn(state, dispatch) {
-	return cmds["deleteColumn"]()(state, dispatch);
+	return cmds.requireCommand("deleteColumn")()(state, dispatch);
 }
 function deleteTable(state, dispatch) {
-	return cmds["deleteTable"]()(state, dispatch);
+	return cmds.requireCommand("deleteTable")()(state, dispatch);
 }
 function selectTable(state, dispatch) {
-	return cmds["selectTable"]()(state, dispatch);
+	return cmds.requireCommand("selectTable")()(state, dispatch);
 }
 function selectRow(state, dispatch) {
-	return cmds["selectRow"]()(state, dispatch);
+	return cmds.requireCommand("selectRow")()(state, dispatch);
 }
 function selectColumn(state, dispatch) {
-	return cmds["selectColumn"]()(state, dispatch);
+	return cmds.requireCommand("selectColumn")()(state, dispatch);
 }
 function mergeCells(state, dispatch) {
-	return cmds["mergeCells"]()(state, dispatch);
+	return cmds.requireCommand("mergeCells")()(state, dispatch);
 }
 function splitCell(state, dispatch) {
-	return cmds["splitCell"]()(state, dispatch);
+	return cmds.requireCommand("splitCell")()(state, dispatch);
 }
 function setCellBorder(side, spec, clearOthers) {
-	return cmds["setCellBorder"](side, spec, clearOthers);
+	return cmds.requireCommand("setCellBorder")(side, spec, clearOthers);
 }
 function setTableBorderPreset(preset) {
-	return cmds["setTableBorderPreset"](preset);
+	return cmds.requireCommand("setTableBorderPreset")(preset);
 }
 function setTableBorders(preset, borderSpec) {
-	return cmds["setTableBorders"](preset, borderSpec);
+	return cmds.requireCommand("setTableBorders")(preset, borderSpec);
 }
 function removeTableBorders(state, dispatch) {
-	return cmds["removeTableBorders"]()(state, dispatch);
+	return cmds.requireCommand("removeTableBorders")()(state, dispatch);
 }
 function setAllTableBorders(state, dispatch, borderSpec) {
-	return cmds["setAllTableBorders"](borderSpec)(state, dispatch);
+	return cmds.requireCommand("setAllTableBorders")(borderSpec)(state, dispatch);
 }
 function setOutsideTableBorders(state, dispatch, borderSpec) {
-	return cmds["setOutsideTableBorders"](borderSpec)(state, dispatch);
+	return cmds.requireCommand("setOutsideTableBorders")(borderSpec)(state, dispatch);
 }
 function setInsideTableBorders(state, dispatch, borderSpec) {
-	return cmds["setInsideTableBorders"](borderSpec)(state, dispatch);
+	return cmds.requireCommand("setInsideTableBorders")(borderSpec)(state, dispatch);
 }
 function setCellVerticalAlign(align) {
-	return cmds["setCellVerticalAlign"](align);
+	return cmds.requireCommand("setCellVerticalAlign")(align);
 }
 function setCellMargins(margins) {
-	return cmds["setCellMargins"](margins);
+	return cmds.requireCommand("setCellMargins")(margins);
 }
 function setCellTextDirection(direction) {
-	return cmds["setCellTextDirection"](direction);
+	return cmds.requireCommand("setCellTextDirection")(direction);
 }
 function toggleNoWrap() {
-	return cmds["toggleNoWrap"]();
+	return cmds.requireCommand("toggleNoWrap")();
 }
 function setRowHeight(height, rule) {
-	return cmds["setRowHeight"](height, rule);
+	return cmds.requireCommand("setRowHeight")(height, rule);
 }
 function toggleHeaderRow() {
-	return cmds["toggleHeaderRow"]();
+	return cmds.requireCommand("toggleHeaderRow")();
 }
 function distributeColumns() {
-	return cmds["distributeColumns"]();
+	return cmds.requireCommand("distributeColumns")();
 }
 function autoFitContents() {
-	return cmds["autoFitContents"]();
+	return cmds.requireCommand("autoFitContents")();
 }
 function setTableProperties(props) {
-	return cmds["setTableProperties"](props);
+	return cmds.requireCommand("setTableProperties")(props);
 }
 function applyTableStyle(styleData) {
-	return cmds["applyTableStyle"](styleData);
+	return cmds.requireCommand("applyTableStyle")(styleData);
 }
 function setCellFillColor(color) {
-	return cmds["setCellFillColor"](color);
+	return cmds.requireCommand("setCellFillColor")(color);
 }
 function setTableBorderColor(color) {
-	return cmds["setTableBorderColor"](color);
+	return cmds.requireCommand("setTableBorderColor")(color);
 }
 function setTableBorderWidth(size) {
-	return cmds["setTableBorderWidth"](size);
+	return cmds.requireCommand("setTableBorderWidth")(size);
 }
 //#endregion
 export { addColumnLeft, addColumnRight, addRowAbove, addRowBelow, applyTableStyle, autoFitContents, deleteColumn, deleteRow, deleteTable, distributeColumns, getTableContext, insertTable, isInTableCell as isInTable, mergeCells, removeTableBorders, selectColumn, selectRow, selectTable, setAllTableBorders, setCellBorder, setCellFillColor, setCellMargins, setCellTextDirection, setCellVerticalAlign, setInsideTableBorders, setOutsideTableBorders, setRowHeight, setTableBorderColor, setTableBorderPreset, setTableBorderWidth, setTableBorders, setTableProperties, splitCell, toggleHeaderRow, toggleNoWrap };

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -9,7 +9,7 @@ import { RUN_FORMATTING_MARK_NAMES } from "../runFormattingMarkNames.js";
 import { expectTextBoxAnchorAttrs } from "../textBoxAnchorAttrs.js";
 import { assertValidProseMirrorDocument } from "../validation.js";
 import { runShadingAttrsToShading } from "./runShadingMark.js";
-import { sdtPropertiesFromAttrs, sdtPropertiesMatchAttrs } from "./sdtAttrs.js";
+import { decodeSdtListItems, sdtPropertiesFromAttrs, sdtPropertiesMatchAttrs } from "./sdtAttrs.js";
 import { textFormattingToMarks } from "./toProseDoc.js";
 import { Fragment } from "prosemirror-model";
 //#region src/prosemirror/conversion/fromProseDoc.ts
@@ -248,10 +248,7 @@ function convertPMBlockSdt(node) {
 	if (attrs.showingPlaceholder !== void 0) properties.showingPlaceholder = attrs.showingPlaceholder;
 	if (attrs.dateFormat) properties.dateFormat = attrs.dateFormat;
 	if (attrs.dateValueISO) properties.dateValueISO = attrs.dateValueISO;
-	if (attrs.listItems) {
-		const items = parseListItemsJson(attrs.listItems);
-		if (items) properties.listItems = items;
-	}
+	if (attrs.listItems) properties.listItems = decodeSdtListItems(attrs.listItems);
 	if (typeof attrs.dropdownLastValue === "string") properties.dropdownLastValue = attrs.dropdownLastValue;
 	if (typeof attrs.checked === "boolean") properties.checked = attrs.checked;
 	if (attrs.rawPropertiesXml) properties.rawPropertiesXml = attrs.rawPropertiesXml;
@@ -276,17 +273,6 @@ function isStillSyntheticFiller(blocks) {
 	if (block.pPrMark !== void 0) return false;
 	return true;
 }
-function parseListItemsJson(raw) {
-	try {
-		const parsed = JSON.parse(raw);
-		if (!Array.isArray(parsed)) return;
-		const items = [];
-		for (const entry of parsed) if (entry !== null && typeof entry === "object" && "displayText" in entry && "value" in entry && typeof entry.displayText === "string" && typeof entry.value === "string") items.push(entry);
-		return items.length > 0 ? items : void 0;
-	} catch {
-		return;
-	}
-}
 function appendTextBoxBlock(blocks, node, options) {
 	const attrs = expectTextBoxAttrs(node);
 	const paragraph = convertPMTextBox(node);
@@ -513,10 +499,27 @@ function convertPMParagraph(node, documentCounts, textBoxAnchorMarkers) {
 	if (attrs.renderedPageBreakBefore) paragraph.renderedPageBreakBefore = true;
 	if (attrs._sectionProperties) paragraph.sectionProperties = attrs._sectionProperties;
 	else if (attrs.sectionBreakType) paragraph.sectionProperties = { sectionStart: attrs.sectionBreakType };
-	if (Array.isArray(attrs._propertyChanges) && attrs._propertyChanges.length > 0) paragraph.propertyChanges = [...attrs._propertyChanges];
+	if (attrs._propertyChanges && attrs._propertyChanges.length > 0) paragraph.propertyChanges = attrs._propertyChanges.map(propertyChangeFromAttrs);
 	if (attrs.pPrMark) paragraph.pPrMark = attrs.pPrMark;
 	return paragraph;
 }
+const propertyChangeFromAttrs = (change) => {
+	const { previousFormatting, currentFormatting, ...info } = change;
+	if (previousFormatting === void 0) return currentFormatting === void 0 ? info : {
+		...info,
+		currentFormatting
+	};
+	const { numPr, ...previousWithoutNumPr } = previousFormatting;
+	const normalizedPrevious = numPr === null || numPr === void 0 ? previousWithoutNumPr : {
+		...previousWithoutNumPr,
+		numPr
+	};
+	return {
+		...info,
+		previousFormatting: normalizedPrevious,
+		...currentFormatting !== void 0 && { currentFormatting }
+	};
+};
 /**
 * Whether the paragraph's numbering still comes verbatim from its style —
 * serialize no direct `<w:numPr>` then. The moment a list command changes
@@ -543,6 +546,7 @@ function paragraphAttrsToFormatting(attrs) {
 	const afterAutospacingEdited = afterHasAutospacingBase ? !autospacingMatchesBase(attrs._autospacingBase, "after", spaceAfter) : afterOriginalAutospacing && attrs._autospacingBase == null;
 	const shouldSerializeSpaceBefore = typeof spaceBefore === "number" && (!beforeHasAutospacingBase || beforeAutospacingEdited);
 	const shouldSerializeSpaceAfter = typeof spaceAfter === "number" && (!afterHasAutospacingBase || afterAutospacingEdited);
+	const hasDirectLineSpacing = attrs.lineSpacingExplicit === true;
 	if (attrs._originalFormatting) {
 		const orig = attrs._originalFormatting;
 		const result = { ...orig };
@@ -556,6 +560,15 @@ function paragraphAttrsToFormatting(attrs) {
 			if (typeof spaceAfter === "number") result.spaceAfter = spaceAfter;
 			else delete result.spaceAfter;
 		}
+		if (attrs.spacingExplicit?.before && typeof spaceBefore === "number") result.spaceBefore = spaceBefore;
+		if (attrs.spacingExplicit?.after && typeof spaceAfter === "number") result.spaceAfter = spaceAfter;
+		const originalHasDirectLineSpacing = orig.lineSpacing !== void 0 || orig.lineSpacingRule !== void 0;
+		if (hasDirectLineSpacing || originalHasDirectLineSpacing) {
+			if (typeof attrs.lineSpacing === "number") result.lineSpacing = attrs.lineSpacing;
+			else Reflect.deleteProperty(result, "lineSpacing");
+			if (attrs.lineSpacingRule) result.lineSpacingRule = attrs.lineSpacingRule;
+			else Reflect.deleteProperty(result, "lineSpacingRule");
+		}
 		if (attrs.alignment !== (orig.alignment ?? void 0)) if (attrs.alignment) result.alignment = attrs.alignment;
 		else delete result.alignment;
 		if (isStyleSourcedNumPr(attrs)) {
@@ -583,15 +596,15 @@ function paragraphAttrsToFormatting(attrs) {
 	}
 	const outlineLevel = Reflect.get(attrs, "outlineLevel");
 	const bidi = directionToBidi(attrs.direction);
-	if (!(attrs.alignment || shouldSerializeSpaceBefore || shouldSerializeSpaceAfter || beforeAutospacingEdited || afterAutospacingEdited || attrs.lineSpacing || attrs.snapToGrid != null || attrs.indentLeft || attrs.indentRight || attrs.indentFirstLine || attrs.numPr || attrs.styleId || attrs.borders || attrs.shading || attrs.tabs || typeof outlineLevel === "number" || attrs.contextualSpacing || attrs.spacingExplicit || bidi != null || attrs.pageBreakBefore != null || attrs.widowControl != null || attrs.kinsoku != null || attrs.overflowPunctuation != null || attrs.suppressAutoHyphens != null)) return;
+	if (!(attrs.alignment || shouldSerializeSpaceBefore || shouldSerializeSpaceAfter || beforeAutospacingEdited || afterAutospacingEdited || hasDirectLineSpacing || attrs.snapToGrid != null || attrs.indentLeft || attrs.indentRight || attrs.indentFirstLine || attrs.numPr || attrs.styleId || attrs.borders || attrs.shading || attrs.tabs || typeof outlineLevel === "number" || attrs.contextualSpacing || attrs.spacingExplicit || bidi != null || attrs.pageBreakBefore != null || attrs.widowControl != null || attrs.kinsoku != null || attrs.overflowPunctuation != null || attrs.suppressAutoHyphens != null)) return;
 	const f = {};
 	if (attrs.alignment) f.alignment = attrs.alignment;
 	if (shouldSerializeSpaceBefore) f.spaceBefore = spaceBefore;
 	if (beforeAutospacingEdited) f.beforeAutospacing = false;
 	if (shouldSerializeSpaceAfter) f.spaceAfter = spaceAfter;
 	if (afterAutospacingEdited) f.afterAutospacing = false;
-	if (attrs.lineSpacing) f.lineSpacing = attrs.lineSpacing;
-	if (attrs.lineSpacingRule) f.lineSpacingRule = attrs.lineSpacingRule;
+	if (hasDirectLineSpacing && typeof attrs.lineSpacing === "number") f.lineSpacing = attrs.lineSpacing;
+	if (hasDirectLineSpacing && attrs.lineSpacingRule) f.lineSpacingRule = attrs.lineSpacingRule;
 	if (attrs.snapToGrid != null) f.snapToGrid = attrs.snapToGrid;
 	if (attrs.spacingExplicit) f.spacingExplicit = attrs.spacingExplicit;
 	if (attrs.indentLeft) f.indentLeft = attrs.indentLeft;

package/dist/prosemirror/conversion/sdtAttrs.d.ts

@@ -4,5 +4,6 @@ import { SdtAttrs } from "../schema/nodes.js";
 declare const sdtAttrsFromProperties: (properties: document_d_exports.SdtProperties) => SdtAttrs;
 declare const sdtPropertiesFromAttrs: (attrs: SdtAttrs) => document_d_exports.SdtProperties;
 declare const sdtPropertiesMatchAttrs: (properties: document_d_exports.SdtProperties, attrs: SdtAttrs) => boolean;
+declare const decodeSdtListItems: (rawItems: string) => NonNullable<document_d_exports.SdtProperties["listItems"]>;
 //#endregion
-export { sdtAttrsFromProperties, sdtPropertiesFromAttrs, sdtPropertiesMatchAttrs };
+export { decodeSdtListItems, sdtAttrsFromProperties, sdtPropertiesFromAttrs, sdtPropertiesMatchAttrs };

package/dist/prosemirror/conversion/sdtAttrs.js

@@ -25,7 +25,7 @@ const sdtPropertiesFromAttrs = (attrs) => {
 	if (attrs.showingPlaceholder !== void 0) properties.showingPlaceholder = attrs.showingPlaceholder;
 	if (attrs.dateFormat) properties.dateFormat = attrs.dateFormat;
 	if (attrs.dateValueISO) properties.dateValueISO = attrs.dateValueISO;
-	if (attrs.listItems) properties.listItems = parseSdtListItems(attrs.listItems);
+	if (attrs.listItems) properties.listItems = decodeSdtListItems(attrs.listItems);
 	if (typeof attrs.dropdownLastValue === "string") properties.dropdownLastValue = attrs.dropdownLastValue;
 	if (typeof attrs.checked === "boolean") properties.checked = attrs.checked;
 	if (attrs.rawPropertiesXml) properties.rawPropertiesXml = attrs.rawPropertiesXml;
@@ -33,8 +33,13 @@ const sdtPropertiesFromAttrs = (attrs) => {
 	return properties;
 };
 const sdtPropertiesMatchAttrs = (properties, attrs) => JSON.stringify(sdtAttrsFromProperties(properties)) === JSON.stringify(sdtAttrsFromProperties(sdtPropertiesFromAttrs(attrs)));
-const parseSdtListItems = (rawItems) => {
-	const parsed = JSON.parse(rawItems);
+const decodeSdtListItems = (rawItems) => {
+	let parsed;
+	try {
+		parsed = JSON.parse(rawItems);
+	} catch {
+		throw new TypeError("Invalid ProseMirror sdt attrs: listItems is not valid JSON");
+	}
 	if (!Array.isArray(parsed)) throw new TypeError("Invalid ProseMirror sdt attrs: listItems is not an array");
 	return parsed.map((item) => {
 		if (!item || typeof item !== "object" || Array.isArray(item)) throw new TypeError("Invalid ProseMirror sdt attrs: listItems contains an invalid item");
@@ -46,4 +51,4 @@ const parseSdtListItems = (rawItems) => {
 	});
 };
 //#endregion
-export { sdtAttrsFromProperties, sdtPropertiesFromAttrs, sdtPropertiesMatchAttrs };
+export { decodeSdtListItems, sdtAttrsFromProperties, sdtPropertiesFromAttrs, sdtPropertiesMatchAttrs };

package/dist/prosemirror/conversion/toProseDoc.js

@@ -319,6 +319,7 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 		set("spaceAfter", formatting?.spaceAfter ?? stylePpr?.spaceAfter);
 		set("lineSpacing", formatting?.lineSpacing ?? stylePpr?.lineSpacing);
 		set("lineSpacingRule", formatting?.lineSpacingRule ?? stylePpr?.lineSpacingRule);
+		set("lineSpacingExplicit", formatting?.lineSpacing !== void 0 || formatting?.lineSpacingRule !== void 0 ? true : void 0);
 		set("snapToGrid", formatting?.snapToGrid ?? stylePpr?.snapToGrid);
 		set("spacingExplicit", formatting?.spacingExplicit);
 		const paragraphStyle = styleId ? styleResolver.getStyle(styleId) ?? styleResolver.getDefaultParagraphStyle() : styleResolver.getDefaultParagraphStyle();

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

@@ -1,5 +1,5 @@
-import { AnyExtension, CommandMap } from "./types.js";
-import { Command, Plugin } from "prosemirror-state";
+import { AnyExtension, CommandFactory, CommandMap, FolioCommandArguments, FolioCommandName } from "./types.js";
+import { Plugin } from "prosemirror-state";
 import { Schema } from "prosemirror-model";
 //#region src/prosemirror/extensions/ExtensionManager.d.ts
 declare class ExtensionManager {
@@ -32,7 +32,10 @@ declare class ExtensionManager {
   /**
    * Get a specific command by name
    */
-  getCommand(name: string): ((...args: unknown[]) => Command) | undefined;
+  getCommand<Name extends FolioCommandName>(name: Name): CommandFactory<FolioCommandArguments[Name]> | undefined;
+  getCommand(name: string): CommandFactory | undefined;
+  requireCommand<Name extends FolioCommandName>(name: Name): CommandFactory<FolioCommandArguments[Name]>;
+  requireCommand(name: string): CommandFactory;
   /**
    * Lifecycle: destroy
    */

package/dist/prosemirror/extensions/ExtensionManager.js

@@ -68,12 +68,14 @@ var ExtensionManager = class {
 	getCommands() {
 		return this.commands;
 	}
-	/**
-	* Get a specific command by name
-	*/
 	getCommand(name) {
 		return this.commands[name];
 	}
+	requireCommand(name) {
+		const command = this.getCommand(name);
+		if (!command) panic(`ExtensionManager: command "${name}" is not registered`);
+		return command;
+	}
 	/**
 	* Lifecycle: destroy
 	*/

package/dist/prosemirror/extensions/core/ParagraphExtension.d.ts

@@ -1,6 +1,6 @@
 import { document_d_exports } from "../../../types/document.js";
-import { NodeExtension } from "../types.js";
 import { NumberingMap } from "../../../docx/numberingParser.js";
+import { NodeExtension } from "../types.js";
 import { EditorState } from "prosemirror-state";
 //#region src/prosemirror/extensions/core/ParagraphExtension.d.ts
 type ResolvedStyleAttrs = {

package/dist/prosemirror/extensions/core/ParagraphExtension.js

@@ -161,6 +161,7 @@ function extractParagraphAttrsFromStyle(element) {
 		if (spacing) {
 			attrs.lineSpacing = spacing.lineSpacing;
 			attrs.lineSpacingRule = spacing.lineSpacingRule;
+			attrs.lineSpacingExplicit = true;
 		}
 	}
 	if (style.marginTop) {
@@ -187,6 +188,7 @@ const paragraphNodeSpec = {
 		spaceAfter: { default: null },
 		lineSpacing: { default: null },
 		lineSpacingRule: { default: null },
+		lineSpacingExplicit: { default: null },
 		snapToGrid: { default: null },
 		spacingExplicit: { default: null },
 		spacingFromDocDefaults: { default: null },
@@ -323,6 +325,30 @@ function setParagraphAttr(attr, value) {
 		return true;
 	};
 }
+function setParagraphSpacingAttr(side, twips) {
+	return (state, dispatch) => {
+		const { $from, $to } = state.selection;
+		if (!dispatch) return true;
+		let tr = state.tr;
+		const seen = /* @__PURE__ */ new Set();
+		state.doc.nodesBetween($from.pos, $to.pos, (node, pos) => {
+			if (node.type.name === "paragraph" && !seen.has(pos)) {
+				seen.add(pos);
+				const spacingExplicit = {
+					...node.attrs["spacingExplicit"],
+					[side]: true
+				};
+				tr = tr.setNodeMarkup(pos, void 0, {
+					...node.attrs,
+					[side === "before" ? "spaceBefore" : "spaceAfter"]: twips,
+					spacingExplicit
+				});
+			}
+		});
+		dispatch(tr.scrollIntoView());
+		return true;
+	};
+}
 function setParagraphAttrsCmd(attrs) {
 	return (state, dispatch) => {
 		const { $from, $to } = state.selection;
@@ -348,7 +374,8 @@ function makeSetAlignment(alignment) {
 function makeSetLineSpacing(value, rule = "auto") {
 	return (state, dispatch) => setParagraphAttrsCmd({
 		lineSpacing: value,
-		lineSpacingRule: rule
+		lineSpacingRule: rule,
+		lineSpacingExplicit: true
 	})(state, dispatch);
 }
 function makeIncreaseIndent(amount = 720) {
@@ -498,8 +525,8 @@ const ParagraphExtension = createNodeExtension({
 			singleSpacing: () => makeSetLineSpacing(240),
 			oneAndHalfSpacing: () => makeSetLineSpacing(360),
 			doubleSpacing: () => makeSetLineSpacing(480),
-			setSpaceBefore: (twips) => setParagraphAttr("spaceBefore", twips),
-			setSpaceAfter: (twips) => setParagraphAttr("spaceAfter", twips),
+			setSpaceBefore: (twips) => setParagraphSpacingAttr("before", twips),
+			setSpaceAfter: (twips) => setParagraphSpacingAttr("after", twips),
 			increaseIndent: (amount) => makeIncreaseIndent(amount),
 			decreaseIndent: (amount) => makeDecreaseIndent(amount),
 			setIndentLeft: (twips) => setParagraphAttr("indentLeft", twips > 0 ? twips : null),

package/dist/prosemirror/extensions/features/ListExtension.js

@@ -1,3 +1,4 @@
+import { expectParagraphAttrs } from "../../attrs/index.js";
 import { PPR_CHANGE_SCOPED_ATTR_KEYS } from "../../commands/propertyChangeScope.js";
 import { SUGGESTION_META, makeRevisionInfo } from "../../plugins/suggestionMode.js";
 import { createExtension } from "../create.js";
@@ -10,11 +11,10 @@ function chainCommands(...commands) {
 		return false;
 	};
 }
-function appendParagraphPropertyChange(attrs, previousFormatting, rev) {
-	const existing = Array.isArray(attrs["_propertyChanges"]) ? attrs["_propertyChanges"] : [];
+function appendParagraphPropertyChange(attrs, existing, previousFormatting, rev) {
 	return {
 		...attrs,
-		_propertyChanges: [...existing, {
+		_propertyChanges: [...existing ?? [], {
 			type: "paragraphPropertyChange",
 			info: {
 				id: rev.id,
@@ -85,7 +85,7 @@ function toggleList(numId) {
 						listMarker: null
 					};
 				}
-				if (rev) nextAttrs = appendParagraphPropertyChange(nextAttrs, getPreviousListFormatting(node.attrs), rev);
+				if (rev) nextAttrs = appendParagraphPropertyChange(nextAttrs, expectParagraphAttrs(node)._propertyChanges, getPreviousListFormatting(node.attrs), rev);
 				tr = tr.setNodeMarkup(pos, void 0, nextAttrs);
 			}
 		});

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

@@ -1,8 +1,7 @@
 import { expectUnderlineMarkAttrs } from "../../attrs/index.js";
 import { createMarkExtension } from "../create.js";
-import { setMark } from "./markUtils.js";
+import { setMark, toggleUnderlineMark } from "./markUtils.js";
 import { panic } from "better-result";
-import { toggleMark } from "prosemirror-commands";
 //#region src/prosemirror/extensions/marks/UnderlineExtension.ts
 /**
 * Underline Mark Extension
@@ -17,14 +16,17 @@ const UnderlineExtension = createMarkExtension({
 		},
 		parseDOM: [{ tag: "u" }, {
 			style: "text-decoration",
-			getAttrs: (value) => value.includes("underline") ? {} : false
+			getAttrs: (value) => {
+				if (value.includes("underline")) return {};
+				return value.includes("none") ? { style: "none" } : false;
+			}
 		}],
 		toDOM(mark) {
 			const attrs = expectUnderlineMarkAttrs(mark);
 			const style = attrs.style;
 			const colorRgb = attrs.color?.rgb;
-			const cssStyle = ["text-decoration: underline"];
-			if (style && style !== "single") {
+			const cssStyle = [`text-decoration: ${style === "none" ? "none" : "underline"}`];
+			if (style && style !== "single" && style !== "none") {
 				const cssDecorationStyle = {
 					double: "double",
 					dotted: "dotted",
@@ -46,13 +48,13 @@ const UnderlineExtension = createMarkExtension({
 		if (!underlineType) panic("Missing mark type: underline");
 		return {
 			commands: {
-				toggleUnderline: () => toggleMark(underlineType),
+				toggleUnderline: () => toggleUnderlineMark(underlineType),
 				setUnderlineStyle: (style, color) => setMark(underlineType, {
 					style,
 					color
 				})
 			},
-			keyboardShortcuts: { "Mod-u": toggleMark(underlineType) }
+			keyboardShortcuts: { "Mod-u": toggleUnderlineMark(underlineType) }
 		};
 	}
 });

package/dist/prosemirror/extensions/marks/markUtils.d.ts

@@ -4,6 +4,7 @@ import { Mark, MarkType, Schema } from "prosemirror-model";
 //#region src/prosemirror/extensions/marks/markUtils.d.ts
 type MarkAttrs = Record<string, unknown>;
 declare function setMark(markType: MarkType, attrs: MarkAttrs): Command;
+declare function toggleUnderlineMark(markType: MarkType): Command;
 declare function removeMark(markType: MarkType): Command;
 /**
  * Check if a mark is active in the current selection
@@ -30,4 +31,4 @@ declare function createSetMarkCommand(markType: MarkType, attrs?: Record<string,
  */
 declare function createRemoveMarkCommand(markType: MarkType): Command;
 //#endregion
-export { clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMarkAttr, isMarkActive, removeMark, setMark, textFormattingToMarks };
+export { clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMarkAttr, isMarkActive, removeMark, setMark, textFormattingToMarks, toggleUnderlineMark };