@ai-matrx/office 0.8.18 → 0.8.20

package/dist/univer-collab.d.cts

@@ -128,6 +128,7 @@ declare class WorkbookCollabSession {
     private muted;
     private started;
     private disposed;
+    private stopColor;
     /** Room entries this seat holds in its content: applied from a peer, or made here. */
     private readonly applied;
     /** Entries without an id (a peer on an older build) are applied once, by identity. */

package/dist/univer-collab.d.ts

@@ -128,6 +128,7 @@ declare class WorkbookCollabSession {
     private muted;
     private started;
     private disposed;
+    private stopColor;
     /** Room entries this seat holds in its content: applied from a peer, or made here. */
     private readonly applied;
     /** Entries without an id (a peer on an older build) are applied once, by identity. */

package/dist/univer-collab.js

@@ -3,7 +3,7 @@
 // src/univer/collab/WorkbookCollabSession.ts
 import * as Y from "yjs";
 import { Awareness } from "y-protocols/awareness";
-import { electCollabHost, remoteOriginOf, REMOTE_PARAM_TAG } from "@ai-matrx/data/realtime/collab";
+import { claimCollaboratorColor, electCollabHost, remoteOriginOf, REMOTE_PARAM_TAG } from "@ai-matrx/data/realtime/collab";
 
 // src/univer/collab/covered.ts
 var COLLAB_COVERED_KEY = "__matrxCollabCovered";
@@ -39,6 +39,7 @@ var WorkbookCollabSession = class {
   muted = 0;
   started = false;
   disposed = false;
+  stopColor = null;
   /** Room entries this seat holds in its content: applied from a peer, or made here. */
   applied = /* @__PURE__ */ new Set();
   /** Entries without an id (a peer on an older build) are applied once, by identity. */
@@ -60,12 +61,12 @@ var WorkbookCollabSession = class {
       uid: this.options.uid,
       clientId: this.options.clientId,
       name: this.options.uid.slice(0, 8),
-      color: pickColor(this.options.uid),
       sheetId: null,
       row: null,
       col: null,
       ts: Date.now()
     });
+    this.stopColor = claimCollaboratorColor(this.awareness, { uid: this.options.uid, clientId: this.options.clientId });
     this.provider = this.options.makeProvider({
       workbookId: this.options.workbookId,
       clientId: this.options.clientId,
@@ -126,6 +127,8 @@ var WorkbookCollabSession = class {
       this.awareness.off("change", this.awarenessObserver);
       this.awarenessObserver = null;
     }
+    this.stopColor?.();
+    this.stopColor = null;
     this.provider?.disconnect();
     this.provider = null;
     if (this.awareness) {
@@ -332,32 +335,6 @@ function stripSenderView(params) {
 function isCellEditorScratch(info) {
   return typeof info.id === "string" && info.id.startsWith("doc.mutation.");
 }
-var CURSOR_PALETTE = [
-  "#3b82f6",
-  // blue
-  "#10b981",
-  // emerald
-  "#f59e0b",
-  // amber
-  "#ef4444",
-  // red
-  "#8b5cf6",
-  // violet
-  "#06b6d4",
-  // cyan
-  "#ec4899",
-  // pink
-  "#84cc16"
-  // lime
-];
-function pickColor(uid) {
-  let h = 2166136261;
-  for (let i = 0; i < uid.length; i++) {
-    h ^= uid.charCodeAt(i);
-    h = Math.imul(h, 16777619);
-  }
-  return CURSOR_PALETTE[Math.abs(h) % CURSOR_PALETTE.length] ?? "#ec4899";
-}
 
 // src/univer/collab/docs-ot/transform.ts
 import { JSONX, TextX, getBodySliceForSplitTextXAction, normalizeTextRuns, merge as univerMerge } from "@univerjs/core";
@@ -1054,9 +1031,32 @@ function asLoadedDocsSnapshot(snapshot) {
     model.dispose();
   }
 }
+var isEmptyDeep = (v) => v == null || v === "" || (Array.isArray(v) ? v.every(isEmptyDeep) : typeof v === "object" ? Object.values(v).every(isEmptyDeep) : false);
+function canonicalResources(resources) {
+  if (!Array.isArray(resources)) return [];
+  const out = [];
+  for (const r of resources) {
+    if (!r || typeof r.name !== "string") continue;
+    let data = r.data;
+    if (typeof data === "string" && data !== "") {
+      try {
+        data = JSON.parse(data);
+      } catch {
+      }
+    }
+    if (isEmptyDeep(data)) continue;
+    out.push({ name: r.name, data: sortDeep(data) });
+  }
+  return out.sort((a, b) => a.name.localeCompare(b.name));
+}
 function canonicalDocsSnapshot(snapshot) {
   const s = asLoadedDocsSnapshot(snapshot);
   delete s.id;
+  s.resources = canonicalResources(s.resources);
+  if (s.settings && typeof s.settings === "object") {
+    s.settings = { ...s.settings };
+    delete s.settings.zoomRatio;
+  }
   for (const k of DOC_LOCAL_KEYS) delete s[k];
   s.body = canonicalBody(s.body);
   for (const seg of ["headers", "footers", "notes"]) {
@@ -1328,7 +1328,7 @@ import * as Y2 from "yjs";
 import { Awareness as Awareness2 } from "y-protocols/awareness";
 import {
   awarenessOpPresence,
-  claimCollaboratorColor,
+  claimCollaboratorColor as claimCollaboratorColor2,
   collabReplace,
   collabRoomExists,
   SupabaseYjsProvider,
@@ -1507,7 +1507,7 @@ function documentOtFactory(o) {
     const doc = new Y2.Doc();
     const awareness = new Awareness2(doc);
     awareness.setLocalState({ uid: o.uid, clientId: o.clientId, name: o.displayName ?? o.uid.slice(0, 8), ts: Date.now() });
-    const stopColor = claimCollaboratorColor(awareness, { uid: o.uid, clientId: o.clientId });
+    const stopColor = claimCollaboratorColor2(awareness, { uid: o.uid, clientId: o.clientId });
     const carets = new RemoteCaretBook(awareness.clientID);
     const emit = () => onAwareness({ states: new Map(awareness.getStates()), selfUid: o.uid, carets: carets.list() });
     const publishAwareness = () => {
@@ -3493,6 +3493,7 @@ import * as Y3 from "yjs";
 import { Awareness as Awareness3 } from "y-protocols/awareness";
 import {
   awarenessOpPresence as awarenessOpPresence2,
+  claimCollaboratorColor as claimCollaboratorColor3,
   collabReplace as collabReplace3,
   collabRoomExists as collabRoomExists3,
   SupabaseYjsProvider as SupabaseYjsProvider2,
@@ -3562,15 +3563,6 @@ async function workbookUsesOrderedRoom(workbookId, knob, isNewWorkbook) {
   if (knob === "new") return isNewWorkbook();
   return false;
 }
-function pickColor2(uid) {
-  const palette = ["#ef4444", "#f59e0b", "#10b981", "#3b82f6", "#8b5cf6", "#ec4899", "#14b8a6", "#f97316"];
-  let h = 2166136261;
-  for (let i = 0; i < uid.length; i++) {
-    h ^= uid.charCodeAt(i);
-    h = Math.imul(h, 16777619);
-  }
-  return palette[Math.abs(h) % palette.length] ?? "#ec4899";
-}
 async function startWorkbookOtRoom(port, o) {
   const latest = await getLatestSnapshot(o.workbookId);
   if (!latest.success) throw new Error(latest.error);
@@ -3587,12 +3579,12 @@ async function startWorkbookOtRoom(port, o) {
     uid: o.uid,
     clientId: o.clientId,
     name: o.displayName ?? o.uid.slice(0, 8),
-    color: pickColor2(o.uid),
     sheetId: null,
     row: null,
     col: null,
     ts: Date.now()
   });
+  const stopColor = claimCollaboratorColor3(awareness, { uid: o.uid, clientId: o.clientId });
   const publishAwareness = () => o.onAwareness?.(new Map(awareness.getStates()));
   awareness.on("change", publishAwareness);
   const provider = new SupabaseYjsProvider2({
@@ -3638,6 +3630,7 @@ async function startWorkbookOtRoom(port, o) {
       awareness.setLocalState({ ...current, sheetId: c.sheetId, row: c.row, col: c.col, ts: Date.now() });
     },
     stop() {
+      stopColor();
       room.stop();
       port.dispose?.();
       awareness.off("change", publishAwareness);