@beyondwork/docx-react-component 1.0.122 → 1.0.124

package/dist/index.js

@@ -4,7 +4,7 @@ import {
   createSearchPlugin,
   performSearch,
   searchPluginKey
-} from "./chunk-QNGJRZ2D.js";
+} from "./chunk-4IPEZYQX.js";
 import {
   CODE_METADATA_TABLE,
   KNOWN_DIAGNOSTIC_CODES,
@@ -26,7 +26,7 @@ import {
   splitListParagraph,
   toggleBulletedList,
   toggleNumberedList
-} from "./chunk-UHQOUTAX.js";
+} from "./chunk-MPH4ZQS4.js";
 import {
   applyParagraphStyleToDocument
 } from "./chunk-6EXNNAO6.js";
@@ -37,7 +37,7 @@ import {
   setSectionPageNumberingAtSectionIndex,
   updateSectionLayoutAtSectionIndex
 } from "./chunk-M6XR534O.js";
-import "./chunk-OBCP6VTG.js";
+import "./chunk-NAMAWCXN.js";
 import {
   createRuntimeCollabSync,
   createRuntimeCommandAppliedBridge
@@ -45,7 +45,7 @@ import {
 import {
   insertPageBreak,
   insertTable
-} from "./chunk-3OFSP2IX.js";
+} from "./chunk-BOHHIVQ2.js";
 import {
   getFormattingStateFromRenderSnapshot
 } from "./chunk-Y4XZCMCS.js";
@@ -53,13 +53,13 @@ import {
   insertImage,
   repositionFloatingImage,
   resizeImage
-} from "./chunk-37SEJQ3G.js";
-import "./chunk-3OHVK2D6.js";
+} from "./chunk-RSYN6FTS.js";
+import "./chunk-IR7QV2BX.js";
 import {
   getTableStructureContext,
   tableStructureActionHandleForTarget
-} from "./chunk-XVFENXLK.js";
-import "./chunk-ZKSDVHGH.js";
+} from "./chunk-LGWNN3L2.js";
+import "./chunk-KOHQFZMM.js";
 import {
   OverlayAnchorBridgeProvider,
   PAGE_CHROME_DEFAULTS,
@@ -84,7 +84,7 @@ import {
   resolveSelectionToolRegistry,
   shouldRenderAbsoluteFloatingImageInPageOverlay,
   shouldRenderSelectionToolKind
-} from "./chunk-QFU7ZOAD.js";
+} from "./chunk-PFYUJU3Q.js";
 import {
   PREDICTED_LANE_COUNTERS,
   createInertGeometryFacet,
@@ -92,7 +92,7 @@ import {
   incrementInvalidationCounter,
   recordPerfSample,
   startPerfProbe
-} from "./chunk-GZW2ERUO.js";
+} from "./chunk-N4VIXI2Z.js";
 import {
   composeSeriesColor,
   computeStructuralHash,
@@ -106,12 +106,12 @@ import {
   resolveColor,
   tryReadLaycacheEnvelope,
   writeEnvelopeToOpcPackage
-} from "./chunk-IT2DK3A7.js";
+} from "./chunk-ZMRO6P3A.js";
 import {
   findTextMatches,
   parseCanonicalFragmentFromWordML,
   searchDocument
-} from "./chunk-PCXTMEGY.js";
+} from "./chunk-Q76XPPTA.js";
 import {
   clearLocalCursorState,
   getCursorColorForUser,
@@ -121,7 +121,7 @@ import {
 import {
   resolveChromePreset,
   resolveChromeVisibilityForPreset
-} from "./chunk-GON2DNTE.js";
+} from "./chunk-HXHQA4BU.js";
 import {
   CAPABILITY_BY_ID,
   ISSUE_METADATA_ID,
@@ -137,7 +137,7 @@ import {
   deriveCapabilities,
   sanitizeMarkdown,
   sha256Hex
-} from "./chunk-G3B2OBCZ.js";
+} from "./chunk-ZRHLLPSJ.js";
 import "./chunk-KFCQYZXR.js";
 import "./chunk-QIO6V46H.js";
 import {
@@ -145,7 +145,7 @@ import {
   getStoryBlocks,
   replaceStoryBlocks,
   stableChartId
-} from "./chunk-3TUQCHYT.js";
+} from "./chunk-H6IL5ABU.js";
 import "./chunk-CX42VC67.js";
 import {
   createDefaultCanonicalDocument,
@@ -156,14 +156,14 @@ import {
   SessionNotOpenError,
   SessionNotWiredError,
   isReopenBarrier
-} from "./chunk-S4ANOS2M.js";
+} from "./chunk-7PC6XUNO.js";
 import {
   createHmacSigner,
   createHmacVerifier,
   loadDocxSessionSync,
   signWorkflowPayloadXml,
   verifyWorkflowPayloadXml
-} from "./chunk-EMDH4IQN.js";
+} from "./chunk-4B74ETJI.js";
 import {
   EDITOR_SESSION_STATE_VERSION,
   assertEditorSessionState,
@@ -172,8 +172,8 @@ import {
   editorSessionStateFromPersistedSnapshot,
   persistedSnapshotFromEditorSessionState,
   validateEditorSessionState
-} from "./chunk-UWDWGQH5.js";
-import "./chunk-TMU7JMXX.js";
+} from "./chunk-TY4DIJO3.js";
+import "./chunk-A74Y5NE4.js";
 import {
   decodePersistedSourcePackageBytes,
   hasValidPersistedSourcePackageDigest
@@ -185,7 +185,7 @@ import {
   collectEditableTargetRefs,
   createHeaderFooterStoryKey,
   createNoteStoryKey
-} from "./chunk-TFSXOIAI.js";
+} from "./chunk-FNWKE74J.js";
 import {
   readOpcPackage
 } from "./chunk-OL2UEHRP.js";
