@leankylin-sheet/react 7.0.5 → 7.0.7

package/dist/index.esm.js

@@ -2330,32 +2330,12 @@ var LinkEditCard = function LinkEditCard(_ref) {
     return m;
   }, [settings === null || settings === void 0 ? void 0 : settings.customLinkTypes]);
   var currentCustomConfig = customLinkTypeMap[linkType];
-  var isCustomTypeValid = useMemo(function () {
-    if (!currentCustomConfig) return true;
-    if (!currentCustomConfig.onSave) return true;
-    var next = currentCustomConfig.onSave({
-      linkText: linkText,
-      linkAddress: linkAddress,
-      position: {
-        r: r,
-        c: c
-      },
-      origin: function () {
-        var o = getCellHyperlink(context, r, c);
-        return o ? {
-          linkType: o.linkType,
-          linkAddress: o.linkAddress,
-          payload: o.payload
-        } : undefined;
-      }()
-    });
-    return next !== undefined;
-  }, [currentCustomConfig, linkText, linkAddress, r, c, context]);
+  var isCustomTypeValid = true;
   var canSubmit = !currentCustomConfig || isCustomTypeValid ? isLinkAddressValid.isValid : false;
   var tooltip = function () {
     var text;
     if (currentCustomConfig) {
-      text = isCustomTypeValid ? "" : insertLink.tooltipInfo1 || "";
+      text =  "" ;
     } else {
       text = isLinkAddressValid.tooltip;
     }
@@ -2430,7 +2410,7 @@ var LinkEditCard = function LinkEditCard(_ref) {
     setLinkType(originType);
     var origin = getCellHyperlink(context, r, c);
     setCustomPayload((_origin$payload2 = origin === null || origin === void 0 ? void 0 : origin.payload) !== null && _origin$payload2 !== void 0 ? _origin$payload2 : {});
-  }, [rc, originAddress, originText, originType, r, c, context]);
+  }, [rc, originAddress, originText, originType, r, c]);
   useLayoutEffect(function () {
     if (selectingCellRange) {
       skipCellRangeSet.current = true;
@@ -2581,7 +2561,9 @@ var LinkEditCard = function LinkEditCard(_ref) {
       } else {
         setLinkAddress("");
       }
-      if (next === "cellrange") setRangeModalVisible(true);
+      if (next === "cellrange") {
+        setRangeModalVisible(true);
+      }
       setLinkType(next);
     }
   }, mergedLinkTypeList.map(function (type) {
@@ -2659,38 +2641,63 @@ var LinkEditCard = function LinkEditCard(_ref) {
     }
   })), tooltip))), /*#__PURE__*/React.createElement("div", {
     className: "modal-footer"
-  }, renderBottomButton(function () {
-    if (!canSubmit) return;
-    _.set(refs.globalCache, "linkCard.mouseEnter", false);
-    if (currentCustomConfig === null || currentCustomConfig === void 0 ? void 0 : currentCustomConfig.onSave) {
-      var origin = function () {
-        var o = getCellHyperlink(context, r, c);
-        return o ? {
-          linkType: o.linkType,
-          linkAddress: o.linkAddress,
-          payload: o.payload
-        } : undefined;
-      }();
-      var saved = currentCustomConfig.onSave({
-        linkText: linkText,
-        linkAddress: linkAddress,
-        position: {
-          r: r,
-          c: c
-        },
-        origin: origin
-      });
-      if (!saved) return;
-      setContext(function (draftCtx) {
-        var _saved$payload;
-        return saveHyperlink(draftCtx, r, c, linkText || saved.linkAddress, saved.linkType, saved.linkAddress, _objectSpread2(_objectSpread2({}, customPayload), (_saved$payload = saved.payload) !== null && _saved$payload !== void 0 ? _saved$payload : {}));
-      });
-      return;
-    }
-    setContext(function (draftCtx) {
-      return saveHyperlink(draftCtx, r, c, linkText, linkType, linkAddress);
-    });
-  }, hideLinkCard))));
+  }, renderBottomButton( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var origin, saved;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (!(!canSubmit && !(currentCustomConfig === null || currentCustomConfig === void 0 ? void 0 : currentCustomConfig.onSave))) {
+            _context.next = 2;
+            break;
+          }
+          return _context.abrupt("return");
+        case 2:
+          _.set(refs.globalCache, "linkCard.mouseEnter", false);
+          if (!(currentCustomConfig === null || currentCustomConfig === void 0 ? void 0 : currentCustomConfig.onSave)) {
+            _context.next = 12;
+            break;
+          }
+          origin = function () {
+            var o = getCellHyperlink(context, r, c);
+            return o ? {
+              linkType: o.linkType,
+              linkAddress: o.linkAddress,
+              payload: o.payload
+            } : undefined;
+          }();
+          _context.next = 7;
+          return currentCustomConfig.onSave({
+            linkText: linkText,
+            linkAddress: linkAddress,
+            position: {
+              r: r,
+              c: c
+            },
+            origin: origin
+          });
+        case 7:
+          saved = _context.sent;
+          if (saved) {
+            _context.next = 10;
+            break;
+          }
+          return _context.abrupt("return");
+        case 10:
+          setContext(function (draftCtx) {
+            var _saved$payload;
+            return saveHyperlink(draftCtx, r, c, linkText || saved.linkAddress, saved.linkType, saved.linkAddress, _objectSpread2(_objectSpread2({}, customPayload), (_saved$payload = saved.payload) !== null && _saved$payload !== void 0 ? _saved$payload : {}));
+          });
+          return _context.abrupt("return");
+        case 12:
+          setContext(function (draftCtx) {
+            return saveHyperlink(draftCtx, r, c, linkText, linkType, linkAddress);
+          });
+        case 13:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })), hideLinkCard))));
 };
 
 var FilterOptions = function FilterOptions(_ref) {

package/dist/index.js

@@ -2340,32 +2340,12 @@ var LinkEditCard = function LinkEditCard(_ref) {
     return m;
   }, [settings === null || settings === void 0 ? void 0 : settings.customLinkTypes]);
   var currentCustomConfig = customLinkTypeMap[linkType];
