@fileverse-dev/fortune-react 1.0.81 → 1.0.83

package/es/components/Workbook/index.js

@@ -15,7 +15,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-import { defaultContext, defaultSettings, initSheetIndex, handleGlobalKeyDown, getSheetIndex, handlePaste, filterPatch, patchToOp, inverseRowColOptions, ensureSheetIndex, insertRowCol, locale, calcSelectionInfo, groupValuesRefresh, insertDuneChart, getFlowdata, api } from "@fileverse-dev/fortune-core";
+import { defaultContext, defaultSettings, initSheetIndex, handleGlobalKeyDown, getSheetIndex, handlePaste, filterPatch, patchToOp, inverseRowColOptions, ensureSheetIndex, insertRowCol, deleteRowCol, locale, calcSelectionInfo, groupValuesRefresh, insertDuneChart, getFlowdata, api } from "@fileverse-dev/fortune-core";
 import React, { useMemo, useState, useCallback, useEffect, useRef, useImperativeHandle } from "react";
 import "./index.css";
 import produce, { applyPatches, enablePatches, produceWithPatches } from "immer";
@@ -478,7 +478,130 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       noHistory: true
     });
   }, [context.currentSheetId, context.luckysheetfile.length, originalData, mergedSettings.defaultRowHeight, mergedSettings.defaultColWidth, mergedSettings.column, mergedSettings.row, mergedSettings.defaultFontSize, mergedSettings.devicePixelRatio, mergedSettings.lang, mergedSettings.allowEdit, mergedSettings.hooks, mergedSettings.generateSheetId, setContextWithProduce, initSheetData, mergedSettings.rowHeaderWidth, mergedSettings.columnHeaderHeight, mergedSettings.addRows, mergedSettings.currency]);
