@beyondwork/docx-react-component 1.0.129 → 1.0.130

package/dist/io/docx-session.cjs

@@ -2107,26 +2107,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 = [];
@@ -2136,33 +2145,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>`;
 }
@@ -2727,79 +2723,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("  ");
 }
@@ -5907,6 +5910,13 @@ function buildParagraphPropertiesXml2(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="${escapeXmlAttribute2(tab.leader)}"` : "";
+      return `<w:tab w:val="${escapeXmlAttribute2(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 = [];
@@ -5928,13 +5938,6 @@ function buildParagraphPropertiesXml2(paragraph) {
   if (paragraph.alignment) {
     parts.push(`<w:jc w:val="${escapeXmlAttribute2(paragraph.alignment)}"/>`);
   }
-  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="${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 serializeInlineNode2(node) {
@@ -6003,51 +6006,60 @@ function buildRunPropertiesXml2(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="${escapeXmlAttribute2(mark.val)}" w:hAnsi="${escapeXmlAttribute2(mark.val)}"/>`);
-        break;
-      case "fontSize":
-        parts.push(`<w:sz w:val="${twip(mark.val)}"/>`);
-        break;
-      case "textColor":
-        parts.push(`<w:color w:val="${escapeXmlAttribute2(mark.color)}"/>`);
-        break;
-      case "highlight":
-        parts.push(`<w:highlight w:val="${escapeXmlAttribute2(mark.val)}"/>`);
-        break;
-      case "backgroundColor":
-        parts.push(`<w:shd w:val="clear" w:color="auto" w:fill="${escapeXmlAttribute2(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 = serializeRunPropertyMark2(mark);
+      if (xml) parts.push(xml);
     }
   }
   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="${escapeXmlAttribute2(mark.val)}" w:hAnsi="${escapeXmlAttribute2(mark.val)}"/>`;
+    case "fontSize":
+      return `<w:sz w:val="${twip(mark.val)}"/>`;
+    case "textColor":
+      return `<w:color w:val="${escapeXmlAttribute2(mark.color)}"/>`;
+    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 "smallCaps":
+      return "<w:smallCaps/>";
+    case "allCaps":
+      return "<w:caps/>";
+    default:
+      return "";
+  }
+}
 function requiresPreservedSpace3(text) {
   return text.length > 0 && (text[0] === " " || text[text.length - 1] === " " || text.includes("  "));
 }
@@ -6221,9 +6233,6 @@ function buildParagraphPropertiesXml3(paragraph) {
     const frameXml = buildFrameXml(paragraph.frameProperties);
     if (frameXml) parts.push(frameXml);
   }
-  if (paragraph.alignment) {
-    parts.push(`<w:jc w:val="${escapeXmlAttribute2(paragraph.alignment)}"/>`);
-  }
   if (paragraph.spacing) {
     const attrs = [];
     if (paragraph.spacing.before !== void 0) attrs.push(`w:before="${twip(paragraph.spacing.before)}"`);
@@ -6244,6 +6253,9 @@ function buildParagraphPropertiesXml3(paragraph) {
       parts.push(`<w:ind ${attrs.join(" ")}/>`);
     }
   }
+  if (paragraph.alignment) {
+    parts.push(`<w:jc w:val="${escapeXmlAttribute2(paragraph.alignment)}"/>`);
+  }
   return parts.length > 0 ? `<w:pPr>${parts.join("")}</w:pPr>` : "";
 }
 function serializeInlineNode3(node) {
@@ -6304,47 +6316,59 @@ function buildRunPropertiesXml3(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="${escapeXmlAttribute2(mark.val)}" w:hAnsi="${escapeXmlAttribute2(mark.val)}"/>`
-        );
-        break;
-      case "fontSize":
-        parts.push(`<w:sz w:val="${twip(mark.val)}"/>`);
-        break;
-      case "textColor":
-        parts.push(`<w:color w:val="${escapeXmlAttribute2(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(serializeRunPropertyMark3(mark));
     }
   }
   return parts.length > 0 ? `<w:rPr>${parts.join("")}</w:rPr>` : "";
 }
+function serializeRunPropertyMark3(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="${escapeXmlAttribute2(mark.val)}" w:hAnsi="${escapeXmlAttribute2(mark.val)}"/>`;
+    case "fontSize":
+      return `<w:sz w:val="${twip(mark.val)}"/>`;
+    case "textColor":
+      return `<w:color w:val="${escapeXmlAttribute2(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);
 }
