@leankylin-sheet/react 5.2.36 → 5.2.38

package/dist/index.esm.js

@@ -1165,6 +1165,7 @@ var InputBox = function InputBox() {
   var row_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.row_focus;
   var col_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.column_focus;
   var preText = useRef("");
+  var prevCellRef = useRef();
   useLayoutEffect(function () {
     if (!context.allowEdit) {
       setContext(function (ctx) {
@@ -1181,11 +1182,18 @@ var InputBox = function InputBox() {
         delete refs.globalCache.doNotUpdateCell;
         return;
       }
-      if (_.isEqual(prevCellUpdate, context.luckysheetCellUpdate) && prevSheetId === context.currentSheetId) {
-        return;
-      }
       var flowdata = getFlowdata(context);
       var cell = flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$row_index = flowdata[row_index]) === null || _flowdata$row_index === void 0 ? void 0 : _flowdata$row_index[col_index];
+      var selectionChanged = !_.isEqual(prevCellUpdate, context.luckysheetCellUpdate) || prevSheetId !== context.currentSheetId;
+      var cellChanged = !prevCellRef.current || prevCellRef.current.r !== row_index || prevCellRef.current.c !== col_index || prevCellRef.current.cell !== cell;
+      if (!selectionChanged && !cellChanged) {
+        return;
+      }
+      prevCellRef.current = {
+        r: row_index,
+        c: col_index,
+        cell: cell
+      };
       var value = "";
       if (cell && !refs.globalCache.overwriteCell) {
         if (isInlineStringCell(cell)) {
@@ -7222,11 +7230,9 @@ var FxEditor = function FxEditor() {
   var prevFirstSelection = usePrevious(firstSelection);
   var prevSheetId = usePrevious(context.currentSheetId);
   var recentText = useRef("");
+  var prevCellRef = useRef();
   useEffect(function () {
     setIsHidenRC(isShowHidenCR(context));
-    if (_.isEqual(prevFirstSelection, firstSelection) && context.currentSheetId === prevSheetId) {
-      return;
-    }
     var d = getFlowdata(context);
     if (context.active_f) {
       return;
@@ -7238,6 +7244,16 @@ var FxEditor = function FxEditor() {
       var c = firstSelection.column_focus;
       if (_.isNil(r) || _.isNil(c)) return;
       var cell = d === null || d === void 0 ? void 0 : (_d$r = d[r]) === null || _d$r === void 0 ? void 0 : _d$r[c];
+      var selectionChanged = !_.isEqual(prevFirstSelection, firstSelection) || context.currentSheetId !== prevSheetId;
+      var cellChanged = !prevCellRef.current || prevCellRef.current.r !== r || prevCellRef.current.c !== c || prevCellRef.current.cell !== cell;
+      if (!selectionChanged && !cellChanged) {
+        return;
+      }
+      prevCellRef.current = {
+        r: r,
+        c: c,
+        cell: cell
+      };
       if (cell) {
         if (isInlineStringCell(cell)) {
           value = getInlineStringNoStyle(r, c, d);
@@ -7249,6 +7265,7 @@ var FxEditor = function FxEditor() {
       }
       refs.fxInput.current.innerHTML = escapeHTMLTag(escapeScriptTag(value));
     } else {
+      prevCellRef.current = undefined;
       refs.fxInput.current.innerHTML = "";
     }
   }, [context.active_f, context.luckysheetfile, context.currentSheetId, context.luckysheet_select_save]);

package/dist/index.js

@@ -1175,6 +1175,7 @@ var InputBox = function InputBox() {
   var row_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.row_focus;
   var col_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.column_focus;
   var preText = React.useRef("");
+  var prevCellRef = React.useRef();
   React.useLayoutEffect(function () {
     if (!context.allowEdit) {
       setContext(function (ctx) {
@@ -1191,11 +1192,18 @@ var InputBox = function InputBox() {
         delete refs.globalCache.doNotUpdateCell;
         return;
       }
-      if (___default['default'].isEqual(prevCellUpdate, context.luckysheetCellUpdate) && prevSheetId === context.currentSheetId) {
-        return;
-      }
       var flowdata = core.getFlowdata(context);
       var cell = flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$row_index = flowdata[row_index]) === null || _flowdata$row_index === void 0 ? void 0 : _flowdata$row_index[col_index];
+      var selectionChanged = !___default['default'].isEqual(prevCellUpdate, context.luckysheetCellUpdate) || prevSheetId !== context.currentSheetId;
+      var cellChanged = !prevCellRef.current || prevCellRef.current.r !== row_index || prevCellRef.current.c !== col_index || prevCellRef.current.cell !== cell;
+      if (!selectionChanged && !cellChanged) {
+        return;
+      }
+      prevCellRef.current = {
+        r: row_index,
+        c: col_index,
+        cell: cell
+      };
       var value = "";
       if (cell && !refs.globalCache.overwriteCell) {
         if (core.isInlineStringCell(cell)) {
@@ -7232,11 +7240,9 @@ var FxEditor = function FxEditor() {
   var prevFirstSelection = usePrevious(firstSelection);
   var prevSheetId = usePrevious(context.currentSheetId);
   var recentText = React.useRef("");
+  var prevCellRef = React.useRef();
   React.useEffect(function () {
     setIsHidenRC(core.isShowHidenCR(context));
-    if (___default['default'].isEqual(prevFirstSelection, firstSelection) && context.currentSheetId === prevSheetId) {
-      return;
-    }
     var d = core.getFlowdata(context);
     if (context.active_f) {
       return;
@@ -7248,6 +7254,16 @@ var FxEditor = function FxEditor() {
       var c = firstSelection.column_focus;
       if (___default['default'].isNil(r) || ___default['default'].isNil(c)) return;
       var cell = d === null || d === void 0 ? void 0 : (_d$r = d[r]) === null || _d$r === void 0 ? void 0 : _d$r[c];
+      var selectionChanged = !___default['default'].isEqual(prevFirstSelection, firstSelection) || context.currentSheetId !== prevSheetId;
+      var cellChanged = !prevCellRef.current || prevCellRef.current.r !== r || prevCellRef.current.c !== c || prevCellRef.current.cell !== cell;
+      if (!selectionChanged && !cellChanged) {
+        return;
+      }
+      prevCellRef.current = {
+        r: r,
+        c: c,
+        cell: cell
+      };
       if (cell) {
         if (core.isInlineStringCell(cell)) {
           value = core.getInlineStringNoStyle(r, c, d);
@@ -7259,6 +7275,7 @@ var FxEditor = function FxEditor() {
       }
       refs.fxInput.current.innerHTML = core.escapeHTMLTag(core.escapeScriptTag(value));
     } else {
+      prevCellRef.current = undefined;
       refs.fxInput.current.innerHTML = "";
     }
   }, [context.active_f, context.luckysheetfile, context.currentSheetId, context.luckysheet_select_save]);

package/dist/index.umd.js

@@ -106196,6 +106196,7 @@
     var row_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.row_focus;
     var col_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.column_focus;
     var preText = React.useRef("");
+    var prevCellRef = React.useRef();
     React.useLayoutEffect(function () {
       if (!context.allowEdit) {
         setContext(function (ctx) {
@@ -106212,11 +106213,18 @@
           delete refs.globalCache.doNotUpdateCell;
           return;
         }
-        if (lodash.isEqual(prevCellUpdate, context.luckysheetCellUpdate) && prevSheetId === context.currentSheetId) {
-          return;
-        }
         var flowdata = getFlowdata(context);
         var cell = flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$row_index = flowdata[row_index]) === null || _flowdata$row_index === void 0 ? void 0 : _flowdata$row_index[col_index];
+        var selectionChanged = !lodash.isEqual(prevCellUpdate, context.luckysheetCellUpdate) || prevSheetId !== context.currentSheetId;
+        var cellChanged = !prevCellRef.current || prevCellRef.current.r !== row_index || prevCellRef.current.c !== col_index || prevCellRef.current.cell !== cell;
+        if (!selectionChanged && !cellChanged) {
+          return;
+        }
+        prevCellRef.current = {
+          r: row_index,
+          c: col_index,
+          cell: cell
+        };
         var value = "";
         if (cell && !refs.globalCache.overwriteCell) {
           if (isInlineStringCell(cell)) {
@@ -112253,11 +112261,9 @@
     var prevFirstSelection = usePrevious(firstSelection);
     var prevSheetId = usePrevious(context.currentSheetId);
     var recentText = React.useRef("");
+    var prevCellRef = React.useRef();
     React.useEffect(function () {
       setIsHidenRC(isShowHidenCR(context));
-      if (lodash.isEqual(prevFirstSelection, firstSelection) && context.currentSheetId === prevSheetId) {
-        return;
-      }
       var d = getFlowdata(context);
       if (context.active_f) {
         return;
@@ -112269,6 +112275,16 @@
         var c = firstSelection.column_focus;
         if (lodash.isNil(r) || lodash.isNil(c)) return;
         var cell = d === null || d === void 0 ? void 0 : (_d$r = d[r]) === null || _d$r === void 0 ? void 0 : _d$r[c];
+        var selectionChanged = !lodash.isEqual(prevFirstSelection, firstSelection) || context.currentSheetId !== prevSheetId;
+        var cellChanged = !prevCellRef.current || prevCellRef.current.r !== r || prevCellRef.current.c !== c || prevCellRef.current.cell !== cell;
+        if (!selectionChanged && !cellChanged) {
+          return;
+        }
+        prevCellRef.current = {
+          r: r,
+          c: c,
+          cell: cell
+        };
         if (cell) {
           if (isInlineStringCell(cell)) {
             value = getInlineStringNoStyle(r, c, d);
@@ -112280,6 +112296,7 @@
         }
         refs.fxInput.current.innerHTML = escapeHTMLTag(escapeScriptTag(value));
       } else {
+        prevCellRef.current = undefined;
         refs.fxInput.current.innerHTML = "";
       }
     }, [context.active_f, context.luckysheetfile, context.currentSheetId, context.luckysheet_select_save]);