@stll/folio-core 0.39.1 → 0.41.0

package/dist/prosemirror/conversion/toProseDoc.js

@@ -9,6 +9,7 @@ import { mergeTextFormatting } from "../../utils/textFormattingMerge.js";
 import { emuToPixels } from "../../utils/units.js";
 import { setAutospacingBaseValue } from "../autospacingBase.js";
 import { buildRunFormattingOverrideAttrs } from "../extensions/marks/RunFormattingOverrideExtension.js";
+import { listRenderingAttrPatch } from "../listRenderingAttrs.js";
 import { stampNumberedRefFieldBaselines } from "../numberedRefFields.js";
 import { pageBreakRunParagraphProjectionDispositionForFeatures } from "../pageBreakRunProjection.js";
 import { directionFromBidi } from "../paragraphDirection.js";
@@ -23,6 +24,7 @@ import { resolveEffectiveTableCellFormatting } from "./effectiveTableCellFormatt
 import { shadingToRunShadingAttrs } from "./runShadingMark.js";
 import { sdtAttrsFromProperties } from "./sdtAttrs.js";
 import { TaggedError, panic } from "better-result";
+import { DRAWING_RAW_XML_MODES } from "@stll/docx-core/model";
 //#region src/prosemirror/conversion/toProseDoc.ts
 /** DOCX content that cannot be preserved by the editable ProseMirror model. */
 var UnsupportedDocxToProseMirrorConversionError = class extends TaggedError("UnsupportedDocxToProseMirrorConversionError") {};
@@ -422,25 +424,7 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 	if (tableOfContentsLevel !== void 0) attrs._tableOfContentsLevel = tableOfContentsLevel;
 	if (formatting?.numPr) attrs.numPr = formatting.numPr;
 	if (formatting?.numPrFromStyle) attrs.numPrFromStyle = formatting.numPrFromStyle;
-	if (paragraph.listRendering?.numFmt) attrs.listNumFmt = paragraph.listRendering.numFmt;
-	if (paragraph.listRendering?.isBullet) attrs.listIsBullet = paragraph.listRendering.isBullet;
-	if (paragraph.listRendering?.isLegal) attrs.listIsLegal = paragraph.listRendering.isLegal;
-	if (paragraph.listRendering?.marker) attrs.listMarker = paragraph.listRendering.marker;
-	if (paragraph.listRendering?.markerTemplate) attrs.listMarkerTemplate = paragraph.listRendering.markerTemplate;
-	if (paragraph.listRendering?.markerHidden) attrs.listMarkerHidden = paragraph.listRendering.markerHidden;
-	if (paragraph.listRendering?.markerFormatting) attrs.listMarkerFormatting = paragraph.listRendering.markerFormatting;
-	if (paragraph.listRendering?.markerAlignment) attrs.listMarkerAlignment = paragraph.listRendering.markerAlignment;
-	if (paragraph.listRendering?.markerSuffix) attrs.listMarkerSuffix = paragraph.listRendering.markerSuffix;
-	if (paragraph.listRendering?.markerAllCaps) attrs.listMarkerAllCaps = paragraph.listRendering.markerAllCaps;
-	if (paragraph.listRendering?.implicitChildLevelAdvances !== void 0) attrs.listImplicitChildLevelAdvances = paragraph.listRendering.implicitChildLevelAdvances;
-	if (paragraph.listRendering?.markerSecondSlotOffsetTwips !== void 0) attrs.listMarkerSecondSlotOffsetTwips = paragraph.listRendering.markerSecondSlotOffsetTwips;
-	if (paragraph.listRendering?.levelNumFmts) attrs.listLevelNumFmts = paragraph.listRendering.levelNumFmts;
-	if (paragraph.listRendering && "levelStarts" in paragraph.listRendering) {
-		const { levelStarts } = paragraph.listRendering;
-		if (Array.isArray(levelStarts) && levelStarts.every((value) => typeof value === "number")) attrs.listLevelStarts = levelStarts;
-	}
-	if (paragraph.listRendering?.abstractNumId !== void 0) attrs.listAbstractNumId = paragraph.listRendering.abstractNumId;
-	if (paragraph.listRendering?.startOverride !== void 0) attrs.listStartOverride = paragraph.listRendering.startOverride;
+	if (paragraph.listRendering) Object.assign(attrs, listRenderingAttrPatch(paragraph.listRendering));
 	if (formatting) attrs._originalFormatting = formatting;
 	if (paragraph.propertyChanges && paragraph.propertyChanges.length > 0) attrs._propertyChanges = [...paragraph.propertyChanges];
 	if (paragraph.pPrMark) attrs.pPrMark = paragraph.pPrMark;
