@ai-matrx/office 0.8.37 → 0.8.38

package/dist/univer-collab.cjs

@@ -1225,29 +1225,38 @@ function undoStacksOf(service) {
   if (!s || !(s._undoStacks instanceof Map) || !(s._redoStacks instanceof Map)) return null;
   return { undo: s._undoStacks, redo: s._redoStacks };
 }
-function rebaseUndoStack(items, remote) {
+function threadThrough(list, remote) {
+  if (!list?.length || isNoopDocsOp(remote)) return { next: null, after: remote };
+  let R = remote;
+  let changed = false;
+  const next = list.map((m) => {
+    if (m.id !== RICH_TEXT_EDITING || isNoopDocsOp(R)) return m;
+    const own = m.params.actions;
+    if (touchesPageSetup(own) && touchesPageSetup(R)) throw new Error("page setup");
+    const x = transformDocsOp(own, R, "left");
+    if (isNoopDocsOp(x.op)) throw new Error("emptied");
+    R = transformDocsOp(R, own, "right").op;
+    changed = true;
+    const params = { ...m.params, actions: x.op };
+    delete params.textRanges;
+    delete params.layoutState;
+    return { ...m, params };
+  });
+  return { next: changed ? next : null, after: R };
+}
+function rebaseUndoStack(items, remote, stack) {
+  if (isNoopDocsOp(remote)) return 0;
+  const first = stack === "undo" ? "undoMutations" : "redoMutations";
+  const second = stack === "undo" ? "redoMutations" : "undoMutations";
   let dropped = 0;
   for (let i = items.length - 1; i >= 0; i--) {
     const item = items[i];
-    let ok3 = true;
-    for (const list of [item.undoMutations, item.redoMutations]) {
-      for (const m of list ?? []) {
-        if (m.id !== RICH_TEXT_EDITING) continue;
-        try {
-          if (touchesPageSetup(m.params.actions) && touchesPageSetup(remote)) throw new Error("page setup");
-          const r = transformDocsOp(m.params.actions, remote, "left");
-          if (isNoopDocsOp(r.op)) ok3 = false;
-          else {
-            m.params = { ...m.params, actions: r.op };
-            delete m.params.textRanges;
-            delete m.params.layoutState;
-          }
-        } catch {
-          ok3 = false;
-        }
-      }
-    }
-    if (!ok3) {
+    try {
+      const a = threadThrough(item[first], remote);
+      const b = threadThrough(item[second], a.after);
+      if (a.next) item[first] = a.next;
+      if (b.next) item[second] = b.next;
+    } catch {
       items.splice(i, 1);
       dropped++;
     }
@@ -1268,6 +1277,7 @@ function openDocsOtRoom(o) {
     }
   };
   const applyNow = (op) => {
+    for (const t of port.undoTargets()) t.flushHistory?.();
     for (const b of branches(op)) {
       const params = { segmentId: segmentOf(b), actions: b };
       port.applyRemote(RICH_TEXT_EDITING, params);
@@ -1275,10 +1285,10 @@ function openDocsOtRoom(o) {
     for (const t of port.undoTargets()) {
       const stacks = undoStacksOf(t.service);
       if (!stacks) continue;
-      for (const m of [stacks.undo, stacks.redo]) {
-        const items = m.get(t.unitId);
-        if (items?.length) rebaseUndoStack(items, op);
-      }
+      const undo = stacks.undo.get(t.unitId);
+      if (undo?.length) rebaseUndoStack(undo, op, "undo");
+      const redo = stacks.redo.get(t.unitId);
+      if (redo?.length) rebaseUndoStack(redo, op, "redo");
     }
     port.markDirty();
   };