handsontable 0.0.0-next-06a64be-20230621 → 0.0.0-next-d1c8e0e-20230621

package/selection/transformation.mjs

@@ -1,127 +1,212 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+import "core-js/modules/es.array.iterator.js";
+import "core-js/modules/es.object.to-string.js";
+import "core-js/modules/es.string.iterator.js";
+import "core-js/modules/es.weak-map.js";
+import "core-js/modules/web.dom-collections.iterator.js";
+import "core-js/modules/es.weak-set.js";
 import "core-js/modules/es.symbol.to-primitive.js";
 import "core-js/modules/es.date.to-primitive.js";
 import "core-js/modules/es.symbol.js";
 import "core-js/modules/es.symbol.description.js";
-import "core-js/modules/es.object.to-string.js";
 import "core-js/modules/es.number.constructor.js";
 import "core-js/modules/es.symbol.iterator.js";
-import "core-js/modules/es.array.iterator.js";
-import "core-js/modules/es.string.iterator.js";
-import "core-js/modules/web.dom-collections.iterator.js";
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
+function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
+function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
+function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
+function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
+function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set"); _classApplyDescriptorSet(receiver, descriptor, value); return value; }
+function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!privateMap.has(receiver)) { throw new TypeError("attempted to " + action + " private field on non-instance"); } return privateMap.get(receiver); }
+function _classApplyDescriptorSet(receiver, descriptor, value) { if (descriptor.set) { descriptor.set.call(receiver, value); } else { if (!descriptor.writable) { throw new TypeError("attempted to set read only private field"); } descriptor.value = value; } }
 import { mixin } from "../helpers/object.mjs";
 import localHooks from "./../mixins/localHooks.mjs";
 /**
  * The Transformation class implements algorithms for transforming coordinates based on current settings
- * passed to the Handsontable.
+ * passed to the Handsontable. The class performs the calculations based on the renderable indexes.
  *
  * Transformation is always applied relative to the current selection.
  *
+ * The class operates on a table size defined by the renderable indexes. If the `navigableHeaders`
+ * option is enabled, the table size is increased by the number of row and/or column headers.
+ * Because the headers are treated as cells as part of the table size (indexes always go from 0 to N),
+ * the algorithm can be written as simply as possible (without new if's that distinguish the headers
+ * logic).
+ *
  * @class Transformation
  * @util
  */
