@fileverse-dev/dsheet 0.0.84 → 0.0.86

package/dist/index.es.js

@@ -6905,31 +6905,30 @@ const aJ = (e, r, t, a) => {
   };
   return delete s.data, s;
 }), iJ = (e, r, t, a, n, o = !1, i, s, u) => {
-  const [l, c] = _t([]), [f, d] = _t(!1), h = Vt([]), p = Vt(!1), m = Vt(!1), v = Vt(!0), g = Vt(!1), y = Vt(null), b = Vt(!1), F = Vt(!1);
+  const [l, c] = _t([]), [f, d] = _t(!1), h = Vt([]), p = Vt(!1), m = Vt(!1), v = Vt(!0), g = Vt(!1), y = Vt(null), b = Vt(!1);
   Jt(() => {
     if (!(!(n != null && n.length) || !e.current || !r))
       try {
-        const A = e.current, S = BY(n), x = new sf();
-        V3(x, S);
-        const N = x.getArray(r);
-        if (Array.from(N).length > 0) {
-          V3(A, S);
-          const j = A.getArray(r), O = Array.from(j);
-          h.current = O, m.current = !0, d(!0), b.current = !0, a && a((E) => E + 1);
-        }
-        x.destroy();
-      } catch (A) {
-        console.error("[DSheet] Error processing portal content:", A);
+        const w = e.current, A = BY(n), S = new sf();
+        V3(S, A);
+        const x = S.getArray(r);
+        if (Array.from(x).length > 0) {
+          V3(w, A);
+          const D = w.getArray(r), j = Array.from(D);
+          h.current = j, m.current = !0, d(!0), b.current = !0, a && a((O) => O + 1);
+        }
+        S.destroy();
+      } catch (w) {
+        console.error("[DSheet] Error processing portal content:", w);
       }
   }, [n, r, e, o]), Jt(() => {
     if (!(!u || !e.current || !r))
       try {
-        const A = e.current.getArray(r), S = Array.from(A);
-        S.length > 0 && u && !F.current && (S.forEach((x) => {
-          const N = x.celldata;
+        const w = e.current.getArray(r), A = Array.from(w);
+        A.length > 0 && u && A.forEach((S, x) => {
+          const N = S.celldata;
           N == null || N.forEach((D) => {
-            const j = u[`${D.r}_${D.c}`];
-            j && j.sheetId === x.id ? D.v && (D.v = {
+            u[`${x}_${D.r}_${D.c}`] ? D.v && (D.v = {
               ...D.v,
               ps: tJ
             }) : D.v && (D.v = {
@@ -6937,46 +6936,46 @@ const aJ = (e, r, t, a) => {
               ps: void 0
             });
           });
-        }), F.current = !0);
-      } catch (A) {
-        console.error("[DSheet] Error processing comment data:", A);
+        });
+      } catch (w) {
+        console.error("[DSheet] Error processing comment data:", w);
       }
   }, [u, r, e, o, f]), Jt(() => {
     !e.current || !r || s === "synced" && (() => {
-      var N, D;
+      var x, N;
       if (m.current)
         return;
-      const S = (N = e.current) == null ? void 0 : N.getArray(r), x = Array.from(S || []);
-      if (x.length === 0)
+      const A = (x = e.current) == null ? void 0 : x.getArray(r), S = Array.from(A || []);
+      if (S.length === 0)
         if (o)
           d(!0), b.current;
         else {
-          const j = LE;
-          (D = e.current) == null || D.transact(() => {
-            S == null || S.delete(0, S.length), S == null || S.insert(0, j);
-          }), h.current = j;
+          const D = LE;
+          (N = e.current) == null || N.transact(() => {
+            A == null || A.delete(0, A.length), A == null || A.insert(0, D);
+          }), h.current = D;
         }
       else
-        h.current = x, a && a((j) => j + 1);
+        h.current = S, a && a((D) => D + 1);
       m.current = !0, d(!0);
     })();
   }, [r, o, s]), Jt(() => {
     if (!e.current || !r) return;
-    const A = e.current.getArray(r), S = () => {
+    const w = e.current.getArray(r), A = () => {
       if (g.current)
         return;
       p.current = !0;
-      const x = Array.from(A);
-      h.current = x, y.current !== null && window.clearTimeout(y.current), y.current = window.setTimeout(() => {
-        a && a((N) => N + 1), y.current = null;
+      const S = Array.from(w);
+      h.current = S, y.current !== null && window.clearTimeout(y.current), y.current = window.setTimeout(() => {
+        a && a((x) => x + 1), y.current = null;
       }, 50);
     };
-    return A.observe(S), () => {
-      A.unobserve(S), y.current !== null && window.clearTimeout(y.current);
+    return w.observe(A), () => {
+      w.unobserve(A), y.current !== null && window.clearTimeout(y.current);
     };
   }, [e, r]);
-  const w = Ut(
-    (A) => {
+  const F = Ut(
+    (w) => {
       if (v.current) {
         v.current = !1;
         return;
@@ -6985,9 +6984,9 @@ const aJ = (e, r, t, a) => {
         p.current = !1;
         return;
       }
-      g.current = !0, aJ(e.current, r, A, t.current), setTimeout(() => {
+      g.current = !0, aJ(e.current, r, w, t.current), setTimeout(() => {
         g.current = !1;
-      }, 50), i && i(A);
+      }, 50), i && i(w);
     },
     [r, i]
   );
@@ -6997,7 +6996,7 @@ const aJ = (e, r, t, a) => {
     currentDataRef: h,
     remoteUpdateRef: p,
     isDataLoaded: f,
-    handleChange: w
+    handleChange: F
   };
 }, oJ = 1200, lJ = 2500, tg = 3e4, Eb = (e) => {
   if (e.shouldConnect && e.ws === null) {
@@ -216077,44 +216076,43 @@ const Cwt = ({
   toggleTemplateSidebar: o,
   onboardingComplete: i,
   onboardingHandler: s,
-  dataBlockApiKeyHandler: u,
-  exportDropdownOpen: l = !1,
-  commentData: c,
-  getCommentCellUI: f,
-  setExportDropdownOpen: d = () => {
-  },
-  dsheetId: h,
-  storeApiKey: p
+  exportDropdownOpen: u = !1,
+  commentData: l,
+  getCommentCellUI: c,
+  setExportDropdownOpen: f = () => {
+  },
+  dsheetId: d,
+  storeApiKey: h
 }) => {
   const {
-    sheetEditorRef: m,
-    ydocRef: v,
-    currentDataRef: g,
-    handleChange: y,
-    forceSheetRender: b,
-    setForceSheetRender: F,
-    syncStatus: w
-  } = XE(), { handleXLSXUpload: A } = Cwt({
-    sheetEditorRef: m,
-    ydocRef: v,
-    setForceSheetRender: F,
-    dsheetId: h,
-    currentDataRef: g
-  }), S = a ? n ? ["comment"] : [] : QY, x = a ? ["filter"] : eJ, N = a ? n ? ["filter", "comment"] : ["filter"] : JY;
+    sheetEditorRef: p,
+    ydocRef: m,
+    currentDataRef: v,
+    handleChange: g,
+    forceSheetRender: y,
+    setForceSheetRender: b,
+    syncStatus: F
+  } = XE(), { handleXLSXUpload: w } = Cwt({
+    sheetEditorRef: p,
+    ydocRef: m,
+    setForceSheetRender: b,
+    dsheetId: d,
+    currentDataRef: v
+  }), A = a ? n ? ["comment"] : [] : QY, S = a ? ["filter"] : eJ, x = a ? n ? ["filter", "comment"] : ["filter"] : JY;
   return ta(() => {
-    const D = `workbook-${h}-${b}`, j = g.current && g.current.length > 0 ? g.current : a ? [] : LE;
+    const N = `workbook-${d}-${y}`, D = v.current && v.current.length > 0 ? v.current : a ? [] : LE;
     return (
       // @ts-ignore
       /* @__PURE__ */ cr.jsx(
         s6t,
         {
-          ref: m,
-          data: j,
-          toolbarItems: N,
-          cellContextMenu: S,
-          headerContextMenu: x,
-          getCommentCellUI: f,
-          onChange: y,
+          ref: p,
+          data: D,
+          toolbarItems: x,
+          cellContextMenu: A,
+          headerContextMenu: S,
+          getCommentCellUI: c,
+          onChange: g,
           showFormulaBar: !0,
           showToolbar: !0,
           lang: "en",
@@ -216123,56 +216121,54 @@ const Cwt = ({
           defaultColWidth: 100,
           defaultRowHeight: 21,
           customToolbarItems: a ? [] : u6t({
-            setExportDropdownOpen: d,
+            setExportDropdownOpen: f,
             handleCSVUpload: N6t,
-            handleXLSXUpload: A,
+            handleXLSXUpload: w,
             handleExportToXLSX: Awt,
             handleExportToCSV: Twt,
             handleExportToJSON: xwt,
-            sheetEditorRef: m,
-            ydocRef: v,
-            dsheetId: h,
-            currentDataRef: g,
-            setForceSheetRender: F,
+            sheetEditorRef: p,
+            ydocRef: m,
+            dsheetId: d,
+            currentDataRef: v,
+            setForceSheetRender: b,
             toggleTemplateSidebar: o,
             setShowFetchURLModal: r
           }),
           hooks: {
-            afterUpdateCell: (O, E, B, k) => {
-              console.log("afterUpdateCell Old value", B);
-              const T = { current: m.current };
+            afterUpdateCell: (j, O, E, B) => {
+              console.log("afterUpdateCell Old value", E);
+              const k = { current: p.current };
               E6t({
-                row: O,
-                column: E,
-                newValue: k,
-                sheetEditorRef: T,
+                row: j,
+                column: O,
+                newValue: B,
+                sheetEditorRef: k,
                 onboardingComplete: i,
                 // @ts-ignore
                 setFetchingURLData: t,
                 onboardingHandler: s,
-                dataBlockApiKeyHandler: u,
-                storeApiKey: p,
+                storeApiKey: h,
                 setInputFetchURLDataBlock: e
               });
             }
           }
         },
-        D
+        N
       )
     );
   }, [
-    b,
-    a,
     y,
+    a,
+    g,
     o,
     i,
     s,
+    d,
     u,
-    h,
     l,
-    c,
-    w,
-    g.current
+    F,
+    v.current
   ]);
 }, Ewt = [
   {
@@ -291100,42 +291096,41 @@ const Cwt = ({
   toggleTemplateSidebar: n,
   onboardingComplete: o,
   onboardingHandler: i,
-  dataBlockApiKeyHandler: s,
-  isTemplateOpen: u,
-  exportDropdownOpen: l,
-  setExportDropdownOpen: c,
-  dsheetId: f,
-  commentData: d,
-  getCommentCellUI: h,
-  selectedTemplate: p,
-  setFetchingURLData: m,
-  setInputFetchURLDataBlock: v,
-  storeApiKey: g
+  isTemplateOpen: s,
+  exportDropdownOpen: u,
+  setExportDropdownOpen: l,
+  dsheetId: c,
+  commentData: f,
+  getCommentCellUI: d,
+  selectedTemplate: h,
+  setFetchingURLData: p,
+  setInputFetchURLDataBlock: m,
+  storeApiKey: v
 }) => {
   const {
-    loading: y,
-    sheetEditorRef: b,
-    currentDataRef: F,
-    ydocRef: w,
-    setForceSheetRender: A
+    loading: g,
+    sheetEditorRef: y,
+    currentDataRef: b,
+    ydocRef: F,
+    setForceSheetRender: w
   } = XE();
   Dwt({
-    selectedTemplate: p,
-    ydocRef: w,
-    dsheetId: f,
-    currentDataRef: F,
-    setForceSheetRender: A,
-    sheetEditorRef: b
+    selectedTemplate: h,
+    ydocRef: F,
+    dsheetId: c,
+    currentDataRef: b,
+    setForceSheetRender: w,
+    sheetEditorRef: y
   }), PZ({
-    exportDropdownOpen: l,
-    isTemplateOpen: u,
+    exportDropdownOpen: u,
+    isTemplateOpen: s,
     isReadOnly: t,
-    loading: y
+    loading: g
   });
-  const S = {
-    sheetEditorRef: b,
-    currentDataRef: F,
-    ydocRef: w
+  const A = {
+    sheetEditorRef: y,
+    currentDataRef: b,
+    ydocRef: F
   };
   return /* @__PURE__ */ cr.jsxs(
     "div",
@@ -291156,7 +291151,7 @@ const Cwt = ({
                 "translate-y-[-100%]": !1
               }
             ),
-            children: r(S)
+            children: r(A)
           }
         ),
         /* @__PURE__ */ cr.jsxs(
@@ -291165,26 +291160,25 @@ const Cwt = ({
             style: { height: "97.8%", marginTop: "44px" },
             className: "relative overflow-hidden",
             children: [
-              /* @__PURE__ */ cr.jsx(yS, { show: y, children: /* @__PURE__ */ cr.jsx(WZ, { isReadOnly: t }) }),
-              /* @__PURE__ */ cr.jsxs(yS, { show: !y, children: [
+              /* @__PURE__ */ cr.jsx(yS, { show: g, children: /* @__PURE__ */ cr.jsx(WZ, { isReadOnly: t }) }),
+              /* @__PURE__ */ cr.jsxs(yS, { show: !g, children: [
                 t && /* @__PURE__ */ cr.jsx("div", { className: "absolute top-2 right-4 z-20", children: /* @__PURE__ */ cr.jsx(Nwt, { allowComments: a || !1 }) }),
                 /* @__PURE__ */ cr.jsx(
                   Swt,
                   {
                     setShowFetchURLModal: e,
-                    setFetchingURLData: m,
-                    setInputFetchURLDataBlock: v,
-                    commentData: d,
-                    getCommentCellUI: h,
+                    setFetchingURLData: p,
+                    setInputFetchURLDataBlock: m,
+                    commentData: f,
+                    getCommentCellUI: d,
                     isReadOnly: t,
                     toggleTemplateSidebar: n,
                     onboardingComplete: o,
                     onboardingHandler: i,
-                    dataBlockApiKeyHandler: s,
-                    exportDropdownOpen: l,
-                    setExportDropdownOpen: c,
-                    dsheetId: f,
-                    storeApiKey: g,
+                    exportDropdownOpen: u,
+                    setExportDropdownOpen: l,
+                    dsheetId: c,
+                    storeApiKey: v,
                     allowComments: a
                   }
                 )
@@ -291213,14 +291207,13 @@ const Cwt = ({
   onboardingHandler: p,
   commentData: m,
   getCommentCellUI: v,
-  dataBlockApiKeyHandler: g,
-  setFetchingURLData: y,
-  setShowFetchURLModal: b,
-  setInputFetchURLDataBlock: F,
-  sheetEditorRef: w,
-  storeApiKey: A
+  setFetchingURLData: g,
+  setShowFetchURLModal: y,
+  setInputFetchURLDataBlock: b,
+  sheetEditorRef: F,
+  storeApiKey: w
 }) => {
-  const [S, x] = _t(!1);
+  const [A, S] = _t(!1);
   return /* @__PURE__ */ cr.jsx(
     NJ,
     {
@@ -291231,7 +291224,7 @@ const Cwt = ({
       enableWebrtc: d,
       isReadOnly: r,
       onChange: s,
-      externalEditorRef: w,
+      externalEditorRef: F,
       isCollaborative: e,
       commentData: m,
       children: /* @__PURE__ */ cr.jsx(
@@ -291240,20 +291233,19 @@ const Cwt = ({
           commentData: m,
           getCommentCellUI: v,
           renderNavbar: a,
-          setFetchingURLData: y,
-          setShowFetchURLModal: b,
-          setInputFetchURLDataBlock: F,
+          setFetchingURLData: g,
+          setShowFetchURLModal: y,
+          setInputFetchURLDataBlock: b,
           isReadOnly: r,
           toggleTemplateSidebar: c,
           onboardingComplete: h,
           onboardingHandler: p,
-          dataBlockApiKeyHandler: g,
           isTemplateOpen: f,
-          exportDropdownOpen: S,
-          setExportDropdownOpen: x,
+          exportDropdownOpen: A,
+          setExportDropdownOpen: S,
           dsheetId: o,
           selectedTemplate: l,
-          storeApiKey: A,
+          storeApiKey: w,
           allowComments: t
         }
       )

package/dist/package/components/editor-workbook.d.ts

@@ -1,8 +1,7 @@
 import { default as React } from 'react';
-import { OnboardingHandlerType, DataBlockApiKeyHandlerType } from '../types';
+import { OnboardingHandlerType } from '../types';
 
 type OnboardingHandler = OnboardingHandlerType;
-type DataBlockApiKeyHandler = DataBlockApiKeyHandlerType;
 interface EditorWorkbookProps {
     setShowFetchURLModal?: React.Dispatch<React.SetStateAction<boolean>>;
     setFetchingURLData?: (fetching: boolean) => void;
@@ -12,7 +11,6 @@ interface EditorWorkbookProps {
     toggleTemplateSidebar?: () => void;
     onboardingComplete?: boolean;
     onboardingHandler?: OnboardingHandler;
-    dataBlockApiKeyHandler?: DataBlockApiKeyHandler;
     exportDropdownOpen?: boolean;
     commentData?: Object;
     getCommentCellUI?: (row: number, column: number) => void;

package/dist/package/dsheet-editor.d.ts

@@ -7,5 +7,5 @@ import { DsheetProps } from './types';
  * @param props - Component properties
  * @returns The SpreadsheetEditor component
  */
-declare const SpreadsheetEditor: ({ isCollaborative, isReadOnly, allowComments, renderNavbar, enableIndexeddbSync, dsheetId, portalContent, onChange, username, selectedTemplate, toggleTemplateSidebar, isTemplateOpen, enableWebrtc, onboardingComplete, onboardingHandler, commentData, getCommentCellUI, dataBlockApiKeyHandler, setFetchingURLData, setShowFetchURLModal, setInputFetchURLDataBlock, sheetEditorRef: externalSheetEditorRef, storeApiKey, }: DsheetProps) => JSX.Element;
+declare const SpreadsheetEditor: ({ isCollaborative, isReadOnly, allowComments, renderNavbar, enableIndexeddbSync, dsheetId, portalContent, onChange, username, selectedTemplate, toggleTemplateSidebar, isTemplateOpen, enableWebrtc, onboardingComplete, onboardingHandler, commentData, getCommentCellUI, setFetchingURLData, setShowFetchURLModal, setInputFetchURLDataBlock, sheetEditorRef: externalSheetEditorRef, storeApiKey, }: DsheetProps) => JSX.Element;
 export default SpreadsheetEditor;

package/dist/package/types.d.ts

@@ -1,4 +1,4 @@
-import { Sheet, Cell } from '@fileverse-dev/fortune-core';
+import { Sheet } from '@fileverse-dev/fortune-core';
 import { RefObject } from 'react';
 import { WorkbookInstance } from '@fileverse-dev/fortune-react';
 
@@ -19,21 +19,6 @@ export type OnboardingHandlerType = (params: {
     row: number;
     column: number;
 };
-export type DataBlockApiKeyHandlerType = (params: {
-    data: string;
-    sheetEditorRef: React.RefObject<WorkbookInstance | null>;
-    executeStringFunction: (functionCallString: string) => Promise<unknown>;
-    row: number;
-    column: number;
-    newValue: Cell;
-    formulaResponseUiSync: (params: {
-        row: number;
-        column: number;
-        newValue: Record<string, string>;
-        apiData: Array<Record<string, object>>;
-        sheetEditorRef: React.RefObject<WorkbookInstance | null>;
-    }) => void;
-}) => void;
 export interface DsheetProps {
     setShowFetchURLModal?: React.Dispatch<React.SetStateAction<boolean>>;
     setFetchingURLData?: (fetching: boolean) => void;
@@ -51,7 +36,6 @@ export interface DsheetProps {
     selectedTemplate?: string;
     onboardingComplete?: boolean;
     onboardingHandler?: OnboardingHandlerType;
-    dataBlockApiKeyHandler?: DataBlockApiKeyHandlerType;
     setForceSheetRender?: React.Dispatch<React.SetStateAction<number>>;
     getCommentCellUI?: (row: number, column: number) => void;
     commentData?: Object;

package/dist/package/utils/after-update-cell.d.ts

@@ -1,6 +1,6 @@
 import { Cell } from '@fileverse-dev/fortune-core';
 import { WorkbookInstance } from '@fileverse-dev/fortune-react';
-import { OnboardingHandlerType, DataBlockApiKeyHandlerType } from '../types';
+import { OnboardingHandlerType } from '../types';
 
 /**
  * Parameters for the afterUpdateCell function
@@ -13,7 +13,6 @@ interface AfterUpdateCellParams {
     onboardingComplete: boolean | undefined;
     setFetchingURLData: (fetching: boolean) => void;
     onboardingHandler: OnboardingHandlerType | undefined;
-    dataBlockApiKeyHandler: DataBlockApiKeyHandlerType | undefined;
     setInputFetchURLDataBlock: React.Dispatch<React.SetStateAction<string>> | undefined;
     storeApiKey?: (apiKeyName: string) => void;
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@fileverse-dev/dsheet",
   "private": false,
   "description": "DSheet",
-  "version": "0.0.84",
+  "version": "0.0.86",
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",
   "exports": {
@@ -82,4 +82,4 @@
     "typescript": "^5.2.2",
     "vite": "^5.0.0"
   }
-}
+}