@fileverse-dev/fortune-react 1.2.50 → 1.2.51

package/es/components/ContextMenu/index.js

@@ -121,7 +121,6 @@ import Tippy from "@tippyjs/react";
 import { LucideIcon } from "@fileverse/ui";
 import { SplitColumn } from "../SplitColumn";
 import { ResetColumnWidth } from "../ResetColumnWidth";
-import DataVerification from "../DataVerification";
 import WorkbookContext from "../../context";
 import { useAlert } from "../../hooks/useAlert";
 import { useDialog } from "../../hooks/useDialog";
@@ -147,7 +146,6 @@ var ContextMenu = function ContextMenu() {
     drag = _b.drag,
     generalDialog = _b.generalDialog,
     info = _b.info,
-    toolbar = _b.toolbar,
     splitText = _b.splitText;
   var _c = useState(""),
     activeMenu = _c[0],
@@ -286,7 +284,7 @@ var ContextMenu = function ContextMenu() {
           setContext(function (draftCtx) {
             draftCtx.contextMenu = {};
           });
-          showDialog(/*#__PURE__*/React.createElement(DataVerification, null), undefined, toolbar.dataVerification);
+          window.dataVerificationClick(context.luckysheet_select_save);
         }
       }, /*#__PURE__*/React.createElement("div", {
         className: "context-item"

package/es/components/Toolbar/index.js

@@ -995,15 +995,13 @@ var Toolbar = function Toolbar(_a) {
       });
     }
     if (name === "dataVerification") {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DataVerificationPortal, {
-        visible: showDataValidation
-      }), /*#__PURE__*/React.createElement(Button, {
+      return /*#__PURE__*/React.createElement(Button, {
         id: "dataVerification",
         iconId: name,
         tooltip: tooltip,
         key: name,
         onClick: dataVerificationClick
-      }));
+      });
     }
     if (name === "locationCondition") {
       var items_3 = [{
@@ -1136,34 +1134,7 @@ var Toolbar = function Toolbar(_a) {
           if (context.allowEdit === false) return;
           showImgChooser();
         }
-      }, /*#__PURE__*/React.createElement("input", {
-        id: "fortune-img-upload",
-        type: "file",
-        accept: "image/*",
-        style: {
-          display: "none"
-        },
-        onChange: function onChange(e) {
-          var _a;
-          var file = (_a = e.currentTarget.files) === null || _a === void 0 ? void 0 : _a[0];
-          if (!file) return;
-          var render = new FileReader();
-          render.readAsDataURL(file);
-          render.onload = function (event) {
-            var _a;
-            if (event.target == null) return;
-            var src = (_a = event.target) === null || _a === void 0 ? void 0 : _a.result;
-            var image = new Image();
-            image.onload = function () {
-              setContext(function (draftCtx) {
-                insertImage(draftCtx, image);
-              });
-            };
-            image.src = src;
-          };
-          e.currentTarget.value = "";
-        }
-      }));
+      });
     }
     if (name === "comment") {
       var last = (_d = context.luckysheet_select_save) === null || _d === void 0 ? void 0 : _d[context.luckysheet_select_save.length - 1];
@@ -1692,7 +1663,37 @@ var Toolbar = function Toolbar(_a) {
     ref: containerRef,
     className: "fortune-toolbar",
     "aria-label": toolbar.toolbar
-  }, /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(DataVerificationPortal, {
+    visible: showDataValidation
+  }), /*#__PURE__*/React.createElement("input", {
+    id: "fortune-img-upload",
+    className: "test-fortune-img-upload",
+    type: "file",
+    accept: "image/*",
+    style: {
+      display: "none"
+    },
+    onChange: function onChange(e) {
+      var _a;
+      var file = (_a = e.currentTarget.files) === null || _a === void 0 ? void 0 : _a[0];
+      if (!file) return;
+      var render = new FileReader();
+      render.readAsDataURL(file);
+      render.onload = function (event) {
+        var _a;
+        if (event.target == null) return;
+        var src = (_a = event.target) === null || _a === void 0 ? void 0 : _a.result;
+        var image = new Image();
+        image.onload = function () {
+          setContext(function (draftCtx) {
+            insertImage(draftCtx, image);
+          });
+        };
+        image.src = src;
+      };
+      e.currentTarget.value = "";
+    }
+  }), /*#__PURE__*/React.createElement("div", {
     className: "fortune-toolbar-left"
   }, settings.customToolbarItems.filter(function (n) {
     return n.key === "import-export";

package/lib/components/ContextMenu/index.js

@@ -13,7 +13,6 @@ var _react2 = _interopRequireDefault(require("@tippyjs/react"));
 var _ui = require("@fileverse/ui");
 var _SplitColumn = require("../SplitColumn");
 var _ResetColumnWidth = require("../ResetColumnWidth");
-var _DataVerification = _interopRequireDefault(require("../DataVerification"));
 var _context = _interopRequireDefault(require("../../context"));
 var _useAlert = require("../../hooks/useAlert");
 var _useDialog = require("../../hooks/useDialog");
@@ -156,7 +155,6 @@ var ContextMenu = function ContextMenu() {
     drag = _b.drag,
     generalDialog = _b.generalDialog,
     info = _b.info,
-    toolbar = _b.toolbar,
     splitText = _b.splitText;
   var _c = (0, _react.useState)(""),
     activeMenu = _c[0],
@@ -295,7 +293,7 @@ var ContextMenu = function ContextMenu() {
           setContext(function (draftCtx) {
             draftCtx.contextMenu = {};
           });
-          showDialog(/*#__PURE__*/_react.default.createElement(_DataVerification.default, null), undefined, toolbar.dataVerification);
+          window.dataVerificationClick(context.luckysheet_select_save);
         }
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: "context-item"

package/lib/components/Toolbar/index.js

@@ -1004,15 +1004,13 @@ var Toolbar = function Toolbar(_a) {
       });
     }
     if (name === "dataVerification") {
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_dataVerificationPortal.default, {
-        visible: showDataValidation
-      }), /*#__PURE__*/_react.default.createElement(_Button.default, {
+      return /*#__PURE__*/_react.default.createElement(_Button.default, {
         id: "dataVerification",
         iconId: name,
         tooltip: tooltip,
         key: name,
         onClick: dataVerificationClick
-      }));
+      });
     }
     if (name === "locationCondition") {
       var items_3 = [{
@@ -1145,34 +1143,7 @@ var Toolbar = function Toolbar(_a) {
           if (context.allowEdit === false) return;
           (0, _fortuneCore.showImgChooser)();
         }
-      }, /*#__PURE__*/_react.default.createElement("input", {
-        id: "fortune-img-upload",
-        type: "file",
-        accept: "image/*",
-        style: {
-          display: "none"
-        },
-        onChange: function onChange(e) {
-          var _a;
-          var file = (_a = e.currentTarget.files) === null || _a === void 0 ? void 0 : _a[0];
-          if (!file) return;
-          var render = new FileReader();
-          render.readAsDataURL(file);
-          render.onload = function (event) {
-            var _a;
-            if (event.target == null) return;
-            var src = (_a = event.target) === null || _a === void 0 ? void 0 : _a.result;
-            var image = new Image();
-            image.onload = function () {
-              setContext(function (draftCtx) {
-                (0, _fortuneCore.insertImage)(draftCtx, image);
-              });
-            };
-            image.src = src;
-          };
-          e.currentTarget.value = "";
-        }
-      }));
+      });
     }
     if (name === "comment") {
       var last = (_d = context.luckysheet_select_save) === null || _d === void 0 ? void 0 : _d[context.luckysheet_select_save.length - 1];
@@ -1701,7 +1672,37 @@ var Toolbar = function Toolbar(_a) {
     ref: containerRef,
     className: "fortune-toolbar",
     "aria-label": toolbar.toolbar
-  }, /*#__PURE__*/_react.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement(_dataVerificationPortal.default, {
+    visible: showDataValidation
+  }), /*#__PURE__*/_react.default.createElement("input", {
+    id: "fortune-img-upload",
+    className: "test-fortune-img-upload",
+    type: "file",
+    accept: "image/*",
+    style: {
+      display: "none"
+    },
+    onChange: function onChange(e) {
+      var _a;
+      var file = (_a = e.currentTarget.files) === null || _a === void 0 ? void 0 : _a[0];
+      if (!file) return;
+      var render = new FileReader();
+      render.readAsDataURL(file);
+      render.onload = function (event) {
+        var _a;
+        if (event.target == null) return;
+        var src = (_a = event.target) === null || _a === void 0 ? void 0 : _a.result;
+        var image = new Image();
+        image.onload = function () {
+          setContext(function (draftCtx) {
+            (0, _fortuneCore.insertImage)(draftCtx, image);
+          });
+        };
+        image.src = src;
+      };
+      e.currentTarget.value = "";
+    }
+  }), /*#__PURE__*/_react.default.createElement("div", {
     className: "fortune-toolbar-left"
   }, settings.customToolbarItems.filter(function (n) {
     return n.key === "import-export";

package/package.json

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