@fileverse-dev/fortune-react 1.3.11-input-ref-2 → 1.3.11-input-ref-3

package/es/components/FxEditor/index.js

@@ -244,7 +244,7 @@ var FxEditor = function FxEditor() {
     }
   }, [getActiveFormula, insertSelectedFormula]);
   var onKeyDown = useCallback(function (e) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     if (e.key === "Delete" || e.key === "Backspace") {
       var anchor = formulaAnchorCellRef.current;
       if (anchor != null) {
@@ -292,9 +292,9 @@ var FxEditor = function FxEditor() {
       setContext(function (draftCtx) {
         draftCtx.formulaCache.rangeSelectionActive = null;
       });
-      var _d = formulaAnchorCellRef.current,
-        anchorRow_2 = _d[0],
-        anchorCol_2 = _d[1];
+      var _e = formulaAnchorCellRef.current,
+        anchorRow_2 = _e[0],
+        anchorCol_2 = _e[1];
       setTimeout(function () {
         setContext(function (draftCtx) {
           var _a, _b;
@@ -317,7 +317,10 @@ var FxEditor = function FxEditor() {
         });
       }, 0);
     }
-    if (key === "ArrowLeft" || key === "ArrowRight") {
+    var isArrowKey = key === "ArrowUp" || key === "ArrowDown" || key === "ArrowLeft" || key === "ArrowRight";
+    var isDirectPlainTypeEdit = context.luckysheetCellUpdate.length > 0 && ((_d = refs.globalCache) === null || _d === void 0 ? void 0 : _d.enteredEditByTyping) === true && !currentInputText.startsWith("=");
+    var sheetArrowShortcut = isArrowKey && (e.metaKey || e.ctrlKey || e.shiftKey);
+    if ((key === "ArrowLeft" || key === "ArrowRight") && !(isDirectPlainTypeEdit && sheetArrowShortcut)) {
       e.stopPropagation();
     }
     if ((e.metaKey || e.ctrlKey) && context.luckysheetCellUpdate.length > 0) {

package/es/components/SheetOverlay/InputBox.js

@@ -400,7 +400,7 @@ var InputBox = function InputBox() {
     });
   }, [formulaMouseDragSignature, context.formulaCache.func_selectedrange, refs.cellInput, setContext]);
   var onKeyDown = useCallback(function (e) {
-    var _a, _b;
+    var _a, _b, _c;
     setContext(function (draftCtx) {
       setFormulaEditorOwner(draftCtx, "cell");
     });
@@ -422,9 +422,9 @@ var InputBox = function InputBox() {
       setContext(function (draftCtx) {
         draftCtx.formulaCache.rangeSelectionActive = null;
       });
-      var _c = formulaAnchorCellRef.current,
-        anchorRow_1 = _c[0],
-        anchorCol_1 = _c[1];
+      var _d = formulaAnchorCellRef.current,
+        anchorRow_1 = _d[0],
+        anchorCol_1 = _d[1];
       skipNextAnchorSelectionSyncRef.current = true;
       setTimeout(function () {
         setContext(function (draftCtx) {
@@ -480,6 +480,7 @@ var InputBox = function InputBox() {
     }
     var allowListNavigation = true;
     var isArrowKey = e.key === "ArrowUp" || e.key === "ArrowDown" || e.key === "ArrowLeft" || e.key === "ArrowRight";
+    var isInPlaceEditMode = ((_c = refs.globalCache) === null || _c === void 0 ? void 0 : _c.enteredEditByTyping) !== true;
     if (e.key === "Delete" || e.key === "Backspace") {
       var anchor = formulaAnchorCellRef.current;
       if (anchor != null) {
@@ -531,7 +532,7 @@ var InputBox = function InputBox() {
       e.preventDefault();
     } else if (e.key === "F4" && context.luckysheetCellUpdate.length > 0) {
       e.preventDefault();
-    } else if (!(e.metaKey || e.ctrlKey) && e.key === "ArrowUp" && context.luckysheetCellUpdate.length > 0 && allowListNavigation) {
+    } else if (!(e.metaKey || e.ctrlKey) && e.key === "ArrowUp" && context.luckysheetCellUpdate.length > 0 && allowListNavigation && !(e.shiftKey && isInPlaceEditMode)) {
       if (document.getElementById("luckysheet-formula-search-c")) {
         var formulaSearchContainer = document.getElementById("luckysheet-formula-search-c");
         var activeItem = formulaSearchContainer === null || formulaSearchContainer === void 0 ? void 0 : formulaSearchContainer.querySelector(".luckysheet-formula-search-item-active");
@@ -550,7 +551,7 @@ var InputBox = function InputBox() {
         }
       }
       e.preventDefault();
-    } else if (!(e.metaKey || e.ctrlKey) && e.key === "ArrowDown" && context.luckysheetCellUpdate.length > 0 && allowListNavigation) {
+    } else if (!(e.metaKey || e.ctrlKey) && e.key === "ArrowDown" && context.luckysheetCellUpdate.length > 0 && allowListNavigation && !(e.shiftKey && isInPlaceEditMode)) {
       if (document.getElementById("luckysheet-formula-search-c")) {
         var formulaSearchContainer = document.getElementById("luckysheet-formula-search-c");
         var activeItem = formulaSearchContainer === null || formulaSearchContainer === void 0 ? void 0 : formulaSearchContainer.querySelector(".luckysheet-formula-search-item-active");

package/es/components/SheetOverlay/index.css

@@ -801,44 +801,11 @@
 }
 
 .fortune-formula-functionrange-highlight .fortune-selection-copy-hc {
-  border: 2px solid #5e5e5e;
-  opacity: 0.03;
+  border-width: 2px;
+  border-style: dotted;
   z-index: initial;
 }
 
-.fortune-selection-highlight-lt {
-  left: -3px;
-  top: -3px;
-  cursor: se-resize;
-}
-
-.fortune-selection-highlight-rt {
-  right: -3px;
-  top: -3px;
-  cursor: ne-resize;
-}
-
-.fortune-selection-highlight-lb {
-  left: -3px;
-  bottom: -3px;
-  cursor: ne-resize;
-}
-
-.fortune-selection-highlight-rb {
-  right: -3px;
-  bottom: -3px;
-  cursor: se-resize;
-}
-
-.fortune-formula-functionrange-highlight .luckysheet-highlight {
-  position: absolute;
-  z-index: 19;
-  border: 1px solid #fff;
-  background: #0188fb;
-  width: 6px;
-  height: 6px;
-}
-
 .fortune-presence-username {
   position: absolute;
   padding-left: 6px;

package/es/components/SheetOverlay/index.js

@@ -28,6 +28,22 @@ import { useDialog } from "../../hooks/useDialog";
 import DropDownList from "../DataVerification/DropdownList";
 import IframeBoxs from "../IFrameBoxs/iFrameBoxs";
 import ErrorBoxes from "../ErrorState";
+function formulaRangeHighlightHcStyle(hex) {
+  var h = hex.replace("#", "");
+  if (h.length !== 6) {
+    return {
+      backgroundColor: hex,
+      borderColor: hex
+    };
+  }
+  var r = parseInt(h.slice(0, 2), 16);
+  var g = parseInt(h.slice(2, 4), 16);
+  var b = parseInt(h.slice(4, 6), 16);
+  return {
+    backgroundColor: "rgba(".concat(r, ",").concat(g, ",").concat(b, ",0.08)"),
+    borderColor: hex
+  };
+}
 var SheetOverlay = function SheetOverlay() {
   var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
   var _o = useContext(WorkbookContext),
@@ -297,18 +313,7 @@ var SheetOverlay = function SheetOverlay() {
       });
     }), /*#__PURE__*/React.createElement("div", {
       className: "fortune-selection-copy-hc",
-      style: {
-        backgroundColor: backgroundColor
-      }
-    }), ["lt", "rt", "lb", "rb"].map(function (d) {
-      return /*#__PURE__*/React.createElement("div", {
-        key: d,
-        "data-type": d,
-        className: "fortune-selection-highlight-".concat(d, " luckysheet-highlight"),
-        style: {
-          backgroundColor: backgroundColor
-        }
-      });
+      style: formulaRangeHighlightHcStyle(backgroundColor)
     }));
   }), /*#__PURE__*/React.createElement("div", {
     className: "luckysheet-row-count-show luckysheet-count-show",

package/lib/components/FxEditor/index.js

@@ -253,7 +253,7 @@ var FxEditor = function FxEditor() {
     }
   }, [getActiveFormula, insertSelectedFormula]);
   var onKeyDown = (0, _react.useCallback)(function (e) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     if (e.key === "Delete" || e.key === "Backspace") {
       var anchor = formulaAnchorCellRef.current;
       if (anchor != null) {
@@ -301,9 +301,9 @@ var FxEditor = function FxEditor() {
       setContext(function (draftCtx) {
         draftCtx.formulaCache.rangeSelectionActive = null;
       });
-      var _d = formulaAnchorCellRef.current,
-        anchorRow_2 = _d[0],
-        anchorCol_2 = _d[1];
+      var _e = formulaAnchorCellRef.current,
+        anchorRow_2 = _e[0],
+        anchorCol_2 = _e[1];
       setTimeout(function () {
         setContext(function (draftCtx) {
           var _a, _b;
@@ -326,7 +326,10 @@ var FxEditor = function FxEditor() {
         });
       }, 0);
     }
-    if (key === "ArrowLeft" || key === "ArrowRight") {
+    var isArrowKey = key === "ArrowUp" || key === "ArrowDown" || key === "ArrowLeft" || key === "ArrowRight";
+    var isDirectPlainTypeEdit = context.luckysheetCellUpdate.length > 0 && ((_d = refs.globalCache) === null || _d === void 0 ? void 0 : _d.enteredEditByTyping) === true && !currentInputText.startsWith("=");
+    var sheetArrowShortcut = isArrowKey && (e.metaKey || e.ctrlKey || e.shiftKey);
+    if ((key === "ArrowLeft" || key === "ArrowRight") && !(isDirectPlainTypeEdit && sheetArrowShortcut)) {
       e.stopPropagation();
     }
     if ((e.metaKey || e.ctrlKey) && context.luckysheetCellUpdate.length > 0) {

package/lib/components/SheetOverlay/InputBox.js

@@ -409,7 +409,7 @@ var InputBox = function InputBox() {
     });
   }, [formulaMouseDragSignature, context.formulaCache.func_selectedrange, refs.cellInput, setContext]);
   var onKeyDown = (0, _react.useCallback)(function (e) {
-    var _a, _b;
+    var _a, _b, _c;
     setContext(function (draftCtx) {
       (0, _fortuneCore.setFormulaEditorOwner)(draftCtx, "cell");
     });
@@ -431,9 +431,9 @@ var InputBox = function InputBox() {
       setContext(function (draftCtx) {
         draftCtx.formulaCache.rangeSelectionActive = null;
       });
-      var _c = formulaAnchorCellRef.current,
-        anchorRow_1 = _c[0],
-        anchorCol_1 = _c[1];
+      var _d = formulaAnchorCellRef.current,
+        anchorRow_1 = _d[0],
+        anchorCol_1 = _d[1];
       skipNextAnchorSelectionSyncRef.current = true;
       setTimeout(function () {
         setContext(function (draftCtx) {
@@ -489,6 +489,7 @@ var InputBox = function InputBox() {
     }
     var allowListNavigation = true;
     var isArrowKey = e.key === "ArrowUp" || e.key === "ArrowDown" || e.key === "ArrowLeft" || e.key === "ArrowRight";
+    var isInPlaceEditMode = ((_c = refs.globalCache) === null || _c === void 0 ? void 0 : _c.enteredEditByTyping) !== true;
     if (e.key === "Delete" || e.key === "Backspace") {
       var anchor = formulaAnchorCellRef.current;
       if (anchor != null) {
@@ -540,7 +541,7 @@ var InputBox = function InputBox() {
       e.preventDefault();
     } else if (e.key === "F4" && context.luckysheetCellUpdate.length > 0) {
       e.preventDefault();
-    } else if (!(e.metaKey || e.ctrlKey) && e.key === "ArrowUp" && context.luckysheetCellUpdate.length > 0 && allowListNavigation) {
+    } else if (!(e.metaKey || e.ctrlKey) && e.key === "ArrowUp" && context.luckysheetCellUpdate.length > 0 && allowListNavigation && !(e.shiftKey && isInPlaceEditMode)) {
       if (document.getElementById("luckysheet-formula-search-c")) {
         var formulaSearchContainer = document.getElementById("luckysheet-formula-search-c");
         var activeItem = formulaSearchContainer === null || formulaSearchContainer === void 0 ? void 0 : formulaSearchContainer.querySelector(".luckysheet-formula-search-item-active");
@@ -559,7 +560,7 @@ var InputBox = function InputBox() {
         }
       }
       e.preventDefault();
-    } else if (!(e.metaKey || e.ctrlKey) && e.key === "ArrowDown" && context.luckysheetCellUpdate.length > 0 && allowListNavigation) {
+    } else if (!(e.metaKey || e.ctrlKey) && e.key === "ArrowDown" && context.luckysheetCellUpdate.length > 0 && allowListNavigation && !(e.shiftKey && isInPlaceEditMode)) {
       if (document.getElementById("luckysheet-formula-search-c")) {
         var formulaSearchContainer = document.getElementById("luckysheet-formula-search-c");
         var activeItem = formulaSearchContainer === null || formulaSearchContainer === void 0 ? void 0 : formulaSearchContainer.querySelector(".luckysheet-formula-search-item-active");

package/lib/components/SheetOverlay/index.css

@@ -801,44 +801,11 @@
 }
 
 .fortune-formula-functionrange-highlight .fortune-selection-copy-hc {
-  border: 2px solid #5e5e5e;
-  opacity: 0.03;
+  border-width: 2px;
+  border-style: dotted;
   z-index: initial;
 }
 
-.fortune-selection-highlight-lt {
-  left: -3px;
-  top: -3px;
-  cursor: se-resize;
-}
-
-.fortune-selection-highlight-rt {
-  right: -3px;
-  top: -3px;
-  cursor: ne-resize;
-}
-
-.fortune-selection-highlight-lb {
-  left: -3px;
-  bottom: -3px;
-  cursor: ne-resize;
-}
-
-.fortune-selection-highlight-rb {
-  right: -3px;
-  bottom: -3px;
-  cursor: se-resize;
-}
-
-.fortune-formula-functionrange-highlight .luckysheet-highlight {
-  position: absolute;
-  z-index: 19;
-  border: 1px solid #fff;
-  background: #0188fb;
-  width: 6px;
-  height: 6px;
-}
-
 .fortune-presence-username {
   position: absolute;
   padding-left: 6px;

package/lib/components/SheetOverlay/index.js

@@ -37,6 +37,22 @@ var __assign = void 0 && (void 0).__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
+function formulaRangeHighlightHcStyle(hex) {
+  var h = hex.replace("#", "");
+  if (h.length !== 6) {
+    return {
+      backgroundColor: hex,
+      borderColor: hex
+    };
+  }
+  var r = parseInt(h.slice(0, 2), 16);
+  var g = parseInt(h.slice(2, 4), 16);
+  var b = parseInt(h.slice(4, 6), 16);
+  return {
+    backgroundColor: "rgba(".concat(r, ",").concat(g, ",").concat(b, ",0.08)"),
+    borderColor: hex
+  };
+}
 var SheetOverlay = function SheetOverlay() {
   var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
   var _o = (0, _react.useContext)(_context.default),
@@ -306,18 +322,7 @@ var SheetOverlay = function SheetOverlay() {
       });
     }), /*#__PURE__*/_react.default.createElement("div", {
       className: "fortune-selection-copy-hc",
-      style: {
-        backgroundColor: backgroundColor
-      }
-    }), ["lt", "rt", "lb", "rb"].map(function (d) {
-      return /*#__PURE__*/_react.default.createElement("div", {
-        key: d,
-        "data-type": d,
-        className: "fortune-selection-highlight-".concat(d, " luckysheet-highlight"),
-        style: {
-          backgroundColor: backgroundColor
-        }
-      });
+      style: formulaRangeHighlightHcStyle(backgroundColor)
     }));
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: "luckysheet-row-count-show luckysheet-count-show",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-react",
-  "version": "1.3.11-input-ref-2",
+  "version": "1.3.11-input-ref-3",
   "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.3.11-input-ref-2",
+    "@fileverse-dev/fortune-core": "1.3.11-input-ref-3",
     "@fileverse/ui": "5.0.0",
     "@tippyjs/react": "^4.2.6",
     "@types/regenerator-runtime": "^0.13.6",