handsontable 0.0.0-next-29d7f5c-20241210 → 0.0.0-next-2580147-20241212

package/helpers/mixed.js

@@ -134,7 +134,7 @@ const domMessages = {
 function _injectProductInfo(key, element) {
   const hasValidType = !isEmpty(key);
   const isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  const hotVersion = "0.0.0-next-29d7f5c-20241210";
+  const hotVersion = "0.0.0-next-2580147-20241212";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';

package/helpers/mixed.mjs

@@ -124,7 +124,7 @@ const domMessages = {
 export function _injectProductInfo(key, element) {
   const hasValidType = !isEmpty(key);
   const isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  const hotVersion = "0.0.0-next-29d7f5c-20241210";
+  const hotVersion = "0.0.0-next-2580147-20241212";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';

package/package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/handsontable/handsontable/issues"
   },
   "author": "Handsoncode <hello@handsontable.com>",
-  "version": "0.0.0-next-29d7f5c-20241210",
+  "version": "0.0.0-next-2580147-20241212",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/plugins/filters/conditionCollection.js

@@ -4,9 +4,10 @@ exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.iterator.map.js");
+require("core-js/modules/esnext.iterator.reduce.js");
 require("core-js/modules/esnext.iterator.some.js");
-var _array = require("../../helpers/array");
 var _object = require("../../helpers/object");
 var _templateLiteralTag = require("../../helpers/templateLiteralTag");
 var _localHooks = _interopRequireDefault(require("../../mixins/localHooks"));
@@ -121,7 +122,7 @@ class ConditionCollection {
     let operation = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _conjunction.OPERATION_ID;
     let position = arguments.length > 3 ? arguments[3] : undefined;
     const localeForColumn = this.hot.getCellMeta(0, column).locale;
-    const args = (0, _array.arrayMap)(conditionDefinition.args, v => typeof v === 'string' ? v.toLocaleLowerCase(localeForColumn) : v);
+    const args = conditionDefinition.args.map(v => typeof v === 'string' ? v.toLocaleLowerCase(localeForColumn) : v);
     const name = conditionDefinition.name || conditionDefinition.command.key;
 
     // If there's no previous condition stack defined (which means the condition stack was not cleared after the
@@ -215,7 +216,7 @@ class ConditionCollection {
    * @returns {Array}
    */
   exportAllConditions() {
-    return (0, _array.arrayReduce)(this.filteringStates.getEntries(), (allConditions, _ref2) => {
+    return this.filteringStates.getEntries().reduce((allConditions, _ref2) => {
       let [column, {
         operation,
         conditions
@@ -223,14 +224,14 @@ class ConditionCollection {
       allConditions.push({
         column,
         operation,
-        conditions: (0, _array.arrayMap)(conditions, _ref3 => {
+        conditions: conditions.map(_ref3 => {
           let {
             name,
             args
           } = _ref3;
           return {
             name,
-            args
+            args: [...args]
           };
         })
       });
@@ -245,8 +246,8 @@ class ConditionCollection {
    */
   importAllConditions(conditions) {
     this.clean();
-    (0, _array.arrayEach)(conditions, stack => {
-      (0, _array.arrayEach)(stack.conditions, condition => this.addCondition(stack.column, condition));
+    conditions.forEach(stack => {
+      stack.conditions.forEach(condition => this.addCondition(stack.column, condition));
     });
   }
 

package/plugins/filters/conditionCollection.mjs

@@ -1,12 +1,13 @@
 import "core-js/modules/es.error.cause.js";
 import "core-js/modules/es.array.push.js";
 import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.for-each.js";
 import "core-js/modules/esnext.iterator.map.js";
+import "core-js/modules/esnext.iterator.reduce.js";
 import "core-js/modules/esnext.iterator.some.js";
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { arrayEach, arrayMap, arrayReduce } from "../../helpers/array.mjs";
 import { mixin } from "../../helpers/object.mjs";
 import { toSingleLine } from "../../helpers/templateLiteralTag.mjs";
 import localHooks from "../../mixins/localHooks.mjs";
@@ -117,7 +118,7 @@ class ConditionCollection {
     let operation = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : OPERATION_AND;
     let position = arguments.length > 3 ? arguments[3] : undefined;
     const localeForColumn = this.hot.getCellMeta(0, column).locale;
-    const args = arrayMap(conditionDefinition.args, v => typeof v === 'string' ? v.toLocaleLowerCase(localeForColumn) : v);
+    const args = conditionDefinition.args.map(v => typeof v === 'string' ? v.toLocaleLowerCase(localeForColumn) : v);
     const name = conditionDefinition.name || conditionDefinition.command.key;
 
     // If there's no previous condition stack defined (which means the condition stack was not cleared after the
@@ -211,7 +212,7 @@ class ConditionCollection {
    * @returns {Array}
    */
   exportAllConditions() {
-    return arrayReduce(this.filteringStates.getEntries(), (allConditions, _ref2) => {
+    return this.filteringStates.getEntries().reduce((allConditions, _ref2) => {
       let [column, {
         operation,
         conditions
@@ -219,14 +220,14 @@ class ConditionCollection {
       allConditions.push({
         column,
         operation,
-        conditions: arrayMap(conditions, _ref3 => {
+        conditions: conditions.map(_ref3 => {
           let {
             name,
             args
           } = _ref3;
           return {
             name,
-            args
+            args: [...args]
           };
         })
       });
@@ -241,8 +242,8 @@ class ConditionCollection {
    */
   importAllConditions(conditions) {
     this.clean();
-    arrayEach(conditions, stack => {
-      arrayEach(stack.conditions, condition => this.addCondition(stack.column, condition));
+    conditions.forEach(stack => {
+      stack.conditions.forEach(condition => this.addCondition(stack.column, condition));
     });
   }
 

package/plugins/filters/utils.js

@@ -15,8 +15,10 @@ require("core-js/modules/es.set.is-subset-of.v2.js");
 require("core-js/modules/es.set.is-superset-of.v2.js");
 require("core-js/modules/es.set.symmetric-difference.v2.js");
 require("core-js/modules/es.set.union.v2.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/esnext.iterator.map.js");
 var _feature = require("../../helpers/feature");
-var _array = require("../../helpers/array");
 const sortCompare = (0, _feature.getComparisonFunction)();
 
 /**
@@ -47,8 +49,6 @@ function toVisualValue(value, defaultEmptyValue) {
   }
   return visualValue;
 }
-const SUPPORT_SET_CONSTRUCTOR = new Set([1]).has(1);
-const SUPPORT_FAST_DEDUPE = SUPPORT_SET_CONSTRUCTOR && typeof Array.from === 'function';
 
 /**
  * Create an array assertion to compare if an element exists in that array (in a more efficient way than .indexOf).
@@ -57,19 +57,9 @@ const SUPPORT_FAST_DEDUPE = SUPPORT_SET_CONSTRUCTOR && typeof Array.from === 'fu
  * @returns {Function}
  */
 function createArrayAssertion(initialData) {
-  let dataset = initialData;
-  if (SUPPORT_SET_CONSTRUCTOR) {
-    dataset = new Set(dataset);
-  }
+  const dataset = new Set(initialData);
   return function (value) {
-    let result;
-    if (SUPPORT_SET_CONSTRUCTOR) {
-      result = dataset.has(value);
-    } else {
-      /* eslint-disable no-bitwise */
-      result = !!~dataset.indexOf(value);
-    }
-    return result;
+    return dataset.has(value);
   };
 }
 
@@ -90,13 +80,7 @@ function toEmptyString(value) {
  * @returns {Array}
  */
 function unifyColumnValues(values) {
-  let unifiedValues = values;
-  if (SUPPORT_FAST_DEDUPE) {
-    unifiedValues = Array.from(new Set(unifiedValues));
-  } else {
-    unifiedValues = (0, _array.arrayUnique)(unifiedValues);
-  }
-  unifiedValues = unifiedValues.sort((a, b) => {
+  return Array.from(new Set(values)).map(value => toEmptyString(value)).sort((a, b) => {
     if (typeof a === 'number' && typeof b === 'number') {
       return a - b;
     }
@@ -105,7 +89,6 @@ function unifyColumnValues(values) {
     }
     return a > b ? 1 : -1;
   });
-  return unifiedValues;
 }
 
 /**
@@ -124,7 +107,7 @@ function intersectValues(base, selected, defaultEmptyValue, callback) {
   if (!same) {
     selectedItemsAssertion = createArrayAssertion(selected);
   }
-  (0, _array.arrayEach)(base, value => {
+  base.forEach(value => {
     let checked = false;
     if (same || selectedItemsAssertion(value)) {
       checked = true;

package/plugins/filters/utils.mjs

@@ -6,8 +6,10 @@ import "core-js/modules/es.set.is-subset-of.v2.js";
 import "core-js/modules/es.set.is-superset-of.v2.js";
 import "core-js/modules/es.set.symmetric-difference.v2.js";
 import "core-js/modules/es.set.union.v2.js";
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.for-each.js";
+import "core-js/modules/esnext.iterator.map.js";
 import { getComparisonFunction } from "../../helpers/feature.mjs";
-import { arrayUnique, arrayEach } from "../../helpers/array.mjs";
 const sortCompare = getComparisonFunction();
 
 /**
@@ -38,8 +40,6 @@ export function toVisualValue(value, defaultEmptyValue) {
   }
   return visualValue;
 }
-const SUPPORT_SET_CONSTRUCTOR = new Set([1]).has(1);
-const SUPPORT_FAST_DEDUPE = SUPPORT_SET_CONSTRUCTOR && typeof Array.from === 'function';
 
 /**
  * Create an array assertion to compare if an element exists in that array (in a more efficient way than .indexOf).
@@ -48,19 +48,9 @@ const SUPPORT_FAST_DEDUPE = SUPPORT_SET_CONSTRUCTOR && typeof Array.from === 'fu
  * @returns {Function}
  */
 export function createArrayAssertion(initialData) {
-  let dataset = initialData;
-  if (SUPPORT_SET_CONSTRUCTOR) {
-    dataset = new Set(dataset);
-  }
+  const dataset = new Set(initialData);
   return function (value) {
-    let result;
-    if (SUPPORT_SET_CONSTRUCTOR) {
-      result = dataset.has(value);
-    } else {
-      /* eslint-disable no-bitwise */
-      result = !!~dataset.indexOf(value);
-    }
-    return result;
+    return dataset.has(value);
   };
 }
 
@@ -81,13 +71,7 @@ export function toEmptyString(value) {
  * @returns {Array}
  */
 export function unifyColumnValues(values) {
-  let unifiedValues = values;
-  if (SUPPORT_FAST_DEDUPE) {
-    unifiedValues = Array.from(new Set(unifiedValues));
-  } else {
-    unifiedValues = arrayUnique(unifiedValues);
-  }
-  unifiedValues = unifiedValues.sort((a, b) => {
+  return Array.from(new Set(values)).map(value => toEmptyString(value)).sort((a, b) => {
     if (typeof a === 'number' && typeof b === 'number') {
       return a - b;
     }
@@ -96,7 +80,6 @@ export function unifyColumnValues(values) {
     }
     return a > b ? 1 : -1;
   });
-  return unifiedValues;
 }
 
 /**
@@ -115,7 +98,7 @@ export function intersectValues(base, selected, defaultEmptyValue, callback) {
   if (!same) {
     selectedItemsAssertion = createArrayAssertion(selected);
   }
-  arrayEach(base, value => {
+  base.forEach(value => {
     let checked = false;
     if (same || selectedItemsAssertion(value)) {
       checked = true;

package/plugins/mergeCells/calculations/autofill.js

@@ -2,6 +2,8 @@
 
 exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.every.js");
 var _object = require("../../../helpers/object");
 var _array = require("../../../helpers/array");
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
@@ -38,35 +40,20 @@ class AutofillCalculations {
     this.mergedCellsCollection = this.plugin.mergedCellsCollection;
   }
 
-  /**
-   * Correct the provided selection area, so it's not selecting only a part of a merged cell.
-   *
-   * @param {Array} selectionArea The selection to correct.
-   */
-  correctSelectionAreaSize(selectionArea) {
-    if (selectionArea[0] === selectionArea[2] && selectionArea[1] === selectionArea[3]) {
-      const mergedCell = this.mergedCellsCollection.get(selectionArea[0], selectionArea[1]);
-      if (mergedCell) {
-        selectionArea[2] = selectionArea[0] + mergedCell.rowspan - 1;
-        selectionArea[3] = selectionArea[1] + mergedCell.colspan - 1;
-      }
-    }
-  }
-
   /**
    * Get the direction of the autofill process.
    *
-   * @param {Array} selectionArea The selection area.
-   * @param {Array} finalArea The final area (base + drag).
+   * @param {Array} baseArea The selection area.
+   * @param {Array} fullArea The final area (base + drag).
    * @returns {string} `up`, `down`, `left` or `right`.
    */
-  getDirection(selectionArea, finalArea) {
+  getDirection(baseArea, fullArea) {
     let direction = null;
-    if (finalArea[0] === selectionArea[0] && finalArea[1] === selectionArea[1] && finalArea[3] === selectionArea[3]) {
+    if (fullArea[0] === baseArea[0] && fullArea[1] === baseArea[1] && fullArea[3] === baseArea[3]) {
       direction = 'down';
-    } else if (finalArea[2] === selectionArea[2] && finalArea[1] === selectionArea[1] && finalArea[3] === selectionArea[3]) {
+    } else if (fullArea[2] === baseArea[2] && fullArea[1] === baseArea[1] && fullArea[3] === baseArea[3]) {
       direction = 'up';
-    } else if (finalArea[1] === selectionArea[1] && finalArea[2] === selectionArea[2]) {
+    } else if (fullArea[1] === baseArea[1] && fullArea[2] === baseArea[2]) {
       direction = 'right';
     } else {
       direction = 'left';
@@ -78,20 +65,20 @@ class AutofillCalculations {
    * Snap the drag area to the farthest merged cell, so it won't clip any of the merged cells.
    *
    * @param {Array} baseArea The base selected area.
-   * @param {Array} dragArea The drag area.
+   * @param {Array} fullArea The drag area.
    * @param {string} dragDirection The autofill drag direction.
    * @param {Array} foundMergedCells MergeCellCoords found in the base selection area.
    * @returns {Array} The new drag area.
    */
-  snapDragArea(baseArea, dragArea, dragDirection, foundMergedCells) {
-    const newDragArea = dragArea.slice(0);
-    const fillSize = this.getAutofillSize(baseArea, dragArea, dragDirection);
+  snapDragArea(baseArea, fullArea, dragDirection, foundMergedCells) {
+    const newDragArea = fullArea.slice(0);
+    const fillSize = this.getAutofillSize(baseArea, fullArea, dragDirection);
     const [baseAreaStartRow, baseAreaStartColumn, baseAreaEndRow, baseAreaEndColumn] = baseArea;
     const verticalDirection = ['up', 'down'].indexOf(dragDirection) > -1;
     const fullCycle = verticalDirection ? baseAreaEndRow - baseAreaStartRow + 1 : baseAreaEndColumn - baseAreaStartColumn + 1;
     const fulls = Math.floor(fillSize / fullCycle) * fullCycle;
     const partials = fillSize - fulls;
-    const farthestCollection = this.getFarthestCollection(baseArea, dragArea, dragDirection, foundMergedCells);
+    const farthestCollection = this.getFarthestCollection(baseArea, fullArea, dragDirection, foundMergedCells);
     if (farthestCollection) {
       if (dragDirection === 'down') {
         const fill = farthestCollection.row + farthestCollection.rowspan - baseAreaStartRow - partials;
@@ -156,13 +143,13 @@ class AutofillCalculations {
    *
    * @private
    * @param {Array} baseArea The base selection area.
-   * @param {Array} dragArea The drag area (containing the base area).
+   * @param {Array} fullArea The drag area (containing the base area).
    * @param {string} direction The drag direction.
    * @returns {number|null} The "length" (height or width, depending on the direction) of the drag.
    */
-  getAutofillSize(baseArea, dragArea, direction) {
+  getAutofillSize(baseArea, fullArea, direction) {
     const [baseAreaStartRow, baseAreaStartColumn, baseAreaEndRow, baseAreaEndColumn] = baseArea;
-    const [dragAreaStartRow, dragAreaStartColumn, dragAreaEndRow, dragAreaEndColumn] = dragArea;
+    const [dragAreaStartRow, dragAreaStartColumn, dragAreaEndRow, dragAreaEndColumn] = fullArea;
     switch (direction) {
       case 'up':
         return baseAreaStartRow - dragAreaStartRow;
@@ -182,22 +169,30 @@ class AutofillCalculations {
    *
    * @private
    * @param {Array} baseArea The base selection area.
-   * @param {Array} dragArea The base selection area extended by the drag area.
+   * @param {Array} fullArea The base selection area extended by the drag area.
    * @param {string} direction Drag direction.
    * @returns {Array|null} Array representing the drag area coordinates.
    */
-  getDragArea(baseArea, dragArea, direction) {
+  getDragArea(baseArea, fullArea, direction) {
     const [baseAreaStartRow, baseAreaStartColumn, baseAreaEndRow, baseAreaEndColumn] = baseArea;
-    const [dragAreaStartRow, dragAreaStartColumn, dragAreaEndRow, dragAreaEndColumn] = dragArea;
+    const [fullAreaStartRow, fullAreaStartColumn, fullAreaEndRow, fullAreaEndColumn] = fullArea;
     switch (direction) {
       case 'up':
-        return [dragAreaStartRow, dragAreaStartColumn, baseAreaStartRow - 1, baseAreaEndColumn];
+        return [fullAreaStartRow, fullAreaStartColumn, baseAreaStartRow - 1, baseAreaEndColumn];
       case 'down':
-        return [baseAreaEndRow + 1, baseAreaStartColumn, dragAreaEndRow, baseAreaEndColumn];
+        {
+          const mergedCell = this.mergedCellsCollection.get(fullAreaEndRow, baseAreaEndColumn);
+          const rowShift = mergedCell ? mergedCell.rowspan - 1 : 0;
+          return [baseAreaEndRow + 1, baseAreaStartColumn, fullAreaEndRow + rowShift, baseAreaEndColumn];
+        }
       case 'left':
-        return [dragAreaStartRow, dragAreaStartColumn, baseAreaEndRow, baseAreaStartColumn - 1];
+        return [fullAreaStartRow, fullAreaStartColumn, baseAreaEndRow, baseAreaStartColumn - 1];
       case 'right':
-        return [baseAreaStartRow, baseAreaEndColumn + 1, dragAreaEndRow, dragAreaEndColumn];
+        {
+          const mergedCell = this.mergedCellsCollection.get(fullAreaEndRow, baseAreaEndColumn);
+          const columnShift = mergedCell ? mergedCell.colspan - 1 : 0;
+          return [baseAreaStartRow, baseAreaEndColumn + columnShift, fullAreaEndRow, fullAreaEndColumn];
+        }
       default:
         return null;
     }
@@ -208,17 +203,17 @@ class AutofillCalculations {
    *
    * @private
    * @param {Array} baseArea The base selection area.
-   * @param {Array} dragArea The drag area (containing the base area).
+   * @param {Array} fullArea The drag area (containing the base area).
    * @param {string} direction The drag direction.
    * @param {Array} mergedCellArray Array of the merged cells found in the base area.
    * @returns {MergedCellCoords|null}
    */
-  getFarthestCollection(baseArea, dragArea, direction, mergedCellArray) {
+  getFarthestCollection(baseArea, fullArea, direction, mergedCellArray) {
     const [baseAreaStartRow, baseAreaStartColumn, baseAreaEndRow, baseAreaEndColumn] = baseArea;
     const verticalDirection = ['up', 'down'].indexOf(direction) > -1;
     const baseEnd = verticalDirection ? baseAreaEndRow : baseAreaEndColumn;
     const baseStart = verticalDirection ? baseAreaStartRow : baseAreaStartColumn;
-    const fillSize = this.getAutofillSize(baseArea, dragArea, direction);
+    const fillSize = this.getAutofillSize(baseArea, fullArea, direction);
     const fullCycle = verticalDirection ? baseAreaEndRow - baseAreaStartRow + 1 : baseAreaEndColumn - baseAreaStartColumn + 1;
     const fulls = Math.floor(fillSize / fullCycle) * fullCycle;
     const partials = fillSize - fulls;
@@ -293,7 +288,7 @@ class AutofillCalculations {
                 rowspan: current.rowspan,
                 col: current.col,
                 colspan: current.colspan
-              });
+              }, true);
               break;
             case 'down':
               this.plugin.mergedCellsCollection.add({
@@ -301,7 +296,7 @@ class AutofillCalculations {
                 rowspan: current.rowspan,
                 col: current.col,
                 colspan: current.colspan
-              });
+              }, true);
               break;
             case 'left':
               this.plugin.mergedCellsCollection.add({
@@ -309,7 +304,7 @@ class AutofillCalculations {
                 rowspan: current.rowspan,
                 col: current.col - fillOffset,
                 colspan: current.colspan
-              });
+              }, true);
               break;
             case 'right':
               this.plugin.mergedCellsCollection.add({
@@ -317,7 +312,7 @@ class AutofillCalculations {
                 rowspan: current.rowspan,
                 col: current.col + fillOffset,
                 colspan: current.colspan
-              });
+              }, true);
               break;
             default:
           }
@@ -392,7 +387,28 @@ class AutofillCalculations {
     const topLeft = this.plugin.hot._createCellCoords(dragAreaStartRow, dragAreaStartColumn);
     const bottomRight = this.plugin.hot._createCellCoords(dragAreaEndRow, dragAreaEndColumn);
     const dragRange = this.plugin.hot._createCellRange(topLeft, topLeft, bottomRight);
-    return this.mergedCellsCollection.getWithinRange(dragRange, true).length > 0;
+    const mergedCellsWithPartials = this.mergedCellsCollection.getWithinRange(dragRange, true);
+    if (mergedCellsWithPartials.length === 0) {
+      return false;
+    }
+    const mergedCellsWithoutPartials = this.mergedCellsCollection.getWithinRange(dragRange, false);
+    if (mergedCellsWithoutPartials.length === 0) {
+      return true;
+    }
+    if (direction === 'up' || direction === 'down') {
+      return !mergedCellsWithoutPartials.every(_ref => {
+        let {
+          colspan
+        } = _ref;
+        return colspan === dragRange.getWidth();
+      });
+    }
+    return !mergedCellsWithoutPartials.every(_ref2 => {
+      let {
+        rowspan
+      } = _ref2;
+      return rowspan === dragRange.getHeight();
+    });
   }
 }
 var _default = exports.default = AutofillCalculations;