@fileverse-dev/fortune-react 1.3.4 → 1.3.5-hyper-1

package/es/components/ContextMenu/index.js

@@ -974,7 +974,8 @@ var ContextMenu = function ContextMenu() {
         key: name,
         onClick: function onClick() {
           setContext(function (draftCtx) {
-            handleLink(draftCtx);
+            var _a;
+            handleLink(draftCtx, (_a = refs.cellInput.current) !== null && _a !== void 0 ? _a : undefined);
             draftCtx.contextMenu = {};
           });
         }

package/es/components/LinkEidtCard/index.js

@@ -9,7 +9,7 @@ var __assign = this && this.__assign || function () {
   return __assign.apply(this, arguments);
 };
 import React, { useContext, useState, useMemo, useCallback, useLayoutEffect, useRef, useEffect } from "react";
-import { locale, saveHyperlink, removeHyperlink, replaceHtml, goToLink, isLinkValid } from "@fileverse-dev/fortune-core";
+import { locale, saveHyperlink, removeHyperlink, replaceHtml, goToLink, isLinkValid, jfrefreshgrid } from "@fileverse-dev/fortune-core";
 import { Button, TextField, Select, SelectContent, SelectItem, SelectTrigger, SelectValue, LucideIcon } from "@fileverse/ui";
 import "./index.css";
 import _ from "lodash";
@@ -23,7 +23,8 @@ export var LinkEditCard = function LinkEditCard(_a) {
     originType = _a.originType,
     originAddress = _a.originAddress,
     isEditing = _a.isEditing,
-    position = _a.position;
+    position = _a.position,
+    applyToSelection = _a.applyToSelection;
   var _b = useContext(WorkbookContext),
     context = _b.context,
     setContext = _b.setContext,
@@ -86,7 +87,14 @@ export var LinkEditCard = function LinkEditCard(_a) {
         if (e.key === "Enter") {
           _.set(refs.globalCache, "linkCard.mouseEnter", false);
           setContext(function (draftCtx) {
-            return saveHyperlink(draftCtx, r, c, linkText, linkType, linkAddress);
+            saveHyperlink(draftCtx, r, c, linkText, linkType, linkAddress, {
+              applyToSelection: applyToSelection || undefined,
+              cellInput: refs.cellInput.current
+            });
+            if (!applyToSelection) {
+              draftCtx.luckysheetCellUpdate = [];
+              jfrefreshgrid(draftCtx, null, undefined);
+            }
           });
         }
       },
@@ -94,7 +102,7 @@ export var LinkEditCard = function LinkEditCard(_a) {
         return e.stopPropagation();
       }
     };
-  }, [refs.globalCache, isButtonDisabled]);
+  }, [refs.globalCache, isButtonDisabled, applyToSelection, linkText, linkType, linkAddress, r, c, setContext, refs.cellInput]);
   var renderToolbarButton = useCallback(function (iconId, onClick) {
     var iconIdClass = iconId.replace(/[^a-zA-Z0-9-]/g, "-").replace(/-+/g, "-");
     return /*#__PURE__*/React.createElement("div", {
@@ -288,7 +296,14 @@ export var LinkEditCard = function LinkEditCard(_a) {
       if (isButtonDisabled) return;
       _.set(refs.globalCache, "linkCard.mouseEnter", false);
       setContext(function (draftCtx) {
-        return saveHyperlink(draftCtx, r, c, linkText, linkType, linkAddress);
+        saveHyperlink(draftCtx, r, c, linkText, linkType, linkAddress, {
+          applyToSelection: applyToSelection || undefined,
+          cellInput: refs.cellInput.current
+        });
+        if (!applyToSelection) {
+          draftCtx.luckysheetCellUpdate = [];
+          jfrefreshgrid(draftCtx, null, undefined);
+        }
       });
     },
     "data-testid": "link-card-cta-insert"

package/es/components/SheetOverlay/index.js

@@ -83,7 +83,7 @@ var SheetOverlay = function SheetOverlay() {
       }
       if (skip || ((_a = globalCache.linkCard) === null || _a === void 0 ? void 0 : _a.mouseEnter)) return;
       setContext(function (draftCtx) {
-        showLinkCard(draftCtx, r, c, isEditing);
+        showLinkCard(draftCtx, r, c, undefined, isEditing);
       });
     }, 800);
   }, [setContext]);
@@ -96,7 +96,7 @@ var SheetOverlay = function SheetOverlay() {
       debouncedShowLinkCard(globalCache, rc.r, rc.c, false);
     } else {
       if ((_a = globalCache.linkCard) === null || _a === void 0 ? void 0 : _a.mouseEnter) return;
-      showLinkCard(ctx, rc.r, rc.c, false);
+      showLinkCard(ctx, rc.r, rc.c, undefined, false);
       debouncedShowLinkCard(globalCache, rc.r, rc.c, false, true);
     }
   }, [debouncedShowLinkCard]);

