@fileverse-dev/dsheet 1.2.93-ydoc-1 → 1.2.93-ydoc-2

package/dist/index.es.js

@@ -186189,68 +186189,68 @@ function lEt(e) {
 const sEt = (e, t) => {
   const r = e.toLowerCase();
   return r === "coingecko" ? lEt(t) === "price" : iEt.includes(r);
-}, Io = (e, t, r, i, n) => {
-  if (console.log("callleed", e, i), !e || !i.length)
+}, Io = (e, t, r, i) => {
+  if (console.log("callleed", e, r), !e || !r.length)
     return;
-  const a = e.getArray(t);
-  console.log("sheetArray ===*", a.toArray()), e.transact(() => {
-    i.forEach(({ sheetId: l, path: c, key: f, value: s, type: o }) => {
-      const u = a.toArray().find((m) => m.get("id") === l);
-      if (!u) return;
-      if (c.length === 1 && c[0] === "celldata" && f) {
-        let m = u.get("celldata");
-        m instanceof Ka || (m = new Ka(), u.set("celldata", m)), o === "delete" ? m.delete(f) : (console.log("cellMap", m, l, c, f, s, o), m.set(f, s));
+  const n = e.getArray(t);
+  console.log("sheetArray ===*", n.toArray()), e.transact(() => {
+    r.forEach(({ sheetId: a, path: l, key: c, value: f, type: s }) => {
+      const o = n.toArray().find((v) => v.get("id") === a);
+      if (!o) return;
+      if (l.length === 1 && l[0] === "celldata" && c) {
+        let v = o.get("celldata");
+        v instanceof Ka || (v = new Ka(), o.set("celldata", v)), s === "delete" ? v.delete(c) : (console.log("cellMap", v, a, l, c, f, s), v.set(c, f));
         return;
       }
-      if (c.length === 1 && c[0] === "calcChain" && f) {
-        let m = u.get("calcChain");
-        m instanceof Ka || (m = new Ka(), u.set("calcChain", m)), o === "delete" ? m.delete(f) : m.set(f, s.v);
+      if (l.length === 1 && l[0] === "calcChain" && c) {
+        let v = o.get("calcChain");
+        v instanceof Ka || (v = new Ka(), o.set("calcChain", v)), s === "delete" ? v.delete(c) : v.set(c, f.v);
         return;
       }
-      if (c.length === 1 && c[0] === "dataBlockCalcFunction" && f) {
-        let m = u.get("dataBlockCalcFunction");
-        m instanceof Ka || (m = new Ka(), u.set("dataBlockCalcFunction", m)), o === "delete" ? m.delete(f) : (console.log("valuewww", s), m.set(f, s));
+      if (l.length === 1 && l[0] === "dataBlockCalcFunction" && c) {
+        let v = o.get("dataBlockCalcFunction");
+        v instanceof Ka || (v = new Ka(), o.set("dataBlockCalcFunction", v)), s === "delete" ? v.delete(c) : (console.log("valuewww", f), v.set(c, f));
         return;
       }
-      if (c.length === 1 && c[0] === "liveQueryList" && f) {
-        let m = u.get("liveQueryList");
-        m instanceof Ka || (m = new Ka(), u.set("liveQueryList", m)), o === "delete" ? m.delete(f) : m.set(f, s);
+      if (l.length === 1 && l[0] === "liveQueryList" && c) {
+        let v = o.get("liveQueryList");
+        v instanceof Ka || (v = new Ka(), o.set("liveQueryList", v)), s === "delete" ? v.delete(c) : v.set(c, f);
         return;
       }
-      if (c.length === 1 && c[0] === "dataVerification" && f) {
-        let m = u.get("dataVerification");
-        m instanceof Ka || (m = new Ka(), u.set("dataVerification", m)), o === "delete" ? m.delete(f) : m.set(f, s);
+      if (l.length === 1 && l[0] === "dataVerification" && c) {
+        let v = o.get("dataVerification");
+        v instanceof Ka || (v = new Ka(), o.set("dataVerification", v)), s === "delete" ? v.delete(c) : v.set(c, f);
         return;
       }
-      if (c.length === 1 && c[0] === "hyperlink" && f) {
-        let m = u.get("hyperlink");
-        m instanceof Ka || (m = new Ka(), u.set("hyperlink", m)), o === "delete" ? m.delete(f) : (console.log("valuewww hyperlink", s), m.set(f, s));
+      if (l.length === 1 && l[0] === "hyperlink" && c) {
+        let v = o.get("hyperlink");
+        v instanceof Ka || (v = new Ka(), o.set("hyperlink", v)), s === "delete" ? v.delete(c) : (console.log("valuewww hyperlink", f), v.set(c, f));
         return;
       }
-      if (c.length === 1 && c[0] === "conditionRules" && f) {
-        let m = u.get("conditionRules");
-        m instanceof Ka || (m = new Ka(), u.set("conditionRules", m)), o === "delete" ? m.delete(f) : m.set(f, s);
+      if (l.length === 1 && l[0] === "conditionRules" && c) {
+        let v = o.get("conditionRules");
+        v instanceof Ka || (v = new Ka(), o.set("conditionRules", v)), s === "delete" ? v.delete(c) : v.set(c, f);
         return;
       }
-      if (c.length === 1 && c[0] === "luckysheet_conditionformat_save" && f) {
-        let m = u.get("luckysheet_conditionformat_save");
-        m instanceof dc || (m = new dc(), u.set("luckysheet_conditionformat_save", m)), m.delete(0, m.toArray().length), m.insert(0, s);
+      if (l.length === 1 && l[0] === "luckysheet_conditionformat_save" && c) {
+        let v = o.get("luckysheet_conditionformat_save");
+        v instanceof dc || (v = new dc(), o.set("luckysheet_conditionformat_save", v)), v.delete(0, v.toArray().length), v.insert(0, f);
         return;
       }
-      let v = u;
-      for (let m = 0; m < c.length - 1; m++) {
-        const h = c[m];
-        let p = v.get(h);
-        p instanceof Ka || (p = new Ka(), v.set(h, p)), v = p;
+      let u = o;
+      for (let v = 0; v < l.length - 1; v++) {
+        const m = l[v];
+        let h = u.get(m);
+        h instanceof Ka || (h = new Ka(), u.set(m, h)), u = h;
       }
-      console.log("target", v, "path", c, "value", s), v.set(c[c.length - 1], s);
-    }), a.forEach((l) => {
-      l.set(
+      console.log("target", u, "path", l, "value", f), u.set(l[l.length - 1], f);
+    }), n.forEach((a) => {
+      a.set(
         "status",
-        l.get("order") === 0 ? 1 : 0
+        a.get("order") === 0 ? 1 : 0
       );
     });
-  }), console.log("sheetArray last", Ec(a)), n && n(a.toArray());
+  }), console.log("sheetArray last", Ec(n)), i && n && e && i(n.toArray());
 };
 function Ec(e) {
   return e.toArray().map((t) => {
@@ -186538,7 +186538,6 @@ const pEt = (e) => {
     e.ydocRef.current,
     // @ts-ignore
     e.dsheetId,
-    e.sheetEditorRef.current,
     [{
       sheetId: t,
       path: ["celldata"],
@@ -190903,7 +190902,6 @@ const uMt = ({
     t.current,
     // @ts-ignore
     r,
-    e.current,
     o,
     // @ts-ignore
     i
@@ -190944,7 +190942,6 @@ const uMt = ({
     t.current,
     // @ts-ignore
     r,
-    e.current,
     o,
     // @ts-ignore
     i
@@ -190991,7 +190988,6 @@ const uMt = ({
     t.current,
     // @ts-ignore
     r,
-    e.current,
     o,
     // @ts-ignore
     i
@@ -191014,7 +191010,6 @@ const uMt = ({
     ydoc,
     // @ts-ignore
     r,
-    e.current,
     [{
       sheetId: n,
       path: ["luckysheet_conditionformat_save"],
@@ -191061,7 +191056,6 @@ const uMt = ({
     t.current,
     // @ts-ignore
     r,
-    e.current,
     o,
     // @ts-ignore
     i
@@ -235297,7 +235291,6 @@ const DMt = ({
             console.log("updateCellYdoc changes from fortune", Z), Io(
               E.current,
               m,
-              k.current,
               Z,
               Q
             );
@@ -738498,7 +738491,6 @@ const DMt = ({
         Io(
           R.current,
           u,
-          D.current,
           [{
             sheetId: oe,
             path: ["celldata"],

package/dist/package/utils/update-ydoc.d.ts

@@ -1,4 +1,4 @@
-import { Sheet, WorkbookInstance } from '@fileverse-dev/fortune-react';
+import { Sheet } from '@fileverse-dev/fortune-react';
 import * as Y from 'yjs';
 export type SheetChangePath = {
     sheetId: string;
@@ -7,5 +7,5 @@ export type SheetChangePath = {
     value: any;
     type?: 'update' | 'delete';
 };
-export declare const updateYdocSheetData: (ydoc: Y.Doc | null, dsheetId: string, sheetEditor: WorkbookInstance | null, changes: SheetChangePath[], handleContentPortal: any) => void;
+export declare const updateYdocSheetData: (ydoc: Y.Doc | null, dsheetId: string, changes: SheetChangePath[], handleContentPortal: any) => void;
 export declare function ySheetArrayToPlain(sheetArray: Y.Array<Y.Map>): Sheet[];

package/package.json

@@ -2,7 +2,7 @@
   "name": "@fileverse-dev/dsheet",
   "private": false,
   "description": "DSheet",
-  "version": "1.2.93-ydoc-1",
+  "version": "1.2.93-ydoc-2",
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",
   "exports": {