handsontable 11.1.0 → 12.1.0

package/3rdparty/walkontable/src/scroll.mjs

@@ -1,22 +1,56 @@
+import "core-js/modules/es.number.is-integer.js";
+import "core-js/modules/es.number.constructor.js";
+
 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, 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; }
 
-import { innerHeight, innerWidth, getScrollLeft, getScrollTop, offset } from "./../../../helpers/dom/element.mjs";
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+import { innerHeight, innerWidth, getScrollLeft, getScrollTop, offset } from "../../../helpers/dom/element.mjs";
 /**
  * @class Scroll
  */
 
 var Scroll = /*#__PURE__*/function () {
   /**
-   * @param {Walkontable} wotInstance The Walkontable instance.
+   * The data access object.
+   *
+   * @protected
+   * @type {ScrollDao}
+   */
+
+  /**
+   * Holds the last column reached by the scroll, which determines the scroll snapping direction
+   * (left or right) for a next horizontal scroll.
+   *
+   * @protected
+   * @type {number}
+   */
+
+  /**
+   * Holds the last row reached by the scroll, which determines the scroll snapping direction
+   * (top or bottom) for a next vertical scroll.
+   *
+   * @protected
+   * @type {number}
    */
-  function Scroll(wotInstance) {
+
+  /**
+   * @param {ScrollDao} dataAccessObject Tha data access object.
+   */
+  function Scroll(dataAccessObject) {
     _classCallCheck(this, Scroll);
 
-    this.wot = wotInstance;
+    _defineProperty(this, "dataAccessObject", void 0);
+
+    _defineProperty(this, "lastScrolledColumnPos", -1);
+
+    _defineProperty(this, "lastScrolledRowPos", -1);
+
+    this.dataAccessObject = dataAccessObject;
   }
   /**
    * Scrolls viewport to a cell.
@@ -33,10 +67,6 @@ var Scroll = /*#__PURE__*/function () {
   _createClass(Scroll, [{
     key: "scrollViewport",
     value: function scrollViewport(coords, snapToTop, snapToRight, snapToBottom, snapToLeft) {
-      if (coords.col < 0 || coords.row < 0) {
-        return false;
-      }
-
       var scrolledHorizontally = this.scrollViewportHorizontally(coords.col, snapToRight, snapToLeft);
       var scrolledVertically = this.scrollViewportVertically(coords.row, snapToTop, snapToBottom);
       return scrolledHorizontally || scrolledVertically;
@@ -53,26 +83,39 @@ var Scroll = /*#__PURE__*/function () {
   }, {
     key: "scrollViewportHorizontally",
     value: function scrollViewportHorizontally(column, snapToRight, snapToLeft) {
-      if (!this.wot.drawn) {
+      var _this$dataAccessObjec = this.dataAccessObject,
+          drawn = _this$dataAccessObjec.drawn,
+          totalColumns = _this$dataAccessObjec.totalColumns; // do not scroll the viewport when the column points to a range outside of the dataset
+
+      if (!drawn || !Number.isInteger(column) || column < 0 || column > totalColumns) {
         return false;
       }
 
-      var _this$_getVariables = this._getVariables(),
-          fixedColumnsLeft = _this$_getVariables.fixedColumnsLeft,
-          leftOverlay = _this$_getVariables.leftOverlay,
-          totalColumns = _this$_getVariables.totalColumns;
+      var firstVisibleColumn = this.getFirstVisibleColumn();
+      var lastVisibleColumn = this.getLastVisibleColumn();
+      var autoSnapping = snapToRight === void 0 && snapToLeft === void 0;
+      var _this$dataAccessObjec2 = this.dataAccessObject,
+          fixedColumnsStart = _this$dataAccessObjec2.fixedColumnsStart,
+          inlineStartOverlay = _this$dataAccessObjec2.inlineStartOverlay; // for auto-snapping (both snap* arguments are undefined) do not scroll the viewport
+      // when the columns points to the overlays
 
-      var result = false;
+      if (autoSnapping && column < fixedColumnsStart) {
+        return false;
+      }
 
-      if (column >= 0 && column <= Math.max(totalColumns - 1, 0)) {
-        var firstVisibleColumn = this.getFirstVisibleColumn();
-        var lastVisibleColumn = this.getLastVisibleColumn();
+      var result = false; // if there is no fully visible columns use the supporting variable (lastScrolledColumnPos) to
+      // determine the snapping direction (left or right)
 
-        if (column >= fixedColumnsLeft && firstVisibleColumn > -1 && (column < firstVisibleColumn || snapToLeft)) {
-          result = leftOverlay.scrollTo(column);
-        } else if (lastVisibleColumn === -1 || lastVisibleColumn > -1 && (column > lastVisibleColumn || snapToRight)) {
-          result = leftOverlay.scrollTo(column, true);
-        }
+      if (firstVisibleColumn === -1) {
+        result = inlineStartOverlay.scrollTo(column, autoSnapping ? column > this.lastScrolledColumnPos : snapToRight);
+      } else if (autoSnapping && (column < firstVisibleColumn || column > lastVisibleColumn) || !autoSnapping) {
+        // if there is at least one fully visible column determine the snapping direction based on
+        // that columns or by snapToRight/snapToLeft flags, if provided.
+        result = inlineStartOverlay.scrollTo(column, autoSnapping ? column > lastVisibleColumn : snapToRight);
+      }
+
+      if (result) {
+        this.lastScrolledColumnPos = column;
       }
 
       return result;
@@ -89,27 +132,40 @@ var Scroll = /*#__PURE__*/function () {
   }, {
     key: "scrollViewportVertically",
     value: function scrollViewportVertically(row, snapToTop, snapToBottom) {
-      if (!this.wot.drawn) {
+      var _this$dataAccessObjec3 = this.dataAccessObject,
+          drawn = _this$dataAccessObjec3.drawn,
+          totalRows = _this$dataAccessObjec3.totalRows; // do not scroll the viewport when the row points to a range outside of the dataset
+
+      if (!drawn || !Number.isInteger(row) || row < 0 || row > totalRows) {
         return false;
       }
 
-      var _this$_getVariables2 = this._getVariables(),
-          fixedRowsBottom = _this$_getVariables2.fixedRowsBottom,
-          fixedRowsTop = _this$_getVariables2.fixedRowsTop,
-          topOverlay = _this$_getVariables2.topOverlay,
-          totalRows = _this$_getVariables2.totalRows;
+      var firstVisibleRow = this.getFirstVisibleRow();
+      var lastVisibleRow = this.getLastVisibleRow();
+      var autoSnapping = snapToTop === void 0 && snapToBottom === void 0;
+      var _this$dataAccessObjec4 = this.dataAccessObject,
+          fixedRowsBottom = _this$dataAccessObjec4.fixedRowsBottom,
+          fixedRowsTop = _this$dataAccessObjec4.fixedRowsTop,
+          topOverlay = _this$dataAccessObjec4.topOverlay; // for auto-snapping (both snap* arguments are undefined) do not scroll the viewport
+      // when the rows points to the overlays
 
-      var result = false;
+      if (autoSnapping && (row < fixedRowsTop || row > totalRows - fixedRowsBottom - 1)) {
+        return false;
+      }
 
-      if (row >= 0 && row <= Math.max(totalRows - 1, 0)) {
-        var firstVisibleRow = this.getFirstVisibleRow();
-        var lastVisibleRow = this.getLastVisibleRow();
+      var result = false; // if there is no fully visible rows use the supporting variable (lastScrolledRowPos) to
+      // determine the snapping direction (top or bottom)
 
-        if (row >= fixedRowsTop && firstVisibleRow > -1 && (row < firstVisibleRow || snapToTop)) {
-          result = topOverlay.scrollTo(row);
-        } else if (lastVisibleRow === -1 || lastVisibleRow > -1 && (row > lastVisibleRow && row < totalRows - fixedRowsBottom || snapToBottom)) {
-          result = topOverlay.scrollTo(row, true);
-        }
+      if (firstVisibleRow === -1) {
+        result = topOverlay.scrollTo(row, autoSnapping ? row > this.lastScrolledRowPos : snapToBottom);
+      } else if (autoSnapping && (row < firstVisibleRow || row > lastVisibleRow) || !autoSnapping) {
+        // if there is at least one fully visible row determine the snapping direction based on
+        // that rows or by snapToTop/snapToBottom flags, if provided.
+        result = topOverlay.scrollTo(row, autoSnapping ? row > lastVisibleRow : snapToBottom);
+      }
+
+      if (result) {
+        this.lastScrolledRowPos = row;
       }
 
       return result;
@@ -123,14 +179,13 @@ var Scroll = /*#__PURE__*/function () {
   }, {
     key: "getFirstVisibleRow",
     value: function getFirstVisibleRow() {
-      var _this$_getVariables3 = this._getVariables(),
-          topOverlay = _this$_getVariables3.topOverlay,
-          wtTable = _this$_getVariables3.wtTable,
-          wtViewport = _this$_getVariables3.wtViewport,
-          totalRows = _this$_getVariables3.totalRows,
-          fixedRowsTop = _this$_getVariables3.fixedRowsTop;
-
-      var rootWindow = this.wot.rootWindow;
+      var _this$dataAccessObjec5 = this.dataAccessObject,
+          topOverlay = _this$dataAccessObjec5.topOverlay,
+          wtTable = _this$dataAccessObjec5.wtTable,
+          wtViewport = _this$dataAccessObjec5.wtViewport,
+          totalRows = _this$dataAccessObjec5.totalRows,
+          fixedRowsTop = _this$dataAccessObjec5.fixedRowsTop,
+          rootWindow = _this$dataAccessObjec5.rootWindow;
       var firstVisibleRow = wtTable.getFirstVisibleRow();
 
       if (topOverlay.mainTableScrollableElement === rootWindow) {
@@ -166,13 +221,12 @@ var Scroll = /*#__PURE__*/function () {
   }, {
     key: "getLastVisibleRow",
     value: function getLastVisibleRow() {
-      var _this$_getVariables4 = this._getVariables(),
-          topOverlay = _this$_getVariables4.topOverlay,
-          wtTable = _this$_getVariables4.wtTable,
-          wtViewport = _this$_getVariables4.wtViewport,
-          totalRows = _this$_getVariables4.totalRows;
-
-      var rootWindow = this.wot.rootWindow;
+      var _this$dataAccessObjec6 = this.dataAccessObject,
+          topOverlay = _this$dataAccessObjec6.topOverlay,
+          wtTable = _this$dataAccessObjec6.wtTable,
+          wtViewport = _this$dataAccessObjec6.wtViewport,
+          totalRows = _this$dataAccessObjec6.totalRows,
+          rootWindow = _this$dataAccessObjec6.rootWindow;
       var lastVisibleRow = wtTable.getLastVisibleRow();
 
       if (topOverlay.mainTableScrollableElement === rootWindow) {
@@ -206,26 +260,25 @@ var Scroll = /*#__PURE__*/function () {
   }, {
     key: "getFirstVisibleColumn",
     value: function getFirstVisibleColumn() {
-      var _this$_getVariables5 = this._getVariables(),
-          leftOverlay = _this$_getVariables5.leftOverlay,
-          wtTable = _this$_getVariables5.wtTable,
-          wtViewport = _this$_getVariables5.wtViewport,
-          totalColumns = _this$_getVariables5.totalColumns;
-
-      var rootWindow = this.wot.rootWindow;
+      var _this$dataAccessObjec7 = this.dataAccessObject,
+          inlineStartOverlay = _this$dataAccessObjec7.inlineStartOverlay,
+          wtTable = _this$dataAccessObjec7.wtTable,
+          wtViewport = _this$dataAccessObjec7.wtViewport,
+          totalColumns = _this$dataAccessObjec7.totalColumns,
+          rootWindow = _this$dataAccessObjec7.rootWindow;
       var firstVisibleColumn = wtTable.getFirstVisibleColumn();
 
-      if (leftOverlay.mainTableScrollableElement === rootWindow) {
+      if (inlineStartOverlay.mainTableScrollableElement === rootWindow) {
         var rootElementOffset = offset(wtTable.wtRootElement);
         var totalTableWidth = innerWidth(wtTable.hider);
         var windowWidth = innerWidth(rootWindow);
-        var windowScrollLeft = getScrollLeft(rootWindow, rootWindow); // Only calculate firstVisibleColumn when table didn't filled (from left) whole viewport space
+        var windowScrollLeft = Math.abs(getScrollLeft(rootWindow, rootWindow)); // Only calculate firstVisibleColumn when table didn't filled (from left) whole viewport space
 
         if (rootElementOffset.left + totalTableWidth - windowWidth <= windowScrollLeft) {
           var columnsWidth = wtViewport.getRowHeaderWidth();
 
           for (var column = totalColumns; column > 0; column--) {
-            columnsWidth += leftOverlay.sumCellSizes(column - 1, column);
+            columnsWidth += inlineStartOverlay.sumCellSizes(column - 1, column);
 
             if (rootElementOffset.left + totalTableWidth - columnsWidth <= windowScrollLeft) {
               // Return physical column + 1
@@ -247,25 +300,24 @@ var Scroll = /*#__PURE__*/function () {
   }, {
     key: "getLastVisibleColumn",
     value: function getLastVisibleColumn() {
-      var _this$_getVariables6 = this._getVariables(),
-          leftOverlay = _this$_getVariables6.leftOverlay,
-          wtTable = _this$_getVariables6.wtTable,
-          wtViewport = _this$_getVariables6.wtViewport,
-          totalColumns = _this$_getVariables6.totalColumns;
-
-      var rootWindow = this.wot.rootWindow;
+      var _this$dataAccessObjec8 = this.dataAccessObject,
+          inlineStartOverlay = _this$dataAccessObjec8.inlineStartOverlay,
+          wtTable = _this$dataAccessObjec8.wtTable,
+          wtViewport = _this$dataAccessObjec8.wtViewport,
+          totalColumns = _this$dataAccessObjec8.totalColumns,
+          rootWindow = _this$dataAccessObjec8.rootWindow;
       var lastVisibleColumn = wtTable.getLastVisibleColumn();
 
-      if (leftOverlay.mainTableScrollableElement === rootWindow) {
+      if (inlineStartOverlay.mainTableScrollableElement === rootWindow) {
         var rootElementOffset = offset(wtTable.wtRootElement);
-        var windowScrollLeft = getScrollLeft(rootWindow, rootWindow); // Only calculate lastVisibleColumn when table didn't filled (from right) whole viewport space
+        var windowScrollLeft = Math.abs(getScrollLeft(rootWindow, rootWindow)); // Only calculate lastVisibleColumn when table didn't filled (from right) whole viewport space
 
         if (rootElementOffset.left > windowScrollLeft) {
           var windowWidth = innerWidth(rootWindow);
           var columnsWidth = wtViewport.getRowHeaderWidth();
 
           for (var column = 1; column <= totalColumns; column++) {
-            columnsWidth += leftOverlay.sumCellSizes(column - 1, column);
+            columnsWidth += inlineStartOverlay.sumCellSizes(column - 1, column);
 
             if (rootElementOffset.left + columnsWidth - windowScrollLeft >= windowWidth) {
               // Return physical column - 1 (-2 because rangeEach gives column index + 1 - sumCellSizes requirements)
@@ -278,38 +330,6 @@ var Scroll = /*#__PURE__*/function () {
 
       return lastVisibleColumn;
     }
-    /**
-     * Returns collection of variables used to rows and columns visibility calculations.
-     *
-     * @returns {object}
-     * @private
-     */
-
-  }, {
-    key: "_getVariables",
-    value: function _getVariables() {
-      var wot = this.wot;
-      var topOverlay = wot.wtOverlays.topOverlay;
-      var leftOverlay = wot.wtOverlays.leftOverlay;
-      var wtTable = wot.wtTable;
-      var wtViewport = wot.wtViewport;
-      var totalRows = wot.getSetting('totalRows');
-      var totalColumns = wot.getSetting('totalColumns');
-      var fixedRowsTop = wot.getSetting('fixedRowsTop');
-      var fixedRowsBottom = wot.getSetting('fixedRowsBottom');
-      var fixedColumnsLeft = wot.getSetting('fixedColumnsLeft');
-      return {
-        topOverlay: topOverlay,
-        leftOverlay: leftOverlay,
-        wtTable: wtTable,
-        wtViewport: wtViewport,
-        totalRows: totalRows,
-        totalColumns: totalColumns,
-        fixedRowsTop: fixedRowsTop,
-        fixedRowsBottom: fixedRowsBottom,
-        fixedColumnsLeft: fixedColumnsLeft
-      };
-    }
   }]);
 
   return Scroll;

package/3rdparty/walkontable/src/selection.js

@@ -39,10 +39,6 @@ var _element = require("./../../../helpers/dom/element");
 
 var _border = _interopRequireDefault(require("./border"));
 
-var _coords = _interopRequireDefault(require("./cell/coords"));
-
-var _range = _interopRequireDefault(require("./cell/range"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -70,7 +66,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
  */
 var Selection = /*#__PURE__*/function () {
   /**
-   * @param {object} settings The selection settings object.
+   * @param {object} settings The selection settings object. @todo type.
    * @param {CellRange} cellRange The cell range instance.
    */
   function Selection(settings, cellRange) {
@@ -86,7 +82,7 @@ var Selection = /*#__PURE__*/function () {
    * Each Walkontable clone requires it's own border for every selection. This method creates and returns selection
    * borders per instance.
    *
-   * @param {Walkontable} wotInstance The Walkontable instance.
+   * @param {WalkontableFacade} wotInstance The Walkontable instance.
    * @returns {Border}
    */
 
@@ -122,7 +118,7 @@ var Selection = /*#__PURE__*/function () {
     key: "add",
     value: function add(coords) {
       if (this.isEmpty()) {
-        this.cellRange = new _range.default(coords);
+        this.cellRange = this.settings.createCellRange(coords);
       } else {
         this.cellRange.expand(coords);
       }
@@ -168,7 +164,7 @@ var Selection = /*#__PURE__*/function () {
       return this;
     }
     /**
-     * Returns the top left (TL) and bottom right (BR) selection coordinates.
+     * Returns the top left (or top right in RTL) and bottom right (or bottom left in RTL) selection coordinates.
      *
      * @returns {Array} Returns array of coordinates for example `[1, 1, 5, 5]`.
      */
@@ -176,14 +172,14 @@ var Selection = /*#__PURE__*/function () {
   }, {
     key: "getCorners",
     value: function getCorners() {
-      var topLeft = this.cellRange.getOuterTopLeftCorner();
-      var bottomRight = this.cellRange.getOuterBottomRightCorner();
-      return [topLeft.row, topLeft.col, bottomRight.row, bottomRight.col];
+      var topStart = this.cellRange.getOuterTopStartCorner();
+      var bottomEnd = this.cellRange.getOuterBottomEndCorner();
+      return [topStart.row, topStart.col, bottomEnd.row, bottomEnd.col];
     }
     /**
      * Adds class name to cell element at given coords.
      *
-     * @param {Walkontable} wotInstance Walkontable instance.
+     * @param {WalkontableFacade} wotInstance Walkontable instance.
      * @param {number} sourceRow Cell row coord.
      * @param {number} sourceColumn Cell column coord.
      * @param {string} className Class name.
@@ -196,7 +192,7 @@ var Selection = /*#__PURE__*/function () {
     key: "addClassAtCoords",
     value: function addClassAtCoords(wotInstance, sourceRow, sourceColumn, className) {
       var markIntersections = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
-      var TD = wotInstance.wtTable.getCell(new _coords.default(sourceRow, sourceColumn));
+      var TD = wotInstance.wtTable.getCell(this.settings.createCellCoords(sourceRow, sourceColumn));
 
       if (_typeof(TD) === 'object') {
         var cellClassName = className;
@@ -252,7 +248,7 @@ var Selection = /*#__PURE__*/function () {
       };
     }
     /**
-     * @param {Walkontable} wotInstance The Walkontable instance.
+     * @param {WalkontableFacade} wotInstance The Walkontable instance.
      */
 
   }, {

package/3rdparty/walkontable/src/selection.mjs

@@ -37,15 +37,13 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 
 import { addClass, hasClass } from "./../../../helpers/dom/element.mjs";
 import Border from "./border.mjs";
-import CellCoords from "./cell/coords.mjs";
-import CellRange from "./cell/range.mjs";
 /**
  * @class Selection
  */
 
 var Selection = /*#__PURE__*/function () {
   /**
-   * @param {object} settings The selection settings object.
+   * @param {object} settings The selection settings object. @todo type.
    * @param {CellRange} cellRange The cell range instance.
    */
   function Selection(settings, cellRange) {
@@ -61,7 +59,7 @@ var Selection = /*#__PURE__*/function () {
    * Each Walkontable clone requires it's own border for every selection. This method creates and returns selection
    * borders per instance.
    *
-   * @param {Walkontable} wotInstance The Walkontable instance.
+   * @param {WalkontableFacade} wotInstance The Walkontable instance.
    * @returns {Border}
    */
 
@@ -97,7 +95,7 @@ var Selection = /*#__PURE__*/function () {
     key: "add",
     value: function add(coords) {
       if (this.isEmpty()) {
-        this.cellRange = new CellRange(coords);
+        this.cellRange = this.settings.createCellRange(coords);
       } else {
         this.cellRange.expand(coords);
       }
@@ -143,7 +141,7 @@ var Selection = /*#__PURE__*/function () {
       return this;
     }
     /**
-     * Returns the top left (TL) and bottom right (BR) selection coordinates.
+     * Returns the top left (or top right in RTL) and bottom right (or bottom left in RTL) selection coordinates.
      *
      * @returns {Array} Returns array of coordinates for example `[1, 1, 5, 5]`.
      */
@@ -151,14 +149,14 @@ var Selection = /*#__PURE__*/function () {
   }, {
     key: "getCorners",
     value: function getCorners() {
-      var topLeft = this.cellRange.getOuterTopLeftCorner();
-      var bottomRight = this.cellRange.getOuterBottomRightCorner();
-      return [topLeft.row, topLeft.col, bottomRight.row, bottomRight.col];
+      var topStart = this.cellRange.getOuterTopStartCorner();
+      var bottomEnd = this.cellRange.getOuterBottomEndCorner();
+      return [topStart.row, topStart.col, bottomEnd.row, bottomEnd.col];
     }
     /**
      * Adds class name to cell element at given coords.
      *
-     * @param {Walkontable} wotInstance Walkontable instance.
+     * @param {WalkontableFacade} wotInstance Walkontable instance.
      * @param {number} sourceRow Cell row coord.
      * @param {number} sourceColumn Cell column coord.
      * @param {string} className Class name.
@@ -171,7 +169,7 @@ var Selection = /*#__PURE__*/function () {
     key: "addClassAtCoords",
     value: function addClassAtCoords(wotInstance, sourceRow, sourceColumn, className) {
       var markIntersections = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
-      var TD = wotInstance.wtTable.getCell(new CellCoords(sourceRow, sourceColumn));
+      var TD = wotInstance.wtTable.getCell(this.settings.createCellCoords(sourceRow, sourceColumn));
 
       if (_typeof(TD) === 'object') {
         var cellClassName = className;
@@ -227,7 +225,7 @@ var Selection = /*#__PURE__*/function () {
       };
     }
     /**
-     * @param {Walkontable} wotInstance The Walkontable instance.
+     * @param {WalkontableFacade} wotInstance The Walkontable instance.
      */
 
   }, {