@@ -14149,8 +14173,7 @@ function resolveContentType(path, contentTypes) {
 // src/io/ooxml/parse-bookmark-references.ts
 var HYPERLINK_ANCHOR_RE = /<(?:\w+:)?hyperlink\b[^>]*\bw:anchor\s*=\s*"([^"]*)"/gi;
 var INSTR_TEXT_RE = /<(?:\w+:)?instrText\b[^>]*>([\s\S]*?)<\/(?:\w+:)?instrText>/gi;
-var FLD_SIMPLE_INSTR_DOUBLE_RE = /<(?:\w+:)?fldSimple\b[^>]*?\b(?:w:)?instr\s*=\s*"([^"]*)"/gi;
-var FLD_SIMPLE_INSTR_SINGLE_RE = /<(?:\w+:)?fldSimple\b[^>]*?\b(?:w:)?instr\s*=\s*'([^']*)'/gi;
+var FLD_SIMPLE_INSTR_RE = /<(?:\w+:)?fldSimple\b[^>]*\bw:instr\s*=\s*(["'])([\s\S]*?)\1/gi;
 var TOC_FIELD_RE = /\bTOC\b/;
 var REFLIKE_FIELD_RE = /\b(?:HYPERLINK|REF|PAGEREF|NOTEREF)\s+([A-Za-z0-9_:.\-]+)/g;
 var DATA_BINDING_RE = /<(?:\w+:)?dataBinding\b/i;
@@ -14169,21 +14192,14 @@ function scanBookmarkReferences(documentXml, callerAllowlist = []) {
   }
   INSTR_TEXT_RE.lastIndex = 0;
   while ((m = INSTR_TEXT_RE.exec(documentXml)) !== null) {
-    const instrText = m[1] ?? "";
-    scanFieldInstruction(instrText, retained, () => {
-      retainAllToc = true;
+    retainInstructionReferences(m[1] ?? "", retained, (value) => {
+      retainAllToc = retainAllToc || value;
     });
   }
-  FLD_SIMPLE_INSTR_DOUBLE_RE.lastIndex = 0;
-  while ((m = FLD_SIMPLE_INSTR_DOUBLE_RE.exec(documentXml)) !== null) {
-    scanFieldInstruction(decodeXmlAttribute(m[1] ?? ""), retained, () => {
-      retainAllToc = true;
-    });
-  }
-  FLD_SIMPLE_INSTR_SINGLE_RE.lastIndex = 0;
-  while ((m = FLD_SIMPLE_INSTR_SINGLE_RE.exec(documentXml)) !== null) {
-    scanFieldInstruction(decodeXmlAttribute(m[1] ?? ""), retained, () => {
-      retainAllToc = true;
+  FLD_SIMPLE_INSTR_RE.lastIndex = 0;
+  while ((m = FLD_SIMPLE_INSTR_RE.exec(documentXml)) !== null) {
+    retainInstructionReferences(m[2] ?? "", retained, (value) => {
+      retainAllToc = retainAllToc || value;
     });
   }
   retainRevisionBoundedBookmarks(documentXml, retained);
@@ -14193,17 +14209,14 @@ function scanBookmarkReferences(documentXml, callerAllowlist = []) {
     retainAll
   };
 }
-function scanFieldInstruction(instrText, retained, retainToc) {
-  if (TOC_FIELD_RE.test(instrText)) retainToc();
+function retainInstructionReferences(instrText, retained, setRetainAllToc) {
+  if (TOC_FIELD_RE.test(instrText)) setRetainAllToc(true);
   REFLIKE_FIELD_RE.lastIndex = 0;
   let r;
   while ((r = REFLIKE_FIELD_RE.exec(instrText)) !== null) {
     if (r[1]) retained.add(r[1]);
   }
 }
-function decodeXmlAttribute(value) {
-  return value.replace(/&quot;/g, '"').replace(/&apos;/g, "'").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&");
-}
 function retainRevisionBoundedBookmarks(documentXml, retained) {
   const starts = /* @__PURE__ */ new Map();
   BOOKMARK_START_RE.lastIndex = 0;

package/dist/io/docx-session.d.cts

@@ -1,7 +1,7 @@
-export { a as LoadDocxEditorSessionAsyncOptions, b as LoadDocxEditorSessionOptions, L as LoadedDocxEditorSession, l as loadDocxEditorSessionAsync } from '../loader-B8TKhmQi.cjs';
+export { a as LoadDocxEditorSessionAsyncOptions, b as LoadDocxEditorSessionOptions, L as LoadedDocxEditorSession, l as loadDocxEditorSessionAsync } from '../loader-DiY_ZgKl.cjs';
 import { R as RevisionStoryTargetRecord, O as OpaqueFragmentRecord } from '../canonical-document-BMtONpgf.cjs';
-import { a$ as EditorAnchorProjection } from '../public-types-B5CRoR6f.cjs';
-import '../types-BLuvZ6cQ.cjs';
+import { a$ as EditorAnchorProjection } from '../public-types-gvubspUI.cjs';
+import '../types-C4bz3kDU.cjs';
 import 'react';
 import 'yjs';
 import 'y-protocols/awareness';

package/dist/io/docx-session.d.ts

@@ -1,7 +1,7 @@
-export { a as LoadDocxEditorSessionAsyncOptions, b as LoadDocxEditorSessionOptions, L as LoadedDocxEditorSession, l as loadDocxEditorSessionAsync } from '../loader-4qsw4eIU.js';
+export { a as LoadDocxEditorSessionAsyncOptions, b as LoadDocxEditorSessionOptions, L as LoadedDocxEditorSession, l as loadDocxEditorSessionAsync } from '../loader-B-aL5HGD.js';
 import { R as RevisionStoryTargetRecord, O as OpaqueFragmentRecord } from '../canonical-document-BMtONpgf.js';
-import { a$ as EditorAnchorProjection } from '../public-types-p9b8rfy8.js';
-import '../types-Dutlyj0T.js';
+import { a$ as EditorAnchorProjection } from '../public-types-DyqnxxO9.js';
+import '../types-VWH6CRvG.js';
 import 'react';
 import 'yjs';
 import 'y-protocols/awareness';

package/dist/io/docx-session.js

@@ -2,13 +2,13 @@ import {
   loadDocxSessionAsync,
   normalizeImportedCommentThreads,
   stripCommentMarkup
-} from "../chunk-XMHSGPLN.js";
-import "../chunk-JJGVE5J7.js";
-import "../chunk-Q3QYGKFE.js";
+} from "../chunk-VRKK2CSZ.js";
+import "../chunk-4YCWECLZ.js";
+import "../chunk-M7YRJX6V.js";
 import "../chunk-4BJ6K26R.js";
-import "../chunk-5DGKFNQT.js";
-import "../chunk-OL2UEHRP.js";
-import "../chunk-EB6M3GE6.js";
+import "../chunk-A66ZVUAT.js";
+import "../chunk-WUDSNHWF.js";
+import "../chunk-FM4K4XFJ.js";
 import "../chunk-IHE7YOAY.js";
 import "../chunk-MT37IIGN.js";
 import "../chunk-UTL65BUI.js";

package/dist/legal.cjs

@@ -1017,8 +1017,7 @@ var SCOPE_MARKER_BOOKMARK_PREFIX = "bw:scope:";
 // src/io/ooxml/parse-bookmark-references.ts
 var HYPERLINK_ANCHOR_RE = /<(?:\w+:)?hyperlink\b[^>]*\bw:anchor\s*=\s*"([^"]*)"/gi;
 var INSTR_TEXT_RE = /<(?:\w+:)?instrText\b[^>]*>([\s\S]*?)<\/(?:\w+:)?instrText>/gi;
-var FLD_SIMPLE_INSTR_DOUBLE_RE = /<(?:\w+:)?fldSimple\b[^>]*?\b(?:w:)?instr\s*=\s*"([^"]*)"/gi;
-var FLD_SIMPLE_INSTR_SINGLE_RE = /<(?:\w+:)?fldSimple\b[^>]*?\b(?:w:)?instr\s*=\s*'([^']*)'/gi;
+var FLD_SIMPLE_INSTR_RE = /<(?:\w+:)?fldSimple\b[^>]*\bw:instr\s*=\s*(["'])([\s\S]*?)\1/gi;
 var TOC_FIELD_RE = /\bTOC\b/;
 var REFLIKE_FIELD_RE = /\b(?:HYPERLINK|REF|PAGEREF|NOTEREF)\s+([A-Za-z0-9_:.\-]+)/g;
 var DATA_BINDING_RE = /<(?:\w+:)?dataBinding\b/i;
@@ -1037,21 +1036,14 @@ function scanBookmarkReferences(documentXml, callerAllowlist = []) {
   }
   INSTR_TEXT_RE.lastIndex = 0;
   while ((m = INSTR_TEXT_RE.exec(documentXml)) !== null) {
-    const instrText = m[1] ?? "";
-    scanFieldInstruction(instrText, retained, () => {
-      retainAllToc = true;
+    retainInstructionReferences(m[1] ?? "", retained, (value) => {
+      retainAllToc = retainAllToc || value;
     });
   }
-  FLD_SIMPLE_INSTR_DOUBLE_RE.lastIndex = 0;
-  while ((m = FLD_SIMPLE_INSTR_DOUBLE_RE.exec(documentXml)) !== null) {
-    scanFieldInstruction(decodeXmlAttribute(m[1] ?? ""), retained, () => {
-      retainAllToc = true;
-    });
-  }
-  FLD_SIMPLE_INSTR_SINGLE_RE.lastIndex = 0;
-  while ((m = FLD_SIMPLE_INSTR_SINGLE_RE.exec(documentXml)) !== null) {
-    scanFieldInstruction(decodeXmlAttribute(m[1] ?? ""), retained, () => {
-      retainAllToc = true;
+  FLD_SIMPLE_INSTR_RE.lastIndex = 0;
+  while ((m = FLD_SIMPLE_INSTR_RE.exec(documentXml)) !== null) {
+    retainInstructionReferences(m[2] ?? "", retained, (value) => {
+      retainAllToc = retainAllToc || value;
     });
   }
   retainRevisionBoundedBookmarks(documentXml, retained);
@@ -1061,17 +1053,14 @@ function scanBookmarkReferences(documentXml, callerAllowlist = []) {
     retainAll
   };
 }
-function scanFieldInstruction(instrText, retained, retainToc) {
-  if (TOC_FIELD_RE.test(instrText)) retainToc();
+function retainInstructionReferences(instrText, retained, setRetainAllToc) {
+  if (TOC_FIELD_RE.test(instrText)) setRetainAllToc(true);
   REFLIKE_FIELD_RE.lastIndex = 0;
   let r;
   while ((r = REFLIKE_FIELD_RE.exec(instrText)) !== null) {
     if (r[1]) retained.add(r[1]);
   }
 }
-function decodeXmlAttribute(value) {
-  return value.replace(/&quot;/g, '"').replace(/&apos;/g, "'").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&");
-}
 function retainRevisionBoundedBookmarks(documentXml, retained) {
   const starts = /* @__PURE__ */ new Map();
   BOOKMARK_START_RE.lastIndex = 0;

package/dist/legal.js

@@ -4,13 +4,13 @@ import {
   isHiddenBookmarkName,
   parseBookmarksFromDocumentXml,
   resolveWalkableRoot
-} from "./chunk-YZDZ4FGR.js";
+} from "./chunk-ZVC23LKV.js";
 import {
   extractComplexFieldsFromBodyXml,
   parseFieldsFromParagraphXml,
   parseMainDocumentXml
-} from "./chunk-Q3QYGKFE.js";
-import "./chunk-5DGKFNQT.js";
+} from "./chunk-M7YRJX6V.js";
+import "./chunk-A66ZVUAT.js";
 import "./chunk-IHE7YOAY.js";
 import "./chunk-UTL65BUI.js";
 import "./chunk-DNXYUIIS.js";

package/dist/{loader-4qsw4eIU.d.ts → loader-B-aL5HGD.d.ts}

@@ -1,6 +1,6 @@
 import { C as CanonicalDocument } from './canonical-document-BMtONpgf.js';
-import { ar as EditorStateNamespace, as as EditorStateLocation, a as EditorSessionState, P as PersistedEditorSnapshot, r as EditorError, t as ProtectionSnapshot, b as ExportDocxOptions, c as ExportResult, L as LoadStage, E as EditorHostAdapter, at as LoadScheduler, o as EditorSurfaceSnapshot } from './public-types-p9b8rfy8.js';
-import { E as EmbeddedDocumentManifest, e as ProgressiveSurfaceProjector } from './types-Dutlyj0T.js';
+import { ar as EditorStateNamespace, as as EditorStateLocation, a as EditorSessionState, P as PersistedEditorSnapshot, r as EditorError, t as ProtectionSnapshot, b as ExportDocxOptions, c as ExportResult, L as LoadStage, E as EditorHostAdapter, at as LoadScheduler, o as EditorSurfaceSnapshot } from './public-types-DyqnxxO9.js';
+import { E as EmbeddedDocumentManifest, e as ProgressiveSurfaceProjector } from './types-VWH6CRvG.js';
 
 interface EditorStatePayloadNamespaceEntry {
     namespace: EditorStateNamespace;