-  var isCustomTypeValid = React.useMemo(function () {
-    if (!currentCustomConfig) return true;
-    if (!currentCustomConfig.onSave) return true;
-    var next = currentCustomConfig.onSave({
-      linkText: linkText,
-      linkAddress: linkAddress,
-      position: {
-        r: r,
-        c: c
-      },
-      origin: function () {
-        var o = core.getCellHyperlink(context, r, c);
-        return o ? {
-          linkType: o.linkType,
-          linkAddress: o.linkAddress,
-          payload: o.payload
-        } : undefined;
-      }()
-    });
-    return next !== undefined;
-  }, [currentCustomConfig, linkText, linkAddress, r, c, context]);
+  var isCustomTypeValid = true;
   var canSubmit = !currentCustomConfig || isCustomTypeValid ? isLinkAddressValid.isValid : false;
   var tooltip = function () {
     var text;
     if (currentCustomConfig) {
-      text = isCustomTypeValid ? "" : insertLink.tooltipInfo1 || "";
+      text =  "" ;
     } else {
       text = isLinkAddressValid.tooltip;
     }
@@ -2440,7 +2420,7 @@ var LinkEditCard = function LinkEditCard(_ref) {
     setLinkType(originType);
     var origin = core.getCellHyperlink(context, r, c);
     setCustomPayload((_origin$payload2 = origin === null || origin === void 0 ? void 0 : origin.payload) !== null && _origin$payload2 !== void 0 ? _origin$payload2 : {});
-  }, [rc, originAddress, originText, originType, r, c, context]);
+  }, [rc, originAddress, originText, originType, r, c]);
   React.useLayoutEffect(function () {
     if (selectingCellRange) {
       skipCellRangeSet.current = true;
@@ -2591,7 +2571,9 @@ var LinkEditCard = function LinkEditCard(_ref) {
       } else {
         setLinkAddress("");
       }
-      if (next === "cellrange") setRangeModalVisible(true);
+      if (next === "cellrange") {
+        setRangeModalVisible(true);
+      }
       setLinkType(next);
     }
   }, mergedLinkTypeList.map(function (type) {
@@ -2669,38 +2651,63 @@ var LinkEditCard = function LinkEditCard(_ref) {
     }
   })), tooltip))), /*#__PURE__*/React__default['default'].createElement("div", {
     className: "modal-footer"
-  }, renderBottomButton(function () {
-    if (!canSubmit) return;
-    ___default['default'].set(refs.globalCache, "linkCard.mouseEnter", false);
-    if (currentCustomConfig === null || currentCustomConfig === void 0 ? void 0 : currentCustomConfig.onSave) {
-      var origin = function () {
-        var o = core.getCellHyperlink(context, r, c);
-        return o ? {
-          linkType: o.linkType,
-          linkAddress: o.linkAddress,
-          payload: o.payload
-        } : undefined;
-      }();
-      var saved = currentCustomConfig.onSave({
-        linkText: linkText,
-        linkAddress: linkAddress,
-        position: {
-          r: r,
-          c: c
-        },
-        origin: origin
-      });
-      if (!saved) return;
-      setContext(function (draftCtx) {
-        var _saved$payload;
-        return core.saveHyperlink(draftCtx, r, c, linkText || saved.linkAddress, saved.linkType, saved.linkAddress, _objectSpread2(_objectSpread2({}, customPayload), (_saved$payload = saved.payload) !== null && _saved$payload !== void 0 ? _saved$payload : {}));
-      });
-      return;
-    }
-    setContext(function (draftCtx) {
-      return core.saveHyperlink(draftCtx, r, c, linkText, linkType, linkAddress);
-    });
-  }, hideLinkCard))));
+  }, renderBottomButton( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var origin, saved;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (!(!canSubmit && !(currentCustomConfig === null || currentCustomConfig === void 0 ? void 0 : currentCustomConfig.onSave))) {
+            _context.next = 2;
+            break;
+          }
+          return _context.abrupt("return");
+        case 2:
+          ___default['default'].set(refs.globalCache, "linkCard.mouseEnter", false);
+          if (!(currentCustomConfig === null || currentCustomConfig === void 0 ? void 0 : currentCustomConfig.onSave)) {
+            _context.next = 12;
+            break;
+          }
+          origin = function () {
+            var o = core.getCellHyperlink(context, r, c);
+            return o ? {
+              linkType: o.linkType,
+              linkAddress: o.linkAddress,
+              payload: o.payload
+            } : undefined;
+          }();
+          _context.next = 7;
+          return currentCustomConfig.onSave({
+            linkText: linkText,
+            linkAddress: linkAddress,
+            position: {
+              r: r,
+              c: c
+            },
+            origin: origin
+          });
+        case 7:
+          saved = _context.sent;
+          if (saved) {
+            _context.next = 10;
+            break;
+          }
+          return _context.abrupt("return");
+        case 10:
+          setContext(function (draftCtx) {
+            var _saved$payload;
+            return core.saveHyperlink(draftCtx, r, c, linkText || saved.linkAddress, saved.linkType, saved.linkAddress, _objectSpread2(_objectSpread2({}, customPayload), (_saved$payload = saved.payload) !== null && _saved$payload !== void 0 ? _saved$payload : {}));
+          });
+          return _context.abrupt("return");
+        case 12:
+          setContext(function (draftCtx) {
+            return core.saveHyperlink(draftCtx, r, c, linkText, linkType, linkAddress);
+          });
+        case 13:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })), hideLinkCard))));
 };
 
 var FilterOptions = function FilterOptions(_ref) {

package/dist/index.umd.js

@@ -21414,32 +21414,12 @@
       return m;
     }, [settings === null || settings === void 0 ? void 0 : settings.customLinkTypes]);
     var currentCustomConfig = customLinkTypeMap[linkType];