package/es/components/Toolbar/index.js

@@ -643,6 +643,12 @@ var Toolbar = function Toolbar(_a) {
     window.dataVerificationClick = dataVerificationClick;
     window.conditionalFormatClick = conditionalFormatClick;
   }, []);
+  useEffect(function () {
+    if (cell != null) {
+      refs.globalCache.recentTextColor = normalizedCellAttr(cell, "fc");
+      refs.globalCache.recentBackgroundColor = normalizedCellAttr(cell, "bg");
+    }
+  }, [cell, refs.globalCache]);
   var getToolbarItem = useCallback(function (name, i) {
     var _a, _b, _c, _d, _e, _f, _g;
     var tooltip = toolbar[name];
@@ -652,6 +658,8 @@ var Toolbar = function Toolbar(_a) {
       });
     }
     if (["font-color", "background"].includes(name)) {
+      var displayTextColor_1 = cell != null ? normalizedCellAttr(cell, "fc") : "#000000";
+      var displayBackgroundColor_1 = cell != null ? normalizedCellAttr(cell, "bg") : undefined;
       var pick_1 = function pick_1(color) {
         setContext(function (draftCtx) {
           return (name === "font-color" ? handleTextColor : handleTextBackground)(draftCtx, refs.cellInput.current, color);
@@ -671,7 +679,7 @@ var Toolbar = function Toolbar(_a) {
         style: {
           width: 24,
           height: 4,
-          backgroundColor: name === "font-color" ? refs.globalCache.recentTextColor : refs.globalCache.recentBackgroundColor,
+          backgroundColor: name === "font-color" ? displayTextColor_1 : displayBackgroundColor_1,
           position: "absolute",
           bottom: 2,
           left: 3,
@@ -681,9 +689,9 @@ var Toolbar = function Toolbar(_a) {
         iconId: name,
         tooltip: tooltip,
         showArrow: false,
-        fillColor: name === "font-color" ? refs.globalCache.recentTextColor : undefined,
+        fillColor: name === "font-color" ? displayTextColor_1 : undefined,
         onClick: function onClick() {
-          var color = name === "font-color" ? refs.globalCache.recentTextColor : refs.globalCache.recentBackgroundColor;
+          var color = name === "font-color" ? displayTextColor_1 : displayBackgroundColor_1;
           if (color) pick_1(color);
         }
       }, function (setOpen) {

package/lib/components/ContextMenu/index.js

@@ -983,7 +983,8 @@ var ContextMenu = function ContextMenu() {
         key: name,
         onClick: function onClick() {
           setContext(function (draftCtx) {
-            (0, _fortuneCore.handleLink)(draftCtx);
+            var _a;
+            (0, _fortuneCore.handleLink)(draftCtx, (_a = refs.cellInput.current) !== null && _a !== void 0 ? _a : undefined);
             draftCtx.contextMenu = {};
           });
         }

package/lib/components/LinkEidtCard/index.js

@@ -32,7 +32,8 @@ var LinkEditCard = exports.LinkEditCard = function LinkEditCard(_a) {
     originType = _a.originType,
     originAddress = _a.originAddress,
     isEditing = _a.isEditing,
-    position = _a.position;
+    position = _a.position,
+    applyToSelection = _a.applyToSelection;
   var _b = (0, _react.useContext)(_context.default),
     context = _b.context,
     setContext = _b.setContext,
@@ -95,7 +96,14 @@ var LinkEditCard = exports.LinkEditCard = function LinkEditCard(_a) {
         if (e.key === "Enter") {
           _lodash.default.set(refs.globalCache, "linkCard.mouseEnter", false);
           setContext(function (draftCtx) {
-            return (0, _fortuneCore.saveHyperlink)(draftCtx, r, c, linkText, linkType, linkAddress);
+            (0, _fortuneCore.saveHyperlink)(draftCtx, r, c, linkText, linkType, linkAddress, {
+              applyToSelection: applyToSelection || undefined,
+              cellInput: refs.cellInput.current
+            });
+            if (!applyToSelection) {
+              draftCtx.luckysheetCellUpdate = [];
+              (0, _fortuneCore.jfrefreshgrid)(draftCtx, null, undefined);
+            }
           });
         }
       },
@@ -103,7 +111,7 @@ var LinkEditCard = exports.LinkEditCard = function LinkEditCard(_a) {
         return e.stopPropagation();
       }
     };
-  }, [refs.globalCache, isButtonDisabled]);
+  }, [refs.globalCache, isButtonDisabled, applyToSelection, linkText, linkType, linkAddress, r, c, setContext, refs.cellInput]);
   var renderToolbarButton = (0, _react.useCallback)(function (iconId, onClick) {
     var iconIdClass = iconId.replace(/[^a-zA-Z0-9-]/g, "-").replace(/-+/g, "-");
     return /*#__PURE__*/_react.default.createElement("div", {
@@ -297,7 +305,14 @@ var LinkEditCard = exports.LinkEditCard = function LinkEditCard(_a) {
       if (isButtonDisabled) return;
       _lodash.default.set(refs.globalCache, "linkCard.mouseEnter", false);
       setContext(function (draftCtx) {
-        return (0, _fortuneCore.saveHyperlink)(draftCtx, r, c, linkText, linkType, linkAddress);
+        (0, _fortuneCore.saveHyperlink)(draftCtx, r, c, linkText, linkType, linkAddress, {
+          applyToSelection: applyToSelection || undefined,
+          cellInput: refs.cellInput.current
+        });
+        if (!applyToSelection) {
+          draftCtx.luckysheetCellUpdate = [];
+          (0, _fortuneCore.jfrefreshgrid)(draftCtx, null, undefined);
+        }
       });
     },
     "data-testid": "link-card-cta-insert"

package/lib/components/SheetOverlay/index.js

@@ -92,7 +92,7 @@ var SheetOverlay = function SheetOverlay() {
       }
       if (skip || ((_a = globalCache.linkCard) === null || _a === void 0 ? void 0 : _a.mouseEnter)) return;
       setContext(function (draftCtx) {
-        (0, _fortuneCore.showLinkCard)(draftCtx, r, c, isEditing);
+        (0, _fortuneCore.showLinkCard)(draftCtx, r, c, undefined, isEditing);
       });
     }, 800);
   }, [setContext]);
@@ -105,7 +105,7 @@ var SheetOverlay = function SheetOverlay() {
       debouncedShowLinkCard(globalCache, rc.r, rc.c, false);
     } else {
       if ((_a = globalCache.linkCard) === null || _a === void 0 ? void 0 : _a.mouseEnter) return;
-      (0, _fortuneCore.showLinkCard)(ctx, rc.r, rc.c, false);
+      (0, _fortuneCore.showLinkCard)(ctx, rc.r, rc.c, undefined, false);
       debouncedShowLinkCard(globalCache, rc.r, rc.c, false, true);
     }
   }, [debouncedShowLinkCard]);

package/lib/components/Toolbar/index.js

@@ -652,6 +652,12 @@ var Toolbar = function Toolbar(_a) {
     window.dataVerificationClick = dataVerificationClick;
     window.conditionalFormatClick = conditionalFormatClick;
   }, []);
+  (0, _react.useEffect)(function () {
+    if (cell != null) {
+      refs.globalCache.recentTextColor = (0, _fortuneCore.normalizedCellAttr)(cell, "fc");
+      refs.globalCache.recentBackgroundColor = (0, _fortuneCore.normalizedCellAttr)(cell, "bg");
+    }
+  }, [cell, refs.globalCache]);
   var getToolbarItem = (0, _react.useCallback)(function (name, i) {
     var _a, _b, _c, _d, _e, _f, _g;
     var tooltip = toolbar[name];
@@ -661,6 +667,8 @@ var Toolbar = function Toolbar(_a) {
       });
     }
     if (["font-color", "background"].includes(name)) {
+      var displayTextColor_1 = cell != null ? (0, _fortuneCore.normalizedCellAttr)(cell, "fc") : "#000000";
+      var displayBackgroundColor_1 = cell != null ? (0, _fortuneCore.normalizedCellAttr)(cell, "bg") : undefined;
       var pick_1 = function pick_1(color) {
         setContext(function (draftCtx) {
           return (name === "font-color" ? _fortuneCore.handleTextColor : _fortuneCore.handleTextBackground)(draftCtx, refs.cellInput.current, color);
@@ -680,7 +688,7 @@ var Toolbar = function Toolbar(_a) {
         style: {
           width: 24,
           height: 4,
-          backgroundColor: name === "font-color" ? refs.globalCache.recentTextColor : refs.globalCache.recentBackgroundColor,
+          backgroundColor: name === "font-color" ? displayTextColor_1 : displayBackgroundColor_1,
           position: "absolute",
           bottom: 2,
           left: 3,
@@ -690,9 +698,9 @@ var Toolbar = function Toolbar(_a) {
         iconId: name,
         tooltip: tooltip,
         showArrow: false,
-        fillColor: name === "font-color" ? refs.globalCache.recentTextColor : undefined,
+        fillColor: name === "font-color" ? displayTextColor_1 : undefined,
         onClick: function onClick() {
-          var color = name === "font-color" ? refs.globalCache.recentTextColor : refs.globalCache.recentBackgroundColor;
+          var color = name === "font-color" ? displayTextColor_1 : displayBackgroundColor_1;
           if (color) pick_1(color);
         }
       }, function (setOpen) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-react",
-  "version": "1.3.4",
+  "version": "1.3.5-hyper-1",
   "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.4",
+    "@fileverse-dev/fortune-core": "1.3.5-hyper-1",
     "@fileverse/ui": "5.0.0",
     "@tippyjs/react": "^4.2.6",
     "@types/regenerator-runtime": "^0.13.6",