@ai-matrx/office 0.8.15 → 0.8.16

package/dist/univer-collab.cjs

@@ -1292,37 +1292,8 @@ var Y2 = __toESM(require("yjs"), 1);
 var import_awareness2 = require("y-protocols/awareness");
 var import_collab3 = require("@ai-matrx/data/realtime/collab");
 
-// src/docs/document-model.ts
-var import_core2 = require("@univerjs/core");
-
-// src/univer/openEditorContent.ts
-var replacers = /* @__PURE__ */ new Map();
-var keyOf = (kind, recordId) => `${kind}:${recordId}`;
-function hasOpenEditorContent(kind, recordId) {
-  return replacers.has(keyOf(kind, recordId));
-}
-async function showSavedSnapshot(kind, recordId, row) {
-  const replace = replacers.get(keyOf(kind, recordId));
-  if (!replace) return false;
-  await replace(row);
-  return true;
-}
-
-// src/docs/document-model.ts
-function moveRangesThroughBodyEdit(ranges, actions) {
-  const a = actions;
-  if (!Array.isArray(a) || a[0] !== "body") return null;
-  const sub = a[1];
-  if (!sub || sub.et !== "text-x" || !Array.isArray(sub.e)) return null;
-  const e = sub.e;
-  return ranges.map((r) => {
-    const collapsed = r.startOffset === r.endOffset;
-    const startOffset = import_core2.TextX.transformPosition(e, r.startOffset, collapsed);
-    return { startOffset, endOffset: collapsed ? startOffset : import_core2.TextX.transformPosition(e, r.endOffset, true) };
-  });
-}
-
 // src/docs/remote-carets.ts
+var import_core2 = require("@univerjs/core");
 var CARET_HEARTBEAT_MS = 2e3;
 var CARET_STALE_MS = 12e3;
 var CARET_MAX_RANGES = 4;
@@ -1332,6 +1303,18 @@ function publishedCaretFromSelection(sel, now) {
   const ranges = sel.slice(0, CARET_MAX_RANGES).map((r) => ({ start: Math.min(r.startOffset, r.endOffset), end: Math.max(r.startOffset, r.endOffset) }));
   return { ranges, at: now };
 }
+function movePeerRangesThroughBodyEdit(ranges, actions) {
+  const a = actions;
+  if (!Array.isArray(a) || a[0] !== "body") return null;
+  const sub = a[1];
+  if (!sub || sub.et !== "text-x" || !Array.isArray(sub.e)) return null;
+  const e = sub.e;
+  return ranges.map((r) => {
+    const collapsed = r.start === r.end;
+    const start = import_core2.TextX.transformPosition(e, r.start, false);
+    return { start, end: collapsed ? start : import_core2.TextX.transformPosition(e, r.end, true) };
+  });
+}
 var sameRanges = (a, b) => a.length === b.length && a.every((r, i) => r.start === b[i].start && r.end === b[i].end);
 function readCaret(raw) {
   const c = raw?.caret;
@@ -1383,9 +1366,8 @@ var RemoteCaretBook = class {
   shiftThrough(actions) {
     let moved = false;
     for (const c of this.carets.values()) {
-      const next = moveRangesThroughBodyEdit(c.ranges.map((r) => ({ startOffset: r.start, endOffset: r.end })), actions);
-      if (!next) return false;
-      const ranges = next.map((r) => ({ start: r.startOffset, end: r.endOffset }));
+      const ranges = movePeerRangesThroughBodyEdit(c.ranges, actions);
+      if (!ranges) return false;
       if (!sameRanges(ranges, c.ranges)) {
         c.ranges = ranges;
         moved = true;
@@ -1588,6 +1570,21 @@ function documentOtFactory(o) {
 
 // src/docs/document-restore.ts
 var import_collab4 = require("@ai-matrx/data/realtime/collab");
+
+// src/univer/openEditorContent.ts
+var replacers = /* @__PURE__ */ new Map();
+var keyOf = (kind, recordId) => `${kind}:${recordId}`;
+function hasOpenEditorContent(kind, recordId) {
+  return replacers.has(keyOf(kind, recordId));
+}
+async function showSavedSnapshot(kind, recordId, row) {
+  const replace = replacers.get(keyOf(kind, recordId));
+  if (!replace) return false;
+  await replace(row);
+  return true;
+}
+
+// src/docs/document-restore.ts
 var defaultDeps = {
   client: () => getDocsHost().getSupabase(),
   roomExists: import_collab4.collabRoomExists,
@@ -3187,21 +3184,36 @@ function univerSheetsOtPort(o) {
     settle();
   });
   const guarded = cs;
-  if (!guarded[DEPTH_GUARD] && typeof cs.executeCommand === "function") {
+  if (!guarded[DEPTH_GUARD]) {
     const trackers = /* @__PURE__ */ new Set();
     guarded[DEPTH_GUARD] = trackers;
-    const original = cs.executeCommand.bind(cs);
-    cs.executeCommand = async (id, params, options) => {
-      const depths = new Map([...trackers].map((t) => [t, t.stack.length]));
+    const restore = (depths) => {
+      for (const [t, d] of depths) {
+        if (t.stack.length > d) {
+          t.stack.length = d;
+          t.settle();
+        }
+      }
+    };
+    const depthsNow = () => new Map([...trackers].map((t) => [t, t.stack.length]));
+    if (typeof cs.executeCommand === "function") {
+      const original = cs.executeCommand.bind(cs);
+      cs.executeCommand = async (id, params, options) => {
+        const depths = depthsNow();
+        try {
+          return await original(id, params, options);
+        } finally {
+          restore(depths);
+        }
+      };
+    }
+    const originalSync = cs.syncExecuteCommand.bind(cs);
+    cs.syncExecuteCommand = (id, params, options) => {
+      const depths = depthsNow();
       try {
-        return await original(id, params, options);
+        return originalSync(id, params, options);
       } finally {
-        for (const [t, d] of depths) {
-          if (t.stack.length > d) {
-            t.stack.length = d;
-            t.settle();
-          }
-        }
+        restore(depths);
       }
     };
   }