Synced code with develop #7031

handsontable · Sep 23, 2021 · f6dac72 · f6dac72
2 parents 6bb854a + 102b3bc
commit f6dac72
Show file tree

Hide file tree

Showing 6 changed files with 583 additions and 61 deletions.
diff --git a/.changelogs/8078.json b/.changelogs/8078.json
@@ -0,0 +1,7 @@
+{
+  "title": "Fixed multiple bugs related to undo/redo actions while using the Formulas plugin",
+  "type": "fixed",
+  "issue": 8078,
+  "breaking": false,
+  "framework": "none"
+}
diff --git a/src/plugins/autofill/__tests__/autofill.spec.js b/src/plugins/autofill/__tests__/autofill.spec.js
@@ -559,7 +559,6 @@ describe('AutoFill', () => {
     };
 
     const direction = 'down';
-    const hasFillDataChanged = false;
 
     expect(afterAutofill).toHaveBeenCalledWith(
       fillData,
@@ -574,7 +573,6 @@ describe('AutoFill', () => {
         new CellCoords(targetRange.to.row, targetRange.to.col),
       ),
       direction,
-      hasFillDataChanged,
     );
   });
 
@@ -633,7 +631,6 @@ describe('AutoFill', () => {
     };
 
     const direction = 'down';
-    const hasFillDataChanged = true;
 
     expect(afterAutofill).toHaveBeenCalledWith(
       fillData,
@@ -648,7 +645,6 @@ describe('AutoFill', () => {
         new CellCoords(targetRange.to.row, targetRange.to.col),
       ),
       direction,
-      hasFillDataChanged,
     );
   });
 

diff --git a/src/plugins/autofill/autofill.js b/src/plugins/autofill/autofill.js
@@ -2,7 +2,6 @@ import { BasePlugin } from '../base';
 import Hooks from '../../pluginHooks';
 import { offset, outerHeight, outerWidth } from '../../helpers/dom/element';
 import { arrayEach, arrayMap } from '../../helpers/array';
-import { isObjectEqual } from '../../helpers/object';
 import EventManager from '../../eventManager';
 import { CellCoords, CellRange } from '../../3rdparty/walkontable/src';
 import { getDeltas, getDragDirectionAndRange, DIRECTIONS, getMappedFillHandleSetting } from './utils';
@@ -235,7 +234,6 @@ export class Autofill extends BasePlugin {
 
     if (startOfDragCoords && startOfDragCoords.row > -1 && startOfDragCoords.col > -1) {
       const selectionData = this.getSelectionData();
-
       const sourceRange = selectionRangeLast.clone();
       const targetRange = new CellRange(startOfDragCoords, startOfDragCoords, endOfDragCoords);
 
@@ -254,19 +252,6 @@ export class Autofill extends BasePlugin {
         return false;
       }
 
-      // TODO: The `hasFillDataChanged` hook argument allows skipping processing of the autofill
-      // handler when the user modifies the fillData in the `beforeAutofill` hook. The workaround
-      // is necessary for the Formulas plugin and can be removed after implementing the missing
-      // feature for the HF (such as `getFillRangeData` method). With that the last argument could
-      // be removed from the `afterAutofill` hook.
-      const {
-        from: sourceFrom,
-        to: sourceTo,
-      } = sourceRange;
-
-      const refData = this.hot.getData(sourceFrom.row, sourceFrom.col, sourceTo.row, sourceTo.col);
-
-      const hasFillDataChanged = !isObjectEqual(refData, beforeAutofillHookResult);
       const deltas = getDeltas(startOfDragCoords, endOfDragCoords, selectionData, directionOfDrag);
 
       let fillData = beforeAutofillHookResult;
@@ -314,7 +299,7 @@ export class Autofill extends BasePlugin {
       );
 
       this.setSelection(cornersOfSelectionAndDragAreas);
-      this.hot.runHooks('afterAutofill', fillData, sourceRange, targetRange, directionOfDrag, hasFillDataChanged);
+      this.hot.runHooks('afterAutofill', fillData, sourceRange, targetRange, directionOfDrag);
       this.hot.render();
 
     } else {