@@ -5247,7 +5247,6 @@ var editorSchema = new Schema({
           }
         }
         const pageBreak = node.attrs.pageBreakBefore;
-        if (pageBreak) styles.push("border-top: 2px dashed rgba(0,0,0,0.1); padding-top: 8px; margin-top: 16px");
         const framePr = node.attrs.frameProperties;
         const hasPosition = typeof framePr?.xTwips === "number" || typeof framePr?.yTwips === "number" || typeof framePr?.xAlign === "string" || typeof framePr?.yAlign === "string";
         if (framePr && framePr.dropCap !== "drop" && framePr.dropCap !== "margin" && hasPosition) {
@@ -5311,15 +5310,7 @@ var editorSchema = new Schema({
         const numberingPicBulletSrc = node.attrs.numberingPicBulletSrc;
         const children = [];
         if (pageBreak) {
-          children.push([
-            "span",
-            {
-              class: "mb-2 inline-flex items-center gap-2 text-[10px] font-medium uppercase tracking-[var(--tracking-eyebrow)] text-tertiary",
-              contenteditable: "false",
-              "data-page-break-before": "true"
-            },
-            "Page break"
-          ]);
+          attrs["data-page-break-before"] = "true";
         }
         if (numberingPrefix || numberingPicBulletSrc) {
           const hasResolvedMarkerWidth = typeof numberingMarkerWidth === "number" && numberingMarkerWidth > 0;
@@ -5644,7 +5635,6 @@ var editorSchema = new Schema({
             "section",
             {
               class: "my-0 border-0 bg-transparent p-0",
-              style: "min-height:var(--wre-page-frame-height-px,1056px);position:relative",
               "data-node-type": "sdt_block",
               "data-sdt-page-break": "true"
             },
@@ -6000,6 +5990,34 @@ var editorSchema = new Schema({
         ];
       }
     },
+    textbox_inline: {
+      inline: true,
+      group: "inline",
+      content: "text*",
+      marks: "_",
+      selectable: true,
+      isolating: true,
+      attrs: {
+        label: { default: "Text box" },
+        detail: { default: null },
+        targetKey: { default: null },
+        geometry: { default: null }
+      },
+      toDOM(node) {
+        const title = node.attrs.detail ?? node.attrs.label;
+        return [
+          "span",
+          {
+            class: "inline-block min-w-[2ch] max-w-full align-middle mx-0.5 rounded-[2px] border border-border bg-surface px-1 py-0.5 text-primary",
+            "data-node-type": "textbox_inline",
+            "data-editable-target-key": node.attrs.targetKey ?? "",
+            "data-shape-geometry": node.attrs.geometry ?? "",
+            title
+          },
+          0
+        ];
+      }
+    },
     wordart_atom: {
       inline: true,
       group: "inline",
@@ -6378,16 +6396,16 @@ function buildPositionMap(surface) {
   const pmDocSize = walkBlocks(surface.blocks, 1, entries, protectedInlineEntries, { rootLevel: true });
   const runtimeStorySize = surface.storySize;
   const runtimeToPm = (runtimePos) => {
-    const firstEditable = entries.find(isRuntimeRestorableEntry);
+    const firstEditable = entries.find(isStoryRuntimeRestorableEntry);
     if (runtimePos <= 0) {
       return firstEditable?.pmStart ?? 1;
     }
     if (runtimePos >= runtimeStorySize) {
-      return lastRestorableEntry(entries)?.pmEnd ?? pmDocSize - 1;
+      return lastStoryRestorableEntry(entries)?.pmEnd ?? pmDocSize - 1;
     }
     let previous = null;
     for (const entry of entries) {
-      if (!isRuntimeRestorableEntry(entry)) {
+      if (!isStoryRuntimeRestorableEntry(entry)) {
         continue;
       }
       if (entry.runtimeStart === entry.runtimeEnd && runtimePos === entry.runtimeStart) {
@@ -6401,12 +6419,12 @@ function buildPositionMap(surface) {
       }
       previous = entry;
     }
-    return lastRestorableEntry(entries)?.pmEnd ?? 1;
+    return lastStoryRestorableEntry(entries)?.pmEnd ?? 1;
   };
   return {
     runtimeToPm,
     runtimeToPmWithContext(input) {
-      const targetEntry = input.editableTarget ? findRestorableEntryForTarget(entries, input.editableTarget) : void 0;
+      const targetEntry = input.editableTarget ? findRestorableEntryForTarget(entries, input.editableTarget, input.runtimePos) : void 0;
       if (targetEntry) {
         return pmForRuntimeInTargetEntry(targetEntry, input.runtimePos, protectedInlineEntries);
       }
@@ -6507,7 +6525,7 @@ function isEditablePmRange(entries, protectedInlineEntries, pmDocSize, runtimeSt
     if (entry.editable === false) return false;
   }
   for (const entry of protectedInlineEntries) {
-    if (pmRangeTouchesEntry(start, end, entry)) return false;
+    if (entry.editable === false && pmRangeTouchesEntry(start, end, entry)) return false;
   }
   return true;
 }
@@ -6515,9 +6533,9 @@ function protectedInlineEntryAtPm(protectedInlineEntries, pmPos) {
   return protectedInlineEntries.find((entry) => pmPos > entry.pmStart && pmPos < entry.pmEnd);
 }
 function pmForRuntimeInTargetEntry(entry, runtimePos, protectedInlineEntries) {
-  const runtimeDelta = Math.max(
-    0,
-    Math.min(runtimePos - entry.runtimeStart, entry.runtimeEnd - entry.runtimeStart)
+  const runtimeDelta = Math.min(
+    runtimePos - entry.runtimeStart,
+    entry.runtimeEnd - entry.runtimeStart
   );
   let pmPos = entry.pmStart + runtimeDelta;
   for (const protectedEntry of protectedInlineEntries) {
@@ -6546,10 +6564,13 @@ function nearestRuntimeGapPm(runtimePos, previous, next) {
 function isRuntimeRestorableEntry(entry) {
   return entry.editable !== false && entry.restorable !== false;
 }
-function lastRestorableEntry(entries) {
+function isStoryRuntimeRestorableEntry(entry) {
+  return isRuntimeRestorableEntry(entry) && entry.runtimeSpace !== "target";
+}
+function lastStoryRestorableEntry(entries) {
   for (let index = entries.length - 1; index >= 0; index -= 1) {
     const entry = entries[index];
-    if (isRuntimeRestorableEntry(entry)) {
+    if (isStoryRuntimeRestorableEntry(entry)) {
       return entry;
     }
   }
@@ -6580,27 +6601,90 @@ function walkBlocks(blocks, pmCursor, entries, protectedInlineEntries, context)
         const runtimeLength = block.to - block.from;
         const tableCell = context.tableCell ?? tableCellFromEditableTarget(block.editableTarget);
         const editable = context.editable !== false;
-        entries.push({
-          runtimeStart: block.from,
-          pmStart: pmContentStart,
-          runtimeEnd: block.to,
-          pmEnd: pmContentStart + runtimeLength,
-          editable,
-          insideTable: context.insideTable === true || context.tableCell !== void 0,
-          editableTarget: block.editableTarget,
-          textTarget: editable && tableCell ? {
-            kind: "table-paragraph",
-            tableBlockIndex: tableCell.tableBlockIndex,
-            rowIndex: tableCell.rowIndex,
-            cellIndex: tableCell.cellIndex,
-            childIndex: blockIndex,
-            paragraphStart: block.from,
-            paragraphEnd: block.to,
-            ...block.editableTarget ? { blockPath: block.editableTarget.blockPath } : {}
-          } : void 0
-        });
-        addProtectedInlineEntries(block, pmContentStart, protectedInlineEntries);
-        nextPmCursor += runtimeLength + 2;
+        const textTarget = editable && tableCell ? {
+          kind: "table-paragraph",
+          tableBlockIndex: tableCell.tableBlockIndex,
+          rowIndex: tableCell.rowIndex,
+          cellIndex: tableCell.cellIndex,
+          childIndex: blockIndex,
+          paragraphStart: block.from,
+          paragraphEnd: block.to,
+          ...block.editableTarget ? { blockPath: block.editableTarget.blockPath } : {}
+        } : void 0;
+        const insideTable = context.insideTable === true || context.tableCell !== void 0;
+        let pmSegmentCursor = pmContentStart;
+        let emittedStoryEntry = false;
+        if (block.editableTarget !== void 0) {
+          entries.push({
+            runtimeStart: block.from,
+            pmStart: pmContentStart,
+            runtimeEnd: block.from,
+            pmEnd: pmContentStart,
+            editable,
+            insideTable,
+            runtimeSpace: "target",
+            editableTarget: block.editableTarget,
+            textTarget
+          });
+        }
+        for (const segment of block.segments) {
+          const pmSize = pmSizeForSegment(segment);
+          const textBoxParagraph = firstEditableTextBoxParagraph(segment);
+          if (textBoxParagraph?.editableTarget) {
+            const textLength = Math.max(0, textBoxParagraph.textLength);
+            const textStart = pmSegmentCursor + 1;
+            entries.push({
+              runtimeStart: 0,
+              pmStart: textStart,
+              runtimeEnd: textLength,
+              pmEnd: textStart + textLength,
+              editable: true,
+              restorable: true,
+              runtimeSpace: "target",
+              editableTarget: textBoxParagraph.editableTarget
+            });
+          } else if (isStoryTextSegment(segment)) {
+            entries.push({
+              runtimeStart: segment.from,
+              pmStart: pmSegmentCursor,
+              runtimeEnd: segment.to,
+              pmEnd: pmSegmentCursor + Math.max(0, segment.to - segment.from),
+              editable,
+              insideTable,
+              editableTarget: block.editableTarget,
+              textTarget
+            });
+            emittedStoryEntry = true;
+          }
+          addProtectedInlineEntryForSegment(segment, pmSegmentCursor, protectedInlineEntries);
+          pmSegmentCursor += pmSize;
+        }
+        if (block.editableTarget !== void 0 && block.to !== block.from) {
+          entries.push({
+            runtimeStart: block.to,
+            pmStart: pmSegmentCursor,
+            runtimeEnd: block.to,
+            pmEnd: pmSegmentCursor,
+            editable,
+            insideTable,
+            runtimeSpace: "target",
+            editableTarget: block.editableTarget,
+            textTarget
+          });
+        }
+        if (!emittedStoryEntry || runtimeLength === 0) {
+          entries.push({
+            runtimeStart: block.from,
+            pmStart: pmContentStart,
+            runtimeEnd: block.to,
+            pmEnd: pmContentStart,
+            editable,
+            insideTable,
+            editableTarget: block.editableTarget,
+            textTarget
+          });
+        }
+        nextPmCursor += pmSegmentCursor - pmContentStart + 2;
         break;
       }
       case "opaque_block": {
@@ -6657,21 +6741,39 @@ function walkBlocks(blocks, pmCursor, entries, protectedInlineEntries, context)
   }
   return nextPmCursor;
 }
-function addProtectedInlineEntries(block, pmContentStart, protectedInlineEntries) {
-  for (const segment of block.segments) {
-    if (segment.kind !== "opaque_inline" && segment.kind !== "shape") {
-      continue;
-    }
-    const runtimeLength = Math.max(1, segment.to - segment.from);
-    const pmStart = pmContentStart + Math.max(0, segment.from - block.from);
-    protectedInlineEntries.push({
-      runtimeStart: segment.from,
-      pmStart,
-      runtimeEnd: segment.to,
-      pmEnd: pmStart + runtimeLength,
-      editable: false
-    });
+function pmSizeForSegment(segment) {
+  const textBoxParagraph = firstEditableTextBoxParagraph(segment);
+  if (textBoxParagraph) {
+    return Math.max(0, textBoxParagraph.textLength) + 2;
+  }
+  return Math.max(1, segment.to - segment.from);
+}
+function isStoryTextSegment(segment) {
+  return segment.kind === "text" || segment.kind === "tab" || segment.kind === "hard_break";
+}
+function firstEditableTextBoxParagraph(segment) {
+  if (segment.kind !== "shape" || segment.isTextBox !== true || segment.txbxBody?.status !== "modeled") {
+    return null;
+  }
+  return segment.txbxBody.paragraphs.find(
+    (paragraph) => paragraph.editableTarget?.editability === "editable" && paragraph.editableTarget.posture.blockers.length === 0
+  ) ?? null;
+}
+function addProtectedInlineEntryForSegment(segment, pmStart, protectedInlineEntries) {
+  if (segment.kind !== "opaque_inline" && segment.kind !== "shape") {
+    return;
+  }
+  if (firstEditableTextBoxParagraph(segment)) {
+    return;
   }
+  const runtimeLength = Math.max(1, segment.to - segment.from);
+  protectedInlineEntries.push({
+    runtimeStart: segment.from,
+    pmStart,
+    runtimeEnd: segment.to,
+    pmEnd: pmStart + runtimeLength,
+    editable: false
+  });
 }
 function hasEditableTargetInBlocks(blocks) {
   for (const block of blocks) {
@@ -6702,21 +6804,46 @@ function findInertEntryForTarget(entries, target) {
     return entry.editable === false && candidate?.targetKey === target.targetKey && candidate.storyKey === target.storyKey && candidate.blockPath === target.blockPath && candidate.leafPath === target.leafPath && candidate.kind === target.kind;
   });
 }
-function findRestorableEntryForTarget(entries, target) {
+function findRestorableEntryForTarget(entries, target, runtimePos) {
   if ("editableOwner" in target && target.editableOwner && isSyntheticLayoutContinuationTarget(target)) {
-    return findRestorableEntryForOwner(entries, target.editableOwner);
+    return findRestorableEntryForOwner(entries, target.editableOwner, runtimePos);
   }
-  return entries.find((entry) => {
+  return selectRestorableEntryForRuntime(entries, runtimePos, (entry) => {
     const candidate = entry.editableTarget;
     return isRuntimeRestorableEntry(entry) && candidate?.targetKey === target.targetKey && candidate.storyKey === target.storyKey && candidate.blockPath === target.blockPath && candidate.leafPath === target.leafPath && candidate.kind === target.kind;
   });
 }
-function findRestorableEntryForOwner(entries, owner) {
-  return entries.find((entry) => {
+function findRestorableEntryForOwner(entries, owner, runtimePos) {
+  return selectRestorableEntryForRuntime(entries, runtimePos, (entry) => {
     const candidate = entry.editableTarget;
     return isRuntimeRestorableEntry(entry) && candidate?.targetKey === owner.targetKey && candidate.storyKey === owner.storyKey && candidate.blockPath === owner.blockPath && candidate.leafPath === owner.leafPath && candidate.kind === owner.kind && candidate.commandFamily === owner.commandFamily;
   });
 }
+function selectRestorableEntryForRuntime(entries, runtimePos, predicate) {
+  const candidates = entries.filter(predicate);
+  if (candidates.length === 0 || runtimePos === void 0) {
+    return candidates[0];
+  }
+  const containing = candidates.filter(
+    (entry) => runtimePos >= entry.runtimeStart && runtimePos <= entry.runtimeEnd
+  );
+  if (containing.length > 0) {
+    return containing.sort(
+      (left, right) => left.runtimeEnd - left.runtimeStart - (right.runtimeEnd - right.runtimeStart)
+    )[0];
+  }
+  return candidates.sort((left, right) => {
+    const leftDistance = Math.min(
+      Math.abs(runtimePos - left.runtimeStart),
+      Math.abs(runtimePos - left.runtimeEnd)
+    );
+    const rightDistance = Math.min(
+      Math.abs(runtimePos - right.runtimeStart),
+      Math.abs(runtimePos - right.runtimeEnd)
+    );
+    return leftDistance - rightDistance;
+  })[0];
+}
 function isSyntheticLayoutContinuationTarget(target) {
   return target.commandFamily === "text-leaf" && target.table?.operationScope === "text" && target.table.verticalMerge === "continue" && target.posture.blockers.includes("synthetic-layout-cell");
 }
@@ -7171,6 +7298,24 @@ function buildInlineContent(segment, mediaPreviews, showUnsupportedObjectPreview
     case "opaque_inline":
       return [buildOpaqueInlineOrComplexAtom(segment, mediaPreviews, showUnsupportedObjectPreviews)];
     case "shape": {
+      const textBoxParagraph = firstEditableTextBoxParagraph2(segment);
+      if (textBoxParagraph) {
+        const content = textBoxParagraph.runs.flatMap(
+          (run) => textBoxRunToPMNodes(run)
+        );
+        const fallbackContent = content.length > 0 && textBoxParagraph.text.length > 0 ? content : textBoxParagraph.text.length > 0 ? [editorSchema.text(textBoxParagraph.text)] : [];
+        return [
+          editorSchema.nodes.textbox_inline.create(
+            {
+              label: segment.label,
+              detail: segment.detail,
+              targetKey: textBoxParagraph.editableTarget?.targetKey ?? null,
+              geometry: segment.geometry ?? null
+            },
+            fallbackContent
+          )
+        ];
+      }
       const renderInPageOverlay = renderAbsoluteFloatingObjectsInPageOverlay && shouldRenderAbsoluteFloatingImageInPageOverlay(segment.anchor);
       return [
         editorSchema.nodes.shape_atom.create({
@@ -7211,6 +7356,28 @@ function buildInlineContent(segment, mediaPreviews, showUnsupportedObjectPreview
       return [];
   }
 }
+function firstEditableTextBoxParagraph2(segment) {
+  if (segment.isTextBox !== true || segment.txbxBody?.status !== "modeled") {
+    return null;
+  }
+  return segment.txbxBody.paragraphs.find(
+    (paragraph) => paragraph.editableTarget?.editability === "editable" && paragraph.editableTarget.posture.blockers.length === 0
+  ) ?? null;
+}
+function textBoxRunToPMNodes(run) {
+  if (run.kind !== "text" || !run.text) return [];
+  const segment = {
+    segmentId: `textbox-run-${run.inlineIndex}`,
+    kind: "text",
+    from: 0,
+    to: run.textLength ?? Array.from(run.text).length,
+    text: run.text,
+    ...run.marks && run.marks.length > 0 ? { marks: run.marks } : {},
+    ...run.markAttrs ? { markAttrs: run.markAttrs } : {}
+  };
+  const marks = applyEffectiveMarks(segment, editorSchema);
+  return [editorSchema.text(run.text, marks.length > 0 ? marks : void 0)];
+}
 function buildTable(block, mediaPreviews, showUnsupportedObjectPreviews, renderAbsoluteFloatingObjectsInPageOverlay) {
   const rows = [];
   for (const row of block.rows) {
@@ -8766,13 +8933,20 @@ function createPredictedPositionMap(canonical, pendingOps) {
     },
     pmToRuntimeWithContext(pmPos) {
       let adjusted = pmPos;
-      for (const op of pendingOps) {
-        const opPmStart = canonical.runtimeToPm(op.fromRuntime);
+      for (let index = 0; index < pendingOps.length; index += 1) {
+        const op = pendingOps[index];
+        const opPmStart = canonical.runtimeToPm(
+          canonicalRuntimeForPredictedOp(pendingOps, index)
+        );
         if (adjusted > opPmStart) {
           adjusted -= opSizeDelta(op);
         }
       }
-      return canonical.pmToRuntimeWithContext(Math.max(1, adjusted));
+      const context = canonical.pmToRuntimeWithContext(Math.max(1, adjusted));
+      return {
+        ...context,
+        runtimePos: applyPendingOpsToCanonicalRuntime(context.runtimePos, pendingOps)
+      };
     },
     ...canonical.isPmRangeEditable ? {
       isPmRangeEditable(fromPm, toPm) {
@@ -8792,6 +8966,25 @@ function createPredictedPositionMap(canonical, pendingOps) {
     }
   };
 }
+function canonicalRuntimeForPredictedOp(pendingOps, opIndex) {
+  let runtimePos = pendingOps[opIndex]?.fromRuntime ?? 0;
+  for (let index = 0; index < opIndex; index += 1) {
+    const op = pendingOps[index];
+    if (op.fromRuntime <= runtimePos) {
+      runtimePos -= opSizeDelta(op);
+    }
+  }
+  return Math.max(0, runtimePos);
+}
+function applyPendingOpsToCanonicalRuntime(runtimePos, pendingOps) {
+  let transformed = runtimePos;
+  for (const op of pendingOps) {
+    if (op.fromRuntime <= transformed) {
+      transformed += opSizeDelta(op);
+    }
+  }
+  return Math.max(0, transformed);
+}
 function totalDelta(pendingOps) {
   let delta = 0;
   for (const op of pendingOps) {

package/dist/io/docx-session.cjs

@@ -14149,7 +14149,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 SIMPLE_FIELD_INSTR_RE = /<(?:\w+:)?fldSimple\b[^>]*\bw:instr\s*=\s*"([^"]*)"/gi;
+var FLD_SIMPLE_INSTR_RE = /<(?:\w+:)?fldSimple\b[^>]*(?:\bw:instr|\binstr)\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;
@@ -14168,15 +14168,11 @@ function scanBookmarkReferences(documentXml, callerAllowlist = []) {
   }
   INSTR_TEXT_RE.lastIndex = 0;
   while ((m = INSTR_TEXT_RE.exec(documentXml)) !== null) {
-    if (scanInstructionForRetainedBookmarks(m[1] ?? "", retained)) {
-      retainAllToc = true;
-    }
+    if (scanInstructionText(m[1] ?? "", retained)) retainAllToc = true;
   }
-  SIMPLE_FIELD_INSTR_RE.lastIndex = 0;
-  while ((m = SIMPLE_FIELD_INSTR_RE.exec(documentXml)) !== null) {
-    if (scanInstructionForRetainedBookmarks(m[1] ?? "", retained)) {
-      retainAllToc = true;
-    }
+  FLD_SIMPLE_INSTR_RE.lastIndex = 0;
+  while ((m = FLD_SIMPLE_INSTR_RE.exec(documentXml)) !== null) {
+    if (scanInstructionText(m[2] ?? "", retained)) retainAllToc = true;
   }
   retainRevisionBoundedBookmarks(documentXml, retained);
   return {
@@ -14185,11 +14181,11 @@ function scanBookmarkReferences(documentXml, callerAllowlist = []) {
     retainAll
   };
 }
-function scanInstructionForRetainedBookmarks(instruction, retained) {
-  const hasTocField = TOC_FIELD_RE.test(instruction);
+function scanInstructionText(instrText, retained) {
+  const hasTocField = TOC_FIELD_RE.test(instrText);
   REFLIKE_FIELD_RE.lastIndex = 0;
   let r;
-  while ((r = REFLIKE_FIELD_RE.exec(instruction)) !== null) {
+  while ((r = REFLIKE_FIELD_RE.exec(instrText)) !== null) {
     if (r[1]) retained.add(r[1]);
   }
   return hasTocField;
@@ -17696,7 +17692,7 @@ var SAFE_TABLE_FIELD_FAMILIES = /* @__PURE__ */ new Set([
   "FORMULA"
 ]);
 var RISKY_TABLE_MARKUP_RE = /<w:(ins|del|moveFrom|moveTo|rPrChange|pPrChange|tblPrChange|trPrChange|tcPrChange|sectPrChange|cellIns|cellDel|cellMerge|smartTag)\b/;
-var SIMPLE_FIELD_INSTR_RE2 = /\bw:instr="([^"]*)"/g;
+var SIMPLE_FIELD_INSTR_RE = /\bw:instr="([^"]*)"/g;
 var COMPLEX_FIELD_TOKEN_RE = /<(?:\w+:)?fldChar\b[^>]*?(?:\w+:)?fldCharType="(begin|separate|end)"[^>]*?(?:\/>|>[\s\S]*?<\/(?:\w+:)?fldChar>)|<(?:\w+:)?instrText\b[^>]*>([\s\S]*?)<\/(?:\w+:)?instrText>/gu;
 function decodeXmlEntities5(text) {
   return text.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&apos;/g, "'").replace(/&amp;/g, "&");
@@ -17737,7 +17733,7 @@ function isSafeTableFieldInstruction(instruction) {
 }
 function tableRequiresOpaquePreservation(rawXml) {
   if (RISKY_TABLE_MARKUP_RE.test(rawXml)) return true;
-  const simpleInstructions = [...rawXml.matchAll(SIMPLE_FIELD_INSTR_RE2)].map(
+  const simpleInstructions = [...rawXml.matchAll(SIMPLE_FIELD_INSTR_RE)].map(
     (match) => match[1] ?? ""
   );
   const complexInstructions = extractComplexFieldInstructionsFromRaw(rawXml);
@@ -23350,7 +23346,8 @@ function parseCommentDefinitions(commentsXml, extensions, durableIds) {
     const createdAt = normalizeImportedTimestamp2(
       readStringAttr(child, "w:date")
     );
-    const initials = readStringAttr(child, "w:initials");
+    const rawInitials = readStringAttr(child, "w:initials");
+    const initials = rawInitials !== void 0 && rawInitials.trim().length > 0 ? rawInitials : void 0;
     const paragraphNodes = child.children.filter(
       (node) => node.type === "element" && localName(node.name) === "p"
     );