@ai-matrx/office 0.8.54 → 0.8.56

package/dist/univer-collab.cjs

@@ -65,6 +65,7 @@ __export(collab_exports, {
   invertDocsOp: () => invertDocsOp,
   isCellEditorScratch: () => isCellEditorScratch,
   isNoopDocsOp: () => isNoopDocsOp,
+  joiningAwareness: () => joiningAwareness,
   moveSelectionsThrough: () => moveSelectionsThrough,
   normalizeDocsOp: () => normalizeDocsOp,
   offlineTextOfGroups: () => offlineTextOfGroups,
@@ -1881,6 +1882,12 @@ var SHEET_MUTATIONS = {
   "sheet.mutation.set-worksheet-row-is-auto-height": covered("size", "ranges", "autoHeightInfo"),
   "sheet.mutation.set-worksheet-row-auto-height": covered("size", "rowsAutoHeightInfo"),
   "sheet.mutation.set-worksheet-col-width": covered("size", "ranges", "colWidth"),
+  // a row or column's hidden flag (`hd`): per index like a size, the later of two wins (the gate's F5: Make table
+  // hides its Record ID column, which was rolled back as "not shared" in a room)
+  "sheet.mutation.set-row-hidden": covered("size", "ranges"),
+  "sheet.mutation.set-row-visible": covered("size", "ranges"),
+  "sheet.mutation.set-col-hidden": covered("size", "ranges"),
+  "sheet.mutation.set-col-visible": covered("size", "ranges"),
   "sheet.mutation.set-worksheet-name": covered("name", "name"),
   // ── covered (C5c) ────────────────────────────────────────────────────────────────────────────────
   "sheet.mutation.set.numfmt": covered("numfmt", "values", "refMap"),
@@ -1937,10 +1944,6 @@ var SHEET_MUTATIONS = {
   "sheet.mutation.set-frozen": barrier("X", "absolute frozen indices: not in C5a"),
   "sheet.mutation.set-row-data": barrier("X", "row properties by index: not in C5a"),
   "sheet.mutation.set-col-data": barrier("X", "column properties by index: not in C5a"),
-  "sheet.mutation.set-row-hidden": barrier("X", "row visibility: not in C5a"),
-  "sheet.mutation.set-row-visible": barrier("X", "row visibility: not in C5a"),
-  "sheet.mutation.set-col-hidden": barrier("X", "column visibility: not in C5a"),
-  "sheet.mutation.set-col-visible": barrier("X", "column visibility: not in C5a"),
   "sheet.mutation.add-range-protection": barrier("X", "permissions: not in C5a"),
   "sheet.mutation.set-range-protection": barrier("X", "permissions: not in C5a"),
   "sheet.mutation.delete-range-protection": barrier("X", "permissions: not in C5a"),
@@ -2615,6 +2618,10 @@ var ID = {
   rowIsAuto: "sheet.mutation.set-worksheet-row-is-auto-height",
   rowAutoHeight: "sheet.mutation.set-worksheet-row-auto-height",
   colWidth: "sheet.mutation.set-worksheet-col-width",
+  colHidden: "sheet.mutation.set-col-hidden",
+  colVisible: "sheet.mutation.set-col-visible",
+  rowHidden: "sheet.mutation.set-row-hidden",
+  rowVisible: "sheet.mutation.set-row-visible",
   name: "sheet.mutation.set-worksheet-name",
   setName: "formula.mutation.set-defined-name",
   removeName: "formula.mutation.remove-defined-name",
@@ -2913,7 +2920,8 @@ function transformCell(X, Y4, side) {
       out.s = { ...outS && typeof outS === "object" ? outS : {}, n: null };
     } else if (side === "right" && outS && typeof outS === "object" && "n" in outS) {
       const rest = withoutStyleKeys(outS, /* @__PURE__ */ new Set(["n"]));
-      if (rest) out.s = rest;
+      if (!has(Y4.s) && Y4.s !== null) out.s = { ...rest ?? {}, n: null };
+      else if (rest) out.s = rest;
       else delete out.s;
       xLost = true;
     }
@@ -2951,6 +2959,34 @@ function transformCellsOverCells(x, y, side) {
   const op = passes.filter((p) => !isEmptyMatrix(p)).map((p) => cellsMutation(x, p));
   return ok2(op, lost, dropped);
 }
+var coveredByMerge = (ranges, r, c) => ranges.some((q) => q.startRow <= r && r <= q.endRow && q.startColumn <= c && c <= q.endColumn && !(r === q.startRow && c === q.startColumn));
+var EMPTY_CONTENT = Object.fromEntries(CONTENT_KEYS.filter((k) => k !== "t").map((k) => [k, null]));
+function valuesUnderMerge(x, y) {
+  const ranges = mergeRanges(y);
+  const out = {};
+  const dropped = [];
+  let changed = false;
+  forEachCell(cellsOf(x), (r, c, v) => {
+    if (v === null || !hasContent(v) || !coveredByMerge(ranges, r, c)) return putCell(out, r, c, v);
+    changed = true;
+    if (!isDerived(x)) dropped.push(cellRef(sheetOf(x), r, c));
+    if ("s" in v) putCell(out, r, c, { s: v.s });
+  });
+  if (!changed) return ok2([x]);
+  return ok2(isEmptyMatrix(out) ? [] : [cellsMutation(x, out)], [], dropped);
+}
+function mergeOverValues(x, y) {
+  const ranges = mergeRanges(x);
+  const clear = {};
+  const lost = [];
+  forEachCell(cellsOf(y), (r, c, v) => {
+    if (v === null || !hasContent(v) || !coveredByMerge(ranges, r, c)) return;
+    putCell(clear, r, c, { ...EMPTY_CONTENT });
+    if (!isDerived(y)) lost.push(cellRef(sheetOf(y), r, c));
+  });
+  if (isEmptyMatrix(clear)) return ok2([x]);
+  return ok2([x, { id: ID.values, params: { subUnitId: sheetOf(x), cellValue: clear, derived: true } }], lost);
+}
 var SIDE_CAR_PARAMS = ["refSheets", "previousName", "derived", "sheetIndex", "sheetsLeft"];
 var isDerived = (m) => m.params.derived === true;
 function derivedSide(x, y, side) {
@@ -3167,9 +3203,21 @@ function annotateFormulas(group, sheets, definedNames) {
     return m;
   });
 }
+var HIDE_SHOW = {
+  [ID.colHidden]: { axis: "col", hidden: true },
+  [ID.colVisible]: { axis: "col", hidden: false },
+  [ID.rowHidden]: { axis: "row", hidden: true },
+  [ID.rowVisible]: { axis: "row", hidden: false }
+};
 function sizeOf(m) {
   const p = m.params;
   const values = /* @__PURE__ */ new Map();
+  const hs = HIDE_SHOW[m.id];
+  if (hs) {
+    const [a02, a12] = S(hs.axis);
+    for (const r of p.ranges ?? []) for (let i = r[a02]; i <= r[a12]; i++) values.set(i, hs.hidden);
+    return { axis: hs.axis, attr: "hd", values };
+  }
   if (m.id === ID.rowAutoHeight) {
     for (const { row, autoHeight } of p.rowsAutoHeightInfo ?? []) values.set(row, autoHeight);
     return { axis: "row", attr: "ah", values };
@@ -3189,6 +3237,12 @@ function sizeOf(m) {
 function buildSize(template, values) {
   if (values.size === 0) return null;
   const p = template.params;
+  const hs = HIDE_SHOW[template.id];
+  if (hs) {
+    const [a02, a12] = S(hs.axis);
+    const first2 = (p.ranges ?? [])[0] ?? { startRow: 0, endRow: 0, startColumn: 0, endColumn: 0 };
+    return { id: template.id, params: { ...p, ranges: runs(values.keys()).map((r) => ({ ...first2, [a02]: r.start, [a12]: r.start + r.count - 1 })) } };
+  }
   if (template.id === ID.rowAutoHeight)
     return { id: template.id, params: { ...p, rowsAutoHeightInfo: [...values].sort((a, b) => a[0] - b[0]).map(([row, autoHeight]) => ({ row, autoHeight })) } };
   const axis = template.id === ID.colWidth ? "col" : "row";
@@ -3734,6 +3788,8 @@ function transformMutation(x, y, side) {
     return ok2([...pre, x, ...mid, ...add.length ? [mergeMutation(ID.addMerge, sheet, add)] : []], lostMerges);
   }
   if (fx === "cell" && fy === "cell") return transformCellsOverCells(x, y, side);
+  if (x.id === ID.values && y.id === ID.addMerge) return valuesUnderMerge(x, y);
+  if (x.id === ID.addMerge && y.id === ID.values) return mergeOverValues(x, y);
   if (fx === "merge" && fy === "merge") {
     const xr = mergeRanges(x);
     const yr = mergeRanges(y);
@@ -4346,6 +4402,8 @@ var REMOVE_SHEET2 = "sheet.mutation.remove-sheet";
 var FILTER_RANGE = "sheet.mutation.set-filter-range";
 var RESHAPE = /* @__PURE__ */ new Set(["sheet.mutation.set-worksheet-row-count", "sheet.mutation.set-worksheet-column-count", "sheet.mutation.remove-sheet", INSERT_SHEET]);
 var UNDO = "univer.command.undo";
+var KEYBOARD_EVENT = 4;
+var ESC_KEY = 27;
 var REDO = "univer.command.redo";
 var DEPTH_GUARD = /* @__PURE__ */ Symbol.for("ai-matrx.office.sheets.command-depth-guard");
 var json = (v) => v === void 0 ? v : JSON.parse(JSON.stringify(v));
@@ -4370,6 +4428,16 @@ function univerSheetsOtPort(o) {
       return null;
     }
   };
+  const closeCellEditor = () => {
+    const u = unitId();
+    if (!u || !edited()) return;
+    editorHold = false;
+    try {
+      cs.syncExecuteCommand("sheet.operation.set-cell-edit-visible", { eventType: KEYBOARD_EVENT, keycode: ESC_KEY, visible: false, unitId: u });
+    } catch (err) {
+      console.warn("[sheets-ot] could not close the cell editor before reloading the workbook", err);
+    }
+  };
   const holding = () => {
     if (editorHold && !edited()) editorHold = false;
     return editorHold;
@@ -4418,38 +4486,55 @@ function univerSheetsOtPort(o) {
       }
     }
   };
+  const removedSheetRefs = (gone) => {
+    const wb = o.workbook();
+    const names = sheetNames();
+    const name = names[gone];
+    if (!wb || !name) return [];
+    const refSheets = {};
+    for (const [id, n] of Object.entries(names)) refSheets[n] = id;
+    const owed = [];
+    for (const ws of wb.getSheets()) {
+      const sheet = ws.getSheetId();
+      if (sheet === gone) continue;
+      ws.getCellMatrix?.().forValue((r, c, cell) => {
+        const f = cell?.f;
+        if (typeof f !== "string" || !f.includes(name)) return;
+        const out = rewriteFormula(f, { ownSheet: sheet, refSheets }, { kind: "remove-sheet", sheet: gone });
+        if (typeof out !== "string" && out.changed) owed.push({ sheet, row: r, col: c, f: out.text });
+      });
+    }
+    return owed;
+  };
   const sweepRemovedSheetRefs = (g) => {
-    const removed = g.mutations.filter((m) => m.id === REMOVE_SHEET2).map((m) => String(m.params.subUnitId ?? ""));
     const wb = o.workbook();
     const u = unitId();
-    if (!removed.length || !wb || !u) return;
-    const refSheets = {};
-    for (const [id, name] of Object.entries(g.sheets)) refSheets[name] = id;
-    for (const gone of removed) {
-      const name = g.sheets[gone];
-      if (!name) continue;
-      for (const ws of wb.getSheets()) {
-        const sheet = ws.getSheetId();
-        const cells = {};
-        ws.getCellMatrix?.().forValue((r, c, cell) => {
-          const f = cell?.f;
-          if (typeof f !== "string" || !f.includes(name)) return;
-          const out = rewriteFormula(f, { ownSheet: sheet, refSheets }, { kind: "remove-sheet", sheet: gone });
-          if (typeof out !== "string" && out.changed) (cells[r] ??= {})[c] = { f: out.text, si: null };
-        });
-        if (!Object.keys(cells).length) continue;
-        applying = true;
-        try {
-          cs.syncExecuteCommand(VALUES, { unitId: u, subUnitId: sheet, cellValue: json(cells) });
-        } finally {
-          applying = false;
-        }
-        const done = {};
-        for (const r of Object.keys(cells))
-          for (const c of Object.keys(cells[r])) (done[r] ??= {})[c] = completeCellContent(cells[r][c], json(ws.getCellRaw(Number(r), Number(c)) ?? null));
-        g.mutations.push({ id: VALUES, params: { subUnitId: sheet, cellValue: done } });
-        g.inverses.push(void 0);
+    if (!g.owedRefs?.length || !wb || !u) return;
+    const written = /* @__PURE__ */ new Set();
+    for (const m of g.mutations)
+      if (m.id === VALUES) {
+        for (const [r, row] of Object.entries(m.params.cellValue ?? {})) for (const [c, v] of Object.entries(row ?? {})) if (v && "f" in v) written.add(`${m.params.subUnitId}:${r}:${c}`);
       }
+    const bySheet = /* @__PURE__ */ new Map();
+    for (const x of g.owedRefs) {
+      if (written.has(`${x.sheet}:${x.row}:${x.col}`) || !wb.getSheetBySheetId(x.sheet)) continue;
+      const cells = bySheet.get(x.sheet) ?? {};
+      (cells[x.row] ??= {})[x.col] = { f: x.f, si: null };
+      bySheet.set(x.sheet, cells);
+    }
+    for (const [sheet, cells] of bySheet) {
+      const ws = wb.getSheetBySheetId(sheet);
+      applying = true;
+      try {
+        cs.syncExecuteCommand(VALUES, { unitId: u, subUnitId: sheet, cellValue: json(cells) });
+      } finally {
+        applying = false;
+      }
+      const done = {};
+      for (const r of Object.keys(cells))
+        for (const c of Object.keys(cells[r])) (done[r] ??= {})[c] = completeCellContent(cells[r][c], json(ws.getCellRaw(Number(r), Number(c)) ?? null));
+      g.mutations.push({ id: VALUES, params: { subUnitId: sheet, cellValue: done } });
+      g.inverses.push(void 0);
     }
   };
   const flush = () => {
@@ -4496,6 +4581,7 @@ function univerSheetsOtPort(o) {
       record.filter = filterOf(String(p.subUnitId ?? ""));
     }
     if (info.id === SHEET_NAME) record.name = ws.getName();
+    if (info.id === REMOVE_SHEET2) record.owedRefs = removedSheetRefs(String(p.subUnitId ?? ""));
     pre.set(p, record);
     const owed = isStructuralMutation({ id: info.id, params: p }) ? mergeFixupsOwed({ id: info.id, params: p }, record.merges ?? []) : null;
     if (owed) {
@@ -4648,6 +4734,8 @@ function univerSheetsOtPort(o) {
         g.mutations.push(r.m);
         g.inverses.push(r.inverse);
       }
+      const owedRefs = info.id === REMOVE_SHEET2 ? pre.get(info.params)?.owedRefs : void 0;
+      if (owedRefs?.length) (g.owedRefs ??= []).push(...owedRefs);
       const was = info.id === VALUES ? pre.get(info.params)?.filter : void 0;
       if (was && !g.notShared) {
         const sheet = String(info.params.subUnitId ?? "");
@@ -4764,6 +4852,7 @@ function univerSheetsOtPort(o) {
       group = null;
       applying = true;
       try {
+        closeCellEditor();
         const u = unitId();
         if (u) releaseUnitPluginState(cs, u, o.saveUnit?.(u) ?? null);
         o.load(snapshot);
@@ -4781,6 +4870,21 @@ function univerSheetsOtPort(o) {
       return () => void undoWatchers.delete(fn);
     },
     markDirty: () => o.markDirty(),
+    cursor() {
+      const sel = o.selections;
+      if (!sel) return null;
+      try {
+        const sheetId = sel.sheetId();
+        if (!sheetId) return null;
+        const first = sel.get()?.[0];
+        const p = first?.primary;
+        const row = p?.actualRow ?? p?.startRow ?? first?.range.startRow ?? 0;
+        const col = p?.actualColumn ?? p?.startColumn ?? first?.range.startColumn ?? 0;
+        return { sheetId, row: Number.isFinite(row) ? row : 0, col: Number.isFinite(col) ? col : 0 };
+      } catch {
+        return null;
+      }
+    },
     dispose() {
       undoWatchers.clear();
       before.dispose();
@@ -5054,6 +5158,24 @@ async function workbookUsesOrderedRoom(workbookId, knob, isNewWorkbook, offlineK
   if (knob === "new") return isNewWorkbook();
   return false;
 }
+function joiningAwareness(o, port) {
+  let at = null;
+  try {
+    at = port.cursor?.() ?? null;
+  } catch {
+    at = null;
+  }
+  return {
+    uid: o.uid,
+    clientId: o.clientId,
+    name: o.displayName || "Someone",
+    ...o.avatarUrl ? { avatarUrl: o.avatarUrl } : {},
+    sheetId: at?.sheetId ?? null,
+    row: at?.row ?? null,
+    col: at?.col ?? null,
+    ts: Date.now()
+  };
+}
 async function startWorkbookOtRoom(port, o) {
   const latest = await getLatestSnapshot(o.workbookId);
   if (!latest.success) throw new Error(latest.error);
@@ -5066,16 +5188,7 @@ async function startWorkbookOtRoom(port, o) {
   }
   const doc = new Y3.Doc();
   const awareness = new import_awareness3.Awareness(doc);
-  awareness.setLocalState({
-    uid: o.uid,
-    clientId: o.clientId,
-    name: o.displayName || "Someone",
-    ...o.avatarUrl ? { avatarUrl: o.avatarUrl } : {},
-    sheetId: null,
-    row: null,
-    col: null,
-    ts: Date.now()
-  });
+  awareness.setLocalState(joiningAwareness(o, port));
   const stopColor = (0, import_collab6.claimCollaboratorColor)(awareness, { uid: o.uid, clientId: o.clientId });
   const publishAwareness = () => o.onAwareness?.(new Map(awareness.getStates()));
   awareness.on("change", publishAwareness);