oasis-editor 0.0.178 → 0.0.180

package/dist/{index-CSKfMgDC.js → index-C0KjmCqU.js}

@@ -2863,7 +2863,7 @@ function OasisEditorAppLazy(props = {}) {
     onCleanup(() => {
       cancelled = true;
     });
-    import("./OasisEditorApp-Bf9zCPBd.js").then((m) => {
+    import("./OasisEditorApp-h2nQFM-y.js").then((m) => {
       cancelled = true;
       setProgress(1);
       setTimeout(() => setApp(() => m.OasisEditorApp), 180);
@@ -37826,6 +37826,11 @@ function getTableCellColSpan(cellProperties) {
   const parsed = value2 ? Number(value2) : 1;
   return Number.isFinite(parsed) && parsed > 1 ? Math.floor(parsed) : 1;
 }
+function parseTrackedVerticalMergeValue(value2) {
+  if (value2 === "rest" || value2 === "restart") return "restart";
+  if (value2 === "cont" || value2 === "continue") return "continue";
+  return void 0;
+}
 function getTableCellVMerge(cellProperties) {
   if (!cellProperties) {
     return void 0;
@@ -37964,15 +37969,13 @@ function parseTableCellStyle(cellProperties, tableDefaultMargins, colors) {
   const merged = getFirstChildByTagNameNS(cellProperties, WORD_NS$3, "cellMerge");
   const structural = inserted ?? deleted ?? merged;
   if (structural) {
-    const originalMerge = getAttributeValue(structural, "vMergeOrig");
+    const originalMerge = parseTrackedVerticalMergeValue(
+      getAttributeValue(structural, "vMergeOrig")
+    );
     style2.revision = {
       ...parseRevisionMetadata(structural),
       type: inserted ? "insert" : deleted ? "delete" : "merge",
-      ...merged && originalMerge ? {
-        previous: {
-          vMerge: originalMerge === "restart" ? "restart" : "continue"
-        }
-      } : {}
+      ...merged && originalMerge ? { previous: { vMerge: originalMerge } } : {}
     };
   }
   for (const [key, border] of Object.entries(
@@ -41049,6 +41052,27 @@ function applyCellParagraphAutospacing(cellNode, blocks) {
     )
   );
 }
+function captureTrackedCellMergeState(cell) {
+  var _a2, _b2;
+  const revision = (_a2 = cell.style) == null ? void 0 : _a2.revision;
+  const previousVMerge = (revision == null ? void 0 : revision.type) === "merge" ? (_b2 = revision.previous) == null ? void 0 : _b2.vMerge : void 0;
+  if (!revision || revision.type !== "merge" || !previousVMerge) return;
+  const previousStyle = cell.style ? { ...cell.style, revision: void 0 } : void 0;
+  const previousCell = {
+    ...cell,
+    blocks: previousVMerge === "continue" ? [] : cell.blocks,
+    vMerge: previousVMerge,
+    rowSpan: void 0,
+    style: previousStyle,
+    mergeRevisionState: void 0
+  };
+  cell.mergeRevisionState = {
+    revisionId: revision.id,
+    orientation: "vertical",
+    currentCellCount: 1,
+    previousCells: [previousCell]
+  };
+}
 async function parseTableNode(tableNode, numberingMaps, zip, relsMap, assets, theme, parseNestedBlocks, _styles) {
   var _a2, _b2;
   const gridCols = [];
@@ -41118,6 +41142,7 @@ async function parseTableNode(tableNode, numberingMaps, zip, relsMap, assets, th
       }
       const cellExtAttrs = collectExtAttributes(cellNode);
       if (cellExtAttrs) cell.extAttributes = cellExtAttrs;
+      captureTrackedCellMergeState(cell);
       if (vMerge === "continue") {
         cell.blocks = [];
       }
@@ -47989,7 +48014,7 @@ async function importDocxInWorker(buffer, options = {}) {
     const worker = new Worker(
       new URL(
         /* @vite-ignore */
-        "" + new URL("assets/importDocxWorker-BPMw_A0Z.js", import.meta.url).href,
+        "" + new URL("assets/importDocxWorker-CTxcTGME.js", import.meta.url).href,
         import.meta.url
       ),
       {
@@ -52295,6 +52320,25 @@ function resolveRowStructuralRevision(row, path, context2) {
     style: row.style ? { ...row.style, revision: void 0 } : row.style
   };
 }
+function restoreVerticalCellMerge(cell) {
+  var _a2, _b2;
+  const state = cell.mergeRevisionState;
+  if ((state == null ? void 0 : state.orientation) === "vertical" && state.currentCellCount === 1 && state.previousCells.length === 1) {
+    return structuredClone(state.previousCells[0]);
+  }
+  const revision = (_a2 = cell.style) == null ? void 0 : _a2.revision;
+  if ((revision == null ? void 0 : revision.type) === "merge" && ((_b2 = revision.previous) == null ? void 0 : _b2.vMerge) === "continue") {
+    return {
+      ...cell,
+      blocks: [],
+      rowSpan: void 0,
+      vMerge: "continue",
+      style: cell.style ? { ...cell.style, revision: void 0 } : cell.style,
+      mergeRevisionState: void 0
+    };
+  }
+  return void 0;
+}
 function resolveCellStructuralRevision(cell, path, context2) {
   var _a2;
   const revision = (_a2 = cell.style) == null ? void 0 : _a2.revision;
@@ -52302,13 +52346,18 @@ function resolveCellStructuralRevision(cell, path, context2) {
   if (revision && matchesRevision(context2, revision.id)) {
     markMatched(context2);
     if (context2.action === "reject" && revision.type === "merge") {
-      pushIssue(context2, {
-        kind: "cell-merge-original-unavailable",
-        revisionId: revision.id,
-        path,
-        message: "The original cell grid for this merge revision is preserved but not reconstructed by the core resolver yet."
-      });
-      return cell;
+      const restored = restoreVerticalCellMerge(cell);
+      if (!restored) {
+        pushIssue(context2, {
+          kind: "cell-merge-original-unavailable",
+          revisionId: revision.id,
+          path,
+          message: "The previous merge topology lacks an exact semantic snapshot for safe restoration."
+        });
+        return cell;
+      }
+      markResolved(context2, revision.id);
+      return restored;
     }
     markResolved(context2, revision.id);
     return {
@@ -52324,11 +52373,16 @@ function resolveCellStructuralRevision(cell, path, context2) {
       markResolved(context2, revisionId);
       return { ...cell, mergeRevisionState: void 0 };
     }
+    const restored = restoreVerticalCellMerge(cell);
+    if (restored) {
+      markResolved(context2, revisionId);
+      return restored;
+    }
     pushIssue(context2, {
       kind: "cell-merge-original-unavailable",
       revisionId,
       path: `${path}.mergeRevisionState`,
-      message: "The original cell grid is preserved but cannot yet be spliced back into the live table safely."
+      message: "The preserved merge snapshot is not a supported exact vertical-cell restoration."
     });
   }
   return cell;
@@ -52381,6 +52435,30 @@ function transformRow(row, path, context2) {
   if (cellsChanged) next = { ...next, cells };
   return next;
 }
+function recomputeVerticalMergeRowSpans(table) {
+  let changed = false;
+  const rows = table.rows.map((row, rowIndex) => {
+    let rowChanged = false;
+    const cells = row.cells.map((cell, cellIndex) => {
+      let rowSpan;
+      if (cell.vMerge === "restart") {
+        rowSpan = 1;
+        for (let nextRowIndex = rowIndex + 1; nextRowIndex < table.rows.length; nextRowIndex += 1) {
+          const nextCell = table.rows[nextRowIndex].cells[cellIndex];
+          if (!nextCell || nextCell.vMerge !== "continue") break;
+          rowSpan += 1;
+        }
+      }
+      if (cell.rowSpan === rowSpan) return cell;
+      rowChanged = true;
+      return { ...cell, rowSpan };
+    });
+    if (!rowChanged) return row;
+    changed = true;
+    return { ...row, cells };
+  });
+  return changed ? { ...table, rows } : table;
+}
 function transformTable(table, path, context2) {
   var _a2;
   let next = table;
@@ -52415,7 +52493,10 @@ function transformTable(table, path, context2) {
     if (transformed !== row) rowsChanged = true;
   }
   if (rowsChanged) next = { ...next, rows };
-  if (rowsChanged) recordRemovedParagraphRelocations(table, next, context2);
+  if (rowsChanged) {
+    next = recomputeVerticalMergeRowSpans(next);
+    recordRemovedParagraphRelocations(table, next, context2);
+  }
   return next;
 }
 function transformBlocks(blocks, path, context2) {

package/dist/oasis-editor.js

@@ -1,4 +1,4 @@
-import { dN, ah, aw, aM, aG, dO, dP, dQ, aA, dR, ai, dS, dw, aN, dT, dU, aL, aD, dV, dW, dX, ag, dY, du, aP, dZ, d_, d$, e0, e1, dI, e2, e3, e4, aU, aT, e5, aE, e6, e7, e8, e9, ea, eb, aI, aF, ec, b3, aO, b2, aV, az, aK, dH, ed, dO as dO2, dV as dV2, dY as dY2, e5 as e52, e6 as e62, eb as eb2, ee, ef, dy, dt, eg, eh, ei, ej, ek, el, em, dv, en, eo, ep, eq, er, dx, es, et } from "./index-CSKfMgDC.js";
+import { dN, ah, aw, aM, aG, dO, dP, dQ, aA, dR, ai, dS, dw, aN, dT, dU, aL, aD, dV, dW, dX, ag, dY, du, aP, dZ, d_, d$, e0, e1, dI, e2, e3, e4, aU, aT, e5, aE, e6, e7, e8, e9, ea, eb, aI, aF, ec, b3, aO, b2, aV, az, aK, dH, ed, dO as dO2, dV as dV2, dY as dY2, e5 as e52, e6 as e62, eb as eb2, ee, ef, dy, dt, eg, eh, ei, ej, ek, el, em, dv, en, eo, ep, eq, er, dx, es, et } from "./index-C0KjmCqU.js";
 export {
   dN as ActionRow,
   ah as BalloonShell,