oasis-editor 0.0.90 → 0.0.91

package/dist/{index-DcElQi6c.js → index-C2DlzueH.js}

@@ -2519,7 +2519,7 @@ function OasisEditorAppLazy(props = {}) {
     onCleanup(() => {
       cancelled = true;
     });
-    import("./OasisEditorApp-2b7y3aGj.js").then((m) => {
+    import("./OasisEditorApp-Cwd5XBHr.js").then((m) => {
       cancelled = true;
       setProgress(1);
       setTimeout(() => setApp(() => m.OasisEditorApp), 180);
@@ -3963,8 +3963,11 @@ function resolveEffectiveTableCellFormatting(options) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
   const { table, rowIndex, cellIndex, visualColumnIndex, columnCount, styles } = options;
   const named = resolveNamedTableStyle((_a = table.style) == null ? void 0 : _a.styleId, styles);
-  const baseTableStyle = mergeTableStyles(named.tableStyle, table.style);
   const row = table.rows[rowIndex];
+  const baseTableStyle = (row == null ? void 0 : row.propertyExceptions) ? mergeTableStyles(
+    mergeTableStyles(named.tableStyle, table.style),
+    row.propertyExceptions
+  ) : mergeTableStyles(named.tableStyle, table.style);
   const cell = row == null ? void 0 : row.cells[cellIndex];
   const keys = conditionalKeys({
     rowIndex,
@@ -5452,19 +5455,16 @@ function projectFootnoteBlocksForPage(document2, footnoteReferenceIds, page, tot
   for (const footnoteId of footnoteReferenceIds) {
     const footnote = (_b = (_a = document2.footnotes) == null ? void 0 : _a.items) == null ? void 0 : _b[footnoteId];
     if (!footnote) continue;
-    const projected = projectBlocks(
-      footnote.blocks,
-      {
-        pageIndex: page.index,
-        totalPages,
-        measuredHeights,
-        measuredParagraphLayouts,
-        styles: document2.styles,
-        contentWidth,
-        measurer,
-        defaultTabStop: (_c = document2.settings) == null ? void 0 : _c.defaultTabStop
-      }
-    );
+    const projected = projectBlocks(footnote.blocks, {
+      pageIndex: page.index,
+      totalPages,
+      measuredHeights,
+      measuredParagraphLayouts,
+      styles: document2.styles,
+      contentWidth,
+      measurer,
+      defaultTabStop: (_c = document2.settings) == null ? void 0 : _c.defaultTabStop
+    });
     for (const block of projected) {
       blocks.push({
         ...block,
@@ -12979,25 +12979,12 @@ function estimateTableRowHeight(row, styles, measurer, defaultTabStop, contentWi
     let blockHeights = 0;
     for (let blockIndex = 0; blockIndex < cell.blocks.length; blockIndex += 1) {
       const paragraph = cell.blocks[blockIndex];
-      const previousParagraph = cell.blocks[blockIndex - 1];
-      const nextParagraph = cell.blocks[blockIndex + 1];
       blockHeights += estimateParagraphBlockHeight(
         paragraph,
         styles,
         paragraphContentWidth,
         measurer,
-        {
-          allowSpacingBefore: !shouldCollapseContextualSpacing(
-            previousParagraph,
-            paragraph,
-            styles
-          ),
-          allowSpacingAfter: !shouldCollapseContextualSpacing(
-            paragraph,
-            nextParagraph,
-            styles
-          )
-        },
+        {},
         defaultTabStop
       );
     }
@@ -13195,7 +13182,12 @@ function projectHeaderFooterBlocks(blocks, context2 = {}) {
 const MAX_COLUMN_BALANCE_ITERATIONS = 100;
 function projectColumnedBlocksLayout(context2, count, runTrackLayout) {
   var _a, _b;
-  const { pageSettings, maxPageHeight, pageOffset = 0, existingPages = [] } = context2;
+  const {
+    pageSettings,
+    maxPageHeight,
+    pageOffset = 0,
+    existingPages = []
+  } = context2;
   const colWidth = ((_a = getPageColumnRects(pageSettings)[0]) == null ? void 0 : _a.width) ?? getPageContentWidth(pageSettings);
   const runTracks = (blocks, trackHeight) => runTrackLayout({
     ...context2,
@@ -14293,19 +14285,16 @@ function resolveEffectiveVerticalMetrics(pageSettings, headerBlocks, footerBlock
   };
 }
 function createHeaderFooterVariantProjector(context2) {
-  return (blocks, contentWidth, pageIndex, totalPageCount) => blocks ? context2.projectHeaderFooterBlocks(
-    blocks,
-    {
-      pageIndex,
-      totalPages: totalPageCount,
-      measuredHeights: context2.measuredHeights,
-      measuredParagraphLayouts: context2.measuredParagraphLayouts,
-      styles: context2.documentStyles,
-      contentWidth,
-      measurer: context2.measurer,
-      defaultTabStop: context2.defaultTabStop
-    }
-  ) : void 0;
+  return (blocks, contentWidth, pageIndex, totalPageCount) => blocks ? context2.projectHeaderFooterBlocks(blocks, {
+    pageIndex,
+    totalPages: totalPageCount,
+    measuredHeights: context2.measuredHeights,
+    measuredParagraphLayouts: context2.measuredParagraphLayouts,
+    styles: context2.documentStyles,
+    contentWidth,
+    measurer: context2.measurer,
+    defaultTabStop: context2.defaultTabStop
+  }) : void 0;
 }
 function projectTallestHeaderVariant(section, contentWidth, projectHeaderFooterVariant) {
   const variants = [
@@ -15167,6 +15156,35 @@ function resolveTableIndentLeft(table) {
   const raw = (_a = table.style) == null ? void 0 : _a.indentLeft;
   return typeof raw === "number" && Number.isFinite(raw) ? toPx(raw) : 0;
 }
+function resolveTableCellSpacingPx(table) {
+  var _a;
+  const px = parseDimensionToPx((_a = table.style) == null ? void 0 : _a.cellSpacing);
+  return px !== null && px > 0 ? px : 0;
+}
+function lineNaturalWidth(line) {
+  if (line.slots.length < 2) return 0;
+  return line.slots[line.slots.length - 1].left - line.slots[0].left;
+}
+function applyFitTextScale(paragraph, scalePercent) {
+  return {
+    ...paragraph,
+    runs: paragraph.runs.map((run) => {
+      var _a;
+      const existing = (_a = run.styles) == null ? void 0 : _a.characterScale;
+      const combined = typeof existing === "number" && existing > 0 ? existing * scalePercent / 100 : scalePercent;
+      return { ...run, styles: { ...run.styles, characterScale: combined } };
+    })
+  };
+}
+function resolveTableLeftOffset(table, tableWidth, contentWidth) {
+  var _a;
+  const align = (_a = table.style) == null ? void 0 : _a.align;
+  if (align === "center" || align === "right") {
+    const slack = Math.max(0, contentWidth - tableWidth);
+    return align === "center" ? slack / 2 : slack;
+  }
+  return resolveTableIndentLeft(table);
+}
 function resolveDefaultBorder() {
   return { width: 1, color: "#6f6f6f", type: "solid" };
 }
@@ -15230,7 +15248,7 @@ function resolveVerticalContentOffset(cell, contentHeightPx, contentNaturalHeigh
   return 0;
 }
 function buildCanvasTableLayout(options) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J;
   const {
     table: sourceTable,
     state,
@@ -15245,7 +15263,8 @@ function buildCanvasTableLayout(options) {
     style: resolveEffectiveTableStyle(sourceTable, state.document.styles)
   };
   const tableWidth = resolveCanvasTableWidth(table, contentWidth);
-  const tableLeft = originX + resolveTableIndentLeft(table);
+  const tableLeft = originX + resolveTableLeftOffset(table, tableWidth, contentWidth);
+  const cellSpacingPx = resolveTableCellSpacingPx(table);
   const tableEntries = buildTableCellLayout(table);
   const unsupported = [];
   const visualColumnCount = Math.max(
@@ -15254,13 +15273,17 @@ function buildCanvasTableLayout(options) {
       (entry) => entry.visualColumnIndex + Math.max(1, entry.colSpan)
     )
   );
+  const columnsWidthBudget = Math.max(
+    visualColumnCount,
+    tableWidth - (visualColumnCount + 1) * cellSpacingPx
+  );
   let resolvedColumnWidths = [];
   if (table.gridCols && table.gridCols.length >= visualColumnCount) {
     const gridTotalWidth = table.gridCols.reduce((a, b) => a + b, 0);
-    const scale = gridTotalWidth > 0 ? tableWidth / gridTotalWidth : 1;
+    const scale = gridTotalWidth > 0 ? columnsWidthBudget / gridTotalWidth : 1;
     resolvedColumnWidths = table.gridCols.map((w) => w * scale);
   } else {
-    const baseCellWidth = tableWidth / visualColumnCount;
+    const baseCellWidth = columnsWidthBudget / visualColumnCount;
     resolvedColumnWidths = Array(visualColumnCount).fill(baseCellWidth);
     for (const entry of tableEntries) {
       if (Math.max(1, entry.colSpan) !== 1) continue;
@@ -15283,9 +15306,9 @@ function buildCanvasTableLayout(options) {
       }
     }
   }
-  const columnOffsets = [0];
+  const columnOffsets = [cellSpacingPx];
   for (let i = 0; i < resolvedColumnWidths.length; i++) {
-    columnOffsets[i + 1] = columnOffsets[i] + resolvedColumnWidths[i];
+    columnOffsets[i + 1] = columnOffsets[i] + resolvedColumnWidths[i] + cellSpacingPx;
   }
   const cellEntriesByKey = new Map(
     tableEntries.map(
@@ -15311,8 +15334,14 @@ function buildCanvasTableLayout(options) {
     if ((_f = effectiveRowStyles[rowIndex]) == null ? void 0 : _f.hidden) {
       continue;
     }
+    if (((_h = (_g = effectiveRowStyles[rowIndex]) == null ? void 0 : _g.revision) == null ? void 0 : _h.type) === "delete") {
+      continue;
+    }
     for (let cellIndex = 0; cellIndex < row.cells.length; cellIndex += 1) {
       const sourceCell = row.cells[cellIndex];
+      if (((_j = (_i = sourceCell.style) == null ? void 0 : _i.revision) == null ? void 0 : _j.type) === "delete") {
+        continue;
+      }
       const entry = cellEntriesByKey.get(`${rowIndex}:${cellIndex}`);
       if (!entry) {
         continue;
@@ -15359,22 +15388,22 @@ function buildCanvasTableLayout(options) {
       const colSpan = Math.max(1, entry.colSpan);
       const width = Math.max(
         1,
-        (columnOffsets[visualCol + colSpan] ?? tableWidth) - (columnOffsets[visualCol] ?? 0)
+        (columnOffsets[visualCol + colSpan] ?? tableWidth) - (columnOffsets[visualCol] ?? 0) - cellSpacingPx
       );
       const padding = resolveCellPadding(cell);
-      const logicalLeft = ((_g = table.style) == null ? void 0 : _g.bidiVisual) ? (_h = cell.style) == null ? void 0 : _h.borderEnd : (_i = cell.style) == null ? void 0 : _i.borderStart;
-      const logicalRight = ((_j = table.style) == null ? void 0 : _j.bidiVisual) ? (_k = cell.style) == null ? void 0 : _k.borderStart : (_l = cell.style) == null ? void 0 : _l.borderEnd;
+      const logicalLeft = ((_k = table.style) == null ? void 0 : _k.bidiVisual) ? (_l = cell.style) == null ? void 0 : _l.borderEnd : (_m = cell.style) == null ? void 0 : _m.borderStart;
+      const logicalRight = ((_n = table.style) == null ? void 0 : _n.bidiVisual) ? (_o = cell.style) == null ? void 0 : _o.borderStart : (_p = cell.style) == null ? void 0 : _p.borderEnd;
       const borders = {
-        top: resolveBorder((_m = cell.style) == null ? void 0 : _m.borderTop),
-        right: resolveBorder(((_n = cell.style) == null ? void 0 : _n.borderRight) ?? logicalRight),
-        bottom: resolveBorder((_o = cell.style) == null ? void 0 : _o.borderBottom),
-        left: resolveBorder(((_p = cell.style) == null ? void 0 : _p.borderLeft) ?? logicalLeft),
-        ...((_q = cell.style) == null ? void 0 : _q.borderTopLeftToBottomRight) ? {
+        top: resolveBorder((_q = cell.style) == null ? void 0 : _q.borderTop),
+        right: resolveBorder(((_r = cell.style) == null ? void 0 : _r.borderRight) ?? logicalRight),
+        bottom: resolveBorder((_s = cell.style) == null ? void 0 : _s.borderBottom),
+        left: resolveBorder(((_t = cell.style) == null ? void 0 : _t.borderLeft) ?? logicalLeft),
+        ...((_u = cell.style) == null ? void 0 : _u.borderTopLeftToBottomRight) ? {
           topLeftToBottomRight: resolveBorder(
             cell.style.borderTopLeftToBottomRight
           )
         } : {},
-        ...((_r = cell.style) == null ? void 0 : _r.borderTopRightToBottomLeft) ? {
+        ...((_v = cell.style) == null ? void 0 : _v.borderTopRightToBottomLeft) ? {
           topRightToBottomLeft: resolveBorder(
             cell.style.borderTopRightToBottomLeft
           )
@@ -15387,15 +15416,35 @@ function buildCanvasTableLayout(options) {
       const verticalMode = resolveCellVerticalMode(cell);
       const isRotated = verticalMode === "rotate-cw" || verticalMode === "rotate-ccw";
       const isStacked = verticalMode === "stack";
+      const isFitText = !!((_w = cell.style) == null ? void 0 : _w.fitText) && !isRotated && !isStacked;
       const explicitRowHeightPx = parseDimensionToPx(effectiveRow.height);
-      const wrapWidth = isRotated || ((_s = cell.style) == null ? void 0 : _s.noWrap) ? isRotated && explicitRowHeightPx !== null && explicitRowHeightPx > 0 ? Math.max(
+      const wrapWidth = isRotated || ((_x = cell.style) == null ? void 0 : _x.noWrap) ? isRotated && explicitRowHeightPx !== null && explicitRowHeightPx > 0 ? Math.max(
         MIN_TABLE_CELL_CONTENT_WIDTH_PX,
         explicitRowHeightPx - borders.top.width - borders.bottom.width - padding.top - padding.bottom
       ) : NO_WRAP_WIDTH_PX : contentWidthPx;
       const projectedParagraphs = [];
       let contentNaturalHeightPx = 0;
       for (const original of cell.blocks) {
-        const paragraph = fitImagesToCellWidth(original, contentWidthPx);
+        let paragraph = fitImagesToCellWidth(original, contentWidthPx);
+        if (isFitText) {
+          const noWrapProjected = projectParagraphLayout(
+            paragraph,
+            pageIndex,
+            void 0,
+            state.document.styles,
+            NO_WRAP_WIDTH_PX,
+            void 0,
+            (_y = state.document.settings) == null ? void 0 : _y.defaultTabStop
+          );
+          const naturalWidth = noWrapProjected.lines.length > 0 ? lineNaturalWidth(noWrapProjected.lines[0]) : 0;
+          if (naturalWidth > 0 && contentWidthPx > 0) {
+            const scalePercent = Math.max(
+              1,
+              Math.min(600, contentWidthPx / naturalWidth * 100)
+            );
+            paragraph = applyFitTextScale(paragraph, scalePercent);
+          }
+        }
         const paragraphStyle = resolveEffectiveParagraphStyle(
           paragraph.style,
           state.document.styles
@@ -15412,7 +15461,7 @@ function buildCanvasTableLayout(options) {
             spacingAfter
           });
           const hasExplicitRowHeight = explicitRowHeightPx !== null && explicitRowHeightPx > 0;
-          const paragraphStyleSize = ((_u = (_t = paragraph.runs[0]) == null ? void 0 : _t.styles) == null ? void 0 : _u.fontSize) ?? 14.6667;
+          const paragraphStyleSize = ((_A = (_z = paragraph.runs[0]) == null ? void 0 : _z.styles) == null ? void 0 : _A.fontSize) ?? 14.6667;
           contentNaturalHeightPx = Math.max(
             contentNaturalHeightPx,
             hasExplicitRowHeight ? paragraphStyleSize * 1.25 : stackLength
@@ -15426,23 +15475,38 @@ function buildCanvasTableLayout(options) {
           state.document.styles,
           wrapWidth,
           void 0,
-          (_v = state.document.settings) == null ? void 0 : _v.defaultTabStop
+          (_B = state.document.settings) == null ? void 0 : _B.defaultTabStop
         );
         const linesBottom = projected.lines.length > 0 ? Math.max(...projected.lines.map((line) => line.top + line.height)) : 1;
         let effectiveSpacingBefore = spacingBefore;
         if (!isRotated && projectedParagraphs.length > 0) {
           const previous = projectedParagraphs[projectedParagraphs.length - 1];
-          const collapsed = Math.min(previous.spacingAfter, spacingBefore);
-          if (collapsed > 0) {
-            if (previous.spacingAfter >= spacingBefore) {
-              effectiveSpacingBefore = 0;
-            } else {
-              const previousHeight = previous.height;
-              previous.height = Math.max(1, previous.height - collapsed);
-              contentNaturalHeightPx = Math.max(
-                0,
-                contentNaturalHeightPx - (previousHeight - previous.height)
-              );
+          if (((_C = state.document.settings) == null ? void 0 : _C.allowSpaceOfSameStyleInTable) && shouldCollapseContextualSpacing(
+            previous.paragraph,
+            paragraph,
+            state.document.styles
+          )) {
+            const removedAfter = previous.spacingAfter;
+            previous.height = Math.max(1, previous.height - removedAfter);
+            previous.spacingAfter = 0;
+            contentNaturalHeightPx = Math.max(
+              0,
+              contentNaturalHeightPx - removedAfter
+            );
+            effectiveSpacingBefore = 0;
+          } else {
+            const collapsed = Math.min(previous.spacingAfter, spacingBefore);
+            if (collapsed > 0) {
+              if (previous.spacingAfter >= spacingBefore) {
+                effectiveSpacingBefore = 0;
+              } else {
+                const previousHeight = previous.height;
+                previous.height = Math.max(1, previous.height - collapsed);
+                contentNaturalHeightPx = Math.max(
+                  0,
+                  contentNaturalHeightPx - (previousHeight - previous.height)
+                );
+              }
             }
           }
         }
@@ -15474,6 +15538,16 @@ function buildCanvasTableLayout(options) {
           contentNaturalHeightPx += paragraphHeight;
         }
       }
+      if ((_D = cell.style) == null ? void 0 : _D.hideMark) {
+        const allEmpty = cell.blocks.every(
+          (para) => para.runs.every(
+            (run) => (run.kind === "text" || run.kind === void 0) && (!run.text || run.text.length === 0)
+          )
+        );
+        if (allEmpty) {
+          contentNaturalHeightPx = 0;
+        }
+      }
       prepared.push({
         rowIndex,
         cellIndex,
@@ -15493,9 +15567,10 @@ function buildCanvasTableLayout(options) {
   }
   const rowCount = Math.max(1, table.rows.length);
   const explicitRowHeights = table.rows.map((row) => {
+    var _a2;
     const rowIndex = table.rows.indexOf(row);
     const effective = effectiveRowStyles[rowIndex];
-    if (effective == null ? void 0 : effective.hidden) {
+    if ((effective == null ? void 0 : effective.hidden) || ((_a2 = effective == null ? void 0 : effective.revision) == null ? void 0 : _a2.type) === "delete") {
       return 0;
     }
     const explicit = parseDimensionToPx(effective == null ? void 0 : effective.height);
@@ -15504,7 +15579,7 @@ function buildCanvasTableLayout(options) {
   const fallbackPerRow = estimatedHeight > 0 ? estimatedHeight / rowCount : DEFAULT_TABLE_ROW_HEIGHT;
   const rowHeights = [];
   for (let rowIndex = 0; rowIndex < table.rows.length; rowIndex += 1) {
-    if ((_w = effectiveRowStyles[rowIndex]) == null ? void 0 : _w.hidden) {
+    if (((_E = effectiveRowStyles[rowIndex]) == null ? void 0 : _E.hidden) || ((_G = (_F = effectiveRowStyles[rowIndex]) == null ? void 0 : _F.revision) == null ? void 0 : _G.type) === "delete") {
       rowHeights[rowIndex] = 0;
       continue;
     }
@@ -15520,10 +15595,10 @@ function buildCanvasTableLayout(options) {
     rowHeights[rowIndex] = Math.max(baseFloor, measured, 1);
   }
   const rowOffsets = [];
-  let cumulativeY = 0;
+  let cumulativeY = cellSpacingPx;
   for (let rowIndex = 0; rowIndex < table.rows.length; rowIndex += 1) {
     rowOffsets[rowIndex] = cumulativeY;
-    cumulativeY += rowHeights[rowIndex] ?? DEFAULT_TABLE_ROW_HEIGHT;
+    cumulativeY += (rowHeights[rowIndex] ?? DEFAULT_TABLE_ROW_HEIGHT) + cellSpacingPx;
   }
   const cells = [];
   for (const cellEntry of prepared) {
@@ -15542,7 +15617,7 @@ function buildCanvasTableLayout(options) {
     const top = originY + (rowOffsets[rowIndex] ?? 0);
     const height = Math.max(
       1,
-      rowHeights.slice(rowIndex, rowIndex + rowSpan).reduce((sum, current) => sum + current, 0)
+      rowHeights.slice(rowIndex, rowIndex + rowSpan).reduce((sum, current) => sum + current, 0) + (rowSpan - 1) * cellSpacingPx
     );
     const contentLeft = left + borders.left.width + padding.left;
     const contentTop = top + borders.top.width + padding.top;
@@ -15588,13 +15663,13 @@ function buildCanvasTableLayout(options) {
       contentTop,
       contentWidth: contentWidthPx,
       contentHeight: contentHeightPx,
-      shading: (_x = cell.style) == null ? void 0 : _x.shading,
+      shading: (_H = cell.style) == null ? void 0 : _H.shading,
       anchorPosition,
       padding,
       borders,
       paragraphs,
       verticalMode: cellEntry.verticalMode,
-      revision: ((_y = cell.style) == null ? void 0 : _y.revision) ?? (((_z = cell.style) == null ? void 0 : _z.propertyRevision) ? { ...cell.style.propertyRevision, type: "property" } : void 0)
+      revision: ((_I = cell.style) == null ? void 0 : _I.revision) ?? (((_J = cell.style) == null ? void 0 : _J.propertyRevision) ? { ...cell.style.propertyRevision, type: "property" } : void 0)
     });
   }
   return {
@@ -15602,7 +15677,8 @@ function buildCanvasTableLayout(options) {
     left: tableLeft,
     top: originY,
     width: tableWidth,
-    height: rowHeights.reduce((sum, current) => sum + current, 0),
+    // Total height includes the leading/trailing/inter-row cell-spacing gaps.
+    height: rowHeights.reduce((sum, current) => sum + current, 0) + (rowHeights.length + 1) * cellSpacingPx,
     rowHeights,
     cells,
     unsupported: Array.from(new Set(unsupported))
@@ -18567,7 +18643,9 @@ async function loadPreciseFontProgramsForFamilies(families) {
       const buffer = await font.blob().then((blob) => blob.arrayBuffer());
       const program = selectFaceProgram(new Uint8Array(buffer), font);
       registerPreciseFont(family, bold, italic, program);
-      registered.push(`${family} ${bold ? "B" : ""}${italic ? "I" : ""}`.trim());
+      registered.push(
+        `${family} ${bold ? "B" : ""}${italic ? "I" : ""}`.trim()
+      );
       changed = true;
     } catch (error) {
       failed.push(`${family} (${font.style ?? "?"}): ${String(error)}`);
@@ -32064,6 +32142,7 @@ const WORD_NS = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
 const DRAWINGML_NS = "http://schemas.openxmlformats.org/drawingml/2006/main";
 const OFFICE_REL_NS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships";
 const WORD14_NS = "http://schemas.microsoft.com/office/word/2010/wordml";
+const MARKUP_COMPAT_NS = "http://schemas.openxmlformats.org/markup-compatibility/2006";
 function getChildrenByTagNameNS(element, namespace, localName) {
   if (!element) {
     return [];
@@ -32071,8 +32150,22 @@ function getChildrenByTagNameNS(element, namespace, localName) {
   const result = [];
   for (let index = 0; index < element.childNodes.length; index += 1) {
     const node = element.childNodes[index];
-    if ((node == null ? void 0 : node.nodeType) === node.ELEMENT_NODE && node.namespaceURI === namespace && node.localName === localName) {
-      result.push(node);
+    if ((node == null ? void 0 : node.nodeType) !== node.ELEMENT_NODE) continue;
+    const el = node;
+    if (el.namespaceURI === MARKUP_COMPAT_NS && el.localName === "AlternateContent") {
+      for (let j = 0; j < el.childNodes.length; j += 1) {
+        const child = el.childNodes[j];
+        if ((child == null ? void 0 : child.nodeType) !== child.ELEMENT_NODE) continue;
+        const childEl = child;
+        if (childEl.namespaceURI === MARKUP_COMPAT_NS && childEl.localName === "Fallback") {
+          result.push(...getChildrenByTagNameNS(childEl, namespace, localName));
+          break;
+        }
+      }
+      continue;
+    }
+    if (el.namespaceURI === namespace && el.localName === localName) {
+      result.push(el);
     }
   }
   return result;
@@ -32108,6 +32201,19 @@ function findElementDeep(element, localName) {
   }
   return null;
 }
+function collectExtAttributes(element) {
+  const result = {};
+  const attrs = element.attributes;
+  for (let i = 0; i < attrs.length; i += 1) {
+    const attr = attrs[i];
+    if (!attr) continue;
+    const ns = attr.namespaceURI;
+    if (!ns || ns === WORD_NS) continue;
+    if (attr.prefix === "xmlns" || attr.localName === "xmlns") continue;
+    result[`${attr.prefix}:${attr.localName}`] = attr.value;
+  }
+  return Object.keys(result).length > 0 ? result : void 0;
+}
 function isWordTrue(value) {
   return value === "1" || value === "true" || value === "on";
 }
@@ -32480,6 +32586,15 @@ function parseSettings(xml) {
       const val = getAttributeValue(adjustLineHeightInTable, "val");
       settings.adjustLineHeightInTable = val !== "0" && val !== "false";
     }
+    const allowSpace = getFirstChildByTagNameNS(
+      compat,
+      WORD_NS,
+      "allowSpaceOfSameStyleInTable"
+    );
+    if (allowSpace) {
+      const val = getAttributeValue(allowSpace, "val");
+      settings.allowSpaceOfSameStyleInTable = val !== "0" && val !== "false";
+    }
   }
   return settings;
 }
@@ -33500,8 +33615,12 @@ function parseTableStyle(tblPr, tableStyleId) {
     getFirstChildByTagNameNS(tblPr, WORD_NS, "jc"),
     "val"
   );
-  if (jc === "left" || jc === "center" || jc === "right") {
-    style2.align = jc;
+  if (jc === "left" || jc === "start") {
+    style2.align = "left";
+  } else if (jc === "center") {
+    style2.align = "center";
+  } else if (jc === "right" || jc === "end") {
+    style2.align = "right";
   }
   const layout = parseTableLayout(tblPr);
   if (layout) {
@@ -33621,6 +33740,17 @@ function parseTableRowStyle(rowProperties) {
   if (cellSpacing !== void 0) {
     style2.cellSpacing = cellSpacing;
   }
+  const rowJc = getAttributeValue(
+    getFirstChildByTagNameNS(rowProperties, WORD_NS, "jc"),
+    "val"
+  );
+  if (rowJc === "left" || rowJc === "start") {
+    style2.align = "left";
+  } else if (rowJc === "center") {
+    style2.align = "center";
+  } else if (rowJc === "right" || rowJc === "end") {
+    style2.align = "right";
+  }
   const cantSplit = parseOnOffProperty(rowProperties, "cantSplit");
   if (cantSplit !== void 0) {
     style2.cantSplit = cantSplit;
@@ -33673,6 +33803,17 @@ function getTableCellVMerge(cellProperties) {
   const value = getAttributeValue(vMerge, "val");
   return value === "restart" ? "restart" : "continue";
 }
+function getTableCellHMerge(cellProperties) {
+  if (!cellProperties) {
+    return void 0;
+  }
+  const hMerge = getFirstChildByTagNameNS(cellProperties, WORD_NS, "hMerge");
+  if (!hMerge) {
+    return void 0;
+  }
+  const value = getAttributeValue(hMerge, "val");
+  return value === "restart" ? "restart" : "continue";
+}
 function parseTableCellVerticalAlign(cellProperties) {
   if (!cellProperties) {
     return void 0;
@@ -35538,6 +35679,12 @@ async function parseTableNode(tableNode, numberingMaps, zip, relsMap, assets, th
       }
       collapseCellAutospacing(paragraphs, autospacingFlags);
       const colSpan = getTableCellColSpan(cellProperties);
+      const hMerge = getTableCellHMerge(cellProperties);
+      if (hMerge === "continue" && cells.length > 0) {
+        const anchor = cells[cells.length - 1];
+        anchor.colSpan = (anchor.colSpan ?? 1) + colSpan;
+        continue;
+      }
       const vMerge = getTableCellVMerge(cellProperties);
       const cellStyle = parseTableCellStyle(cellProperties);
       const cell = createEditorTableCell(
@@ -35547,6 +35694,8 @@ async function parseTableNode(tableNode, numberingMaps, zip, relsMap, assets, th
       );
       if (cellStyle) cell.style = cellStyle;
       cell.conditionalStyle = parseTableConditionalFlags(cellProperties);
+      const cellExtAttrs = collectExtAttributes(cellNode);
+      if (cellExtAttrs) cell.extAttributes = cellExtAttrs;
       if (vMerge === "continue") {
         cell.blocks = [];
       }
@@ -35561,9 +35710,22 @@ async function parseTableNode(tableNode, numberingMaps, zip, relsMap, assets, th
       row.style = rowStyle;
     }
     row.conditionalStyle = rowConditionalStyle;
+    const rowExtAttrs = collectExtAttributes(rowNode);
+    if (rowExtAttrs) row.extAttributes = rowExtAttrs;
     const tblPrEx = getFirstChildByTagNameNS(rowNode, WORD_NS, "tblPrEx");
     if (tblPrEx) {
-      row.tblPrExXml = new XMLSerializer().serializeToString(tblPrEx);
+      const exceptions = parseTableStyle(tblPrEx);
+      if (exceptions) {
+        row.propertyExceptions = exceptions;
+      }
+      const changeEl = getFirstChildByTagNameNS(
+        tblPrEx,
+        WORD_NS,
+        "tblPrExChange"
+      );
+      if (changeEl) {
+        row.tblPrExChangeXml = new XMLSerializer().serializeToString(changeEl);
+      }
     }
     rows.push(row);
   }
@@ -36394,6 +36556,12 @@ async function importDocxToEditorDocument(buffer, options = {}) {
         defaultTabStop: docSettings.defaultTabStop
       };
     }
+    if (docSettings.allowSpaceOfSameStyleInTable) {
+      doc2.settings = {
+        ...doc2.settings ?? {},
+        allowSpaceOfSameStyleInTable: true
+      };
+    }
     let result = doc2;
     if (editorFootnotes) {
       result.footnotes = editorFootnotes;
@@ -36580,7 +36748,7 @@ function importDocxInWorker(buffer, options = {}) {
     const worker = new Worker(
       new URL(
         /* @vite-ignore */
-        "" + new URL("assets/importDocxWorker-BN5o1geV.js", import.meta.url).href,
+        "" + new URL("assets/importDocxWorker-6DqfSWfq.js", import.meta.url).href,
         import.meta.url
       ),
       {
@@ -39130,7 +39298,11 @@ function parseFontSizePtToPx(pt) {
   return fontSizePtToPx(value);
 }
 const UNDERLINE_STYLE_OPTIONS = [
-  { value: "single", labelKey: "underline.style.single", preview: { borderStyle: "solid" } },
+  {
+    value: "single",
+    labelKey: "underline.style.single",
+    preview: { borderStyle: "solid" }
+  },
   {
     value: "double",
     labelKey: "underline.style.double",
@@ -39141,13 +39313,21 @@ const UNDERLINE_STYLE_OPTIONS = [
     labelKey: "underline.style.thick",
     preview: { borderStyle: "solid", borderBottomWidth: "3px" }
   },
-  { value: "dotted", labelKey: "underline.style.dotted", preview: { borderStyle: "dotted" } },
+  {
+    value: "dotted",
+    labelKey: "underline.style.dotted",
+    preview: { borderStyle: "dotted" }
+  },
   {
     value: "dottedHeavy",
     labelKey: "underline.style.dottedHeavy",
     preview: { borderStyle: "dotted", borderBottomWidth: "3px" }
   },
-  { value: "dash", labelKey: "underline.style.dashed", preview: { borderStyle: "dashed" } },
+  {
+    value: "dash",
+    labelKey: "underline.style.dashed",
+    preview: { borderStyle: "dashed" }
+  },
   {
     value: "dashedHeavy",
     labelKey: "underline.style.dashedHeavy",
@@ -39163,7 +39343,11 @@ const UNDERLINE_STYLE_OPTIONS = [
     labelKey: "underline.style.longDashesHeavy",
     preview: { borderStyle: "dashed", borderBottomWidth: "3px" }
   },
-  { value: "dotDash", labelKey: "underline.style.dotDash", preview: { borderStyle: "dashed" } },
+  {
+    value: "dotDash",
+    labelKey: "underline.style.dotDash",
+    preview: { borderStyle: "dashed" }
+  },
   {
     value: "dashDotHeavy",
     labelKey: "underline.style.dotDashHeavy",