@stll/folio-core 0.40.0 → 0.41.0

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/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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.40.0",
+  "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.2",
+    "@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",