-    var isCustomTypeValid = React.useMemo(function () {
-      if (!currentCustomConfig) return true;
-      if (!currentCustomConfig.onSave) return true;
-      var next = currentCustomConfig.onSave({
-        linkText: linkText,
-        linkAddress: linkAddress,
-        position: {
-          r: r,
-          c: c
-        },
-        origin: function () {
-          var o = core.getCellHyperlink(context, r, c);
-          return o ? {
-            linkType: o.linkType,
-            linkAddress: o.linkAddress,
-            payload: o.payload
-          } : undefined;
-        }()
-      });
-      return next !== undefined;
-    }, [currentCustomConfig, linkText, linkAddress, r, c, context]);
+    var isCustomTypeValid = true;
     var canSubmit = !currentCustomConfig || isCustomTypeValid ? isLinkAddressValid.isValid : false;
     var tooltip = function () {
       var text;
       if (currentCustomConfig) {
-        text = isCustomTypeValid ? "" : insertLink.tooltipInfo1 || "";
+        text =  "" ;
       } else {
         text = isLinkAddressValid.tooltip;
       }
@@ -21514,7 +21494,7 @@
       setLinkType(originType);
       var origin = core.getCellHyperlink(context, r, c);
       setCustomPayload((_origin$payload2 = origin === null || origin === void 0 ? void 0 : origin.payload) !== null && _origin$payload2 !== void 0 ? _origin$payload2 : {});
-    }, [rc, originAddress, originText, originType, r, c, context]);
+    }, [rc, originAddress, originText, originType, r, c]);
     React.useLayoutEffect(function () {
       if (selectingCellRange) {
         skipCellRangeSet.current = true;
@@ -21665,7 +21645,9 @@
         } else {
           setLinkAddress("");
         }
-        if (next === "cellrange") setRangeModalVisible(true);
+        if (next === "cellrange") {
+          setRangeModalVisible(true);
+        }
         setLinkType(next);
       }
     }, mergedLinkTypeList.map(function (type) {
@@ -21743,38 +21725,63 @@
       }
     })), tooltip))), /*#__PURE__*/React__default['default'].createElement("div", {
       className: "modal-footer"
-    }, renderBottomButton(function () {
-      if (!canSubmit) return;
-      lodash.set(refs.globalCache, "linkCard.mouseEnter", false);
-      if (currentCustomConfig === null || currentCustomConfig === void 0 ? void 0 : currentCustomConfig.onSave) {
-        var origin = function () {
-          var o = core.getCellHyperlink(context, r, c);
-          return o ? {
-            linkType: o.linkType,
-            linkAddress: o.linkAddress,
-            payload: o.payload
-          } : undefined;
-        }();
-        var saved = currentCustomConfig.onSave({
-          linkText: linkText,
-          linkAddress: linkAddress,
-          position: {
-            r: r,
-            c: c
-          },
-          origin: origin
-        });
-        if (!saved) return;
-        setContext(function (draftCtx) {
-          var _saved$payload;
-          return core.saveHyperlink(draftCtx, r, c, linkText || saved.linkAddress, saved.linkType, saved.linkAddress, _objectSpread2(_objectSpread2({}, customPayload), (_saved$payload = saved.payload) !== null && _saved$payload !== void 0 ? _saved$payload : {}));
-        });
-        return;
-      }
-      setContext(function (draftCtx) {
-        return core.saveHyperlink(draftCtx, r, c, linkText, linkType, linkAddress);
-      });
-    }, hideLinkCard))));
+    }, renderBottomButton( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var origin, saved;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!(!canSubmit && !(currentCustomConfig === null || currentCustomConfig === void 0 ? void 0 : currentCustomConfig.onSave))) {
+              _context.next = 2;
+              break;
+            }
+            return _context.abrupt("return");
+          case 2:
+            lodash.set(refs.globalCache, "linkCard.mouseEnter", false);
+            if (!(currentCustomConfig === null || currentCustomConfig === void 0 ? void 0 : currentCustomConfig.onSave)) {
+              _context.next = 12;
+              break;
+            }
+            origin = function () {
+              var o = core.getCellHyperlink(context, r, c);
+              return o ? {
+                linkType: o.linkType,
+                linkAddress: o.linkAddress,
+                payload: o.payload
+              } : undefined;
+            }();
+            _context.next = 7;
+            return currentCustomConfig.onSave({
+              linkText: linkText,
+              linkAddress: linkAddress,
+              position: {
+                r: r,
+                c: c
+              },
+              origin: origin
+            });
+          case 7:
+            saved = _context.sent;
+            if (saved) {
+              _context.next = 10;
+              break;
+            }
+            return _context.abrupt("return");
+          case 10:
+            setContext(function (draftCtx) {
+              var _saved$payload;
+              return core.saveHyperlink(draftCtx, r, c, linkText || saved.linkAddress, saved.linkType, saved.linkAddress, _objectSpread2(_objectSpread2({}, customPayload), (_saved$payload = saved.payload) !== null && _saved$payload !== void 0 ? _saved$payload : {}));
+            });
+            return _context.abrupt("return");
+          case 12:
+            setContext(function (draftCtx) {
+              return core.saveHyperlink(draftCtx, r, c, linkText, linkType, linkAddress);
+            });
+          case 13:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    })), hideLinkCard))));
   };
 
   var FilterOptions = function FilterOptions(_ref) {