+var _range = /*#__PURE__*/new WeakMap();
+var _options = /*#__PURE__*/new WeakMap();
+var _offset = /*#__PURE__*/new WeakMap();
+var _setOffsetSize = /*#__PURE__*/new WeakSet();
+var _clampCoords = /*#__PURE__*/new WeakSet();
+var _getTableSize = /*#__PURE__*/new WeakSet();
+var _visualToZeroBasedCoords = /*#__PURE__*/new WeakSet();
+var _zeroBasedToVisualCoords = /*#__PURE__*/new WeakSet();
 var Transformation = /*#__PURE__*/function () {
   function Transformation(range, options) {
     _classCallCheck(this, Transformation);
+    /**
+     * Translates the zero-based coordinates to visual ones.
+     *
+     * @param {CellCoords} zeroBasedCoords The coordinates to process.
+     * @returns {CellCoords}
+     */
+    _classPrivateMethodInitSpec(this, _zeroBasedToVisualCoords);
+    /**
+     * Translates the visual coordinates to zero-based ones.
+     *
+     * @param {CellCoords} visualCoords The visual coords to process.
+     * @returns {{x: number, y: number}}
+     */
+    _classPrivateMethodInitSpec(this, _visualToZeroBasedCoords);
+    /**
+     * Gets the table size in number of rows with headers as "height" and number of columns with
+     * headers as "width".
+     *
+     * @returns {{width: number, height: number}}
+     */
+    _classPrivateMethodInitSpec(this, _getTableSize);
+    /**
+     * Clamps the coords to make sure they points to the cell (or header) in the table range.
+     *
+     * @param {CellCoords} zeroBasedCoords The coords object to clamp.
+     * @returns {{rowDir: 1|0|-1, colDir: 1|0|-1}}
+     */
+    _classPrivateMethodInitSpec(this, _clampCoords);
+    /**
+     * Sets the additional offset in table size that may occur when the `navigableHeaders` option
+     * is enabled.
+     *
+     * @param {{x: number, y: number}} offset Offset as x and y properties.
+     */
+    _classPrivateMethodInitSpec(this, _setOffsetSize);
     /**
      * Instance of the SelectionRange, holder for visual coordinates applied to the table.
      *
      * @type {SelectionRange}
      */
-    this.range = range;
+    _classPrivateFieldInitSpec(this, _range, {
+      writable: true,
+      value: void 0
+    });
     /**
      * Additional options which define the state of the settings which can infer transformation and
      * give the possibility to translate indexes.
      *
      * @type {object}
      */
-    this.options = options;
+    _classPrivateFieldInitSpec(this, _options, {
+      writable: true,
+      value: void 0
+    });
+    /**
+     * Increases the table size by applying the offsets. The option is used by the `navigableHeaders`
+     * option.
+     *
+     * @type {{ x: number, y: number }}
+     */
+    _classPrivateFieldInitSpec(this, _offset, {
+      writable: true,
+      value: {
+        x: 0,
+        y: 0
+      }
+    });
+    _classPrivateFieldSet(this, _range, range);
+    _classPrivateFieldSet(this, _options, options);
   }
 
   /**
-   * Selects cell relative to current cell (if possible).
+   * Selects cell relative to the current cell (if possible).
    *
    * @param {number} rowDelta Rows number to move, value can be passed as negative number.
    * @param {number} colDelta Columns number to move, value can be passed as negative number.
-   * @param {boolean} [force=false] If `true` the new rows/columns will be created if necessary. Otherwise, row/column will
+   * @param {boolean} [createMissingRecords=false] If `true` the new rows/columns will be created if necessary. Otherwise, row/column will
    *                        be created according to `minSpareRows/minSpareCols` settings of Handsontable.
    * @returns {CellCoords} Visual coordinates after transformation.
    */
   _createClass(Transformation, [{
     key: "transformStart",
     value: function transformStart(rowDelta, colDelta) {
-      var force = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-      var delta = this.options.createCellCoords(rowDelta, colDelta);
-      var highlightCoords = this.range.current().highlight;
-      var _this$options$visualT = this.options.visualToRenderableCoords(highlightCoords),
-        renderableRow = _this$options$visualT.row,
-        renderableColumn = _this$options$visualT.col;
-      var visualCoords = highlightCoords;
+      var createMissingRecords = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+      _classPrivateMethodGet(this, _setOffsetSize, _setOffsetSize2).call(this, {
+        x: _classPrivateFieldGet(this, _options).navigableHeaders() ? _classPrivateFieldGet(this, _options).countRowHeaders() : 0,
+        y: _classPrivateFieldGet(this, _options).navigableHeaders() ? _classPrivateFieldGet(this, _options).countColHeaders() : 0
+      });
+      var delta = _classPrivateFieldGet(this, _options).createCellCoords(rowDelta, colDelta);
+      var visualCoords = _classPrivateFieldGet(this, _range).current().highlight;
+      var highlightRenderableCoords = _classPrivateFieldGet(this, _options).visualToRenderableCoords(visualCoords);
       var rowTransformDir = 0;
       var colTransformDir = 0;
       this.runLocalHooks('beforeTransformStart', delta);
-      if (renderableRow !== null && renderableColumn !== null) {
-        var totalRows = this.options.countRows();
-        var totalCols = this.options.countCols();
-        var fixedRowsBottom = this.options.fixedRowsBottom();
-        var minSpareRows = this.options.minSpareRows();
-        var minSpareCols = this.options.minSpareCols();
-        var autoWrapRow = this.options.autoWrapRow();
-        var autoWrapCol = this.options.autoWrapCol();
-        if (renderableRow + rowDelta > totalRows - 1) {
-          if (force && minSpareRows > 0 && !(fixedRowsBottom && renderableRow >= totalRows - fixedRowsBottom - 1)) {
-            this.runLocalHooks('insertRowRequire', totalRows);
-            totalRows = this.options.countRows();
+      if (highlightRenderableCoords.row !== null && highlightRenderableCoords.col !== null) {
+        var _classPrivateMethodGe = _classPrivateMethodGet(this, _getTableSize, _getTableSize2).call(this),
+          width = _classPrivateMethodGe.width,
+          height = _classPrivateMethodGe.height;
+        var _classPrivateMethodGe2 = _classPrivateMethodGet(this, _visualToZeroBasedCoords, _visualToZeroBasedCoords2).call(this, visualCoords),
+          x = _classPrivateMethodGe2.x,
+          y = _classPrivateMethodGe2.y;
+        var fixedRowsBottom = _classPrivateFieldGet(this, _options).fixedRowsBottom();
+        var minSpareRows = _classPrivateFieldGet(this, _options).minSpareRows();
+        var minSpareCols = _classPrivateFieldGet(this, _options).minSpareCols();
+        var autoWrapRow = _classPrivateFieldGet(this, _options).autoWrapRow();
+        var autoWrapCol = _classPrivateFieldGet(this, _options).autoWrapCol();
+        var rawCoords = {
+          row: y + delta.row,
+          col: x + delta.col
+        };
+        if (rawCoords.row >= height) {
+          if (createMissingRecords && minSpareRows > 0 && fixedRowsBottom === 0) {
+            this.runLocalHooks('insertRowRequire', _classPrivateFieldGet(this, _options).countRenderableRows());
           } else if (autoWrapCol) {
-            delta.row = 1 - totalRows;
-            delta.col = renderableColumn + delta.col === totalCols - 1 ? 1 - totalCols : 1;
+            var nextColumn = rawCoords.col + 1;
+            rawCoords.row = rawCoords.row - height;
+            rawCoords.col = nextColumn >= width ? nextColumn - width : nextColumn;
+          }
+        } else if (rawCoords.row < 0) {
+          if (autoWrapCol) {
+            var previousColumn = rawCoords.col - 1;
+            rawCoords.row = height + rawCoords.row;
+            rawCoords.col = previousColumn < 0 ? width + previousColumn : previousColumn;
           }
-        } else if (autoWrapCol && renderableRow + delta.row < 0 && renderableColumn + delta.col >= 0) {
-          delta.row = totalRows - 1;
-          delta.col = renderableColumn + delta.col === 0 ? totalCols - 1 : -1;
         }
-        if (renderableColumn + delta.col > totalCols - 1) {
-          if (force && minSpareCols > 0) {
-            this.runLocalHooks('insertColRequire', totalCols);
-            totalCols = this.options.countCols();
+        if (rawCoords.col >= width) {
+          if (createMissingRecords && minSpareCols > 0) {
+            this.runLocalHooks('insertColRequire', _classPrivateFieldGet(this, _options).countRenderableColumns());
           } else if (autoWrapRow) {
-            delta.row = renderableRow + delta.row === totalRows - 1 ? 1 - totalRows : 1;
-            delta.col = 1 - totalCols;
+            var nextRow = rawCoords.row + 1;
+            rawCoords.row = nextRow >= height ? nextRow - height : nextRow;
+            rawCoords.col = rawCoords.col - width;
+          }
+        } else if (rawCoords.col < 0) {
+          if (autoWrapRow) {
+            var previousRow = rawCoords.row - 1;
+            rawCoords.row = previousRow < 0 ? height + previousRow : previousRow;
+            rawCoords.col = width + rawCoords.col;
           }
-        } else if (autoWrapRow && renderableColumn + delta.col < 0 && renderableRow + delta.row >= 0) {
-          delta.row = renderableRow + delta.row === 0 ? totalRows - 1 : -1;
-          delta.col = totalCols - 1;
-        }
-        var coords = this.options.createCellCoords(renderableRow + delta.row, renderableColumn + delta.col);
-        rowTransformDir = 0;
-        colTransformDir = 0;
-        if (coords.row < 0) {
-          rowTransformDir = -1;
-          coords.row = 0;
-        } else if (coords.row > 0 && coords.row >= totalRows) {
-          rowTransformDir = 1;
-          coords.row = totalRows - 1;
-        }
-        if (coords.col < 0) {
-          colTransformDir = -1;
-          coords.col = 0;
-        } else if (coords.col > 0 && coords.col >= totalCols) {
-          colTransformDir = 1;
-          coords.col = totalCols - 1;
         }
-        visualCoords = this.options.renderableToVisualCoords(coords);
+        var coords = _classPrivateFieldGet(this, _options).createCellCoords(rawCoords.row, rawCoords.col);
+        var _classPrivateMethodGe3 = _classPrivateMethodGet(this, _clampCoords, _clampCoords2).call(this, coords),
+          rowDir = _classPrivateMethodGe3.rowDir,
+          colDir = _classPrivateMethodGe3.colDir;
+        rowTransformDir = rowDir;
+        colTransformDir = colDir;
+        visualCoords = _classPrivateMethodGet(this, _zeroBasedToVisualCoords, _zeroBasedToVisualCoords2).call(this, coords);
       }
       this.runLocalHooks('afterTransformStart', visualCoords, rowTransformDir, colTransformDir);
       return visualCoords;
     }
 
     /**
-     * Sets selection end cell relative to current selection end cell (if possible).
+     * Sets selection end cell relative to the current selection end cell (if possible).
      *
      * @param {number} rowDelta Rows number to move, value can be passed as negative number.
      * @param {number} colDelta Columns number to move, value can be passed as negative number.
@@ -130,41 +215,40 @@ var Transformation = /*#__PURE__*/function () {
   }, {
     key: "transformEnd",
     value: function transformEnd(rowDelta, colDelta) {
-      var delta = this.options.createCellCoords(rowDelta, colDelta);
-      var cellRange = this.range.current();
-      var visualCoords = cellRange.to;
+      _classPrivateMethodGet(this, _setOffsetSize, _setOffsetSize2).call(this, {
+        x: _classPrivateFieldGet(this, _options).navigableHeaders() ? _classPrivateFieldGet(this, _options).countRowHeaders() : 0,
+        y: _classPrivateFieldGet(this, _options).navigableHeaders() ? _classPrivateFieldGet(this, _options).countColHeaders() : 0
+      });
+      var delta = _classPrivateFieldGet(this, _options).createCellCoords(rowDelta, colDelta);
+      var cellRange = _classPrivateFieldGet(this, _range).current();
+      var highlightRenderableCoords = _classPrivateFieldGet(this, _options).visualToRenderableCoords(cellRange.highlight);
+      var visualCoords = cellRange.to.clone();
       var rowTransformDir = 0;
       var colTransformDir = 0;
       this.runLocalHooks('beforeTransformEnd', delta);
-      var _this$options$visualT2 = this.options.visualToRenderableCoords(cellRange.highlight),
-        rowHighlight = _this$options$visualT2.row,
-        colHighlight = _this$options$visualT2.col;
-
-      // We have highlight (start point for the selection).
-      if (rowHighlight !== null && colHighlight !== null) {
-        var totalRows = this.options.countRows();
-        var totalCols = this.options.countCols();
-        var _this$options$visualT3 = this.options.visualToRenderableCoords(cellRange.to),
-          rowTo = _this$options$visualT3.row,
-          colTo = _this$options$visualT3.col;
-        var coords = this.options.createCellCoords(rowTo + delta.row, colTo + delta.col);
-        rowTransformDir = 0;
-        colTransformDir = 0;
-        if (coords.row < 0) {
-          rowTransformDir = -1;
-          coords.row = 0;
-        } else if (coords.row > 0 && coords.row >= totalRows) {
-          rowTransformDir = 1;
-          coords.row = totalRows - 1;
-        }
-        if (coords.col < 0) {
-          colTransformDir = -1;
-          coords.col = 0;
-        } else if (coords.col > 0 && coords.col >= totalCols) {
-          colTransformDir = 1;
-          coords.col = totalCols - 1;
+      if (highlightRenderableCoords.row !== null && highlightRenderableCoords.col !== null) {
+        var _classPrivateMethodGe4 = _classPrivateMethodGet(this, _visualToZeroBasedCoords, _visualToZeroBasedCoords2).call(this, cellRange.to),
+          x = _classPrivateMethodGe4.x,
+          y = _classPrivateMethodGe4.y;
+        var rawCoords = {
+          row: y + delta.row,
+          col: x + delta.col
+        };
+        var coords = _classPrivateFieldGet(this, _options).createCellCoords(rawCoords.row, rawCoords.col);
+        var _classPrivateMethodGe5 = _classPrivateMethodGet(this, _clampCoords, _clampCoords2).call(this, coords),
+          rowDir = _classPrivateMethodGe5.rowDir,
+          colDir = _classPrivateMethodGe5.colDir;
+        rowTransformDir = rowDir;
+        colTransformDir = colDir;
+        var newVisualCoords = _classPrivateMethodGet(this, _zeroBasedToVisualCoords, _zeroBasedToVisualCoords2).call(this, coords);
+        if (delta.row === 0 && delta.col !== 0) {
+          visualCoords.col = newVisualCoords.col;
+        } else if (delta.row !== 0 && delta.col === 0) {
+          visualCoords.row = newVisualCoords.row;
+        } else {
+          visualCoords.row = newVisualCoords.row;
+          visualCoords.col = newVisualCoords.col;
         }
-        visualCoords = this.options.renderableToVisualCoords(coords);
       }
       this.runLocalHooks('afterTransformEnd', visualCoords, rowTransformDir, colTransformDir);
       return visualCoords;
@@ -172,5 +256,58 @@ var Transformation = /*#__PURE__*/function () {
   }]);
   return Transformation;
 }();
+function _setOffsetSize2(_ref) {
+  var x = _ref.x,
+    y = _ref.y;
+  _classPrivateFieldSet(this, _offset, {
+    x: x,
+    y: y
+  });
+}
+function _clampCoords2(zeroBasedCoords) {
+  var _classPrivateMethodGe6 = _classPrivateMethodGet(this, _getTableSize, _getTableSize2).call(this),
+    width = _classPrivateMethodGe6.width,
+    height = _classPrivateMethodGe6.height;
+  var rowDir = 0;
+  var colDir = 0;
+  if (zeroBasedCoords.row < 0) {
+    rowDir = -1;
+    zeroBasedCoords.row = 0;
+  } else if (zeroBasedCoords.row > 0 && zeroBasedCoords.row >= height) {
+    rowDir = 1;
+    zeroBasedCoords.row = height - 1;
+  }
+  if (zeroBasedCoords.col < 0) {
+    colDir = -1;
+    zeroBasedCoords.col = 0;
+  } else if (zeroBasedCoords.col > 0 && zeroBasedCoords.col >= width) {
+    colDir = 1;
+    zeroBasedCoords.col = width - 1;
+  }
+  return {
+    rowDir: rowDir,
+    colDir: colDir
+  };
+}
+function _getTableSize2() {
+  return {
+    width: _classPrivateFieldGet(this, _offset).x + _classPrivateFieldGet(this, _options).countRenderableColumns(),
+    height: _classPrivateFieldGet(this, _offset).y + _classPrivateFieldGet(this, _options).countRenderableRows()
+  };
+}
+function _visualToZeroBasedCoords2(visualCoords) {
+  var _classPrivateFieldGet2 = _classPrivateFieldGet(this, _options).visualToRenderableCoords(visualCoords),
+    row = _classPrivateFieldGet2.row,
+    col = _classPrivateFieldGet2.col;
+  return {
+    x: _classPrivateFieldGet(this, _offset).x + col,
+    y: _classPrivateFieldGet(this, _offset).y + row
+  };
+}
+function _zeroBasedToVisualCoords2(zeroBasedCoords) {
+  zeroBasedCoords.col = zeroBasedCoords.col - _classPrivateFieldGet(this, _offset).x;
+  zeroBasedCoords.row = zeroBasedCoords.row - _classPrivateFieldGet(this, _offset).y;
+  return _classPrivateFieldGet(this, _options).renderableToVisualCoords(zeroBasedCoords);
+}
 mixin(Transformation, localHooks);
 export default Transformation;

package/selection/utils.js

@@ -1,14 +1,9 @@
 "use strict";
 
 require("core-js/modules/es.symbol.iterator.js");
-require("core-js/modules/es.array.slice.js");
-require("core-js/modules/es.regexp.to-string.js");
-require("core-js/modules/es.function.name.js");
-require("core-js/modules/es.regexp.exec.js");
 exports.__esModule = true;
 exports.SELECTION_TYPE_UNRECOGNIZED = exports.SELECTION_TYPE_OBJECT = exports.SELECTION_TYPE_EMPTY = exports.SELECTION_TYPE_ARRAY = exports.SELECTION_TYPES = void 0;
 exports.detectSelectionType = detectSelectionType;
-exports.isValidCoord = isValidCoord;
 exports.normalizeSelectionFactory = normalizeSelectionFactory;
 exports.transformSelectionToColumnDistance = transformSelectionToColumnDistance;
 exports.transformSelectionToRowDistance = transformSelectionToRowDistance;
@@ -26,12 +21,6 @@ require("core-js/modules/es.array.sort.js");
 var _src = require("./../3rdparty/walkontable/src");
 var _array = require("./../helpers/array");
 var _mixed = require("./../helpers/mixed");
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 var SELECTION_TYPE_UNRECOGNIZED = 0;
 exports.SELECTION_TYPE_UNRECOGNIZED = SELECTION_TYPE_UNRECOGNIZED;
@@ -135,7 +124,9 @@ function normalizeSelectionFactory(type) {
       rowEnd = Math.max(origRowStart, origRowEnd);
       columnEnd = Math.max(origColumnStart, origColumnEnd);
     }
-    return [rowStart, columnStart, rowEnd, columnEnd];
+    var from = new _src.CellCoords(rowStart, columnStart);
+    var to = new _src.CellCoords(rowEnd, columnEnd);
+    return new _src.CellRange(from, from, to);
   };
 }
 
@@ -162,11 +153,10 @@ function transformSelectionToColumnDistance(selectionRanges) {
   // Iterate through all ranges and collect all column indexes which are not saved yet.
   (0, _array.arrayEach)(selectionRanges, function (selection) {
     var _selectionSchemaNorma = selectionSchemaNormalizer(selection),
-      _selectionSchemaNorma2 = _slicedToArray(_selectionSchemaNorma, 4),
-      columnStart = _selectionSchemaNorma2[1],
-      columnEnd = _selectionSchemaNorma2[3];
-    var columnNonHeaderStart = Math.max(columnStart, 0);
-    var amount = columnEnd - columnNonHeaderStart + 1;
+      from = _selectionSchemaNorma.from,
+      to = _selectionSchemaNorma.to;
+    var columnNonHeaderStart = Math.max(from.col, 0);
+    var amount = to.col - columnNonHeaderStart + 1;
     (0, _array.arrayEach)(Array.from(new Array(amount), function (_, i) {
       return columnNonHeaderStart + i;
     }), function (index) {
@@ -213,12 +203,11 @@ function transformSelectionToRowDistance(selectionRanges) {
 
   // Iterate through all ranges and collect all column indexes which are not saved yet.
   (0, _array.arrayEach)(selectionRanges, function (selection) {
-    var _selectionSchemaNorma3 = selectionSchemaNormalizer(selection),
-      _selectionSchemaNorma4 = _slicedToArray(_selectionSchemaNorma3, 3),
-      rowStart = _selectionSchemaNorma4[0],
-      rowEnd = _selectionSchemaNorma4[2];
-    var rowNonHeaderStart = Math.max(rowStart, 0);
-    var amount = rowEnd - rowNonHeaderStart + 1;
+    var _selectionSchemaNorma2 = selectionSchemaNormalizer(selection),
+      from = _selectionSchemaNorma2.from,
+      to = _selectionSchemaNorma2.to;
+    var rowNonHeaderStart = Math.max(from.row, 0);
+    var amount = to.row - rowNonHeaderStart + 1;
     (0, _array.arrayEach)(Array.from(new Array(amount), function (_, i) {
       return rowNonHeaderStart + i;
     }), function (index) {
@@ -241,17 +230,4 @@ function transformSelectionToRowDistance(selectionRanges) {
     return acc;
   }, []);
   return normalizedRowRanges;
-}
-
-/**
- * Check if passed value can be treated as valid cell coordinate. The second argument is
- * used to check if the value doesn't exceed the defined max table rows/columns count.
- *
- * @param {number} coord The coordinate to validate (row index or column index).
- * @param {number} maxTableItemsCount The value that declares the maximum coordinate that is still validatable.
- * @returns {boolean}
- */
-function isValidCoord(coord) {
-  var maxTableItemsCount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : Infinity;
-  return typeof coord === 'number' && coord >= 0 && coord < maxTableItemsCount;
 }

package/selection/utils.mjs

@@ -1,9 +1,3 @@
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 import "core-js/modules/es.symbol.js";
 import "core-js/modules/es.symbol.description.js";
@@ -17,11 +11,7 @@ import "core-js/modules/web.dom-collections.iterator.js";
 import "core-js/modules/es.array.from.js";
 import "core-js/modules/es.array.sort.js";
 import "core-js/modules/es.symbol.iterator.js";
-import "core-js/modules/es.array.slice.js";
-import "core-js/modules/es.regexp.to-string.js";
-import "core-js/modules/es.function.name.js";
-import "core-js/modules/es.regexp.exec.js";
-import { CellRange } from "./../3rdparty/walkontable/src/index.mjs";
+import { CellRange, CellCoords } from "./../3rdparty/walkontable/src/index.mjs";
 import { arrayEach, arrayReduce } from "./../helpers/array.mjs";
 import { isUndefined } from "./../helpers/mixed.mjs";
 export var SELECTION_TYPE_UNRECOGNIZED = 0;
@@ -121,7 +111,9 @@ export function normalizeSelectionFactory(type) {
       rowEnd = Math.max(origRowStart, origRowEnd);
       columnEnd = Math.max(origColumnStart, origColumnEnd);
     }
-    return [rowStart, columnStart, rowEnd, columnEnd];
+    var from = new CellCoords(rowStart, columnStart);
+    var to = new CellCoords(rowEnd, columnEnd);
+    return new CellRange(from, from, to);
   };
 }
 
@@ -148,11 +140,10 @@ export function transformSelectionToColumnDistance(selectionRanges) {
   // Iterate through all ranges and collect all column indexes which are not saved yet.
   arrayEach(selectionRanges, function (selection) {
     var _selectionSchemaNorma = selectionSchemaNormalizer(selection),
-      _selectionSchemaNorma2 = _slicedToArray(_selectionSchemaNorma, 4),
-      columnStart = _selectionSchemaNorma2[1],
-      columnEnd = _selectionSchemaNorma2[3];
-    var columnNonHeaderStart = Math.max(columnStart, 0);
-    var amount = columnEnd - columnNonHeaderStart + 1;
+      from = _selectionSchemaNorma.from,
+      to = _selectionSchemaNorma.to;
+    var columnNonHeaderStart = Math.max(from.col, 0);
+    var amount = to.col - columnNonHeaderStart + 1;
     arrayEach(Array.from(new Array(amount), function (_, i) {
       return columnNonHeaderStart + i;
     }), function (index) {
@@ -199,12 +190,11 @@ export function transformSelectionToRowDistance(selectionRanges) {
 
   // Iterate through all ranges and collect all column indexes which are not saved yet.
   arrayEach(selectionRanges, function (selection) {
-    var _selectionSchemaNorma3 = selectionSchemaNormalizer(selection),
-      _selectionSchemaNorma4 = _slicedToArray(_selectionSchemaNorma3, 3),
-      rowStart = _selectionSchemaNorma4[0],
-      rowEnd = _selectionSchemaNorma4[2];
-    var rowNonHeaderStart = Math.max(rowStart, 0);
-    var amount = rowEnd - rowNonHeaderStart + 1;
+    var _selectionSchemaNorma2 = selectionSchemaNormalizer(selection),
+      from = _selectionSchemaNorma2.from,
+      to = _selectionSchemaNorma2.to;
+    var rowNonHeaderStart = Math.max(from.row, 0);
+    var amount = to.row - rowNonHeaderStart + 1;
     arrayEach(Array.from(new Array(amount), function (_, i) {
       return rowNonHeaderStart + i;
     }), function (index) {
@@ -227,17 +217,4 @@ export function transformSelectionToRowDistance(selectionRanges) {
     return acc;
   }, []);
   return normalizedRowRanges;
-}
-
-/**
- * Check if passed value can be treated as valid cell coordinate. The second argument is
- * used to check if the value doesn't exceed the defined max table rows/columns count.
- *
- * @param {number} coord The coordinate to validate (row index or column index).
- * @param {number} maxTableItemsCount The value that declares the maximum coordinate that is still validatable.
- * @returns {boolean}
- */
-export function isValidCoord(coord) {
-  var maxTableItemsCount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : Infinity;
-  return typeof coord === 'number' && coord >= 0 && coord < maxTableItemsCount;
 }

package/settings.d.ts

@@ -164,6 +164,7 @@ export interface GridSettings extends Events {
   minSpareCols?: number;
   minSpareRows?: number;
   multiColumnSorting?: MultiColumnSortingSettings;
+  navigableHeaders?: boolean;
   nestedHeaders?: NestedHeadersSettings;
   nestedRows?: boolean;
   noWordWrapClassName?: string;

package/shortcutContexts/commands/editor/closeAndSave.js

@@ -0,0 +1,15 @@
+"use strict";
+
+exports.__esModule = true;
+exports.command = void 0;
+require("core-js/modules/es.array.includes.js");
+require("core-js/modules/es.string.includes.js");
+var command = {
+  name: 'editorCloseAndSave',
+  callback: function callback(hot, event, keys) {
+    var editorManager = hot._getEditorManager();
+    editorManager.closeEditorAndSaveChanges(hot.getShortcutManager().isCtrlPressed());
+    editorManager.moveSelectionAfterEnter(keys.includes('shift'));
+  }
+};
+exports.command = command;

package/shortcutContexts/commands/editor/closeAndSave.mjs

@@ -0,0 +1,10 @@
+import "core-js/modules/es.array.includes.js";
+import "core-js/modules/es.string.includes.js";
+export var command = {
+  name: 'editorCloseAndSave',
+  callback: function callback(hot, event, keys) {
+    var editorManager = hot._getEditorManager();
+    editorManager.closeEditorAndSaveChanges(hot.getShortcutManager().isCtrlPressed());
+    editorManager.moveSelectionAfterEnter(keys.includes('shift'));
+  }
+};

package/shortcutContexts/commands/editor/closeWithoutSaving.js

@@ -0,0 +1,13 @@
+"use strict";
+
+exports.__esModule = true;
+exports.command = void 0;
+var command = {
+  name: 'editorCloseWithoutSaving',
+  callback: function callback(hot) {
+    var editorManager = hot._getEditorManager();
+    editorManager.closeEditorAndRestoreOriginalValue(hot.getShortcutManager().isCtrlPressed());
+    editorManager.activeEditor.focus();
+  }
+};
+exports.command = command;