+  var isMac = navigator.platform.toUpperCase().includes("MAC");
+  var waitingForRInsertRow = false;
+  var resetInsertRowTimer;
+  var waitingForDelRow = false;
+  var resetDeleteRowTimer;
   var onKeyDown = useCallback(function (e) {
+    var _a, _b;
+    var _c = ref.current,
+      getSelection = _c.getSelection,
+      getSheet = _c.getSheet,
+      setSelection = _c.setSelection;
+    var isMacShortcutInsertRow = isMac && e.ctrlKey && e.altKey;
+    var isWindowsShortcutInsertRow = !isMac && e.altKey;
+    if ((isMacShortcutInsertRow || isWindowsShortcutInsertRow) && e.code === "KeyI") {
+      waitingForRInsertRow = true;
+      clearTimeout(resetInsertRowTimer);
+      resetInsertRowTimer = setTimeout(function () {
+        waitingForRInsertRow = false;
+      }, 3000);
+      e.preventDefault();
+      return;
+    }
+    if (waitingForRInsertRow && (e.code === "KeyR" || e.code === "KeyC")) {
+      var direction = "rightbottom";
+      var position = void 0;
+      var insertRowColOp_1;
+      if (e.code === "KeyR") {
+        position = getSelection()[0].row[1];
+        insertRowColOp_1 = {
+          type: "row",
+          index: position,
+          count: 1,
+          direction: direction,
+          id: context.currentSheetId
+        };
+      } else {
+        position = getSelection()[0].column[1];
+        insertRowColOp_1 = {
+          type: "column",
+          index: position,
+          count: 1,
+          direction: direction,
+          id: context.currentSheetId
+        };
+      }
+      if (!position) return;
+      var range_1 = context.luckysheet_select_save;
+      setContextWithProduce(function (draftCtx) {
+        if (insertRowColOp_1) insertRowCol(draftCtx, insertRowColOp_1);
+        draftCtx.luckysheet_select_save = range_1;
+      }, {
+        insertRowColOp: insertRowColOp_1
+      });
+      waitingForRInsertRow = false;
+      clearTimeout(resetInsertRowTimer);
+      e.preventDefault();
+    }
+    var isDashKey = e.key === "-" || e.code === "Minus";
+    var isSecondShortcut = isMac ? e.metaKey && e.altKey && isDashKey : e.ctrlKey && e.altKey && isDashKey;
+    if (isSecondShortcut) {
+      waitingForDelRow = true;
+      clearTimeout(resetDeleteRowTimer);
+      resetDeleteRowTimer = setTimeout(function () {
+        waitingForDelRow = false;
+        console.log("Timeout: No second key (R or C) pressed in time.");
+      }, 3000);
+      e.preventDefault();
+      return;
+    }
+    if (waitingForDelRow && (e.code === "KeyR" || e.code === "KeyC")) {
+      var st_index_1;
+      var ed_index_1;
+      if (e.code === "KeyR") {
+        _a = getSelection()[0].row, st_index_1 = _a[0], ed_index_1 = _a[1];
+        var range_2 = context.luckysheet_select_save;
+        setContextWithProduce(function (draftCtx) {
+          deleteRowCol(draftCtx, {
+            type: "row",
+            start: st_index_1,
+            end: ed_index_1,
+            id: context.currentSheetId
+          });
+          draftCtx.luckysheet_select_save = range_2;
+        });
+      } else {
+        _b = getSelection()[0].column, st_index_1 = _b[0], ed_index_1 = _b[1];
+        var range_3 = context.luckysheet_select_save;
+        setContextWithProduce(function (draftCtx) {
+          deleteRowCol(draftCtx, {
+            type: "column",
+            start: st_index_1,
+            end: ed_index_1,
+            id: context.currentSheetId
+          });
+          draftCtx.luckysheet_select_save = range_3;
+        });
+      }
+      waitingForDelRow = false;
+      clearTimeout(resetDeleteRowTimer);
+      e.preventDefault();
+      return;
+    }
+    if (e.shiftKey && e.code === "Space") {
+      e.stopPropagation();
+      e.preventDefault();
+      var selection = getSelection();
+      var selectedCol = selection === null || selection === void 0 ? void 0 : selection[0].column;
+      var totalRow = getSheet().data.length;
+      setSelection([{
+        row: [0, totalRow - 1],
+        column: selectedCol
+      }]);
+    }
+    if (e.ctrlKey && e.code === "Space") {
+      e.stopPropagation();
+      e.preventDefault();
+      var selection = getSelection();
+      var selectedRow = selection === null || selection === void 0 ? void 0 : selection[0].row;
+      var totalCol = getSheet().data[0].length;
+      setSelection([{
+        row: selectedRow,
+        column: [0, totalCol - 1]
+      }]);
+    }
     var nativeEvent = e.nativeEvent;
     if ((e.ctrlKey || e.metaKey) && e.code === "KeyZ") {
       if (e.shiftKey) {
@@ -512,9 +635,9 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       var trList = ele.querySelectorAll("table tr");
       var maxRow = trList.length + context.luckysheet_select_save[0].row[0];
       var rowToBeAdded = maxRow - context.luckysheetfile[getSheetIndex(context, context.currentSheetId)].data.length;
-      var range_1 = context.luckysheet_select_save;
+      var range_4 = context.luckysheet_select_save;
       if (rowToBeAdded > 0) {
-        var insertRowColOp_1 = {
+        var insertRowColOp_2 = {
           type: "row",
           index: context.luckysheetfile[getSheetIndex(context, context.currentSheetId)].data.length - 1,
           count: rowToBeAdded,
@@ -522,10 +645,10 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
           id: context.currentSheetId
         };
         setContextWithProduce(function (draftCtx) {
-          insertRowCol(draftCtx, insertRowColOp_1);
-          draftCtx.luckysheet_select_save = range_1;
+          insertRowCol(draftCtx, insertRowColOp_2);
+          draftCtx.luckysheet_select_save = range_4;
         }, {
-          insertRowColOp: insertRowColOp_1
+          insertRowColOp: insertRowColOp_2
         });
       }
       setContextWithProduce(function (draftCtx) {

package/lib/components/Workbook/index.js

@@ -487,7 +487,130 @@ var Workbook = /*#__PURE__*/_react.default.forwardRef(function (_a, ref) {
       noHistory: true
     });
   }, [context.currentSheetId, context.luckysheetfile.length, originalData, mergedSettings.defaultRowHeight, mergedSettings.defaultColWidth, mergedSettings.column, mergedSettings.row, mergedSettings.defaultFontSize, mergedSettings.devicePixelRatio, mergedSettings.lang, mergedSettings.allowEdit, mergedSettings.hooks, mergedSettings.generateSheetId, setContextWithProduce, initSheetData, mergedSettings.rowHeaderWidth, mergedSettings.columnHeaderHeight, mergedSettings.addRows, mergedSettings.currency]);
+  var isMac = navigator.platform.toUpperCase().includes("MAC");
+  var waitingForRInsertRow = false;
+  var resetInsertRowTimer;
+  var waitingForDelRow = false;
+  var resetDeleteRowTimer;
   var onKeyDown = (0, _react.useCallback)(function (e) {
+    var _a, _b;
+    var _c = ref.current,
+      getSelection = _c.getSelection,
+      getSheet = _c.getSheet,
+      setSelection = _c.setSelection;
+    var isMacShortcutInsertRow = isMac && e.ctrlKey && e.altKey;
+    var isWindowsShortcutInsertRow = !isMac && e.altKey;
+    if ((isMacShortcutInsertRow || isWindowsShortcutInsertRow) && e.code === "KeyI") {
+      waitingForRInsertRow = true;
+      clearTimeout(resetInsertRowTimer);
+      resetInsertRowTimer = setTimeout(function () {
+        waitingForRInsertRow = false;
+      }, 3000);
+      e.preventDefault();
+      return;
+    }
+    if (waitingForRInsertRow && (e.code === "KeyR" || e.code === "KeyC")) {
+      var direction = "rightbottom";
+      var position = void 0;
+      var insertRowColOp_1;
+      if (e.code === "KeyR") {
+        position = getSelection()[0].row[1];
+        insertRowColOp_1 = {
+          type: "row",
+          index: position,
+          count: 1,
+          direction: direction,
+          id: context.currentSheetId
+        };
+      } else {
+        position = getSelection()[0].column[1];
+        insertRowColOp_1 = {
+          type: "column",
+          index: position,
+          count: 1,
+          direction: direction,
+          id: context.currentSheetId
+        };
+      }
+      if (!position) return;
+      var range_1 = context.luckysheet_select_save;
+      setContextWithProduce(function (draftCtx) {
+        if (insertRowColOp_1) (0, _fortuneCore.insertRowCol)(draftCtx, insertRowColOp_1);
+        draftCtx.luckysheet_select_save = range_1;
+      }, {
+        insertRowColOp: insertRowColOp_1
+      });
+      waitingForRInsertRow = false;
+      clearTimeout(resetInsertRowTimer);
+      e.preventDefault();
+    }
+    var isDashKey = e.key === "-" || e.code === "Minus";
+    var isSecondShortcut = isMac ? e.metaKey && e.altKey && isDashKey : e.ctrlKey && e.altKey && isDashKey;
+    if (isSecondShortcut) {
+      waitingForDelRow = true;
+      clearTimeout(resetDeleteRowTimer);
+      resetDeleteRowTimer = setTimeout(function () {
+        waitingForDelRow = false;
+        console.log("Timeout: No second key (R or C) pressed in time.");
+      }, 3000);
+      e.preventDefault();
+      return;
+    }
+    if (waitingForDelRow && (e.code === "KeyR" || e.code === "KeyC")) {
+      var st_index_1;
+      var ed_index_1;
+      if (e.code === "KeyR") {
+        _a = getSelection()[0].row, st_index_1 = _a[0], ed_index_1 = _a[1];
+        var range_2 = context.luckysheet_select_save;
+        setContextWithProduce(function (draftCtx) {
+          (0, _fortuneCore.deleteRowCol)(draftCtx, {
+            type: "row",
+            start: st_index_1,
+            end: ed_index_1,
+            id: context.currentSheetId
+          });
+          draftCtx.luckysheet_select_save = range_2;
+        });
+      } else {
+        _b = getSelection()[0].column, st_index_1 = _b[0], ed_index_1 = _b[1];
+        var range_3 = context.luckysheet_select_save;
+        setContextWithProduce(function (draftCtx) {
+          (0, _fortuneCore.deleteRowCol)(draftCtx, {
+            type: "column",
+            start: st_index_1,
+            end: ed_index_1,
+            id: context.currentSheetId
+          });
+          draftCtx.luckysheet_select_save = range_3;
+        });
+      }
+      waitingForDelRow = false;
+      clearTimeout(resetDeleteRowTimer);
+      e.preventDefault();
+      return;
+    }
+    if (e.shiftKey && e.code === "Space") {
+      e.stopPropagation();
+      e.preventDefault();
+      var selection = getSelection();
+      var selectedCol = selection === null || selection === void 0 ? void 0 : selection[0].column;
+      var totalRow = getSheet().data.length;
+      setSelection([{
+        row: [0, totalRow - 1],
+        column: selectedCol
+      }]);
+    }
+    if (e.ctrlKey && e.code === "Space") {
+      e.stopPropagation();
+      e.preventDefault();
+      var selection = getSelection();
+      var selectedRow = selection === null || selection === void 0 ? void 0 : selection[0].row;
+      var totalCol = getSheet().data[0].length;
+      setSelection([{
+        row: selectedRow,
+        column: [0, totalCol - 1]
+      }]);
+    }
     var nativeEvent = e.nativeEvent;
     if ((e.ctrlKey || e.metaKey) && e.code === "KeyZ") {
       if (e.shiftKey) {
@@ -521,9 +644,9 @@ var Workbook = /*#__PURE__*/_react.default.forwardRef(function (_a, ref) {
       var trList = ele.querySelectorAll("table tr");
       var maxRow = trList.length + context.luckysheet_select_save[0].row[0];
       var rowToBeAdded = maxRow - context.luckysheetfile[(0, _fortuneCore.getSheetIndex)(context, context.currentSheetId)].data.length;
-      var range_1 = context.luckysheet_select_save;
+      var range_4 = context.luckysheet_select_save;
       if (rowToBeAdded > 0) {
-        var insertRowColOp_1 = {
+        var insertRowColOp_2 = {
           type: "row",
           index: context.luckysheetfile[(0, _fortuneCore.getSheetIndex)(context, context.currentSheetId)].data.length - 1,
           count: rowToBeAdded,
@@ -531,10 +654,10 @@ var Workbook = /*#__PURE__*/_react.default.forwardRef(function (_a, ref) {
           id: context.currentSheetId
         };
         setContextWithProduce(function (draftCtx) {
-          (0, _fortuneCore.insertRowCol)(draftCtx, insertRowColOp_1);
-          draftCtx.luckysheet_select_save = range_1;
+          (0, _fortuneCore.insertRowCol)(draftCtx, insertRowColOp_2);
+          draftCtx.luckysheet_select_save = range_4;
         }, {
-          insertRowColOp: insertRowColOp_1
+          insertRowColOp: insertRowColOp_2
         });
       }
       setContextWithProduce(function (draftCtx) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-react",
-  "version": "1.0.81",
+  "version": "1.0.83",
   "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.0.81",
+    "@fileverse-dev/fortune-core": "1.0.83",
     "@fileverse/ui": "^4.1.7-patch-21",
     "@tippyjs/react": "^4.2.6",
     "@types/regenerator-runtime": "^0.13.6",