oasis-editor 0.0.82 → 0.0.84

package/dist/{OasisEditorApp-DnKmTPKR.js → OasisEditorApp-lNYRC99y.js}

@@ -1,21 +1,148 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-import { a as assertNever, c as createSignal, b as createEditorStateFromDocument, d as createInitialEditorState, S as STANDARD_FONT_SIZES_PT, f as fontSizePxToPt, p as probeLocalFontFamilies, e as createEditorParagraphFromRuns, i as isInlineObjectRun, g as createEditorStyledRun, h as getParagraphLength, j as getParagraphText, k as getActiveZone, l as getDocumentSections, m as getActiveSectionIndex, n as getParagraphs, o as normalizeSelection, q as positionToParagraphOffset, r as paragraphOffsetToPosition, s as clampPosition, t as findParagraphIndex, u as createCollapsedSelection, v as isSelectionCollapsed, w as parseFontSizePtToPx, x as formatFontSizePt, y as createEditorParagraph, z as getBlockParagraphs, A as findParagraphTableLocation, B as buildTableCellLayout, P as PT_PER_PX, C as createEditorTableCell, D as createEditorTableRow, E as createEditorTable, F as underlineStyleToCssDecorationStyle, G as resolveImageSrc, H as listKindForTag, I as isParagraphTag, J as collectInlineRuns, K as parseParagraphStyle, L as InlineShell, M as BalloonShell, N as DocumentShell, O as createMemo, Q as buildCanvasLayoutSnapshot, R as getCaretRectFromSnapshot, T as getParagraphRectFromSnapshot, U as createComponent, V as CaretOverlay, W as Show, X as createRenderEffect, Y as style, Z as setAttribute, _ as setStyleProperty, $ as memo, a0 as template, a1 as useI18n, a2 as createEffect, a3 as insert, a4 as use, a5 as addEventListener, a6 as Dialog, a7 as delegateEvents, a8 as className, a9 as For, aa as UNDERLINE_STYLE_OPTIONS, ab as Tabs, ac as onMount, ad as onCleanup, ae as PluginUiHost, af as OasisEditorEditor, ag as OasisBrandMark, ah as setPreciseFontPreference, ai as setWelcomeSeen, aj as enablePreciseFontMode, ak as TWIPS_PER_POINT, al as PX_PER_INCH, am as TWIPS_PER_INCH, an as resolveEffectiveParagraphStyle, ao as resolveEffectiveTextStyleForParagraph, ap as EMU_PER_PX, aq as EMU_PER_PT, ar as visitRun, as as iterateFootnoteReferenceRuns, at as iterateEndnoteReferenceRuns, au as imageContentTypeDefaults, av as createEditorRun, aw as JSZip, ax as imageExtensionFromMime, ay as pxToPt$1, az as resolveFloatingObjectRect, aA as getTextBoxFloatingGeometry, aB as getPresetPathSegments, aC as projectBlocksLayout, aD as buildListLabels, aE as textStyleToFontSizePt, aF as PX_PER_POINT, aG as DEFAULT_FONT_SIZE_PX, aH as isDoubleUnderlineStyle, aI as isWavyUnderlineStyle, aJ as underlineStyleLineWidthPx, aK as underlineStyleDashArray, aL as resolveListLabel, aM as getListLabelInset, aN as getAlignedListLabelInset, aO as getParagraphBorderInsets, aP as buildSegmentTable, aQ as buildCanvasTableLayout, aR as normalizeFamily, aS as ROBOTO_FONT_FILES, aT as loadFontAsset, aU as OFFICE_COMPAT_FONT_FAMILIES, aV as buildSfnt, aW as defaultFontDecoderRegistry, aX as SfntFontProgram, aY as collectPdfFontFamilies, aZ as projectDocumentLayout, a_ as getPageContentWidth, a$ as getPageHeaderZoneTop, b0 as getPageBodyTop, b1 as getPageColumnRects, b2 as findFootnoteReference, b3 as FOOTNOTE_MARKER_GUTTER_PX, b4 as resolveImporterForFile, b5 as getDocumentSectionsCanonical, b6 as getDocumentParagraphsCanonical, b7 as getDocumentParagraphs, b8 as getDocumentPageSettings, b9 as getTableCellContentWidthForParagraph, ba as on, bb as debounce, bc as unwrap, bd as perfTimer, be as createEditorDocument, bf as resolveResizedDimensions, bg as resolveTextBoxRenderHeight, bh as getToolbarStyleState, bi as getCachedCanvasImage, bj as measureParagraphMinContentWidthPx, bk as getEditableBlocksForZone, bl as findParagraphLocation, bm as createSectionBoundaryParagraph, bn as normalizePageSettings, bo as DEFAULT_EDITOR_PAGE_SETTINGS, bp as markStart, bq as markEnd, br as getParagraphEntries, bs as getParagraphById, bt as createEditorFootnote, bu as createFootnoteReferenceRun, bv as renumberFootnotes, bw as getFootnoteDisplayMarker, bx as getHeadingLevel, by as preciseFontModeVersion, bz as isPreciseFontModeEnabled, bA as togglePreciseFontMode, bB as nextFontSizePt, bC as previousFontSizePt, bD as fontSizePtToPx, bE as createDefaultToolbarPreset, bF as MenuRegistry, bG as createToolbarRegistry, bH as Editor, bI as resolveCommandRef, bJ as commandRefName, bK as createOasisEditorClient, bL as createEditorZoom, bM as startLongTaskObserver, bN as installGlobalReport, bO as applyStoredPreciseFontPreference, bP as getWelcomeSeen, bQ as isLocalFontAccessSupported, bR as EDITOR_SCROLL_PADDING_PX, bS as Toolbar, bT as OasisEditorLoading, bU as I18nProvider, bV as createTranslator, bW as createEditorLogger, bX as registerDomStatsSurface } from "./index-BNz5Hsd-.js";
+import { v as visitRun, a as assertNever, c as createSignal, b as createEditorStateFromDocument, d as createInitialEditorState, S as STANDARD_FONT_SIZES_PT, f as fontSizePxToPt, p as probeLocalFontFamilies, e as createEditorParagraphFromRuns, i as isInlineObjectRun, g as createEditorStyledRun, h as getParagraphLength, j as getParagraphText, k as getActiveZone, l as getDocumentSections, m as getActiveSectionIndex, n as getParagraphs, o as normalizeSelection, q as positionToParagraphOffset, r as paragraphOffsetToPosition, s as clampPosition, t as findParagraphIndex, u as createCollapsedSelection, w as isSelectionCollapsed, x as parseFontSizePtToPx, y as formatFontSizePt, z as createEditorParagraph, A as getBlockParagraphs, B as findParagraphTableLocation, C as buildTableCellLayout, P as PT_PER_PX, D as createEditorTableCell, E as createEditorTableRow, F as createEditorTable, G as underlineStyleToCssDecorationStyle, H as resolveImageSrc, I as listKindForTag, J as isParagraphTag, K as collectInlineRuns, L as parseParagraphStyle, M as getRunImage, N as InlineShell, O as BalloonShell, Q as DocumentShell, R as createMemo, T as buildCanvasLayoutSnapshot, U as getCaretRectFromSnapshot, V as getParagraphRectFromSnapshot, W as createComponent, X as CaretOverlay, Y as Show, Z as createRenderEffect, _ as style, $ as setAttribute, a0 as setStyleProperty, a1 as memo, a2 as template, a3 as useI18n, a4 as createEffect, a5 as insert, a6 as use, a7 as addEventListener, a8 as Dialog, a9 as delegateEvents, aa as className, ab as For, ac as UNDERLINE_STYLE_OPTIONS, ad as Tabs, ae as onMount, af as onCleanup, ag as PluginUiHost, ah as OasisEditorEditor, ai as OasisBrandMark, aj as setPreciseFontPreference, ak as setWelcomeSeen, al as enablePreciseFontMode, am as TWIPS_PER_POINT, an as PX_PER_INCH, ao as TWIPS_PER_INCH, ap as resolveEffectiveParagraphStyle, aq as resolveEffectiveTextStyleForParagraph, ar as EMU_PER_PX, as as EMU_PER_PT, at as getRunFootnoteReference, au as getRunEndnoteReference, av as iterateFootnoteReferenceRuns, aw as iterateEndnoteReferenceRuns, ax as imageContentTypeDefaults, ay as getRunFieldChar, az as getRunFieldInstruction, aA as createEditorRun, aB as JSZip, aC as imageExtensionFromMime, aD as pxToPt$1, aE as resolveFloatingObjectRect, aF as getTextBoxFloatingGeometry, aG as getPresetPathSegments, aH as projectBlocksLayout, aI as buildListLabels, aJ as textStyleToFontSizePt, aK as PX_PER_POINT, aL as DEFAULT_FONT_SIZE_PX, aM as isDoubleUnderlineStyle, aN as isWavyUnderlineStyle, aO as underlineStyleLineWidthPx, aP as underlineStyleDashArray, aQ as resolveListLabel, aR as getListLabelInset, aS as getAlignedListLabelInset, aT as getParagraphBorderInsets, aU as buildSegmentTable, aV as buildCanvasTableLayout, aW as normalizeFamily, aX as ROBOTO_FONT_FILES, aY as loadFontAsset, aZ as OFFICE_COMPAT_FONT_FAMILIES, a_ as buildSfnt, a$ as defaultFontDecoderRegistry, b0 as SfntFontProgram, b1 as collectPdfFontFamilies, b2 as projectDocumentLayout, b3 as getPageContentWidth, b4 as getPageHeaderZoneTop, b5 as getPageBodyTop, b6 as getPageColumnRects, b7 as findFootnoteReference, b8 as FOOTNOTE_MARKER_GUTTER_PX, b9 as resolveImporterForFile, ba as getDocumentSectionsCanonical, bb as getDocumentParagraphsCanonical, bc as getDocumentParagraphs, bd as getDocumentPageSettings, be as getTableCellContentWidthForParagraph, bf as on, bg as debounce, bh as unwrap, bi as perfTimer, bj as getRunTextBox, bk as createEditorDocument, bl as resolveResizedDimensions, bm as resolveTextBoxRenderHeight, bn as getToolbarStyleState, bo as getCachedCanvasImage, bp as measureParagraphMinContentWidthPx, bq as getEditableBlocksForZone, br as findParagraphLocation, bs as createSectionBoundaryParagraph, bt as normalizePageSettings, bu as DEFAULT_EDITOR_PAGE_SETTINGS, bv as markStart, bw as markEnd, bx as getParagraphEntries, by as getParagraphById, bz as createEditorFootnote, bA as createFootnoteReferenceRun, bB as renumberFootnotes, bC as getFootnoteDisplayMarker, bD as getHeadingLevel, bE as preciseFontModeVersion, bF as isPreciseFontModeEnabled, bG as togglePreciseFontMode, bH as nextFontSizePt, bI as previousFontSizePt, bJ as fontSizePtToPx, bK as createDefaultToolbarPreset, bL as MenuRegistry, bM as createToolbarRegistry, bN as Editor, bO as resolveCommandRef, bP as commandRefName, bQ as createOasisEditorClient, bR as createEditorZoom, bS as startLongTaskObserver, bT as installGlobalReport, bU as applyStoredPreciseFontPreference, bV as getWelcomeSeen, bW as isLocalFontAccessSupported, bX as EDITOR_SCROLL_PADDING_PX, bY as Toolbar, bZ as OasisEditorLoading, b_ as I18nProvider, b$ as createTranslator, c0 as createEditorLogger, c1 as registerDomStatsSurface } from "./index-9_ibx79n.js";
+function cloneStyle(style2) {
+  return style2 ? { ...style2 } : void 0;
+}
+function stylesEqual(left, right) {
+  return JSON.stringify(left ?? null) === JSON.stringify(right ?? null);
+}
+function setBooleanStyle(style2, key, enabled) {
+  const next = { ...style2 ?? {} };
+  if (enabled) {
+    next[key] = true;
+  } else {
+    delete next[key];
+  }
+  return Object.keys(next).length > 0 ? next : void 0;
+}
+function setValueStyle(style2, key, value) {
+  const next = { ...style2 ?? {} };
+  if (value === null || value === void 0 || value === "") {
+    delete next[key];
+  } else {
+    next[key] = value;
+  }
+  return Object.keys(next).length > 0 ? next : void 0;
+}
+function setParagraphStyleValue(style2, key, value) {
+  const next = { ...style2 ?? {} };
+  if (value === null || value === void 0) {
+    delete next[key];
+  } else {
+    next[key] = value;
+  }
+  return Object.keys(next).length > 0 ? next : void 0;
+}
+function cloneTextBox(textBox) {
+  return {
+    ...textBox,
+    floating: textBox.floating ? {
+      ...textBox.floating,
+      positionH: textBox.floating.positionH ? { ...textBox.floating.positionH } : void 0,
+      positionV: textBox.floating.positionV ? { ...textBox.floating.positionV } : void 0
+    } : void 0,
+    shape: textBox.shape ? { ...textBox.shape } : void 0,
+    body: textBox.body ? { ...textBox.body } : void 0,
+    blocks: cloneBlocks(textBox.blocks)
+  };
+}
+function cloneRun(run) {
+  const base = {
+    id: run.id,
+    text: run.text,
+    styles: cloneStyle(run.styles),
+    revision: run.revision ? { ...run.revision } : void 0
+  };
+  return visitRun(run, {
+    text: () => ({ ...base, kind: "text" }),
+    image: (r) => ({ ...base, kind: "image", image: { ...r.image } }),
+    textBox: (r) => ({
+      ...base,
+      kind: "textBox",
+      textBox: cloneTextBox(r.textBox)
+    }),
+    field: (r) => ({ ...base, kind: "field", field: { ...r.field } }),
+    fieldChar: (r) => ({
+      ...base,
+      kind: "fieldChar",
+      fieldChar: { ...r.fieldChar }
+    }),
+    fieldInstruction: (r) => ({
+      ...base,
+      kind: "fieldInstruction",
+      fieldInstruction: r.fieldInstruction
+    }),
+    footnoteReference: (r) => ({
+      ...base,
+      kind: "footnoteReference",
+      footnoteReference: { ...r.footnoteReference }
+    }),
+    endnoteReference: (r) => ({
+      ...base,
+      kind: "endnoteReference",
+      endnoteReference: { ...r.endnoteReference }
+    }),
+    sym: (r) => ({ ...base, kind: "sym", sym: { ...r.sym } })
+  });
+}
+function cloneParagraph(paragraph) {
+  return {
+    ...paragraph,
+    runs: paragraph.runs.map(cloneRun),
+    style: paragraph.style ? { ...paragraph.style } : void 0,
+    list: paragraph.list ? { ...paragraph.list } : void 0
+  };
+}
+function cloneParagraphList(list) {
+  return list ? { ...list } : void 0;
+}
+function cloneParagraphs(paragraphs) {
+  return paragraphs.map(cloneParagraph);
+}
+function cloneBlocks(blocks) {
+  return blocks.map((block) => {
+    switch (block.type) {
+      case "paragraph":
+        return cloneParagraph(block);
+      case "table":
+        return {
+          ...block,
+          style: block.style ? {
+            ...block.style,
+            defaultCellMargins: block.style.defaultCellMargins ? { ...block.style.defaultCellMargins } : void 0,
+            floating: block.style.floating ? { ...block.style.floating } : void 0,
+            revisionXml: block.style.revisionXml ? [...block.style.revisionXml] : void 0
+          } : void 0,
+          tblGridChangeXml: block.tblGridChangeXml,
+          rows: block.rows.map((row) => ({
+            ...row,
+            style: row.style ? {
+              ...row.style,
+              revisionXml: row.style.revisionXml ? [...row.style.revisionXml] : void 0
+            } : void 0,
+            cells: row.cells.map((cell) => ({
+              ...cell,
+              style: cell.style ? {
+                ...cell.style,
+                revisionXml: cell.style.revisionXml ? [...cell.style.revisionXml] : void 0
+              } : void 0,
+              blocks: cloneParagraphs(cell.blocks)
+            }))
+          }))
+        };
+      default:
+        return assertNever(block, "block");
+    }
+  });
+}
 function cloneBlock(block) {
   switch (block.type) {
     case "paragraph":
       return {
         ...block,
-        runs: block.runs.map((run) => ({
-          ...run,
-          styles: run.styles ? { ...run.styles } : void 0,
-          image: run.image ? { ...run.image } : void 0,
-          field: run.field ? { ...run.field } : void 0,
-          revision: run.revision ? { ...run.revision } : void 0,
-          footnoteReference: run.footnoteReference ? { ...run.footnoteReference } : void 0,
-          endnoteReference: run.endnoteReference ? { ...run.endnoteReference } : void 0
-        })),
+        runs: block.runs.map(cloneRun),
         style: block.style ? { ...block.style } : void 0,
         list: block.list ? { ...block.list } : void 0
       };
@@ -46,15 +173,7 @@ function cloneBlock(block) {
             } : void 0,
             blocks: cell.blocks.map((paragraph) => ({
               ...paragraph,
-              runs: paragraph.runs.map((run) => ({
-                ...run,
-                styles: run.styles ? { ...run.styles } : void 0,
-                image: run.image ? { ...run.image } : void 0,
-                field: run.field ? { ...run.field } : void 0,
-                revision: run.revision ? { ...run.revision } : void 0,
-                footnoteReference: run.footnoteReference ? { ...run.footnoteReference } : void 0,
-                endnoteReference: run.endnoteReference ? { ...run.endnoteReference } : void 0
-              })),
+              runs: paragraph.runs.map(cloneRun),
               style: paragraph.style ? { ...paragraph.style } : void 0,
               list: paragraph.list ? { ...paragraph.list } : void 0
             }))
@@ -26643,115 +26762,40 @@ function createEditorFontOptions(ctx) {
     loadLocalFontFamilyOptions
   };
 }
-function cloneStyle(style2) {
-  return style2 ? { ...style2 } : void 0;
-}
-function stylesEqual(left, right) {
-  return JSON.stringify(left ?? null) === JSON.stringify(right ?? null);
-}
-function setBooleanStyle(style2, key, enabled) {
-  const next = { ...style2 ?? {} };
-  if (enabled) {
-    next[key] = true;
-  } else {
-    delete next[key];
-  }
-  return Object.keys(next).length > 0 ? next : void 0;
-}
-function setValueStyle(style2, key, value) {
-  const next = { ...style2 ?? {} };
-  if (value === null || value === void 0 || value === "") {
-    delete next[key];
-  } else {
-    next[key] = value;
-  }
-  return Object.keys(next).length > 0 ? next : void 0;
-}
-function setParagraphStyleValue(style2, key, value) {
-  const next = { ...style2 ?? {} };
-  if (value === null || value === void 0) {
-    delete next[key];
-  } else {
-    next[key] = value;
-  }
-  return Object.keys(next).length > 0 ? next : void 0;
-}
-function cloneTextBox(textBox) {
-  return {
-    ...textBox,
-    floating: textBox.floating ? {
-      ...textBox.floating,
-      positionH: textBox.floating.positionH ? { ...textBox.floating.positionH } : void 0,
-      positionV: textBox.floating.positionV ? { ...textBox.floating.positionV } : void 0
-    } : void 0,
-    shape: textBox.shape ? { ...textBox.shape } : void 0,
-    body: textBox.body ? { ...textBox.body } : void 0,
-    blocks: cloneBlocks(textBox.blocks)
-  };
-}
-function cloneRun(run) {
-  return {
-    ...run,
-    styles: cloneStyle(run.styles),
-    image: run.image ? { ...run.image } : void 0,
-    textBox: run.textBox ? cloneTextBox(run.textBox) : void 0,
-    field: run.field ? { ...run.field } : void 0,
-    fieldChar: run.fieldChar ? { ...run.fieldChar } : void 0,
-    revision: run.revision ? { ...run.revision } : void 0,
-    footnoteReference: run.footnoteReference ? { ...run.footnoteReference } : void 0,
-    endnoteReference: run.endnoteReference ? { ...run.endnoteReference } : void 0
-  };
-}
-function cloneParagraph(paragraph) {
-  return {
-    ...paragraph,
-    runs: paragraph.runs.map(cloneRun),
-    style: paragraph.style ? { ...paragraph.style } : void 0,
-    list: paragraph.list ? { ...paragraph.list } : void 0
-  };
-}
-function cloneParagraphList(list) {
-  return list ? { ...list } : void 0;
-}
-function cloneParagraphs(paragraphs) {
-  return paragraphs.map(cloneParagraph);
-}
-function cloneBlocks(blocks) {
-  return blocks.map((block) => {
-    switch (block.type) {
-      case "paragraph":
-        return cloneParagraph(block);
-      case "table":
-        return {
-          ...block,
-          style: block.style ? {
-            ...block.style,
-            defaultCellMargins: block.style.defaultCellMargins ? { ...block.style.defaultCellMargins } : void 0,
-            floating: block.style.floating ? { ...block.style.floating } : void 0,
-            revisionXml: block.style.revisionXml ? [...block.style.revisionXml] : void 0
-          } : void 0,
-          tblGridChangeXml: block.tblGridChangeXml,
-          rows: block.rows.map((row) => ({
-            ...row,
-            style: row.style ? {
-              ...row.style,
-              revisionXml: row.style.revisionXml ? [...row.style.revisionXml] : void 0
-            } : void 0,
-            cells: row.cells.map((cell) => ({
-              ...cell,
-              style: cell.style ? {
-                ...cell.style,
-                revisionXml: cell.style.revisionXml ? [...cell.style.revisionXml] : void 0
-              } : void 0,
-              blocks: cloneParagraphs(cell.blocks)
-            }))
-          }))
-        };
-      default:
-        return assertNever(block, "block");
-    }
-  });
-}
+const MERGE_KEYS = {
+  insertText: "insertText",
+  insertImage: "insertImage",
+  insertTable: "insertTable",
+  moveImage: "moveImage",
+  splitListItem: "splitListItem",
+  link: "link",
+  imageAlt: "imageAlt",
+  imageCaption: "imageCaption",
+  layoutWrapPolygon: "layoutWrapPolygon",
+  specialIndent: "specialIndent",
+  paraBorders: "paraBorders",
+  findReplace: "findReplace",
+  findReplaceAll: "findReplaceAll",
+  tableProperties: "tableProperties",
+  paragraphDialog: "paragraph-dialog",
+  fontDialog: "font-dialog",
+  copyTextByDrag: "copyTextByDrag",
+  moveTextByDrag: "moveTextByDrag",
+  collapseSelectionByClick: "collapseSelectionByClick",
+  mergeTable: "mergeTable",
+  splitTable: "splitTable",
+  insertTableColumn: "insertTableColumn",
+  deleteTableColumn: "deleteTableColumn",
+  insertTableRow: "insertTableRow",
+  deleteTableRow: "deleteTableRow",
+  tableShading: "tableShading",
+  tableBorders: "tableBorders",
+  tableWidth: "tableWidth",
+  tableAlign: "tableAlign",
+  tableCellWidth: "tableCellWidth",
+  layoutWrapPreset: "layoutWrapPreset",
+  layoutFixedPosition: "layoutFixedPosition"
+};
 function normalizeRuns(runs, fallbackStyles) {
   const merged = [];
   for (const run of runs) {
@@ -26859,7 +26903,7 @@ function expandLinkRangeInParagraph(paragraph, offset) {
   var _a, _b, _c;
   const resolved = getRunAtOffset(paragraph, offset);
   const href = (_a = resolved == null ? void 0 : resolved.run.styles) == null ? void 0 : _a.link;
-  if (!resolved || !href || resolved.run.image) {
+  if (!resolved || !href || resolved.run.kind === "image") {
     return null;
   }
   let startOffset = resolved.startOffset;
@@ -26877,14 +26921,14 @@ function expandLinkRangeInParagraph(paragraph, offset) {
   endOffset = consumed + resolved.run.text.length;
   for (let index = runIndex - 1; index >= 0; index -= 1) {
     const run = runs[index];
-    if (run.image || ((_b = run.styles) == null ? void 0 : _b.link) !== href) {
+    if (run.kind === "image" || ((_b = run.styles) == null ? void 0 : _b.link) !== href) {
       break;
     }
     startOffset -= run.text.length;
   }
   for (let index = runIndex + 1; index < runs.length; index += 1) {
     const run = runs[index];
-    if (run.image || ((_c = run.styles) == null ? void 0 : _c.link) !== href) {
+    if (run.kind === "image" || ((_c = run.styles) == null ? void 0 : _c.link) !== href) {
       break;
     }
     endOffset += run.text.length;
@@ -26908,31 +26952,13 @@ function sliceRuns(paragraph, startOffset, endOffset) {
     const overlapStart = Math.max(start, runStart);
     const overlapEnd = Math.min(end, runEnd);
     if (overlapStart < overlapEnd) {
-      const isObjectRun = isInlineObjectRun(run);
-      const piece = {
-        id: `run:${Math.random().toString(36).slice(2, 9)}`,
-        text: isObjectRun ? "" : run.text.slice(overlapStart - runStart, overlapEnd - runStart)
-      };
-      if (run.styles) {
-        piece.styles = { ...run.styles };
-      }
-      if (run.image) {
-        piece.image = { ...run.image };
-      }
-      if (run.textBox) {
-        piece.textBox = cloneTextBox(run.textBox);
-      }
-      if (run.revision) {
-        piece.revision = { ...run.revision };
-      }
-      if (run.field) {
-        piece.field = { ...run.field };
-      }
-      if (run.footnoteReference) {
-        piece.footnoteReference = { ...run.footnoteReference };
-      }
-      if (run.endnoteReference) {
-        piece.endnoteReference = { ...run.endnoteReference };
+      const piece = cloneRun(run);
+      piece.id = `run:${Math.random().toString(36).slice(2, 9)}`;
+      if (!isInlineObjectRun(run)) {
+        piece.text = run.text.slice(
+          overlapStart - runStart,
+          overlapEnd - runStart
+        );
       }
       pieces.push(piece);
     }
@@ -27503,7 +27529,8 @@ function insertTextAtSelection(state, text, styleOverride) {
   const insertedRun = {
     id: `run:${Math.random().toString(36).slice(2, 9)}`,
     text,
-    styles
+    styles,
+    kind: "text"
   };
   if (collapsedState.trackChangesEnabled) {
     insertedRun.revision = {
@@ -27611,6 +27638,7 @@ function deleteBackward(state) {
         const deletionRun = {
           id: `run:${Math.random().toString(36).slice(2, 9)}`,
           text: charToDelete,
+          kind: "text",
           styles: { ...targetRun.styles },
           revision: {
             id: `rev:${Math.random().toString(36).slice(2, 9)}`,
@@ -27719,6 +27747,7 @@ function deleteForward(state) {
         const deletionRun = {
           id: `run:${Math.random().toString(36).slice(2, 9)}`,
           text: charToDelete,
+          kind: "text",
           styles: { ...targetRun.styles },
           revision: {
             id: `rev:${Math.random().toString(36).slice(2, 9)}`,
@@ -28126,7 +28155,7 @@ function createFontDialogBridge(deps) {
         }
         return next;
       },
-      { mergeKey: "font-dialog" }
+      { mergeKey: MERGE_KEYS.fontDialog }
     );
     deps.focusInput();
   };
@@ -28508,7 +28537,7 @@ function createParagraphDialogBridge(deps) {
         }
         return next;
       },
-      { mergeKey: "paragraph-dialog" }
+      { mergeKey: MERGE_KEYS.paragraphDialog }
     );
     deps.focusInput();
   };
@@ -29211,7 +29240,7 @@ function createTablePropertiesDialogBridge(deps) {
     deps.resetTransactionGrouping();
     deps.applyTransactionalState(
       (current) => applyTableProperties(current, values),
-      { mergeKey: "tableProperties" }
+      { mergeKey: MERGE_KEYS.tableProperties }
     );
     deps.focusInput();
   };
@@ -29406,7 +29435,7 @@ function textLanguageToHtmlAttributes(language) {
 }
 function serializeImageRunToHtml(run, document2) {
   var _a;
-  if (!run.image) {
+  if (run.kind !== "image") {
     return "";
   }
   const resolvedSrc = resolveImageSrc(document2, run.image.src);
@@ -29418,7 +29447,7 @@ function serializeImageRunToHtml(run, document2) {
   return img;
 }
 function serializeTextRunToHtml(run, document2) {
-  if (run.image) {
+  if (run.kind === "image") {
     return serializeImageRunToHtml(run, document2);
   }
   const text = escapeHtml(run.text).replace(/\n/g, "<br>");
@@ -29786,11 +29815,14 @@ function parseEditorClipboardHtmlWithDom(html) {
   const appendParagraph = (element, runs, list) => {
     const fallbackRuns = runs.length > 0 ? runs : [createEditorStyledRun("")];
     paragraphs.push({
-      runs: fallbackRuns.map((run) => ({
-        text: run.text,
-        styles: cloneStyle(run.styles),
-        image: run.image ? { ...run.image } : void 0
-      })),
+      runs: fallbackRuns.map((run) => {
+        const image = getRunImage(run);
+        return {
+          text: run.text,
+          styles: cloneStyle(run.styles),
+          image: image ? { ...image } : void 0
+        };
+      }),
       style: element ? parseParagraphStyle(element) : void 0,
       list
     });
@@ -30113,35 +30145,35 @@ function createEditorTableContextMenuActions(deps) {
     openBordersAndShading: () => deps.openTablePropertiesDialog("cell"),
     merge: () => applyTableContextCommand(
       (current) => tableOps.mergeSelectedTable(current),
-      "mergeTable"
+      MERGE_KEYS.mergeTable
     ),
     split: () => applyTableContextCommand(
       (current) => tableOps.splitSelectedTable(current),
-      "splitTable"
+      MERGE_KEYS.splitTable
     ),
     insertColumnBefore: () => applyTableContextCommand(
       (current) => tableOps.insertSelectedTableColumn(current, -1),
-      "insertTableColumn"
+      MERGE_KEYS.insertTableColumn
     ),
     insertColumnAfter: () => applyTableContextCommand(
       (current) => tableOps.insertSelectedTableColumn(current, 1),
-      "insertTableColumn"
+      MERGE_KEYS.insertTableColumn
     ),
     deleteColumn: () => applyTableContextCommand(
       (current) => tableOps.deleteSelectedTableColumn(current),
-      "deleteTableColumn"
+      MERGE_KEYS.deleteTableColumn
     ),
     insertRowBefore: () => applyTableContextCommand(
       (current) => tableOps.insertSelectedTableRow(current, -1),
-      "insertTableRow"
+      MERGE_KEYS.insertTableRow
     ),
     insertRowAfter: () => applyTableContextCommand(
       (current) => tableOps.insertSelectedTableRow(current, 1),
-      "insertTableRow"
+      MERGE_KEYS.insertTableRow
     ),
     deleteRow: () => applyTableContextCommand(
       (current) => tableOps.deleteSelectedTableRow(current),
-      "deleteTableRow"
+      MERGE_KEYS.deleteTableRow
     )
   };
 }
@@ -33086,7 +33118,7 @@ function serializeTableXml(table, serializeParagraphXml2) {
         {
           id: "",
           type: "paragraph",
-          runs: [{ id: "", text: "" }]
+          runs: [{ id: "", text: "", kind: "text" }]
         }
       ];
       const paragraphsXml = paragraphs.map((paragraph) => serializeParagraphXml2(paragraph, cell)).join("");
@@ -33817,7 +33849,7 @@ function serializeFootnoteRefMarker() {
   return serializeNoteRefMarker("footnote");
 }
 function serializeFootnoteReference(run, materializedRunStyle, context) {
-  const ref = run.footnoteReference;
+  const ref = getRunFootnoteReference(run);
   return serializeNoteReference(
     "footnote",
     ref ? { noteId: ref.footnoteId, customMark: ref.customMark } : void 0,
@@ -33829,7 +33861,7 @@ function serializeEndnoteRefMarker() {
   return serializeNoteRefMarker("endnote");
 }
 function serializeEndnoteReference(run, materializedRunStyle, context) {
-  const ref = run.endnoteReference;
+  const ref = getRunEndnoteReference(run);
   return serializeNoteReference(
     "endnote",
     ref ? { noteId: ref.endnoteId, customMark: ref.customMark } : void 0,
@@ -33914,7 +33946,7 @@ function stripRpr(rPr) {
   return rPr.replace(/^<w:rPr>/, "").replace(/<\/w:rPr>$/, "");
 }
 function isSplittableTextRun(run) {
-  return !run.image && !run.textBox && !run.field && !run.fieldChar && run.fieldInstruction === void 0 && !run.footnoteReference && !run.endnoteReference;
+  return run.kind === "text" || run.kind === "sym";
 }
 function serializeRunsWithBoundaries(runs, tokens, context, paragraphStyleId, styles) {
   const sorted = [...tokens].sort(
@@ -34001,7 +34033,7 @@ function serializeBlocksXml(blocks, context, styles) {
 }
 function serializeParagraphXml(paragraph, context, styles, overrides) {
   var _a, _b, _c;
-  const runs = paragraph.runs.length > 0 ? paragraph.runs : [{ id: "", text: "" }];
+  const runs = paragraph.runs.length > 0 ? paragraph.runs : [{ id: "", text: "", kind: "text" }];
   const dropCapFrame = paragraph.dropCap ? serializeDropCapFrameParagraph(paragraph.dropCap) : "";
   const bookmarkEvents = (_a = context.bookmarkEventsByParagraph) == null ? void 0 : _a.get(paragraph.id);
   const commentEvents = (_b = context.commentEventsByParagraph) == null ? void 0 : _b.get(paragraph.id);
@@ -34050,7 +34082,7 @@ function collectReferencedFootnotesForExport(document2) {
   const seen = /* @__PURE__ */ new Map();
   let nextDocxId = FIRST_FOOTNOTE_DOCX_ID;
   for (const { run } of iterateFootnoteReferenceRuns(document2)) {
-    const ref = run.footnoteReference;
+    const ref = getRunFootnoteReference(run);
     if (!ref) continue;
     if (seen.has(ref.footnoteId)) continue;
     const footnote = items[ref.footnoteId];
@@ -34087,7 +34119,7 @@ function createEmptyFootnoteBodyParagraph(withMarker = true) {
     type: "paragraph",
     runs: [
       ...withMarker ? [makeFootnoteRefMarkerRun()] : [],
-      { id: "synthetic:footnote-body-empty-text", text: "" }
+      { id: "synthetic:footnote-body-empty-text", text: "", kind: "text" }
     ],
     style: { styleId: "FootnoteText" }
   };
@@ -34104,6 +34136,7 @@ function makeFootnoteRefMarkerRun() {
   return {
     id: "synthetic:footnoteRef",
     text: "",
+    kind: "text",
     styles: { styleId: "FootnoteReference", superscript: true },
     // Tag the run so the special serializer below can intercept it.
     __isFootnoteRefMarker: true
@@ -34145,7 +34178,7 @@ function collectReferencedEndnotesForExport(document2) {
   const seen = /* @__PURE__ */ new Map();
   let nextDocxId = FIRST_ENDNOTE_DOCX_ID;
   for (const { run } of iterateEndnoteReferenceRuns(document2)) {
-    const ref = run.endnoteReference;
+    const ref = getRunEndnoteReference(run);
     if (!ref) continue;
     if (seen.has(ref.endnoteId)) continue;
     const endnote = items[ref.endnoteId];
@@ -34182,7 +34215,7 @@ function createEmptyEndnoteBodyParagraph(withMarker = true) {
     type: "paragraph",
     runs: [
       ...withMarker ? [makeEndnoteRefMarkerRun()] : [],
-      { id: "synthetic:endnote-body-empty-text", text: "" }
+      { id: "synthetic:endnote-body-empty-text", text: "", kind: "text" }
     ],
     style: { styleId: "EndnoteText" }
   };
@@ -34199,6 +34232,7 @@ function makeEndnoteRefMarkerRun() {
   return {
     id: "synthetic:endnoteRef",
     text: "",
+    kind: "text",
     styles: { styleId: "EndnoteReference", superscript: true },
     __isEndnoteRefMarker: true
   };
@@ -34446,7 +34480,7 @@ function buildPartRelationshipsXml(images, hyperlinks) {
 function visitParagraphDeep(paragraph, callback) {
   callback(paragraph);
   for (const run of paragraph.runs) {
-    if (run.textBox) {
+    if (run.kind === "textBox") {
       visitBlocks(run.textBox.blocks, callback);
     }
   }
@@ -34621,14 +34655,20 @@ const IMAGE_CAPTION_STYLE_ID = "Caption";
 const IMAGE_CAPTION_FIELD_IDENTIFIER = "Figure";
 const IMAGE_CAPTION_FIELD_INSTRUCTION = " SEQ Figure \\* ARABIC ";
 function createFieldCharRun(kind) {
-  const run = createEditorRun("");
-  run.fieldChar = { kind };
-  return run;
+  return {
+    id: createEditorRun("").id,
+    text: "",
+    kind: "fieldChar",
+    fieldChar: { kind }
+  };
 }
 function createFieldInstructionRun(instruction) {
-  const run = createEditorRun("");
-  run.fieldInstruction = instruction;
-  return run;
+  return {
+    id: createEditorRun("").id,
+    text: "",
+    kind: "fieldInstruction",
+    fieldInstruction: instruction
+  };
 }
 function createImageCaptionParagraph(captionText, label, sequenceNumber) {
   const paragraph = createEditorParagraphFromRuns([
@@ -34657,11 +34697,12 @@ function isImageCaptionParagraph(paragraph) {
   if (styleId !== "caption") {
     return false;
   }
-  return paragraph.runs.some(
-    (run) => run.fieldInstruction !== void 0 && new RegExp(`\\bSEQ\\s+${IMAGE_CAPTION_FIELD_IDENTIFIER}\\b`, "i").test(
-      run.fieldInstruction
-    )
-  );
+  return paragraph.runs.some((run) => {
+    const instruction = getRunFieldInstruction(run);
+    return instruction !== void 0 && new RegExp(`\\bSEQ\\s+${IMAGE_CAPTION_FIELD_IDENTIFIER}\\b`, "i").test(
+      instruction
+    );
+  });
 }
 function getImageCaptionText(paragraph) {
   var _a;
@@ -34675,7 +34716,7 @@ function getImageCaptionText(paragraph) {
       value += run.text;
       continue;
     }
-    if (((_a = run.fieldChar) == null ? void 0 : _a.kind) === "end") {
+    if (((_a = getRunFieldChar(run)) == null ? void 0 : _a.kind) === "end") {
       afterField = true;
     }
   }
@@ -34699,12 +34740,11 @@ function renumberCaptionParagraph(paragraph, sequenceNumber) {
   let insideSeqResult = false;
   let changed = false;
   const nextRuns = paragraph.runs.map((run) => {
-    var _a, _b;
-    if (((_a = run.fieldChar) == null ? void 0 : _a.kind) === "separate") {
+    if (run.kind === "fieldChar" && run.fieldChar.kind === "separate") {
       insideSeqResult = true;
       return { ...run, fieldChar: { ...run.fieldChar } };
     }
-    if (((_b = run.fieldChar) == null ? void 0 : _b.kind) === "end") {
+    if (run.kind === "fieldChar" && run.fieldChar.kind === "end") {
       insideSeqResult = false;
       return { ...run, fieldChar: { ...run.fieldChar } };
     }
@@ -34791,11 +34831,11 @@ function buildPartContext(blocks, numberingContext, state, document2) {
         hyperlinkMap.set(link, rId2);
         hyperlinks.push({ rId: rId2, href: link });
       }
-      if (run.textBox && !textBoxDocPrIds.has(run.id)) {
+      if (run.kind === "textBox" && !textBoxDocPrIds.has(run.id)) {
         textBoxDocPrIds.set(run.id, state.nextTextBoxDocPrId);
         state.nextTextBoxDocPrId += 1;
       }
-      if (!run.image) {
+      if (run.kind !== "image") {
         continue;
       }
       const imageNumber = state.nextImageId;
@@ -37743,7 +37783,7 @@ function isFloatingFixedPosition(floating) {
   return ((_a = floating == null ? void 0 : floating.positionV) == null ? void 0 : _a.relativeFrom) === "page";
 }
 function getSelectedImageRun(state) {
-  return getSelectedObjectRun(state, (run) => Boolean(run.image));
+  return getSelectedObjectRun(state, (run) => run.kind === "image");
 }
 function insertImageAtSelection(state, image) {
   const collapsedState = isSelectionCollapsed(state.selection) ? state : deleteSelectionRange(state);
@@ -37778,7 +37818,7 @@ function resizeSelectedImage(state, width, height) {
     return {
       ...cloneParagraph(candidate),
       runs: candidate.runs.map(
-        (run) => run.id === targetRun.id && run.image ? {
+        (run) => run.id === targetRun.id && run.kind === "image" ? {
           ...run,
           image: {
             ...run.image,
@@ -37820,7 +37860,7 @@ function rotateSelectedImage(state, rotation) {
     return {
       ...cloneParagraph(candidate),
       runs: candidate.runs.map(
-        (run) => run.id === targetRun.id && run.image ? {
+        (run) => run.id === targetRun.id && run.kind === "image" ? {
           ...run,
           image: {
             ...run.image,
@@ -37841,19 +37881,20 @@ function rotateSelectedImage(state, rotation) {
 }
 function getSelectedImageWrapPreset(state) {
   const selectedImage = getSelectedImageRun(state);
-  if (!(selectedImage == null ? void 0 : selectedImage.run.image)) {
+  const image = selectedImage && getRunImage(selectedImage.run);
+  if (!image) {
     return null;
   }
-  return floatingToWrapPreset(selectedImage.run.image.floating);
+  return floatingToWrapPreset(image.floating);
 }
 function isSelectedImageFixedPosition(state) {
-  var _a;
   const selectedImage = getSelectedImageRun(state);
-  return isFloatingFixedPosition((_a = selectedImage == null ? void 0 : selectedImage.run.image) == null ? void 0 : _a.floating);
+  const image = selectedImage && getRunImage(selectedImage.run);
+  return isFloatingFixedPosition(image == null ? void 0 : image.floating);
 }
 function patchSelectedImageFloating(state, next) {
   const selectedImage = getSelectedImageRun(state);
-  if (!(selectedImage == null ? void 0 : selectedImage.run.image)) {
+  if (!selectedImage || !getRunImage(selectedImage.run)) {
     return state;
   }
   const paragraphs = getParagraphs(state);
@@ -37865,7 +37906,7 @@ function patchSelectedImageFloating(state, next) {
     return {
       ...cloneParagraph(candidate),
       runs: candidate.runs.map((run) => {
-        if (run.id !== targetRun.id || !run.image) {
+        if (run.id !== targetRun.id || run.kind !== "image") {
           return cloneRun(run);
         }
         const floating = next(run.image.floating);
@@ -37904,13 +37945,13 @@ function setImageWrapPolygon(state, runId, polygon) {
   const paragraphs = getParagraphs(state);
   let matched = false;
   const nextParagraphs = paragraphs.map((candidate) => {
-    if (!candidate.runs.some((run) => run.id === runId && run.image)) {
+    if (!candidate.runs.some((run) => run.id === runId && run.kind === "image")) {
       return cloneParagraph(candidate);
     }
     return {
       ...cloneParagraph(candidate),
       runs: candidate.runs.map((run) => {
-        if (run.id !== runId || !run.image) {
+        if (run.id !== runId || run.kind !== "image") {
           return cloneRun(run);
         }
         matched = true;
@@ -37938,7 +37979,7 @@ function setImageWrapPolygon(state, runId, polygon) {
 }
 function setSelectedImageAlt(state, alt) {
   const selectedImage = getSelectedImageRun(state);
-  if (!(selectedImage == null ? void 0 : selectedImage.run.image)) {
+  if (!selectedImage || !getRunImage(selectedImage.run)) {
     return state;
   }
   const paragraphs = getParagraphs(state);
@@ -37949,7 +37990,7 @@ function setSelectedImageAlt(state, alt) {
     return {
       ...cloneParagraph(candidate),
       runs: candidate.runs.map(
-        (run) => run.id === selectedImage.run.id && run.image ? {
+        (run) => run.id === selectedImage.run.id && run.kind === "image" ? {
           ...run,
           image: {
             ...run.image,
@@ -37970,7 +38011,7 @@ function setSelectedImageAlt(state, alt) {
 }
 function getSelectedImageCaption(state) {
   const selectedImage = getSelectedImageRun(state);
-  if (!(selectedImage == null ? void 0 : selectedImage.run.image)) {
+  if (!selectedImage || !getRunImage(selectedImage.run)) {
     return null;
   }
   const paragraphs = getParagraphs(state);
@@ -37978,7 +38019,7 @@ function getSelectedImageCaption(state) {
 }
 function setSelectedImageCaption(state, captionText, label) {
   const selectedImage = getSelectedImageRun(state);
-  if (!(selectedImage == null ? void 0 : selectedImage.run.image)) {
+  if (!selectedImage || !getRunImage(selectedImage.run)) {
     return state;
   }
   const paragraphs = getParagraphs(state);
@@ -38048,7 +38089,7 @@ function moveSelectedImageToPosition(state, targetPosition) {
       createEditorStyledRun(
         "",
         getStyleAtOffset(paragraph, offset),
-        imageRun.image
+        getRunImage(imageRun)
       )
     ]
   );
@@ -38135,7 +38176,7 @@ function createImageInsertionService(deps) {
         const targetState = position ? setSelection(current, { anchor: position, focus: position }) : current;
         return insertImageAtSelection(targetState, { src, width, height });
       },
-      { mergeKey: "insertImage" }
+      { mergeKey: MERGE_KEYS.insertImage }
     );
   };
   return {
@@ -38940,7 +38981,7 @@ function createEditorHistoryActions(deps) {
       deps.applyTransactionalState(
         () => moveSelectedImageToPosition(nextState, targetPosition),
         {
-          mergeKey: "moveImage"
+          mergeKey: MERGE_KEYS.moveImage
         }
       );
       deps.focusInput();
@@ -38953,7 +38994,7 @@ function createEditorHistoryActions(deps) {
         current,
         paragraphOffsetToPosition(targetParagraph, targetOffset)
       ),
-      { mergeKey: "moveImage" }
+      { mergeKey: MERGE_KEYS.moveImage }
     );
     deps.focusInput();
     return true;
@@ -39105,7 +39146,7 @@ function createIndexedDbPersistence(options = {}) {
   };
 }
 function computeLayoutInvalidationFromTransaction(prev, next) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
+  var _a, _b, _c, _d, _e, _f;
   if (prev === next || prev.document === next.document) {
     return {};
   }
@@ -39147,7 +39188,9 @@ function computeLayoutInvalidationFromTransaction(prev, next) {
         changed = true;
         break;
       }
-      if (Boolean(a.image) !== Boolean(b.image) || (((_a = a.image) == null ? void 0 : _a.width) ?? -1) !== (((_b = b.image) == null ? void 0 : _b.width) ?? -1) || (((_c = a.image) == null ? void 0 : _c.height) ?? -1) !== (((_d = b.image) == null ? void 0 : _d.height) ?? -1) || (((_f = (_e = a.image) == null ? void 0 : _e.floating) == null ? void 0 : _f.wrap) ?? "") !== (((_h = (_g = b.image) == null ? void 0 : _g.floating) == null ? void 0 : _h.wrap) ?? "") || Boolean((_j = (_i = a.image) == null ? void 0 : _i.floating) == null ? void 0 : _j.behindDoc) !== Boolean((_l = (_k = b.image) == null ? void 0 : _k.floating) == null ? void 0 : _l.behindDoc) || (((_n = (_m = a.image) == null ? void 0 : _m.wrapPolygon) == null ? void 0 : _n.length) ?? -1) !== (((_p = (_o = b.image) == null ? void 0 : _o.wrapPolygon) == null ? void 0 : _p.length) ?? -1)) {
+      const aImage = getRunImage(a);
+      const bImage = getRunImage(b);
+      if (Boolean(aImage) !== Boolean(bImage) || ((aImage == null ? void 0 : aImage.width) ?? -1) !== ((bImage == null ? void 0 : bImage.width) ?? -1) || ((aImage == null ? void 0 : aImage.height) ?? -1) !== ((bImage == null ? void 0 : bImage.height) ?? -1) || (((_a = aImage == null ? void 0 : aImage.floating) == null ? void 0 : _a.wrap) ?? "") !== (((_b = bImage == null ? void 0 : bImage.floating) == null ? void 0 : _b.wrap) ?? "") || Boolean((_c = aImage == null ? void 0 : aImage.floating) == null ? void 0 : _c.behindDoc) !== Boolean((_d = bImage == null ? void 0 : bImage.floating) == null ? void 0 : _d.behindDoc) || (((_e = aImage == null ? void 0 : aImage.wrapPolygon) == null ? void 0 : _e.length) ?? -1) !== (((_f = bImage == null ? void 0 : bImage.wrapPolygon) == null ? void 0 : _f.length) ?? -1)) {
         changed = true;
         break;
       }
@@ -39381,7 +39424,7 @@ function createEditorDocumentRuntime(deps) {
 }
 const MIN_TEXT_BOX_SIZE_PX = 24;
 function getSelectedTextBoxRun(state) {
-  return getSelectedObjectRun(state, (run) => Boolean(run.textBox));
+  return getSelectedObjectRun(state, (run) => run.kind === "textBox");
 }
 function shiftFloatingForResize(floating, widthDelta, heightDelta, growsFromWest, growsFromNorth) {
   let next = floating;
@@ -39420,7 +39463,7 @@ function normalizeRotation(rotation) {
 }
 function rotateSelectedTextBox(state, rotation) {
   const selected = getSelectedTextBoxRun(state);
-  if (!selected || !selected.run.textBox) {
+  if (!selected || !getRunTextBox(selected.run)) {
     return state;
   }
   const nextRotation = normalizeRotation(rotation);
@@ -39433,7 +39476,7 @@ function rotateSelectedTextBox(state, rotation) {
     return {
       ...cloneParagraph(candidate),
       runs: candidate.runs.map(
-        (run) => run.id === targetRun.id && run.textBox ? {
+        (run) => run.id === targetRun.id && run.kind === "textBox" ? {
           ...run,
           textBox: { ...run.textBox, rotation: nextRotation }
         } : cloneRun(run)
@@ -39451,19 +39494,20 @@ function rotateSelectedTextBox(state, rotation) {
 }
 function getSelectedTextBoxWrapPreset(state) {
   const selected = getSelectedTextBoxRun(state);
-  if (!(selected == null ? void 0 : selected.run.textBox)) {
+  const textBox = selected && getRunTextBox(selected.run);
+  if (!textBox) {
     return null;
   }
-  return floatingToWrapPreset(selected.run.textBox.floating);
+  return floatingToWrapPreset(textBox.floating);
 }
 function isSelectedTextBoxFixedPosition(state) {
-  var _a;
   const selected = getSelectedTextBoxRun(state);
-  return isFloatingFixedPosition((_a = selected == null ? void 0 : selected.run.textBox) == null ? void 0 : _a.floating);
+  const textBox = selected && getRunTextBox(selected.run);
+  return isFloatingFixedPosition(textBox == null ? void 0 : textBox.floating);
 }
 function patchSelectedTextBoxFloating(state, next) {
   const selected = getSelectedTextBoxRun(state);
-  if (!(selected == null ? void 0 : selected.run.textBox)) {
+  if (!selected || !getRunTextBox(selected.run)) {
     return state;
   }
   const { paragraphIndex, run: targetRun } = selected;
@@ -39475,7 +39519,7 @@ function patchSelectedTextBoxFloating(state, next) {
     return {
       ...cloneParagraph(candidate),
       runs: candidate.runs.map((run) => {
-        if (run.id !== targetRun.id || !run.textBox) {
+        if (run.id !== targetRun.id || run.kind !== "textBox") {
           return cloneRun(run);
         }
         const floating = next(run.textBox.floating);
@@ -39512,7 +39556,8 @@ function setSelectedTextBoxFixedPosition(state, fixed) {
 }
 function resizeSelectedTextBox(state, width, height, options = {}) {
   const selected = getSelectedTextBoxRun(state);
-  if (!selected || !selected.run.textBox) {
+  const selectedTextBox = selected && getRunTextBox(selected.run);
+  if (!selected || !selectedTextBox) {
     return state;
   }
   const direction = options.handleDirection ?? "se";
@@ -39522,8 +39567,8 @@ function resizeSelectedTextBox(state, width, height, options = {}) {
   const nextWidth = Math.max(MIN_TEXT_BOX_SIZE_PX, Math.round(width));
   const nextHeight = Math.max(MIN_TEXT_BOX_SIZE_PX, Math.round(height));
   const { paragraphIndex, run: targetRun } = selected;
-  const widthDelta = nextWidth - selected.run.textBox.width;
-  const heightDelta = nextHeight - selected.run.textBox.height;
+  const widthDelta = nextWidth - selectedTextBox.width;
+  const heightDelta = nextHeight - selectedTextBox.height;
   const paragraphs = getParagraphs(state);
   const nextParagraphs = paragraphs.map((candidate, candidateIndex) => {
     if (candidateIndex !== paragraphIndex) {
@@ -39533,7 +39578,7 @@ function resizeSelectedTextBox(state, width, height, options = {}) {
       ...cloneParagraph(candidate),
       runs: candidate.runs.map((run) => {
         var _a;
-        if (run.id !== targetRun.id || !run.textBox) {
+        if (run.id !== targetRun.id || run.kind !== "textBox") {
           return cloneRun(run);
         }
         const textBox = run.textBox;
@@ -40806,7 +40851,7 @@ function createEditorTableOperations(deps) {
     deps.applyTransactionalState(
       (current) => insertTableAtSelection(current, rows, cols),
       {
-        mergeKey: "insertTable"
+        mergeKey: MERGE_KEYS.insertTable
       }
     );
     deps.focusInput();
@@ -41054,7 +41099,7 @@ function createEditorImageOperations(deps) {
     for (const run of paragraph.runs) {
       const startOffset = offset;
       offset += run.text.length;
-      if (run.image && run.text.length === 1 && startOffset === normalized.startParagraphOffset) {
+      if (run.kind === "image" && run.text.length === 1 && startOffset === normalized.startParagraphOffset) {
         return {
           paragraph,
           run,
@@ -41188,7 +41233,7 @@ function createEditorImageOperations(deps) {
         );
         deps.applyTransactionalState(
           (current) => moveSelectedImageToPosition(current, position),
-          { mergeKey: "moveImage" }
+          { mergeKey: MERGE_KEYS.moveImage }
         );
       } else {
         deps.logger.warn(
@@ -41281,15 +41326,16 @@ function createEditorImageOperations(deps) {
 function createEditorTextBoxOperations(deps) {
   const getSelectedTextBoxSize = (current) => {
     const selected = getSelectedTextBoxRun(current);
-    if (!(selected == null ? void 0 : selected.run.textBox)) {
+    const textBox = selected && getRunTextBox(selected.run);
+    if (!textBox) {
       return null;
     }
     return {
-      width: selected.run.textBox.width,
+      width: textBox.width,
       // Start the drag from the height actually painted on screen. For an
       // auto-fit box that is its content height, not the stored height, so the
       // box doesn't jump on the first pointer move.
-      height: resolveTextBoxRenderHeight(selected.run.textBox, current, 0)
+      height: resolveTextBoxRenderHeight(textBox, current, 0)
     };
   };
   const resizeSession = createResizeSession(
@@ -41540,7 +41586,7 @@ function useEditorFindReplace(deps) {
         });
         return insertTextAtSelection(stateWithSelection, replaceTerm());
       },
-      { mergeKey: "findReplace" }
+      { mergeKey: MERGE_KEYS.findReplace }
     );
   };
   const replaceAll = () => {
@@ -41559,7 +41605,7 @@ function useEditorFindReplace(deps) {
         }
         return workingState;
       },
-      { mergeKey: "findReplaceAll" }
+      { mergeKey: MERGE_KEYS.findReplaceAll }
     );
     setIsOpen(false);
     deps.focusInput();
@@ -42183,7 +42229,7 @@ function createEditorLayoutOptionsController(deps) {
       const polygon = traceImageAlphaContour(img2);
       applyTransactionalState(
         (current) => setImageWrapPolygon(current, runId, polygon),
-        { mergeKey: "layoutWrapPolygon" }
+        { mergeKey: MERGE_KEYS.layoutWrapPolygon }
       );
     };
     const img = getCachedCanvasImage(resolved, () => {
@@ -42209,19 +42255,19 @@ function createEditorLayoutOptionsController(deps) {
     },
     setPreset: (preset) => {
       applyLayoutOptionPatch(
-        "layoutWrapPreset",
+        MERGE_KEYS.layoutWrapPreset,
         (current, target) => target === "image" ? setSelectedImageWrapPreset(current, preset) : setSelectedTextBoxWrapPreset(current, preset)
       );
       if (preset === "tight" || preset === "through") {
         const selected = getSelectedImageRun(state());
-        const image = selected == null ? void 0 : selected.run.image;
+        const image = selected && getRunImage(selected.run);
         if (image && !image.wrapPolygon) {
           ensureImageWrapContour(selected.run.id, image.src);
         }
       }
     },
     setFixedPosition: (fixed) => applyLayoutOptionPatch(
-      "layoutFixedPosition",
+      MERGE_KEYS.layoutFixedPosition,
       (current, target) => target === "image" ? setSelectedImageFixedPosition(current, fixed) : setSelectedTextBoxFixedPosition(current, fixed)
     )
   };
@@ -43626,7 +43672,7 @@ function createEditorTextInput(deps) {
         (temp) => insertTextAtSelection(temp, text, pendingStyle)
       ),
       {
-        mergeKey: "insertText"
+        mergeKey: MERGE_KEYS.insertText
       }
     );
     event.currentTarget.value = "";
@@ -43663,7 +43709,7 @@ function createEditorTextInput(deps) {
         (temp) => insertTextAtSelection(temp, text, pendingStyle)
       ),
       {
-        mergeKey: "insertText"
+        mergeKey: MERGE_KEYS.insertText
       }
     );
     event.currentTarget.value = "";
@@ -43815,7 +43861,7 @@ function createEditorTextDrag(deps) {
           current,
           (temp) => moveOrCopySelectionToPosition(temp, destination, { copy })
         ),
-        { mergeKey: copy ? "copyTextByDrag" : "moveTextByDrag" }
+        { mergeKey: copy ? MERGE_KEYS.copyTextByDrag : MERGE_KEYS.moveTextByDrag }
       );
       (_b = deps.logger) == null ? void 0 : _b.info("text-drag:apply", {
         mode: copy ? "copy" : "move",
@@ -43833,7 +43879,7 @@ function createEditorTextDrag(deps) {
             focus: startPosition
           });
         },
-        { mergeKey: "collapseSelectionByClick" }
+        { mergeKey: MERGE_KEYS.collapseSelectionByClick }
       );
       (_c = deps.logger) == null ? void 0 : _c.info("text-drag:collapse", {
         at: `${startPosition.paragraphId}:${startPosition.runId}[${startPosition.offset}]`
@@ -44411,7 +44457,7 @@ function nextAutoMarker(document2) {
   let autoCount = startAt - 1;
   const seen = /* @__PURE__ */ new Set();
   for (const { run } of iterateFootnoteReferenceRuns(document2)) {
-    const ref = run.footnoteReference;
+    const ref = getRunFootnoteReference(run);
     if (!ref || ref.customMark) continue;
     if (seen.has(ref.footnoteId)) continue;
     seen.add(ref.footnoteId);
@@ -44602,7 +44648,7 @@ function getLinkAtSelection(state) {
     const startOffset = paragraphIndex === normalized.startIndex ? normalized.startParagraphOffset : 0;
     const endOffset = paragraphIndex === normalized.endIndex ? normalized.endParagraphOffset : getParagraphLength(paragraph);
     return sliceRuns(paragraph, startOffset, endOffset);
-  }).filter((run) => run.text.length > 0 && !run.image);
+  }).filter((run) => run.text.length > 0 && run.kind !== "image");
   if (touchedRuns.length === 0) {
     return null;
   }
@@ -44891,7 +44937,7 @@ function createEditorCommandsController(deps) {
           current,
           (temp) => splitListItemAtSelection(temp)
         ),
-        { mergeKey: "splitListItem" }
+        { mergeKey: MERGE_KEYS.splitListItem }
       );
     }
     focusInput();
@@ -45097,7 +45143,7 @@ function createEditorCommandsController(deps) {
     clearPreferredColumn();
     resetTransactionGrouping();
     applyTransactionalState((current) => setLinkAtSelection(current, href), {
-      mergeKey: "link"
+      mergeKey: MERGE_KEYS.link
     });
     focusInput();
   };
@@ -45119,7 +45165,7 @@ function createEditorCommandsController(deps) {
     clearPreferredColumn();
     resetTransactionGrouping();
     applyTransactionalState((current) => setSelectedImageAlt(current, alt), {
-      mergeKey: "imageAlt"
+      mergeKey: MERGE_KEYS.imageAlt
     });
     focusInput();
   };
@@ -45129,7 +45175,7 @@ function createEditorCommandsController(deps) {
     if (!run) {
       return;
     }
-    const currentAlt = ((_a = run.run.image) == null ? void 0 : _a.alt) ?? "";
+    const currentAlt = ((_a = getRunImage(run.run)) == null ? void 0 : _a.alt) ?? "";
     deps.openImageAltDialog(currentAlt);
   };
   const applyImageCaptionCommand = (caption) => {
@@ -45141,7 +45187,7 @@ function createEditorCommandsController(deps) {
     resetTransactionGrouping();
     applyTransactionalState(
       (current) => setSelectedImageCaption(current, caption, deps.imageCaptionLabel()),
-      { mergeKey: "imageCaption" }
+      { mergeKey: MERGE_KEYS.imageCaption }
     );
     focusInput();
   };
@@ -45929,8 +45975,19 @@ function collectTocHeadings(state, maxLevel = DEFAULT_TOC_MAX_LEVEL) {
   return headings;
 }
 function makeRun(partial) {
-  const run = createEditorRun(partial.text ?? "");
-  return { ...run, ...partial, id: run.id };
+  const id = createEditorRun(partial.text).id;
+  if (partial.fieldChar) {
+    return { id, text: partial.text, kind: "fieldChar", fieldChar: partial.fieldChar };
+  }
+  if (partial.fieldInstruction !== void 0) {
+    return {
+      id,
+      text: partial.text,
+      kind: "fieldInstruction",
+      fieldInstruction: partial.fieldInstruction
+    };
+  }
+  return { id, text: partial.text, kind: "text" };
 }
 function makeParagraph(runs, style2) {
   const paragraph = createEditorParagraph("");
@@ -46009,7 +46066,6 @@ function insertTableOfContents(state, resolvePage = () => void 0, maxLevel = DEF
   return replaceSectionBlocks(state, sectionIndex, nextBlocks, tocBlocks[0]);
 }
 function findTocRegion(blocks) {
-  var _a, _b, _c;
   let depth = 0;
   let instruction = "";
   let separateBlockIndex = -1;
@@ -46019,7 +46075,9 @@ function findTocRegion(blocks) {
     const block = blocks[i];
     if (block.type !== "paragraph") continue;
     for (const run of block.runs) {
-      if (((_a = run.fieldChar) == null ? void 0 : _a.kind) === "begin") {
+      const fieldChar = getRunFieldChar(run);
+      const fieldInstruction = getRunFieldInstruction(run);
+      if ((fieldChar == null ? void 0 : fieldChar.kind) === "begin") {
         depth += 1;
         if (depth === 1) {
           beginBlockIndex = i;
@@ -46027,12 +46085,12 @@ function findTocRegion(blocks) {
           isToc = false;
           separateBlockIndex = -1;
         }
-      } else if (depth === 1 && run.fieldInstruction !== void 0) {
-        instruction += run.fieldInstruction;
+      } else if (depth === 1 && fieldInstruction !== void 0) {
+        instruction += fieldInstruction;
         if (/\bTOC\b/i.test(instruction)) isToc = true;
-      } else if (((_b = run.fieldChar) == null ? void 0 : _b.kind) === "separate") {
+      } else if ((fieldChar == null ? void 0 : fieldChar.kind) === "separate") {
         if (depth === 1) separateBlockIndex = i;
-      } else if (((_c = run.fieldChar) == null ? void 0 : _c.kind) === "end") {
+      } else if ((fieldChar == null ? void 0 : fieldChar.kind) === "end") {
         if (depth === 1) {
           if (isToc) {
             return {
@@ -46827,7 +46885,7 @@ function createEditorEssentialsRuntimePlugin(options) {
           }
           return next;
         },
-        { mergeKey: "specialIndent" }
+        { mergeKey: MERGE_KEYS.specialIndent }
       );
       options.focusInput();
     },
@@ -46846,7 +46904,7 @@ function createEditorEssentialsRuntimePlugin(options) {
           next = setParagraphStyle(next, "borderLeft", border);
           return next;
         },
-        { mergeKey: "paraBorders" }
+        { mergeKey: MERGE_KEYS.paraBorders }
       );
       options.focusInput();
     },
@@ -46956,39 +47014,39 @@ function createEditorEssentialsRuntimePlugin(options) {
       canEditRow: () => options.tableOps.canEditSelectedTableRow(options.state()),
       merge: () => apply(
         (current) => options.tableOps.mergeSelectedTable(current),
-        "mergeTable"
+        MERGE_KEYS.mergeTable
       ),
       split: () => apply(
         (current) => options.tableOps.splitSelectedTable(current),
-        "splitTable"
+        MERGE_KEYS.splitTable
       ),
       insertColumnBefore: () => apply(
         (current) => options.tableOps.insertSelectedTableColumn(current, -1),
-        "insertTableColumn"
+        MERGE_KEYS.insertTableColumn
       ),
       insertColumnAfter: () => apply(
         (current) => options.tableOps.insertSelectedTableColumn(current, 1),
-        "insertTableColumn"
+        MERGE_KEYS.insertTableColumn
       ),
       deleteColumn: () => apply(
         (current) => options.tableOps.deleteSelectedTableColumn(current),
-        "deleteTableColumn"
+        MERGE_KEYS.deleteTableColumn
       ),
       insertRowBefore: () => apply(
         (current) => options.tableOps.insertSelectedTableRow(current, -1),
-        "insertTableRow"
+        MERGE_KEYS.insertTableRow
       ),
       insertRowAfter: () => apply(
         (current) => options.tableOps.insertSelectedTableRow(current, 1),
-        "insertTableRow"
+        MERGE_KEYS.insertTableRow
       ),
       deleteRow: () => apply(
         (current) => options.tableOps.deleteSelectedTableRow(current),
-        "deleteTableRow"
+        MERGE_KEYS.deleteTableRow
       ),
       cellShading: (color) => apply(
         (current) => setTableCellStyleValue(current, "shading", color || null),
-        "tableShading"
+        MERGE_KEYS.tableShading
       ),
       cellBorders: () => apply(
         (current) => setTableCellBorders(current, {
@@ -46996,7 +47054,7 @@ function createEditorEssentialsRuntimePlugin(options) {
           type: "solid",
           color: "#64748b"
         }),
-        "tableBorders"
+        MERGE_KEYS.tableBorders
       ),
       cellNoBorders: () => apply(
         (current) => setTableCellBorders(current, {
@@ -47004,25 +47062,25 @@ function createEditorEssentialsRuntimePlugin(options) {
           type: "none",
           color: "transparent"
         }),
-        "tableBorders"
+        MERGE_KEYS.tableBorders
       ),
       width100: () => apply(
         (current) => setTableStyleValue(current, "width", "100%"),
-        "tableWidth"
+        MERGE_KEYS.tableWidth
       ),
       alignLeft: () => apply(
         (current) => setTableCellStyleValue(current, "horizontalAlign", "left"),
-        "tableAlign"
+        MERGE_KEYS.tableAlign
       ),
       alignCenter: () => apply(
         (current) => setTableCellStyleValue(current, "horizontalAlign", "center"),
-        "tableAlign"
+        MERGE_KEYS.tableAlign
       ),
       alignRight: () => apply(
         (current) => setTableCellStyleValue(current, "horizontalAlign", "right"),
-        "tableAlign"
+        MERGE_KEYS.tableAlign
       ),
-      setCellWidth: (width) => apply((current) => setTableCellWidth(current, width), "tableCellWidth"),
+      setCellWidth: (width) => apply((current) => setTableCellWidth(current, width), MERGE_KEYS.tableCellWidth),
       insert: (rows, cols) => options.tableOps.insertTableCommand(rows, cols)
     };
   })();