@beyondwork/docx-react-component 1.0.128 → 1.0.130

package/dist/{chunk-YD2JE54B.js → chunk-ZVC23LKV.js}

@@ -1,6 +1,6 @@
 import {
   extractBookmarksFromBodyXml
-} from "./chunk-4YJVRIUB.js";
+} from "./chunk-M7YRJX6V.js";
 
 // src/legal/document-root.ts
 function resolveWalkableRoot(document) {

package/dist/compare.cjs

@@ -3987,26 +3987,35 @@ function buildParagraphPropertiesXml(paragraph) {
     if (frameXml) children.push(frameXml);
   }
   pushOnOffParagraphProperty(children, "widowControl", paragraph.widowControl);
-  if (paragraph.outlineLevel !== void 0) {
-    children.push(`<w:outlineLvl w:val="${paragraph.outlineLevel}"/>`);
-  }
   if (paragraph.numbering) {
     children.push(serializeParagraphNumberingProperties(paragraph.numbering));
   }
+  pushOnOffParagraphProperty(children, "suppressLineNumbers", paragraph.suppressLineNumbers);
+  if (paragraph.borders) {
+    const bordersXml = serializeParagraphBorders(paragraph.borders);
+    if (bordersXml) children.push(bordersXml);
+  }
+  if (paragraph.shading) {
+    const shadingXml = serializeParagraphShading(paragraph.shading);
+    if (shadingXml) children.push(shadingXml);
+  }
+  if (paragraph.tabStops && paragraph.tabStops.length > 0) {
+    const tabsXml = paragraph.tabStops.map((tab) => {
+      const leaderAttr = tab.leader ? ` w:leader="${escapeXmlAttribute2(tab.leader)}"` : "";
+      return `<w:tab w:val="${escapeXmlAttribute2(tab.align)}" w:pos="${twip(tab.position)}"${leaderAttr}/>`;
+    }).join("");
+    children.push(`<w:tabs>${tabsXml}</w:tabs>`);
+  }
+  pushOnOffParagraphProperty(children, "bidi", paragraph.bidi);
   if (paragraph.spacing) {
     const s = paragraph.spacing;
     const attrs = [];
     if (s.before !== void 0) attrs.push(`w:before="${twip(s.before)}"`);
     if (s.after !== void 0) attrs.push(`w:after="${twip(s.after)}"`);
     if (s.line !== void 0) attrs.push(`w:line="${twip(s.line)}"`);
-    if (s.lineRule !== void 0) attrs.push(`w:lineRule="${s.lineRule}"`);
+    if (s.lineRule !== void 0) attrs.push(`w:lineRule="${escapeXmlAttribute2(s.lineRule)}"`);
     if (attrs.length > 0) children.push(`<w:spacing ${attrs.join(" ")}/>`);
   }
-  if (paragraph.contextualSpacing === true) {
-    children.push("<w:contextualSpacing/>");
-  } else if (paragraph.contextualSpacing === false) {
-    children.push(`<w:contextualSpacing w:val="false"/>`);
-  }
   if (paragraph.indentation) {
     const ind = paragraph.indentation;
     const attrs = [];
@@ -4016,33 +4025,20 @@ function buildParagraphPropertiesXml(paragraph) {
     if (ind.hanging !== void 0) attrs.push(`w:hanging="${twip(ind.hanging)}"`);
     if (attrs.length > 0) children.push(`<w:ind ${attrs.join(" ")}/>`);
   }
-  if (paragraph.alignment) {
-    children.push(`<w:jc w:val="${paragraph.alignment}"/>`);
+  if (paragraph.contextualSpacing === true) {
+    children.push("<w:contextualSpacing/>");
+  } else if (paragraph.contextualSpacing === false) {
+    children.push(`<w:contextualSpacing w:val="false"/>`);
   }
-  if (paragraph.borders) {
-    const bordersXml = serializeParagraphBorders(paragraph.borders);
-    if (bordersXml) {
-      children.push(bordersXml);
-    }
+  if (paragraph.alignment) {
+    children.push(`<w:jc w:val="${escapeXmlAttribute2(paragraph.alignment)}"/>`);
   }
-  if (paragraph.shading) {
-    const shadingXml = serializeParagraphShading(paragraph.shading);
-    if (shadingXml) {
-      children.push(shadingXml);
-    }
+  if (paragraph.outlineLevel !== void 0) {
+    children.push(`<w:outlineLvl w:val="${paragraph.outlineLevel}"/>`);
   }
-  pushOnOffParagraphProperty(children, "bidi", paragraph.bidi);
-  pushOnOffParagraphProperty(children, "suppressLineNumbers", paragraph.suppressLineNumbers);
   if (paragraph.cnfStyle) {
     children.push(`<w:cnfStyle w:val="${escapeXmlAttribute2(paragraph.cnfStyle)}"/>`);
   }
-  if (paragraph.tabStops && paragraph.tabStops.length > 0) {
-    const tabsXml = paragraph.tabStops.map((tab) => {
-      const leaderAttr = tab.leader ? ` w:leader="${tab.leader}"` : "";
-      return `<w:tab w:val="${tab.align}" w:pos="${twip(tab.position)}"${leaderAttr}/>`;
-    }).join("");
-    children.push(`<w:tabs>${tabsXml}</w:tabs>`);
-  }
   if (children.length === 0) return "";
   return `<w:pPr>${children.join("")}</w:pPr>`;
 }
@@ -4607,79 +4603,86 @@ function serializeRunProperties(marks) {
   if (!marks || marks.length === 0) {
     return "";
   }
+  const orderedTypes = [
+    "fontFamily",
+    "bold",
+    "italic",
+    "allCaps",
+    "smallCaps",
+    "strikethrough",
+    "doubleStrikethrough",
+    "shadow",
+    "emboss",
+    "imprint",
+    "vanish",
+    "textColor",
+    "charSpacing",
+    "kerning",
+    "position",
+    "fontSize",
+    "highlight",
+    "underline",
+    "backgroundColor",
+    "lang",
+    "textFill"
+  ];
   const markParts = [];
-  for (const mark of marks) {
-    switch (mark.type) {
-      case "bold":
-        markParts.push("<w:b/>");
-        break;
-      case "italic":
-        markParts.push("<w:i/>");
-        break;
-      case "underline":
-        markParts.push(`<w:u w:val="single"/>`);
-        break;
-      case "strikethrough":
-        markParts.push("<w:strike/>");
-        break;
-      case "doubleStrikethrough":
-        markParts.push("<w:dstrike/>");
-        break;
-      case "vanish":
-        markParts.push("<w:vanish/>");
-        break;
-      case "lang":
-        markParts.push(`<w:lang w:val="${escapeXmlAttribute2(mark.val)}"/>`);
-        break;
-      case "highlight":
-        markParts.push(`<w:highlight w:val="${escapeXmlAttribute2(mark.val)}"/>`);
-        break;
-      case "backgroundColor":
-        markParts.push(
-          `<w:shd w:val="clear" w:color="auto" w:fill="${escapeXmlAttribute2(mark.color)}"/>`
-        );
-        break;
-      case "charSpacing":
-        markParts.push(`<w:spacing w:val="${mark.val}"/>`);
-        break;
-      case "kerning":
-        markParts.push(`<w:kern w:val="${mark.val}"/>`);
-        break;
-      case "emboss":
-        markParts.push("<w:emboss/>");
-        break;
-      case "imprint":
-        markParts.push("<w:imprint/>");
-        break;
-      case "shadow":
-        markParts.push("<w:shadow/>");
-        break;
-      case "position":
-        markParts.push(`<w:position w:val="${mark.val}"/>`);
-        break;
-      case "textFill":
-        markParts.push(mark.xml);
-        break;
-      case "fontFamily":
-        markParts.push(`<w:rFonts w:ascii="${escapeXmlAttribute2(mark.val)}" w:hAnsi="${escapeXmlAttribute2(mark.val)}"/>`);
-        break;
-      case "fontSize":
-        markParts.push(`<w:sz w:val="${mark.val}"/>`);
-        break;
-      case "textColor":
-        markParts.push(`<w:color w:val="${escapeXmlAttribute2(mark.color)}"/>`);
-        break;
-      case "smallCaps":
-        markParts.push("<w:smallCaps/>");
-        break;
-      case "allCaps":
-        markParts.push("<w:caps/>");
-        break;
+  for (const type of orderedTypes) {
+    for (const mark of marks) {
+      if (mark.type !== type) continue;
+      const xml = serializeRunPropertyMark(mark);
+      if (xml) markParts.push(xml);
     }
   }
   const children = markParts.join("");
   return children.length > 0 ? `<w:rPr>${children}</w:rPr>` : "";
 }
+function serializeRunPropertyMark(mark) {
+  switch (mark.type) {
+    case "bold":
+      return "<w:b/>";
+    case "italic":
+      return "<w:i/>";
+    case "underline":
+      return `<w:u w:val="single"/>`;
+    case "strikethrough":
+      return "<w:strike/>";
+    case "doubleStrikethrough":
+      return "<w:dstrike/>";
+    case "vanish":
+      return "<w:vanish/>";
+    case "lang":
+      return `<w:lang w:val="${escapeXmlAttribute2(mark.val)}"/>`;
+    case "highlight":
+      return `<w:highlight w:val="${escapeXmlAttribute2(mark.val)}"/>`;
+    case "backgroundColor":
+      return `<w:shd w:val="clear" w:color="auto" w:fill="${escapeXmlAttribute2(mark.color)}"/>`;
+    case "charSpacing":
+      return `<w:spacing w:val="${mark.val}"/>`;
+    case "kerning":
+      return `<w:kern w:val="${mark.val}"/>`;
+    case "emboss":
+      return "<w:emboss/>";
+    case "imprint":
+      return "<w:imprint/>";
+    case "shadow":
+      return "<w:shadow/>";
+    case "position":
+      return `<w:position w:val="${mark.val}"/>`;
+    case "textFill":
+      return mark.xml;
+    case "fontFamily":
+      return `<w:rFonts w:ascii="${escapeXmlAttribute2(mark.val)}" w:hAnsi="${escapeXmlAttribute2(mark.val)}"/>`;
+    case "fontSize":
+      return `<w:sz w:val="${mark.val}"/>`;
+    case "textColor":
+      return `<w:color w:val="${escapeXmlAttribute2(mark.color)}"/>`;
+    case "smallCaps":
+      return "<w:smallCaps/>";
+    case "allCaps":
+      return "<w:caps/>";
+  }
+}
 function requiresPreservedSpace(text) {
   return /^\s/.test(text) || /\s$/.test(text) || text.includes("  ");
 }

package/dist/compare.d.cts

@@ -1,4 +1,4 @@
-import { C as CanonicalDocument, B as BlockNode } from './canonical-document-CXCFCbAz.cjs';
+import { C as CanonicalDocument, B as BlockNode } from './canonical-document-BMtONpgf.cjs';
 
 type OpcCompressionMethod = "store" | "deflate";
 type OpcSurfaceKind = "content" | "relationships" | "content-types";

package/dist/compare.d.ts

@@ -1,4 +1,4 @@
-import { C as CanonicalDocument, B as BlockNode } from './canonical-document-CXCFCbAz.js';
+import { C as CanonicalDocument, B as BlockNode } from './canonical-document-BMtONpgf.js';
 
 type OpcCompressionMethod = "store" | "deflate";
 type OpcSurfaceKind = "content" | "relationships" | "content-types";

package/dist/compare.js

@@ -1,6 +1,6 @@
 import {
   createCommentStoreFromRuntimeComments
-} from "./chunk-CX42VC67.js";
+} from "./chunk-SYQWQ6FE.js";
 import "./chunk-OYGMRRR7.js";
 import {
   createCommentExportIdMap,
@@ -10,12 +10,12 @@ import {
   serializeMergedCommentsXml,
   serializeRuntimeRevisionsIntoDocumentXml,
   splitDocumentAtReviewBoundaries
-} from "./chunk-OL2UEHRP.js";
+} from "./chunk-WUDSNHWF.js";
 import {
   WORD_NUMBERING_CONTENT_TYPE,
   serializeMainDocument,
   serializeNumberingXml
-} from "./chunk-EB6M3GE6.js";
+} from "./chunk-FM4K4XFJ.js";
 import "./chunk-IHE7YOAY.js";
 import {
   DOCX_DOCUMENT_CONTENT_TYPE,

package/dist/core/commands/formatting-commands.d.cts

@@ -1,7 +1,7 @@
 import 'prosemirror-state';
 import 'prosemirror-model';
-export { g4 as Alignment, g5 as FormattingMutationResult, g6 as FormattingOperation, g7 as TextMarkClearTarget, g8 as TextMarkRangeOperation, g9 as applyFormattingOperationToDocument, ga as applyIndentation, gb as applyTextMarkOperationToDocumentRange, gc as getFormattingStateFromRenderSnapshot, gd as isMarkActive, ge as makeSetAlignment, gf as makeSetFontFamily, gg as makeSetFontSize, gh as makeSetHighlight, gi as makeSetTextColor, gj as makeToggleAllCaps, gk as makeToggleBold, gl as makeToggleItalic, gm as makeToggleSmallCaps, gn as makeToggleStrikethrough, go as makeToggleSubscript, gp as makeToggleSuperscript, gq as makeToggleUnderline } from '../../public-types-B-CskQen.cjs';
-import '../../canonical-document-CXCFCbAz.cjs';
+export { g4 as Alignment, g5 as FormattingMutationResult, g6 as FormattingOperation, g7 as TextMarkClearTarget, g8 as TextMarkRangeOperation, g9 as applyFormattingOperationToDocument, ga as applyIndentation, gb as applyTextMarkOperationToDocumentRange, gc as getFormattingStateFromRenderSnapshot, gd as isMarkActive, ge as makeSetAlignment, gf as makeSetFontFamily, gg as makeSetFontSize, gh as makeSetHighlight, gi as makeSetTextColor, gj as makeToggleAllCaps, gk as makeToggleBold, gl as makeToggleItalic, gm as makeToggleSmallCaps, gn as makeToggleStrikethrough, go as makeToggleSubscript, gp as makeToggleSuperscript, gq as makeToggleUnderline } from '../../public-types-gvubspUI.cjs';
+import '../../canonical-document-BMtONpgf.cjs';
 import 'react';
 import 'yjs';
 import 'y-protocols/awareness';

package/dist/core/commands/formatting-commands.d.ts

@@ -1,7 +1,7 @@
 import 'prosemirror-state';
 import 'prosemirror-model';
-export { g4 as Alignment, g5 as FormattingMutationResult, g6 as FormattingOperation, g7 as TextMarkClearTarget, g8 as TextMarkRangeOperation, g9 as applyFormattingOperationToDocument, ga as applyIndentation, gb as applyTextMarkOperationToDocumentRange, gc as getFormattingStateFromRenderSnapshot, gd as isMarkActive, ge as makeSetAlignment, gf as makeSetFontFamily, gg as makeSetFontSize, gh as makeSetHighlight, gi as makeSetTextColor, gj as makeToggleAllCaps, gk as makeToggleBold, gl as makeToggleItalic, gm as makeToggleSmallCaps, gn as makeToggleStrikethrough, go as makeToggleSubscript, gp as makeToggleSuperscript, gq as makeToggleUnderline } from '../../public-types-7KZsNGE2.js';
-import '../../canonical-document-CXCFCbAz.js';
+export { g4 as Alignment, g5 as FormattingMutationResult, g6 as FormattingOperation, g7 as TextMarkClearTarget, g8 as TextMarkRangeOperation, g9 as applyFormattingOperationToDocument, ga as applyIndentation, gb as applyTextMarkOperationToDocumentRange, gc as getFormattingStateFromRenderSnapshot, gd as isMarkActive, ge as makeSetAlignment, gf as makeSetFontFamily, gg as makeSetFontSize, gh as makeSetHighlight, gi as makeSetTextColor, gj as makeToggleAllCaps, gk as makeToggleBold, gl as makeToggleItalic, gm as makeToggleSmallCaps, gn as makeToggleStrikethrough, go as makeToggleSubscript, gp as makeToggleSuperscript, gq as makeToggleUnderline } from '../../public-types-DyqnxxO9.js';
+import '../../canonical-document-BMtONpgf.js';
 import 'react';
 import 'yjs';
 import 'y-protocols/awareness';