@fileverse-dev/fortune-react 1.2.64-patch-11 → 1.2.64-patch-12

package/es/components/ContextMenu/index.js

@@ -128,7 +128,6 @@ import Divider from "./Divider";
 import "./index.css";
 import Menu from "./Menu";
 import "tippy.js/dist/tippy.css";
-import ConditionalFormat from "../ConditionFormat";
 import SVGIcon from "../SVGIcon";
 import { LucideIcon as LocalLucidIcon } from "../../components/SheetOverlay/LucideIcon";
 var ContextMenu = function ContextMenu() {
@@ -986,50 +985,20 @@ var ContextMenu = function ContextMenu() {
       }), /*#__PURE__*/React.createElement("p", null, rightclick.link)));
     }
     if (name === "conditionFormat") {
-      var closeContextMenu = function closeContextMenu() {
-        return setContext(function (ctx) {
-          ctx.contextMenu = {};
-        });
-      };
-      return /*#__PURE__*/React.createElement(Tippy, {
+      return /*#__PURE__*/React.createElement(Menu, {
         key: name,
-        placement: "right-start",
-        interactive: true,
-        interactiveBorder: 50,
-        offset: [0, 0],
-        arrow: false,
-        zIndex: 3000,
-        appendTo: document.body,
-        onShow: function onShow() {
-          setActiveMenu("conditionFormat");
-        },
-        onHide: function onHide() {
-          if (activeMenu === "conditionFormat") setActiveMenu("");
-        },
-        content: /*#__PURE__*/React.createElement("div", {
-          style: {
-            minWidth: 220
-          }
-        }, /*#__PURE__*/React.createElement(ConditionalFormat, {
-          items: ["highlightCellRules", "itemSelectionRules", "-", "deleteRule"],
-          setOpen: closeContextMenu
-        })),
-        trigger: "mouseenter focus",
-        hideOnClick: false
-      }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Menu, {
-        isActive: activeMenu === "conditionFormat"
-      }, /*#__PURE__*/React.createElement("div", {
-        className: "flex items-center justify-between w-full"
+        onClick: function onClick() {
+          if (context.allowEdit === false) return;
+          setContext(function (draftCtx) {
+            draftCtx.contextMenu = {};
+          });
+          window.conditionalFormatClick(context.luckysheet_select_save);
+        }
       }, /*#__PURE__*/React.createElement("div", {
-        className: "flex items-center gap-2 context-item"
+        className: "context-item"
       }, /*#__PURE__*/React.createElement(LucideIcon, {
         name: "PaintbrushVertical"
-      }), /*#__PURE__*/React.createElement("p", null, rightclick.conditionFormat || "Conditional Format")), /*#__PURE__*/React.createElement(LucideIcon, {
-        name: "ChevronRight",
-        width: 16,
-        height: 16,
-        className: "color-text-secondary w-4 h-4"
-      })))));
+      }), /*#__PURE__*/React.createElement("p", null, "Conditional formatting")));
     }
     if (name === "clear-format") {
       return /*#__PURE__*/React.createElement(Menu, {

package/es/components/Toolbar/index.js

@@ -619,10 +619,10 @@ var Toolbar = function Toolbar(_a) {
   };
   useEffect(function () {
     window.dataVerificationClick = dataVerificationClick;
+    window.conditionalFormatClick = conditionalFormatClick;
   }, []);
   var conditionalFormatClick = function conditionalFormatClick(selectedCells) {
     var _a;
-    console.log("conditionalFormatClick called");
     var selection = api.getSelection(context);
     if (!selection && !selectedCells) {
       setContext(function (ctx) {

package/lib/components/ContextMenu/index.js

@@ -20,7 +20,6 @@ var _Divider = _interopRequireDefault(require("./Divider"));
 require("./index.css");
 var _Menu = _interopRequireDefault(require("./Menu"));
 require("tippy.js/dist/tippy.css");
-var _ConditionFormat = _interopRequireDefault(require("../ConditionFormat"));
 var _SVGIcon = _interopRequireDefault(require("../SVGIcon"));
 var _LucideIcon = require("../../components/SheetOverlay/LucideIcon");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
@@ -995,50 +994,20 @@ var ContextMenu = function ContextMenu() {
       }), /*#__PURE__*/_react.default.createElement("p", null, rightclick.link)));
     }
     if (name === "conditionFormat") {
-      var closeContextMenu = function closeContextMenu() {
-        return setContext(function (ctx) {
-          ctx.contextMenu = {};
-        });
-      };
-      return /*#__PURE__*/_react.default.createElement(_react2.default, {
+      return /*#__PURE__*/_react.default.createElement(_Menu.default, {
         key: name,
-        placement: "right-start",
-        interactive: true,
-        interactiveBorder: 50,
-        offset: [0, 0],
-        arrow: false,
-        zIndex: 3000,
-        appendTo: document.body,
-        onShow: function onShow() {
-          setActiveMenu("conditionFormat");
-        },
-        onHide: function onHide() {
-          if (activeMenu === "conditionFormat") setActiveMenu("");
-        },
-        content: /*#__PURE__*/_react.default.createElement("div", {
-          style: {
-            minWidth: 220
-          }
-        }, /*#__PURE__*/_react.default.createElement(_ConditionFormat.default, {
-          items: ["highlightCellRules", "itemSelectionRules", "-", "deleteRule"],
-          setOpen: closeContextMenu
-        })),
-        trigger: "mouseenter focus",
-        hideOnClick: false
-      }, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_Menu.default, {
-        isActive: activeMenu === "conditionFormat"
-      }, /*#__PURE__*/_react.default.createElement("div", {
-        className: "flex items-center justify-between w-full"
+        onClick: function onClick() {
+          if (context.allowEdit === false) return;
+          setContext(function (draftCtx) {
+            draftCtx.contextMenu = {};
+          });
+          window.conditionalFormatClick(context.luckysheet_select_save);
+        }
       }, /*#__PURE__*/_react.default.createElement("div", {
-        className: "flex items-center gap-2 context-item"
+        className: "context-item"
       }, /*#__PURE__*/_react.default.createElement(_ui.LucideIcon, {
         name: "PaintbrushVertical"
-      }), /*#__PURE__*/_react.default.createElement("p", null, rightclick.conditionFormat || "Conditional Format")), /*#__PURE__*/_react.default.createElement(_ui.LucideIcon, {
-        name: "ChevronRight",
-        width: 16,
-        height: 16,
-        className: "color-text-secondary w-4 h-4"
-      })))));
+      }), /*#__PURE__*/_react.default.createElement("p", null, "Conditional formatting")));
     }
     if (name === "clear-format") {
       return /*#__PURE__*/_react.default.createElement(_Menu.default, {

package/lib/components/Toolbar/index.js

@@ -628,10 +628,10 @@ var Toolbar = function Toolbar(_a) {
   };
   (0, _react.useEffect)(function () {
     window.dataVerificationClick = dataVerificationClick;
+    window.conditionalFormatClick = conditionalFormatClick;
   }, []);
   var conditionalFormatClick = function conditionalFormatClick(selectedCells) {
     var _a;
-    console.log("conditionalFormatClick called");
     var selection = _fortuneCore.api.getSelection(context);
     if (!selection && !selectedCells) {
       setContext(function (ctx) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-react",
-  "version": "1.2.64-patch-11",
+  "version": "1.2.64-patch-12",
   "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.64-patch-11",
+    "@fileverse-dev/fortune-core": "1.2.64-patch-12",
     "@fileverse/ui": "^4.1.7-patch-40",
     "@tippyjs/react": "^4.2.6",
     "@types/regenerator-runtime": "^0.13.6",