@beyondwork/docx-react-component 1.0.129 → 1.0.130

package/dist/{chunk-XMHSGPLN.js → chunk-VRKK2CSZ.js}

@@ -8,7 +8,7 @@ import {
   getRevisionActionability,
   normalizeParsedTextDocument,
   normalizeParsedTextDocumentAsync
-} from "./chunk-JJGVE5J7.js";
+} from "./chunk-4YCWECLZ.js";
 import {
   OLE_RELATIONSHIP_TYPES,
   buildFieldRegistry,
@@ -59,7 +59,7 @@ import {
   resolveHighlightColor,
   setActiveParseTelemetryBus,
   toCanonicalNumberingInstanceId
-} from "./chunk-Q3QYGKFE.js";
+} from "./chunk-M7YRJX6V.js";
 import {
   createPersistedSourcePackage,
   decodeBytesBase64,
@@ -81,7 +81,7 @@ import {
   serializeRuntimeRevisionsIntoDocumentXml,
   serializeRuntimeRevisionsIntoStoryXml,
   splitDocumentAtReviewBoundaries
-} from "./chunk-OL2UEHRP.js";
+} from "./chunk-WUDSNHWF.js";
 import {
   DOCX_NULL_NUMBERING_INSTANCE_ID,
   WORD_NUMBERING_CONTENT_TYPE,
@@ -96,7 +96,7 @@ import {
   serializeTablePropertiesXml,
   serializeTableRowPropertiesXml,
   twip
-} from "./chunk-EB6M3GE6.js";
+} from "./chunk-FM4K4XFJ.js";
 import {
   localName,
   parseXml,
@@ -1770,6 +1770,13 @@ function buildParagraphPropertiesXml(paragraph) {
     const frameXml = buildFrameXml(paragraph.frameProperties);
     if (frameXml) parts.push(frameXml);
   }
+  if (paragraph.tabStops && paragraph.tabStops.length > 0) {
+    const tabsXml = paragraph.tabStops.map((tab) => {
+      const leaderAttr = tab.leader ? ` w:leader="${escapeXmlAttribute(tab.leader)}"` : "";
+      return `<w:tab w:val="${escapeXmlAttribute(tab.align)}" w:pos="${twip(tab.position)}"${leaderAttr}/>`;
+    }).join("");
+    parts.push(`<w:tabs>${tabsXml}</w:tabs>`);
+  }
   if (paragraph.spacing) {
     const s = paragraph.spacing;
     const attrs = [];
@@ -1791,13 +1798,6 @@ function buildParagraphPropertiesXml(paragraph) {
   if (paragraph.alignment) {
     parts.push(`<w:jc w:val="${escapeXmlAttribute(paragraph.alignment)}"/>`);
   }
-  if (paragraph.tabStops && paragraph.tabStops.length > 0) {
-    const tabsXml = paragraph.tabStops.map((tab) => {
-      const leaderAttr = tab.leader ? ` w:leader="${escapeXmlAttribute(tab.leader)}"` : "";
-      return `<w:tab w:val="${tab.align}" w:pos="${twip(tab.position)}"${leaderAttr}/>`;
-    }).join("");
-    parts.push(`<w:tabs>${tabsXml}</w:tabs>`);
-  }
   return parts.length > 0 ? `<w:pPr>${parts.join("")}</w:pPr>` : "";
 }
 function serializeInlineNode(node) {
@@ -1866,51 +1866,60 @@ function buildRunPropertiesXml(marks) {
   if (!marks || marks.length === 0) {
     return "";
   }
+  const orderedTypes = [
+    "fontFamily",
+    "bold",
+    "italic",
+    "allCaps",
+    "smallCaps",
+    "strikethrough",
+    "doubleStrikethrough",
+    "textColor",
+    "fontSize",
+    "highlight",
+    "underline",
+    "backgroundColor"
+  ];
   const parts = [];
-  for (const mark of marks) {
-    switch (mark.type) {
-      case "bold":
-        parts.push("<w:b/>");
-        break;
-      case "italic":
-        parts.push("<w:i/>");
-        break;
-      case "underline":
-        parts.push('<w:u w:val="single"/>');
-        break;
-      case "strikethrough":
-        parts.push("<w:strike/>");
-        break;
-      case "doubleStrikethrough":
-        parts.push("<w:dstrike/>");
-        break;
-      case "fontFamily":
-        parts.push(`<w:rFonts w:ascii="${escapeXmlAttribute(mark.val)}" w:hAnsi="${escapeXmlAttribute(mark.val)}"/>`);
-        break;
-      case "fontSize":
-        parts.push(`<w:sz w:val="${twip(mark.val)}"/>`);
-        break;
-      case "textColor":
-        parts.push(`<w:color w:val="${escapeXmlAttribute(mark.color)}"/>`);
-        break;
-      case "highlight":
-        parts.push(`<w:highlight w:val="${escapeXmlAttribute(mark.val)}"/>`);
-        break;
-      case "backgroundColor":
-        parts.push(`<w:shd w:val="clear" w:color="auto" w:fill="${escapeXmlAttribute(mark.color)}"/>`);
-        break;
-      case "smallCaps":
-        parts.push("<w:smallCaps/>");
-        break;
-      case "allCaps":
-        parts.push("<w:caps/>");
-        break;
-      default:
-        break;
+  for (const type of orderedTypes) {
+    for (const mark of marks) {
+      if (mark.type !== type) continue;
+      const xml = serializeRunPropertyMark(mark);
+      if (xml) parts.push(xml);
     }
   }
   return parts.length > 0 ? `<w:rPr>${parts.join("")}</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 "fontFamily":
+      return `<w:rFonts w:ascii="${escapeXmlAttribute(mark.val)}" w:hAnsi="${escapeXmlAttribute(mark.val)}"/>`;
+    case "fontSize":
+      return `<w:sz w:val="${twip(mark.val)}"/>`;
+    case "textColor":
+      return `<w:color w:val="${escapeXmlAttribute(mark.color)}"/>`;
+    case "highlight":
+      return `<w:highlight w:val="${escapeXmlAttribute(mark.val)}"/>`;
+    case "backgroundColor":
+      return `<w:shd w:val="clear" w:color="auto" w:fill="${escapeXmlAttribute(mark.color)}"/>`;
+    case "smallCaps":
+      return "<w:smallCaps/>";
+    case "allCaps":
+      return "<w:caps/>";
+    default:
+      return "";
+  }
+}
 function requiresPreservedSpace(text) {
   return text.length > 0 && (text[0] === " " || text[text.length - 1] === " " || text.includes("  "));
 }
@@ -2084,9 +2093,6 @@ function buildParagraphPropertiesXml2(paragraph) {
     const frameXml = buildFrameXml(paragraph.frameProperties);
     if (frameXml) parts.push(frameXml);
   }
-  if (paragraph.alignment) {
-    parts.push(`<w:jc w:val="${escapeXmlAttribute(paragraph.alignment)}"/>`);
-  }
   if (paragraph.spacing) {
     const attrs = [];
     if (paragraph.spacing.before !== void 0) attrs.push(`w:before="${twip(paragraph.spacing.before)}"`);
@@ -2107,6 +2113,9 @@ function buildParagraphPropertiesXml2(paragraph) {
       parts.push(`<w:ind ${attrs.join(" ")}/>`);
     }
   }
+  if (paragraph.alignment) {
+    parts.push(`<w:jc w:val="${escapeXmlAttribute(paragraph.alignment)}"/>`);
+  }
   return parts.length > 0 ? `<w:pPr>${parts.join("")}</w:pPr>` : "";
 }
 function serializeInlineNode2(node) {
@@ -2167,47 +2176,59 @@ function buildRunPropertiesXml2(marks) {
   if (!marks || marks.length === 0) {
     return "";
   }
-  const parts = [];
+  const orderedTypes = [
+    "fontFamily",
+    "bold",
+    "italic",
+    "allCaps",
+    "smallCaps",
+    "strikethrough",
+    "doubleStrikethrough",
+    "textColor",
+    "fontSize",
+    "underline"
+  ];
+  const supportedTypes = new Set(orderedTypes);
   for (const mark of marks) {
-    switch (mark.type) {
-      case "bold":
-        parts.push("<w:b/>");
-        break;
-      case "italic":
-        parts.push("<w:i/>");
-        break;
-      case "underline":
-        parts.push('<w:u w:val="single"/>');
-        break;
-      case "strikethrough":
-        parts.push("<w:strike/>");
-        break;
-      case "doubleStrikethrough":
-        parts.push("<w:dstrike/>");
-        break;
-      case "fontFamily":
-        parts.push(
-          `<w:rFonts w:ascii="${escapeXmlAttribute(mark.val)}" w:hAnsi="${escapeXmlAttribute(mark.val)}"/>`
-        );
-        break;
-      case "fontSize":
-        parts.push(`<w:sz w:val="${twip(mark.val)}"/>`);
-        break;
-      case "textColor":
-        parts.push(`<w:color w:val="${escapeXmlAttribute(mark.color)}"/>`);
-        break;
-      case "smallCaps":
-        parts.push("<w:smallCaps/>");
-        break;
-      case "allCaps":
-        parts.push("<w:caps/>");
-        break;
-      default:
-        throw new Error(`Cannot safely serialize ${mark.type} marks in note sub-parts.`);
+    if (!supportedTypes.has(mark.type)) {
+      throw new Error(`Cannot safely serialize ${mark.type} marks in note sub-parts.`);
+    }
+  }
+  const parts = [];
+  for (const type of orderedTypes) {
+    for (const mark of marks) {
+      if (mark.type !== type) continue;
+      parts.push(serializeRunPropertyMark2(mark));
     }
   }
   return parts.length > 0 ? `<w:rPr>${parts.join("")}</w:rPr>` : "";
 }
+function serializeRunPropertyMark2(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 "fontFamily":
+      return `<w:rFonts w:ascii="${escapeXmlAttribute(mark.val)}" w:hAnsi="${escapeXmlAttribute(mark.val)}"/>`;
+    case "fontSize":
+      return `<w:sz w:val="${twip(mark.val)}"/>`;
+    case "textColor":
+      return `<w:color w:val="${escapeXmlAttribute(mark.color)}"/>`;
+    case "smallCaps":
+      return "<w:smallCaps/>";
+    case "allCaps":
+      return "<w:caps/>";
+    default:
+      throw new Error(`Cannot safely serialize ${mark.type} marks in note sub-parts.`);
+  }
+}
 function compareNoteIds(left, right) {
   return Number.parseInt(left.noteId, 10) - Number.parseInt(right.noteId, 10);
 }

package/dist/{chunk-OL2UEHRP.js → chunk-WUDSNHWF.js}

@@ -1,6 +1,6 @@
 import {
   escapeXmlAttribute
-} from "./chunk-EB6M3GE6.js";
+} from "./chunk-FM4K4XFJ.js";
 import {
   localName,
   parseXmlWithOffsets