@ai-matrx/office 0.8.18 → 0.8.20

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.8.20
+
+UNVERIFIED: this release has no Unreleased entry and the source comparison could not be made (the caller supplied no source comparison). Whether source changed is unknown; consumer action is unknown.
+Check the package's gitHead on npm against this version's gitHead: `git diff <previous gitHead> <this gitHead> -- apps/shared/office/src`.
+
+## 0.8.19
+### C7a: the browser editor's plugin resources
+
+- **Docs state hash: plugin resources by content, zoom never.** The browser editor (full docs preset) writes one `resources` entry per plugin on every save (`"[]"`, `""`, `{"links":[]}`, `{"data":{},"order":[]}`) and `settings.zoomRatio`; a stored row and a headless load have neither, so live seats still refused a restore after 0.8.18. The canonical form now parses each resource, drops empty ones, sorts by name, and drops the zoom. Forcing case: the live row and what the browser held after loading it (red on 0.8.18, green). Consumer action: none.
+
 ## 0.8.18
 ### C7a restore hash, stale checkpoints, collaborator colours
 

package/dist/univer-collab.cjs

@@ -119,6 +119,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. */
@@ -140,12 +141,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 = (0, import_collab.claimCollaboratorColor)(this.awareness, { uid: this.options.uid, clientId: this.options.clientId });
     this.provider = this.options.makeProvider({
       workbookId: this.options.workbookId,
       clientId: this.options.clientId,
@@ -206,6 +207,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) {
@@ -412,32 +415,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
 var import_core = require("@univerjs/core");
@@ -1134,9 +1111,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"]) {
@@ -3620,15 +3620,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);
@@ -3645,12 +3636,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 = (0, import_collab6.claimCollaboratorColor)(awareness, { uid: o.uid, clientId: o.clientId });
   const publishAwareness = () => o.onAwareness?.(new Map(awareness.getStates()));
   awareness.on("change", publishAwareness);
   const provider = new import_collab6.SupabaseYjsProvider({
@@ -3696,6 +3687,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);