@fileverse-dev/fortune-react 1.2.44 → 1.2.46

package/es/components/SheetOverlay/drag_and_drop/column-helpers.js

@@ -238,6 +238,7 @@ export var useColumnDragAndDrop = function useColumnDragAndDrop(containerRef, se
           });
           selectedSourceColRef.current = selectedSourceCol;
           selectedTargetColRef.current = selectedTargetCol;
+          console.log("selectedSourceCol", selectedTargetCol);
           selectedSourceCol.forEach(function () {
             var adjustedSourceIndex = sourceIndex_1;
             if (targetIndex < sourceIndex_1) {
@@ -351,13 +352,10 @@ export var useColumnDragAndDrop = function useColumnDragAndDrop(containerRef, se
             }
           });
           (_g = window === null || window === void 0 ? void 0 : window.updateDataBlockCalcFunctionAfterRowDrag) === null || _g === void 0 ? void 0 : _g.call(window, selectedSourceCol, selectedTargetCol, "column", context.currentSheetId, sourceIndex_1, targetIndex);
-        });
-        var d = getFlowdata(context);
-        var rowLen_1 = (d === null || d === void 0 ? void 0 : d.length) || 0;
-        setContext(function (draftCtx) {
-          api.setSelection(draftCtx, [{
-            row: [0, rowLen_1],
-            column: selectedTargetColRef.current
+          var rowLen = (d === null || d === void 0 ? void 0 : d.length) || 0;
+          api.setSelection(draft, [{
+            row: [0, rowLen],
+            column: [selectedTargetCol === null || selectedTargetCol === void 0 ? void 0 : selectedTargetCol[0], selectedTargetCol === null || selectedTargetCol === void 0 ? void 0 : selectedTargetCol[selectedTargetCol.length - 1]]
           }], {
             id: context.currentSheetId
           });

package/es/components/SheetOverlay/drag_and_drop/row-helpers.js

@@ -194,20 +194,20 @@ export var useRowDragAndDrop = function useRowDragAndDrop(containerRef, selected
     }
   };
   var handleRowDragEnd = function handleRowDragEnd(ev) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     if (!dragRef.current.mouseDown) return;
     dragRef.current.mouseDown = false;
     try {
       document.body.style.userSelect = dragRef.current.prevUserSelect || "";
       document.body.style.webkitUserSelect = dragRef.current.prevWebkitUserSelect || "";
-    } catch (_e) {}
+    } catch (_d) {}
     if (dragRef.current.active) {
       var finalInsertionIndex_1 = computeInsertionFromPageY(ev.pageY).insertionIndex;
       var sourceIndex_1 = ((_c = (_b = (_a = context.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.row) === null || _c === void 0 ? void 0 : _c[0]) || 0;
       var sheetIdx_1 = getSheetIndex(context, context.currentSheetId);
       if (sheetIdx_1 != null && sourceIndex_1 >= 0 && Number.isFinite(finalInsertionIndex_1) && finalInsertionIndex_1 >= 0) {
         setContext(function (draft) {
-          var _a, _b, _c, _d, _e;
+          var _a, _b, _c, _d, _e, _f;
           var _sheet = draft.luckysheetfile[sheetIdx_1];
           if (!(_sheet === null || _sheet === void 0 ? void 0 : _sheet.data)) return;
           var rows = _sheet.data;
@@ -341,20 +341,10 @@ export var useRowDragAndDrop = function useRowDragAndDrop(containerRef, selected
             }
           });
           (_e = window === null || window === void 0 ? void 0 : window.updateDataBlockCalcFunctionAfterRowDrag) === null || _e === void 0 ? void 0 : _e.call(window, sourceIndex_1, targetIndex, "row", context.currentSheetId);
-        });
-        var d = getFlowdata(context);
-        var colLen_1 = ((_d = d === null || d === void 0 ? void 0 : d[0]) === null || _d === void 0 ? void 0 : _d.length) || 0;
-        var targetIndex_1 = finalInsertionIndex_1;
-        if (targetIndex_1 > sourceIndex_1) targetIndex_1 -= 1;
-        var selData = api.getSelection(context) || [];
-        var sel = __spreadArray([], selData, true);
-        if (sel && sel[0]) {
-          sel[0].column = [targetIndex_1, targetIndex_1];
-        }
-        setContext(function (draftCtx) {
-          api.setSelection(draftCtx, [{
-            row: [targetIndex_1, targetIndex_1],
-            column: [0, colLen_1]
+          var colLen = ((_f = d === null || d === void 0 ? void 0 : d[0]) === null || _f === void 0 ? void 0 : _f.length) || 0;
+          api.setSelection(draft, [{
+            row: [selectedTargetRow[0], selectedTargetRow[selectedTargetRow.length - 1]],
+            column: [0, colLen]
           }], {
             id: context.currentSheetId
           });

package/es/components/Workbook/api.d.ts

@@ -1,7 +1,7 @@
 import { api, Cell, Context, Op, Range, Selection, Presence, Settings, SingleRange, Sheet, CellMatrix, CellWithRowAndCol, GlobalCache, LiveQueryData } from "@fileverse-dev/fortune-core";
 import { getCryptoPrice } from "../../utils/cryptoApi";
 import { SetContextOptions } from "../../context";
-export declare function generateAPIs(context: Context, setContext: (recipe: (ctx: Context) => void, options?: SetContextOptions) => void, handleUndo: () => void, handleRedo: () => void, settings: Required<Settings>, cellInput: HTMLDivElement | null, scrollbarX: HTMLDivElement | null, scrollbarY: HTMLDivElement | null, globalCache: GlobalCache | null): {
+export declare function generateAPIs(context: Context, setContext: (recipe: (ctx: Context) => void, options?: SetContextOptions) => void, handleUndo: () => void, handleRedo: () => void, settings: Required<Settings>, cellInput: HTMLDivElement | null, scrollbarX: HTMLDivElement | null, scrollbarY: HTMLDivElement | null, globalCache: GlobalCache | null, refs: any): {
     applyOp: (ops: Op[]) => void;
     getCryptoPrice: typeof getCryptoPrice;
     getCellValue: (row: number, column: number, options?: api.CommonOptions & {
@@ -1191,4 +1191,7 @@ export declare function generateAPIs(context: Context, setContext: (recipe: (ctx
     getWorkbookContext: () => Context;
     getWorkbookSetContext: () => (recipe: (ctx: Context) => void, options?: SetContextOptions) => void;
     getSettings: () => Required<Settings>;
+    getRefs: () => any;
+    getShowDialog: () => (content: import("react").ReactNode, type?: "ok" | "yesno" | undefined, title?: import("react").ReactNode, okLabel?: string | undefined, cancelLabel?: string | undefined, onOk?: () => void, onCancel?: () => void) => void;
+    getSplitColComponent: () => import("react").FC<{}>;
 };

package/es/components/Workbook/api.js

@@ -12,7 +12,9 @@ import { addSheet, api, deleteRowCol, deleteSheet, insertRowCol, opToPatch, crea
 import { applyPatches } from "immer";
 import _ from "lodash";
 import { getCryptoPrice } from "../../utils/cryptoApi";
-export function generateAPIs(context, setContext, handleUndo, handleRedo, settings, cellInput, scrollbarX, scrollbarY, globalCache) {
+import { useDialog } from "../../hooks/useDialog";
+import { SplitColumn } from "../../components/SplitColumn";
+export function generateAPIs(context, setContext, handleUndo, handleRedo, settings, cellInput, scrollbarX, scrollbarY, globalCache, refs) {
   return {
     applyOp: function applyOp(ops) {
       setContext(function (ctx_) {
@@ -436,6 +438,16 @@ export function generateAPIs(context, setContext, handleUndo, handleRedo, settin
     },
     getSettings: function getSettings() {
       return settings;
+    },
+    getRefs: function getRefs() {
+      return refs;
+    },
+    getShowDialog: function getShowDialog() {
+      var showDialog = useDialog().showDialog;
+      return showDialog;
+    },
+    getSplitColComponent: function getSplitColComponent() {
+      return SplitColumn;
     }
   };
 }

package/es/components/Workbook/index.d.ts

@@ -1199,5 +1199,8 @@ declare const Workbook: React.ForwardRefExoticComponent<Settings & AdditionalPro
     getWorkbookContext: () => Context;
     getWorkbookSetContext: () => (recipe: (ctx: Context) => void, options?: SetContextOptions | undefined) => void;
     getSettings: () => Required<Settings>;
+    getRefs: () => any;
+    getShowDialog: () => (content: React.ReactNode, type?: "ok" | "yesno" | undefined, title?: React.ReactNode, okLabel?: string | undefined, cancelLabel?: string | undefined, onOk?: () => void, onCancel?: () => void) => void;
+    getSplitColComponent: () => React.FC<{}>;
 }>>;
 export default Workbook;

package/es/components/Workbook/index.js

@@ -663,7 +663,7 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     };
   }, [onPaste]);
   useImperativeHandle(ref, function () {
-    return generateAPIs(context, setContextWithProduce, handleUndo, handleRedo, mergedSettings, cellInput.current, scrollbarX.current, scrollbarY.current, globalCache.current);
+    return generateAPIs(context, setContextWithProduce, handleUndo, handleRedo, mergedSettings, cellInput.current, scrollbarX.current, scrollbarY.current, globalCache.current, refs);
   }, [context, setContextWithProduce, handleUndo, handleRedo, mergedSettings, globalCache]);
   var i = getSheetIndex(context, context.currentSheetId);
   if (i == null) {

package/lib/components/SheetOverlay/drag_and_drop/column-helpers.js

@@ -246,6 +246,7 @@ var useColumnDragAndDrop = exports.useColumnDragAndDrop = function useColumnDrag
           });
           selectedSourceColRef.current = selectedSourceCol;
           selectedTargetColRef.current = selectedTargetCol;
+          console.log("selectedSourceCol", selectedTargetCol);
           selectedSourceCol.forEach(function () {
             var adjustedSourceIndex = sourceIndex_1;
             if (targetIndex < sourceIndex_1) {
@@ -359,13 +360,10 @@ var useColumnDragAndDrop = exports.useColumnDragAndDrop = function useColumnDrag
             }
           });
           (_g = window === null || window === void 0 ? void 0 : window.updateDataBlockCalcFunctionAfterRowDrag) === null || _g === void 0 ? void 0 : _g.call(window, selectedSourceCol, selectedTargetCol, "column", context.currentSheetId, sourceIndex_1, targetIndex);
-        });
-        var d = (0, _fortuneCore.getFlowdata)(context);
-        var rowLen_1 = (d === null || d === void 0 ? void 0 : d.length) || 0;
-        setContext(function (draftCtx) {
-          _fortuneCore.api.setSelection(draftCtx, [{
-            row: [0, rowLen_1],
-            column: selectedTargetColRef.current
+          var rowLen = (d === null || d === void 0 ? void 0 : d.length) || 0;
+          _fortuneCore.api.setSelection(draft, [{
+            row: [0, rowLen],
+            column: [selectedTargetCol === null || selectedTargetCol === void 0 ? void 0 : selectedTargetCol[0], selectedTargetCol === null || selectedTargetCol === void 0 ? void 0 : selectedTargetCol[selectedTargetCol.length - 1]]
           }], {
             id: context.currentSheetId
           });

package/lib/components/SheetOverlay/drag_and_drop/row-helpers.js

@@ -201,20 +201,20 @@ var useRowDragAndDrop = exports.useRowDragAndDrop = function useRowDragAndDrop(c
     }
   };
   var handleRowDragEnd = function handleRowDragEnd(ev) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     if (!dragRef.current.mouseDown) return;
     dragRef.current.mouseDown = false;
     try {
       document.body.style.userSelect = dragRef.current.prevUserSelect || "";
       document.body.style.webkitUserSelect = dragRef.current.prevWebkitUserSelect || "";
-    } catch (_e) {}
+    } catch (_d) {}
     if (dragRef.current.active) {
       var finalInsertionIndex_1 = computeInsertionFromPageY(ev.pageY).insertionIndex;
       var sourceIndex_1 = ((_c = (_b = (_a = context.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.row) === null || _c === void 0 ? void 0 : _c[0]) || 0;
       var sheetIdx_1 = (0, _fortuneCore.getSheetIndex)(context, context.currentSheetId);
       if (sheetIdx_1 != null && sourceIndex_1 >= 0 && Number.isFinite(finalInsertionIndex_1) && finalInsertionIndex_1 >= 0) {
         setContext(function (draft) {
-          var _a, _b, _c, _d, _e;
+          var _a, _b, _c, _d, _e, _f;
           var _sheet = draft.luckysheetfile[sheetIdx_1];
           if (!(_sheet === null || _sheet === void 0 ? void 0 : _sheet.data)) return;
           var rows = _sheet.data;
@@ -348,20 +348,10 @@ var useRowDragAndDrop = exports.useRowDragAndDrop = function useRowDragAndDrop(c
             }
           });
           (_e = window === null || window === void 0 ? void 0 : window.updateDataBlockCalcFunctionAfterRowDrag) === null || _e === void 0 ? void 0 : _e.call(window, sourceIndex_1, targetIndex, "row", context.currentSheetId);
-        });
-        var d = (0, _fortuneCore.getFlowdata)(context);
-        var colLen_1 = ((_d = d === null || d === void 0 ? void 0 : d[0]) === null || _d === void 0 ? void 0 : _d.length) || 0;
-        var targetIndex_1 = finalInsertionIndex_1;
-        if (targetIndex_1 > sourceIndex_1) targetIndex_1 -= 1;
-        var selData = _fortuneCore.api.getSelection(context) || [];
-        var sel = __spreadArray([], selData, true);
-        if (sel && sel[0]) {
-          sel[0].column = [targetIndex_1, targetIndex_1];
-        }
-        setContext(function (draftCtx) {
-          _fortuneCore.api.setSelection(draftCtx, [{
-            row: [targetIndex_1, targetIndex_1],
-            column: [0, colLen_1]
+          var colLen = ((_f = d === null || d === void 0 ? void 0 : d[0]) === null || _f === void 0 ? void 0 : _f.length) || 0;
+          _fortuneCore.api.setSelection(draft, [{
+            row: [selectedTargetRow[0], selectedTargetRow[selectedTargetRow.length - 1]],
+            column: [0, colLen]
           }], {
             id: context.currentSheetId
           });

package/lib/components/Workbook/api.d.ts

@@ -1,7 +1,7 @@
 import { api, Cell, Context, Op, Range, Selection, Presence, Settings, SingleRange, Sheet, CellMatrix, CellWithRowAndCol, GlobalCache, LiveQueryData } from "@fileverse-dev/fortune-core";
 import { getCryptoPrice } from "../../utils/cryptoApi";
 import { SetContextOptions } from "../../context";
-export declare function generateAPIs(context: Context, setContext: (recipe: (ctx: Context) => void, options?: SetContextOptions) => void, handleUndo: () => void, handleRedo: () => void, settings: Required<Settings>, cellInput: HTMLDivElement | null, scrollbarX: HTMLDivElement | null, scrollbarY: HTMLDivElement | null, globalCache: GlobalCache | null): {
+export declare function generateAPIs(context: Context, setContext: (recipe: (ctx: Context) => void, options?: SetContextOptions) => void, handleUndo: () => void, handleRedo: () => void, settings: Required<Settings>, cellInput: HTMLDivElement | null, scrollbarX: HTMLDivElement | null, scrollbarY: HTMLDivElement | null, globalCache: GlobalCache | null, refs: any): {
     applyOp: (ops: Op[]) => void;
     getCryptoPrice: typeof getCryptoPrice;
     getCellValue: (row: number, column: number, options?: api.CommonOptions & {
@@ -1191,4 +1191,7 @@ export declare function generateAPIs(context: Context, setContext: (recipe: (ctx
     getWorkbookContext: () => Context;
     getWorkbookSetContext: () => (recipe: (ctx: Context) => void, options?: SetContextOptions) => void;
     getSettings: () => Required<Settings>;
+    getRefs: () => any;
+    getShowDialog: () => (content: import("react").ReactNode, type?: "ok" | "yesno" | undefined, title?: import("react").ReactNode, okLabel?: string | undefined, cancelLabel?: string | undefined, onOk?: () => void, onCancel?: () => void) => void;
+    getSplitColComponent: () => import("react").FC<{}>;
 };

package/lib/components/Workbook/api.js

@@ -8,6 +8,8 @@ var _fortuneCore = require("@fileverse-dev/fortune-core");
 var _immer = require("immer");
 var _lodash = _interopRequireDefault(require("lodash"));
 var _cryptoApi = require("../../utils/cryptoApi");
+var _useDialog = require("../../hooks/useDialog");
+var _SplitColumn = require("../../components/SplitColumn");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 var __assign = void 0 && (void 0).__assign || function () {
   __assign = Object.assign || function (t) {
@@ -19,7 +21,7 @@ var __assign = void 0 && (void 0).__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
-function generateAPIs(context, setContext, handleUndo, handleRedo, settings, cellInput, scrollbarX, scrollbarY, globalCache) {
+function generateAPIs(context, setContext, handleUndo, handleRedo, settings, cellInput, scrollbarX, scrollbarY, globalCache, refs) {
   return {
     applyOp: function applyOp(ops) {
       setContext(function (ctx_) {
@@ -443,6 +445,16 @@ function generateAPIs(context, setContext, handleUndo, handleRedo, settings, cel
     },
     getSettings: function getSettings() {
       return settings;
+    },
+    getRefs: function getRefs() {
+      return refs;
+    },
+    getShowDialog: function getShowDialog() {
+      var showDialog = (0, _useDialog.useDialog)().showDialog;
+      return showDialog;
+    },
+    getSplitColComponent: function getSplitColComponent() {
+      return _SplitColumn.SplitColumn;
     }
   };
 }

package/lib/components/Workbook/index.d.ts

@@ -1199,5 +1199,8 @@ declare const Workbook: React.ForwardRefExoticComponent<Settings & AdditionalPro
     getWorkbookContext: () => Context;
     getWorkbookSetContext: () => (recipe: (ctx: Context) => void, options?: SetContextOptions | undefined) => void;
     getSettings: () => Required<Settings>;
+    getRefs: () => any;
+    getShowDialog: () => (content: React.ReactNode, type?: "ok" | "yesno" | undefined, title?: React.ReactNode, okLabel?: string | undefined, cancelLabel?: string | undefined, onOk?: () => void, onCancel?: () => void) => void;
+    getSplitColComponent: () => React.FC<{}>;
 }>>;
 export default Workbook;

package/lib/components/Workbook/index.js

@@ -672,7 +672,7 @@ var Workbook = /*#__PURE__*/_react.default.forwardRef(function (_a, ref) {
     };
   }, [onPaste]);
   (0, _react.useImperativeHandle)(ref, function () {
-    return (0, _api.generateAPIs)(context, setContextWithProduce, handleUndo, handleRedo, mergedSettings, cellInput.current, scrollbarX.current, scrollbarY.current, globalCache.current);
+    return (0, _api.generateAPIs)(context, setContextWithProduce, handleUndo, handleRedo, mergedSettings, cellInput.current, scrollbarX.current, scrollbarY.current, globalCache.current, refs);
   }, [context, setContextWithProduce, handleUndo, handleRedo, mergedSettings, globalCache]);
   var i = (0, _fortuneCore.getSheetIndex)(context, context.currentSheetId);
   if (i == null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-react",
-  "version": "1.2.44",
+  "version": "1.2.46",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "module": "es/index.js",
@@ -16,7 +16,7 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@fileverse-dev/fortune-core": "1.2.44",
+    "@fileverse-dev/fortune-core": "1.2.45",
     "@fileverse/ui": "^4.1.7-patch-40",
     "@tippyjs/react": "^4.2.6",
     "@types/regenerator-runtime": "^0.13.6",