@@ -1605,7 +1589,8 @@ function convertRunContent(content, marks, formatting, textBoxAnchors) {
 		case "drawing": return [withRunBoundaryMarks(convertImage({
 			image: content.image,
 			rawXml: content.rawXml,
-			rawXmlMode: content.rawXmlMode
+			rawXmlMode: content.rawXmlMode,
+			rawImageFingerprint: content.rawXmlMode === DRAWING_RAW_XML_MODES.PRESERVE_ONLY ? void 0 : content.rawImageFingerprint
 		}), marks)];
 		case "shape": {
 			const shp = content.shape;
@@ -1645,7 +1630,7 @@ function withRunBoundaryMarks(node, marks) {
 	if (!marks.some(({ type }) => type.name === "hyperlink" || type.name === "pageBreakRunOwner")) return node;
 	return node.mark(marks);
 }
-function convertImage({ image, rawXml, rawXmlMode }) {
+function convertImage({ image, rawXml, rawXmlMode, rawImageFingerprint }) {
 	const imageSize = image.size;
 	const widthPx = imageSize?.width ? emuToPixels(imageSize.width) : void 0;
 	const heightPx = imageSize?.height ? emuToPixels(imageSize.height) : void 0;
@@ -1737,8 +1722,13 @@ function convertImage({ image, rawXml, rawXmlMode }) {
 		cropRight: image.crop?.right,
 		cropBottom: image.crop?.bottom,
 		cropLeft: image.crop?.left,
+		paddingTop: image.padding?.top,
+		paddingRight: image.padding?.right,
+		paddingBottom: image.padding?.bottom,
+		paddingLeft: image.padding?.left,
 		position,
 		layoutInCell: image.layoutInCell,
+		frameLocks: image.frameLocks ? { ...image.frameLocks } : void 0,
 		borderWidth,
 		borderColor,
 		borderStyle,
@@ -1747,6 +1737,7 @@ function convertImage({ image, rawXml, rawXmlMode }) {
 		hlinkRId: image.hlinkRId,
 		_docxRawXml: rawXml,
 		_docxRawXmlMode: rawXmlMode,
+		_docxRawImageFingerprint: rawImageFingerprint,
 		_docxObjectPreview: rawXml !== void 0 && /<(?:[A-Za-z_][\w.-]*:)?object(?:\s|>)/u.test(rawXml)
 	});
 }

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

@@ -1,6 +1,7 @@
 import { expectParagraphAttrs } from "../../attrs/index.js";
 import { PPR_CHANGE_SCOPED_ATTR_KEYS, hasSerializableParagraphPropertyChange } from "../../commands/propertyChangeScope.js";
-import { CLEARED_LIST_RENDERING_ATTRS, LIST_RENDERING_ATTR_KEYS } from "../../listMarker.js";
+import { CLEARED_LIST_RENDERING_ATTRS } from "../../listMarker.js";
+import { LIST_RENDERING_ATTR_KEYS } from "../../listRenderingAttrs.js";
 import { getDocumentNumbering } from "../../plugins/documentNumbering.js";
 import { SUGGESTION_META, makeRevisionInfo } from "../../plugins/suggestionMode.js";
 import { listLevelAttrPatch } from "../../styles/resolvedStyleAttrs.js";

package/dist/prosemirror/extensions/nodes/ImageExtension.js

@@ -33,8 +33,13 @@ const ImageExtension = createNodeExtension({
 			cropRight: { default: null },
 			cropBottom: { default: null },
 			cropLeft: { default: null },
+			paddingTop: { default: null },
+			paddingRight: { default: null },
+			paddingBottom: { default: null },
+			paddingLeft: { default: null },
 			position: { default: null },
 			layoutInCell: { default: null },
+			frameLocks: { default: null },
 			borderWidth: { default: null },
 			borderColor: { default: null },
 			borderStyle: { default: null },
@@ -43,6 +48,7 @@ const ImageExtension = createNodeExtension({
 			hlinkRId: { default: null },
 			_docxRawXml: { default: null },
 			_docxRawXmlMode: { default: null },
+			_docxRawImageFingerprint: { default: null },
 			_docxObjectPreview: { default: null }
 		},
 		parseDOM: [{

package/dist/prosemirror/imageCommit.js

@@ -1,5 +1,5 @@
+import { allowsDirectDrawingEdit } from "../docx/imageRawXml.js";
 import { expectImageAttrs, mergeImageAttrs } from "./attrs/index.js";
-import { DRAWING_RAW_XML_MODES } from "@stll/docx-core/model";
 //#region src/prosemirror/imageCommit.ts
 const MIN_IMAGE_PX = 20;
 const MAX_IMAGE_PX = 2e3;
@@ -38,11 +38,15 @@ function isFloatingImage(node) {
 		"through"
 	].includes(wrapType) : false);
 }
-/** Resolve the image node at `pmPos`, or null if it isn't an image. */
+/**
+* Resolve the image node at `pmPos`, or null if it isn't an image or is one
+* whose raw XML says more than the model does. Refusing the node leaves the
+* rest of the document editable.
+*/
 function imageNodeAt(view, pmPos) {
 	const node = view.state.doc.nodeAt(pmPos);
 	if (!node || node.type.name !== "image") return null;
-	if (expectImageAttrs(node)._docxRawXmlMode === DRAWING_RAW_XML_MODES.PRESERVE_ONLY) return null;
+	if (!allowsDirectDrawingEdit(expectImageAttrs(node)._docxRawXmlMode)) return null;
 	return node;
 }
 /**

package/dist/prosemirror/listMarker.d.ts

@@ -1,5 +1,6 @@
 import { document_d_exports } from "../types/document.js";
 import { ParagraphAttrs } from "./schema/nodes.js";
+import { LIST_RENDERING_ATTR_KEYS } from "./listRenderingAttrs.js";
 //#region src/prosemirror/listMarker.d.ts
 type ListCounterState = {
   counters: Map<number, number[]>;
@@ -42,7 +43,6 @@ type ResolvedListTemplate = {
   components: readonly ResolvedListComponent[];
 };
 declare const MAX_LIST_LEVEL = 8;
-declare const LIST_RENDERING_ATTR_KEYS: readonly ["listIsBullet", "listIsLegal", "listNumFmt", "listMarker", "listMarkerTemplate", "listMarkerHidden", "listMarkerFormatting", "listMarkerAlignment", "listMarkerSuffix", "listMarkerAllCaps", "listImplicitChildLevelAdvances", "listMarkerSecondSlotOffsetTwips", "listLevelNumFmts", "listLevelStarts", "listAbstractNumId", "listStartOverride"];
 declare const CLEARED_LIST_RENDERING_ATTRS: Readonly<{
   listIsBullet: null;
   listIsLegal: null;

package/dist/prosemirror/listMarker.js

@@ -1,25 +1,8 @@
 import { convertBulletToUnicode } from "../docx/bulletMarkers.js";
 import { formatOoxmlCounter } from "../docx/ooxmlCounterFormatter.js";
+import { LIST_RENDERING_ATTR_KEYS } from "./listRenderingAttrs.js";
 //#region src/prosemirror/listMarker.ts
 const MAX_LIST_LEVEL = 8;
-const LIST_RENDERING_ATTR_KEYS = [
-	"listIsBullet",
-	"listIsLegal",
-	"listNumFmt",
-	"listMarker",
-	"listMarkerTemplate",
-	"listMarkerHidden",
-	"listMarkerFormatting",
-	"listMarkerAlignment",
-	"listMarkerSuffix",
-	"listMarkerAllCaps",
-	"listImplicitChildLevelAdvances",
-	"listMarkerSecondSlotOffsetTwips",
-	"listLevelNumFmts",
-	"listLevelStarts",
-	"listAbstractNumId",
-	"listStartOverride"
-];
 const CLEARED_LIST_RENDERING_ATTRS = Object.freeze({
 	listIsBullet: null,
 	listIsLegal: null,

package/dist/prosemirror/listRenderingAttrs.d.ts

@@ -0,0 +1,42 @@
+import { document_d_exports } from "../types/document.js";
+import { ParagraphAttrs } from "./schema/nodes.js";
+//#region src/prosemirror/listRenderingAttrs.d.ts
+/** `ListRendering` fields that have their own editor attr. */
+type ListRenderingAttrField = Exclude<keyof document_d_exports.ListRendering, "level" | "numId">;
+declare const LIST_RENDERING_ATTR_BY_FIELD: {
+  readonly marker: "listMarker";
+  readonly markerTemplate: "listMarkerTemplate";
+  readonly isBullet: "listIsBullet";
+  readonly isLegal: "listIsLegal";
+  readonly numFmt: "listNumFmt";
+  readonly markerHidden: "listMarkerHidden";
+  readonly markerFormatting: "listMarkerFormatting";
+  readonly markerAlignment: "listMarkerAlignment";
+  readonly markerAllCaps: "listMarkerAllCaps";
+  readonly markerSuffix: "listMarkerSuffix";
+  readonly levelNumFmts: "listLevelNumFmts";
+  readonly levelStarts: "listLevelStarts";
+  readonly abstractNumId: "listAbstractNumId";
+  readonly startOverride: "listStartOverride";
+  readonly implicitChildLevelAdvances: "listImplicitChildLevelAdvances";
+  readonly markerSecondSlotOffsetTwips: "listMarkerSecondSlotOffsetTwips";
+};
+type ListRenderingAttrKey = (typeof LIST_RENDERING_ATTR_BY_FIELD)[ListRenderingAttrField];
+declare const LIST_RENDERING_ATTR_KEYS: readonly ListRenderingAttrKey[];
+/**
+ * Editor attrs carrying `rendering`. A falsy marker, flag or format is left
+ * unset: the editor treats `null` and absent alike for those, and the parser
+ * never authors them as `false` or `""` deliberately.
+ */
+declare const listRenderingAttrPatch: (rendering: document_d_exports.ListRendering) => Partial<ParagraphAttrs>;
+type ListRenderingFromAttrsOptions = {
+  attrs: ParagraphAttrs;
+  numId: number;
+};
+/**
+ * Inverse of `listRenderingAttrPatch`. The caller decides whether the
+ * paragraph is a list item at all; this only reassembles the fields.
+ */
+declare const listRenderingFromAttrs: ({ attrs, numId }: ListRenderingFromAttrsOptions) => document_d_exports.ListRendering;
+//#endregion
+export { LIST_RENDERING_ATTR_BY_FIELD, LIST_RENDERING_ATTR_KEYS, ListRenderingAttrField, ListRenderingAttrKey, listRenderingAttrPatch, listRenderingFromAttrs };

package/dist/prosemirror/listRenderingAttrs.js

@@ -0,0 +1,80 @@
+//#region src/prosemirror/listRenderingAttrs.ts
+const LIST_RENDERING_ATTR_BY_FIELD = {
+	marker: "listMarker",
+	markerTemplate: "listMarkerTemplate",
+	isBullet: "listIsBullet",
+	isLegal: "listIsLegal",
+	numFmt: "listNumFmt",
+	markerHidden: "listMarkerHidden",
+	markerFormatting: "listMarkerFormatting",
+	markerAlignment: "listMarkerAlignment",
+	markerAllCaps: "listMarkerAllCaps",
+	markerSuffix: "listMarkerSuffix",
+	levelNumFmts: "listLevelNumFmts",
+	levelStarts: "listLevelStarts",
+	abstractNumId: "listAbstractNumId",
+	startOverride: "listStartOverride",
+	implicitChildLevelAdvances: "listImplicitChildLevelAdvances",
+	markerSecondSlotOffsetTwips: "listMarkerSecondSlotOffsetTwips"
+};
+const LIST_RENDERING_ATTR_KEYS = Object.values(LIST_RENDERING_ATTR_BY_FIELD);
+const isDefinedEntry = ([, value]) => value !== void 0;
+const definedAttrs = (patch) => Object.fromEntries(Object.entries(patch).filter(isDefinedEntry));
+const definedFields = (fields) => Object.fromEntries(Object.entries(fields).filter(isDefinedEntry));
+/**
+* Editor attrs carrying `rendering`. A falsy marker, flag or format is left
+* unset: the editor treats `null` and absent alike for those, and the parser
+* never authors them as `false` or `""` deliberately.
+*/
+const listRenderingAttrPatch = (rendering) => {
+	const patch = {
+		listMarker: rendering.marker || void 0,
+		listMarkerTemplate: rendering.markerTemplate || void 0,
+		listIsBullet: rendering.isBullet || void 0,
+		listIsLegal: rendering.isLegal || void 0,
+		listNumFmt: rendering.numFmt || void 0,
+		listMarkerHidden: rendering.markerHidden || void 0,
+		listMarkerFormatting: rendering.markerFormatting || void 0,
+		listMarkerAlignment: rendering.markerAlignment || void 0,
+		listMarkerAllCaps: rendering.markerAllCaps || void 0,
+		listMarkerSuffix: rendering.markerSuffix || void 0,
+		listLevelNumFmts: rendering.levelNumFmts || void 0,
+		listLevelStarts: rendering.levelStarts || void 0,
+		listAbstractNumId: rendering.abstractNumId,
+		listStartOverride: rendering.startOverride,
+		listImplicitChildLevelAdvances: rendering.implicitChildLevelAdvances,
+		listMarkerSecondSlotOffsetTwips: rendering.markerSecondSlotOffsetTwips
+	};
+	return definedAttrs(patch);
+};
+/**
+* Inverse of `listRenderingAttrPatch`. The caller decides whether the
+* paragraph is a list item at all; this only reassembles the fields.
+*/
+const listRenderingFromAttrs = ({ attrs, numId }) => {
+	const optional = {
+		markerTemplate: attrs.listMarkerTemplate ?? void 0,
+		isLegal: attrs.listIsLegal ?? void 0,
+		numFmt: attrs.listNumFmt ?? void 0,
+		markerHidden: attrs.listMarkerHidden ?? void 0,
+		markerFormatting: attrs.listMarkerFormatting ?? void 0,
+		markerAlignment: attrs.listMarkerAlignment ?? void 0,
+		markerAllCaps: attrs.listMarkerAllCaps ?? void 0,
+		markerSuffix: attrs.listMarkerSuffix ?? void 0,
+		levelNumFmts: attrs.listLevelNumFmts ?? void 0,
+		levelStarts: attrs.listLevelStarts ?? void 0,
+		abstractNumId: attrs.listAbstractNumId ?? void 0,
+		startOverride: attrs.listStartOverride ?? void 0,
+		implicitChildLevelAdvances: attrs.listImplicitChildLevelAdvances ?? void 0,
+		markerSecondSlotOffsetTwips: attrs.listMarkerSecondSlotOffsetTwips ?? void 0
+	};
+	return {
+		marker: attrs.listMarker ?? "",
+		level: attrs.numPr?.ilvl ?? 0,
+		numId,
+		isBullet: attrs.listIsBullet ?? false,
+		...definedFields(optional)
+	};
+};
+//#endregion
+export { LIST_RENDERING_ATTR_BY_FIELD, LIST_RENDERING_ATTR_KEYS, listRenderingAttrPatch, listRenderingFromAttrs };

package/dist/prosemirror/runFormattingInlineCarriers.d.ts

@@ -26,6 +26,21 @@ declare const RUN_FORMATTING_INLINE_ATOM_DISPOSITIONS: Readonly<{
   readonly textBoxAnchor: "not-a-run";
 }>;
 declare const runFormattingInlineControlCharacter: (node: Node) => string | null;
+/**
+ * Text an inline atom contributes to a flattened, reader-facing projection.
+ *
+ * A control-character carrier contributes its character; a field contributes its
+ * authored result, so a cross-reference reads as the text Word shows instead of
+ * vanishing. A field with no result contributes nothing: the placeholder
+ * `getFieldVisibleText` paints for the editor is a rendering decision, not
+ * document text, and one of its branches is the current date.
+ */
+declare const runFormattingInlineAtomCleanText: (node: Node) => string | null;
+/**
+ * Document text an inline atom contributes, as opposed to a control character:
+ * today a field's authored result.
+ */
+declare const runFormattingInlineAtomResultText: (node: Node) => string | null;
 declare const runFormattingInlineControlNodeName: (character: string) => string | null;
 declare const runFormattingInlineAtomDisposition: (node: Node) => RunFormattingInlineAtomDisposition | null;
 type RunFormattingCarrierRepresentation = {
@@ -74,4 +89,4 @@ declare const selectRunFormattingCarrierRepresentations: ({ doc, from, to }: Sel
 /** Deterministic visible text for one logical formatting revision carrier. */
 declare const runFormattingCarrierReviewText: (carrier: RunFormattingCarrier) => string;
 //#endregion
-export { RUN_FORMATTING_INLINE_ATOM_DISPOSITIONS, RunFormattingCarrier, RunFormattingCarrierRepresentation, RunFormattingInlineAtomDisposition, SelectedRunFormattingCarrierRepresentation, applyMarksToRunFormattingRepresentation, expandRunFormattingCarrier, runFormattingCarrierReviewText, runFormattingInlineAtomDisposition, runFormattingInlineControlCharacter, runFormattingInlineControlNodeName, selectRunFormattingCarrierRepresentations };
+export { RUN_FORMATTING_INLINE_ATOM_DISPOSITIONS, RunFormattingCarrier, RunFormattingCarrierRepresentation, RunFormattingInlineAtomDisposition, SelectedRunFormattingCarrierRepresentation, applyMarksToRunFormattingRepresentation, expandRunFormattingCarrier, runFormattingCarrierReviewText, runFormattingInlineAtomCleanText, runFormattingInlineAtomDisposition, runFormattingInlineAtomResultText, runFormattingInlineControlCharacter, runFormattingInlineControlNodeName, selectRunFormattingCarrierRepresentations };

package/dist/prosemirror/runFormattingInlineCarriers.js

@@ -42,6 +42,25 @@ const runFormattingInlineControlCharacter = (node) => {
 	if (disposition === null) return null;
 	return CONTROL_CHARACTER_BY_DISPOSITION[disposition] ?? null;
 };
+/**
+* Text an inline atom contributes to a flattened, reader-facing projection.
+*
+* A control-character carrier contributes its character; a field contributes its
+* authored result, so a cross-reference reads as the text Word shows instead of
+* vanishing. A field with no result contributes nothing: the placeholder
+* `getFieldVisibleText` paints for the editor is a rendering decision, not
+* document text, and one of its branches is the current date.
+*/
+const runFormattingInlineAtomCleanText = (node) => {
+	const disposition = runFormattingInlineAtomDisposition(node);
+	if (disposition === null) return null;
+	return runFormattingInlineAtomResultText(node) ?? CONTROL_CHARACTER_BY_DISPOSITION[disposition];
+};
+/**
+* Document text an inline atom contributes, as opposed to a control character:
+* today a field's authored result.
+*/
+const runFormattingInlineAtomResultText = (node) => runFormattingInlineAtomDisposition(node) === "field-run" ? expectFieldAttrs(node).displayText ?? "" : null;
 const runFormattingInlineControlNodeName = (character) => {
 	return Object.entries(RUN_FORMATTING_INLINE_ATOM_DISPOSITIONS).find(([, disposition]) => CONTROL_CHARACTER_BY_DISPOSITION[disposition] === character)?.[0] ?? null;
 };
@@ -148,4 +167,4 @@ const runFormattingCarrierReviewText = (carrier) => {
 	}
 };
 //#endregion
-export { RUN_FORMATTING_INLINE_ATOM_DISPOSITIONS, applyMarksToRunFormattingRepresentation, expandRunFormattingCarrier, runFormattingCarrierReviewText, runFormattingInlineAtomDisposition, runFormattingInlineControlCharacter, runFormattingInlineControlNodeName, selectRunFormattingCarrierRepresentations };
+export { RUN_FORMATTING_INLINE_ATOM_DISPOSITIONS, applyMarksToRunFormattingRepresentation, expandRunFormattingCarrier, runFormattingCarrierReviewText, runFormattingInlineAtomCleanText, runFormattingInlineAtomDisposition, runFormattingInlineAtomResultText, runFormattingInlineControlCharacter, runFormattingInlineControlNodeName, selectRunFormattingCarrierRepresentations };

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

@@ -201,7 +201,7 @@ type RunFormattingOverrideAttrs = {
   position?: 0;
   rtl?: false;
   scale?: 100;
-  shading?: ShadingProperties & {
+  shading?: Omit<ShadingProperties, "pattern"> & {
     pattern: "nil";
   };
   spacing?: 0;

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

@@ -292,10 +292,25 @@ type ImageAttrs = {
   cropRight?: number;
   cropBottom?: number;
   cropLeft?: number;
+  /**
+   * `wp:effectExtent` reservation, in EMU — not pixels like `dist*` above.
+   * Nothing renders it, and `emuToPixels` rounds (12700 EMU would land back
+   * as 9525), so the editor carries the authored units untouched.
+   */
+  paddingTop?: number;
+  paddingRight?: number;
+  paddingBottom?: number;
+  paddingLeft?: number;
   /** Position for floating images (horizontal and vertical alignment) */
   position?: ImagePositionAttrs;
   /** Use the containing table cell as the anchor's positioning scope (the OOXML default). */
   layoutInCell?: boolean;
+  /**
+   * Authored `a:graphicFrameLocks`. Carried through the editor so a resize,
+   * which forces the serializer to regenerate DrawingML, cannot silently
+   * relax a lock the author set.
+   */
+  frameLocks?: document_d_exports.ImageFrameLocks;
   /** Border width in pixels */
   borderWidth?: number;
   /** Border color as CSS color string */
@@ -312,6 +327,11 @@ type ImageAttrs = {
   _docxRawXml?: string;
   /** Raw XML preserved without an editable image projection. */
   _docxRawXmlMode?: document_d_exports.DrawingRawXmlMode;
+  /**
+   * The fingerprint captured with `_docxRawXml`. A preview-only drawing must
+   * compare against this rather than re-baseline on its own edited projection.
+   */
+  _docxRawImageFingerprint?: string;
   /** Embedded-object previews use their authored box as the exact line height. */
   _docxObjectPreview?: boolean;
 };

package/dist/prosemirror/styles/resolvedStyleAttrs.js

@@ -2,6 +2,7 @@ import { computeListRendering, numberingLevelHasMarkerSlot } from "../../docx/nu
 import { tableOfContentsStyleLevel } from "../../utils/tableOfContentsStyle.js";
 import { setAutospacingBaseValue } from "../autospacingBase.js";
 import { CLEARED_LIST_RENDERING_ATTRS } from "../listMarker.js";
+import { listRenderingAttrPatch } from "../listRenderingAttrs.js";
 //#region src/prosemirror/styles/resolvedStyleAttrs.ts
 /**
 * Shared helper for projecting a resolved paragraph style onto ProseMirror
@@ -103,20 +104,7 @@ function listAttrsFromNumbering(numPr, numbering) {
 	return {
 		...CLEARED_LIST_RENDERING_ATTRS,
 		numPr: targetNumPr,
-		listNumFmt: rendering?.numFmt ?? null,
-		listIsBullet: rendering?.isBullet ?? null,
-		listIsLegal: rendering?.isLegal ?? null,
-		listMarker: rendering?.marker ?? null,
-		listMarkerTemplate: rendering?.markerTemplate ?? null,
-		listMarkerHidden: rendering?.markerHidden ?? null,
-		listMarkerFormatting: rendering?.markerFormatting ?? null,
-		listMarkerAlignment: rendering?.markerAlignment ?? null,
-		listMarkerSuffix: rendering?.markerSuffix ?? null,
-		listMarkerAllCaps: rendering?.markerAllCaps ?? null,
-		listLevelNumFmts: rendering?.levelNumFmts ?? null,
-		listLevelStarts: rendering?.levelStarts ?? null,
-		listAbstractNumId: rendering?.abstractNumId ?? null,
-		listStartOverride: rendering?.startOverride ?? null
+		...rendering && listRenderingAttrPatch(rendering)
 	};
 }
 /** Recompute every level-dependent attr when a paragraph changes list level. */

package/dist/utils/mergeDocumentContent.js

@@ -85,7 +85,7 @@ function mergeDocumentContent(target, source) {
 function remapBlock(block, numIdRemap, abstractNumIdRemap) {
 	if (block.type === "paragraph") return remapParagraph(block, numIdRemap, abstractNumIdRemap);
 	if (block.type === "table") return remapTable(block, numIdRemap, abstractNumIdRemap);
-	if ("content" in block && Array.isArray(block.content)) return {
+	if (block.type === "blockSdt" && Array.isArray(block.content)) return {
 		...block,
 		content: block.content.map((child) => remapBlock(child, numIdRemap, abstractNumIdRemap))
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.39.1",
+  "version": "0.41.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",
@@ -121,7 +121,7 @@
     "perf": "bun scripts/profile-editor.ts"
   },
   "dependencies": {
-    "@stll/docx-core": "^0.20.1",
+    "@stll/docx-core": "^0.21.0",
     "@stll/docx-utils": "^0.1.0",
     "@stll/template-conditions": ">=0.4.0 <1.0.0",
     "better-result": "3.0.1",