handsontable 0.0.0-next-b0a4ea2-20231024 → 0.0.0-next-9059914-20231025

package/3rdparty/walkontable/src/{selection/border/border.js → border.js}

@@ -1,11 +1,10 @@
 "use strict";
 
 exports.__esModule = true;
-var _element = require("../../../../../helpers/dom/element");
-var _event = require("../../../../../helpers/dom/event");
-var _object = require("../../../../../helpers/object");
-var _browser = require("../../../../../helpers/browser");
-var _constants = require("./constants");
+var _element = require("../../../helpers/dom/element");
+var _event = require("../../../helpers/dom/event");
+var _object = require("../../../helpers/object");
+var _browser = require("../../../helpers/browser");
 /**
  *
  */
@@ -35,7 +34,13 @@ class Border {
     this.bottomStyle = null;
     this.startStyle = null;
     this.endStyle = null;
-    this.cornerDefaultStyle = _constants.CORNER_DEFAULT_STYLE;
+    this.cornerDefaultStyle = {
+      width: '6px',
+      height: '6px',
+      borderWidth: '1px',
+      borderStyle: 'solid',
+      borderColor: '#FFF'
+    };
     // Offset to moving the corner to be centered relative to the grid.
     this.cornerCenterPointOffset = -(parseInt(this.cornerDefaultStyle.width, 10) / 2);
     this.corner = null;
@@ -245,7 +250,7 @@ class Border {
    * @returns {boolean}
    */
   isPartRange(row, col) {
-    const areaSelection = this.wot.selectionManager.getAreaSelection();
+    const areaSelection = this.wot.selections.createOrGetArea();
     if (areaSelection.cellRange) {
       if (row !== areaSelection.cellRange.to.row || col !== areaSelection.cellRange.to.col) {
         return true;

package/3rdparty/walkontable/src/{selection/border/border.mjs → border.mjs}

@@ -1,8 +1,7 @@
-import { addClass, hasClass, removeClass, getComputedStyle, getTrimmingContainer, innerWidth, innerHeight, offset, outerHeight, outerWidth } from "../../../../../helpers/dom/element.mjs";
-import { stopImmediatePropagation } from "../../../../../helpers/dom/event.mjs";
-import { objectEach } from "../../../../../helpers/object.mjs";
-import { isMobileBrowser } from "../../../../../helpers/browser.mjs";
-import { CORNER_DEFAULT_STYLE } from "./constants.mjs";
+import { addClass, hasClass, removeClass, getComputedStyle, getTrimmingContainer, innerWidth, innerHeight, offset, outerHeight, outerWidth } from "../../../helpers/dom/element.mjs";
+import { stopImmediatePropagation } from "../../../helpers/dom/event.mjs";
+import { objectEach } from "../../../helpers/object.mjs";
+import { isMobileBrowser } from "../../../helpers/browser.mjs";
 /**
  *
  */
@@ -32,7 +31,13 @@ class Border {
     this.bottomStyle = null;
     this.startStyle = null;
     this.endStyle = null;
-    this.cornerDefaultStyle = CORNER_DEFAULT_STYLE;
+    this.cornerDefaultStyle = {
+      width: '6px',
+      height: '6px',
+      borderWidth: '1px',
+      borderStyle: 'solid',
+      borderColor: '#FFF'
+    };
     // Offset to moving the corner to be centered relative to the grid.
     this.cornerCenterPointOffset = -(parseInt(this.cornerDefaultStyle.width, 10) / 2);
     this.corner = null;
@@ -242,7 +247,7 @@ class Border {
    * @returns {boolean}
    */
   isPartRange(row, col) {
-    const areaSelection = this.wot.selectionManager.getAreaSelection();
+    const areaSelection = this.wot.selections.createOrGetArea();
     if (areaSelection.cellRange) {
       if (row !== areaSelection.cellRange.to.row || col !== areaSelection.cellRange.to.col) {
         return true;

package/3rdparty/walkontable/src/cell/coords.d.ts

@@ -4,12 +4,7 @@ export default class CellCoords {
   row: number;
   col: number;
 
-  isValid(tableParams: {
-    countRows?: number;
-    countCols?: number;
-    countRowHeaders?: number;
-    countColHeaders?: number;
-  }): boolean;
+  isValid(wot: any): boolean;
   isEqual(cellCoords: CellCoords): boolean;
   isSouthEastOf(testedCoords: any): boolean;
   isNorthWestOf(testedCoords: any): boolean;

package/3rdparty/walkontable/src/cell/coords.js

@@ -62,45 +62,26 @@ class CellCoords {
 
   /**
    * Checks if the coordinates in your `CellCoords` instance are valid
-   * in the context of given table parameters.
+   * in the context of a given Walkontable instance.
    *
    * The `row` index:
-   * - Must be an integer.
-   * - Must be higher than the number of column headers in the table.
-   * - Must be lower than the total number of rows in the table.
+   * - Can't be negative.
+   * - Can't be higher than the total number of rows in the Walkontable instance.
    *
    * The `col` index:
-   * - Must be an integer.
-   * - Must be higher than the number of row headers in the table.
-   * - Must be lower than the total number of columns in the table.
+   * - Can't be negative.
+   * - Can't be higher than the total number of columns in the Walkontable instance.
    *
-   * @param {object} [tableParams] An object with a defined table size.
-   * @param {number} [tableParams.countRows=0] The total number of rows.
-   * @param {number} [tableParams.countCols=0] The total number of columns.
-   * @param {number} [tableParams.countRowHeaders=0] A number of row headers.
-   * @param {number} [tableParams.countColHeaders=0] A number of column headers.
+   * @param {Walkontable} wot A Walkontable instance.
    * @returns {boolean} `true`: The coordinates are valid.
    */
-  isValid(tableParams) {
-    const {
-      countRows,
-      countCols,
-      countRowHeaders,
-      countColHeaders
-    } = {
-      countRows: 0,
-      countCols: 0,
-      countRowHeaders: 0,
-      countColHeaders: 0,
-      ...tableParams
-    };
-    if (!Number.isInteger(this.row) || !Number.isInteger(this.col)) {
-      return false;
-    }
-    if (this.row < -countColHeaders || this.col < -countRowHeaders) {
+  isValid(wot) {
+    // check if the row and column indexes are valid (0 or higher)
+    if (this.row < 0 || this.col < 0) {
       return false;
     }
-    if (this.row >= countRows || this.col >= countCols) {
+    // check if the selection fits in the total of rows and columns
+    if (this.row >= wot.getSetting('totalRows') || this.col >= wot.getSetting('totalColumns')) {
       return false;
     }
     return true;
@@ -120,26 +101,6 @@ class CellCoords {
     return this.row === cellCoords.row && this.col === cellCoords.col;
   }
 
-  /**
-   * Checks if the coordinates point to the headers range. If one of the axis (row or col) point to
-   * the header (negative value) then method returns `true`.
-   *
-   * @returns {boolean}
-   */
-  isHeader() {
-    return !this.isCell();
-  }
-
-  /**
-   * Checks if the coordinates point to the cells range. If all axis (row and col) point to
-   * the cell (positive value) then method returns `true`.
-   *
-   * @returns {boolean}
-   */
-  isCell() {
-    return this.row >= 0 && this.col >= 0;
-  }
-
   /**
    * Checks if another set of coordinates (`testedCoords`)
    * is south-east of the coordinates in your `CellCoords` instance.

package/3rdparty/walkontable/src/cell/coords.mjs

@@ -59,45 +59,26 @@ class CellCoords {
 
   /**
    * Checks if the coordinates in your `CellCoords` instance are valid
-   * in the context of given table parameters.
+   * in the context of a given Walkontable instance.
    *
    * The `row` index:
-   * - Must be an integer.
-   * - Must be higher than the number of column headers in the table.
-   * - Must be lower than the total number of rows in the table.
+   * - Can't be negative.
+   * - Can't be higher than the total number of rows in the Walkontable instance.
    *
    * The `col` index:
-   * - Must be an integer.
-   * - Must be higher than the number of row headers in the table.
-   * - Must be lower than the total number of columns in the table.
+   * - Can't be negative.
+   * - Can't be higher than the total number of columns in the Walkontable instance.
    *
-   * @param {object} [tableParams] An object with a defined table size.
-   * @param {number} [tableParams.countRows=0] The total number of rows.
-   * @param {number} [tableParams.countCols=0] The total number of columns.
-   * @param {number} [tableParams.countRowHeaders=0] A number of row headers.
-   * @param {number} [tableParams.countColHeaders=0] A number of column headers.
+   * @param {Walkontable} wot A Walkontable instance.
    * @returns {boolean} `true`: The coordinates are valid.
    */
-  isValid(tableParams) {
-    const {
-      countRows,
-      countCols,
-      countRowHeaders,
-      countColHeaders
-    } = {
-      countRows: 0,
-      countCols: 0,
-      countRowHeaders: 0,
-      countColHeaders: 0,
-      ...tableParams
-    };
-    if (!Number.isInteger(this.row) || !Number.isInteger(this.col)) {
-      return false;
-    }
-    if (this.row < -countColHeaders || this.col < -countRowHeaders) {
+  isValid(wot) {
+    // check if the row and column indexes are valid (0 or higher)
+    if (this.row < 0 || this.col < 0) {
       return false;
     }
-    if (this.row >= countRows || this.col >= countCols) {
+    // check if the selection fits in the total of rows and columns
+    if (this.row >= wot.getSetting('totalRows') || this.col >= wot.getSetting('totalColumns')) {
       return false;
     }
     return true;
@@ -117,26 +98,6 @@ class CellCoords {
     return this.row === cellCoords.row && this.col === cellCoords.col;
   }
 
-  /**
-   * Checks if the coordinates point to the headers range. If one of the axis (row or col) point to
-   * the header (negative value) then method returns `true`.
-   *
-   * @returns {boolean}
-   */
-  isHeader() {
-    return !this.isCell();
-  }
-
-  /**
-   * Checks if the coordinates point to the cells range. If all axis (row and col) point to
-   * the cell (positive value) then method returns `true`.
-   *
-   * @returns {boolean}
-   */
-  isCell() {
-    return this.row >= 0 && this.col >= 0;
-  }
-
   /**
    * Checks if another set of coordinates (`testedCoords`)
    * is south-east of the coordinates in your `CellCoords` instance.

package/3rdparty/walkontable/src/cell/range.d.ts

@@ -12,15 +12,8 @@ export default class CellRange {
   setHighlight(coords: CellCoords): CellRange;
   setFrom(coords: CellCoords): CellRange;
   setTo(coords: CellCoords): CellRange;
-  isValid(tableParams: {
-    countRows?: number;
-    countCols?: number;
-    countRowHeaders?: number;
-    countColHeaders?: number;
-  }): boolean;
-  isSingleCell(): boolean;
-  isSingleHeader(): boolean;
-  containsHeaders(): boolean;
+  isValid(wot: any): boolean;
+  isSingle(): boolean;
   getOuterHeight(): number;
   getOuterWidth(): number;
   getHeight(): number;

package/3rdparty/walkontable/src/cell/range.js

@@ -71,7 +71,7 @@ class CellRange {
       writable: true,
       value: false
     });
-    this.highlight = highlight.clone();
+    this.highlight = highlight.clone().normalize();
     this.from = from.clone();
     this.to = to.clone();
     _classPrivateFieldSet(this, _isRtl, isRtl);
@@ -84,7 +84,7 @@ class CellRange {
    * @returns {CellRange}
    */
   setHighlight(coords) {
-    this.highlight = coords.clone();
+    this.highlight = coords.clone().normalize();
     return this;
   }
 
@@ -112,28 +112,15 @@ class CellRange {
 
   /**
    * Checks if the coordinates in your `CellRange` instance are valid
-   * in the context of given table parameters.
+   * in the context of a given Walkontable instance.
    *
    * See the [`isValid()`](@/api/cellCoords.md#isvalid) method of the [`CellCoords`](@/api/cellCoords.md) class.
    *
-   * @param {object} tableParams An object with a defined table size.
-   * @param {number} tableParams.countRows The total number of rows.
-   * @param {number} tableParams.countCols The total number of columns.
-   * @param {number} tableParams.countRowHeaders A number of row headers.
-   * @param {number} tableParams.countColHeaders A number of column headers.
+   * @param {Walkontable} wot A Walkontable instance.
    * @returns {boolean}
    */
-  isValid(tableParams) {
-    return this.from.isValid(tableParams) && this.to.isValid(tableParams);
-  }
-
-  /**
-   * Checks if your range is just a single cell or header.
-   *
-   * @returns {boolean}
-   */
-  isSingle() {
-    return this.isSingleCell() || this.isSingleHeader();
+  isValid(wot) {
+    return this.from.isValid(wot) && this.to.isValid(wot);
   }
 
   /**
@@ -141,28 +128,10 @@ class CellRange {
    *
    * @returns {boolean}
    */
-  isSingleCell() {
+  isSingle() {
     return this.from.row >= 0 && this.from.row === this.to.row && this.from.col >= 0 && this.from.col === this.to.col;
   }
 
-  /**
-   * Checks if your range is just a single header.
-   *
-   * @returns {boolean}
-   */
-  isSingleHeader() {
-    return (this.from.row < 0 || this.from.col < 0) && this.from.row === this.to.row && this.from.col === this.to.col;
-  }
-
-  /**
-   * Checks if your range overlaps headers range (negative coordinates).
-   *
-   * @returns {boolean}
-   */
-  containsHeaders() {
-    return this.from.isHeader() || this.to.isHeader();
-  }
-
   /**
    * Returns the height of your range (as a number of rows, including row headers).
    *

package/3rdparty/walkontable/src/cell/range.mjs

@@ -67,7 +67,7 @@ class CellRange {
       writable: true,
       value: false
     });
-    this.highlight = highlight.clone();
+    this.highlight = highlight.clone().normalize();
     this.from = from.clone();
     this.to = to.clone();
     _classPrivateFieldSet(this, _isRtl, isRtl);
@@ -80,7 +80,7 @@ class CellRange {
    * @returns {CellRange}
    */
   setHighlight(coords) {
-    this.highlight = coords.clone();
+    this.highlight = coords.clone().normalize();
     return this;
   }
 
@@ -108,28 +108,15 @@ class CellRange {
 
   /**
    * Checks if the coordinates in your `CellRange` instance are valid
-   * in the context of given table parameters.
+   * in the context of a given Walkontable instance.
    *
    * See the [`isValid()`](@/api/cellCoords.md#isvalid) method of the [`CellCoords`](@/api/cellCoords.md) class.
    *
-   * @param {object} tableParams An object with a defined table size.
-   * @param {number} tableParams.countRows The total number of rows.
-   * @param {number} tableParams.countCols The total number of columns.
-   * @param {number} tableParams.countRowHeaders A number of row headers.
-   * @param {number} tableParams.countColHeaders A number of column headers.
+   * @param {Walkontable} wot A Walkontable instance.
    * @returns {boolean}
    */
-  isValid(tableParams) {
-    return this.from.isValid(tableParams) && this.to.isValid(tableParams);
-  }
-
-  /**
-   * Checks if your range is just a single cell or header.
-   *
-   * @returns {boolean}
-   */
-  isSingle() {
-    return this.isSingleCell() || this.isSingleHeader();
+  isValid(wot) {
+    return this.from.isValid(wot) && this.to.isValid(wot);
   }
 
   /**
@@ -137,28 +124,10 @@ class CellRange {
    *
    * @returns {boolean}
    */
-  isSingleCell() {
+  isSingle() {
     return this.from.row >= 0 && this.from.row === this.to.row && this.from.col >= 0 && this.from.col === this.to.col;
   }
 
-  /**
-   * Checks if your range is just a single header.
-   *
-   * @returns {boolean}
-   */
-  isSingleHeader() {
-    return (this.from.row < 0 || this.from.col < 0) && this.from.row === this.to.row && this.from.col === this.to.col;
-  }
-
-  /**
-   * Checks if your range overlaps headers range (negative coordinates).
-   *
-   * @returns {boolean}
-   */
-  containsHeaders() {
-    return this.from.isHeader() || this.to.isHeader();
-  }
-
   /**
    * Returns the height of your range (as a number of rows, including row headers).
    *

package/3rdparty/walkontable/src/core/_base.js

@@ -31,7 +31,7 @@ class CoreAbstract {
     _defineProperty(this, "wtScroll", void 0);
     _defineProperty(this, "wtViewport", void 0);
     _defineProperty(this, "wtOverlays", void 0);
-    _defineProperty(this, "selectionManager", void 0);
+    _defineProperty(this, "selections", void 0);
     _defineProperty(this, "wtEvent", void 0);
     /**
      * The walkontable instance id.
@@ -309,8 +309,8 @@ class CoreAbstract {
         return wot.wtOverlays; // TODO refactoring: move outside dao, use IOC
       },
 
-      get selectionManager() {
-        return wot.selectionManager; // TODO refactoring: move outside dao, use IOC
+      get selections() {
+        return wot.selections; // TODO refactoring: move outside dao, use IOC
       },
 
       get drawn() {
@@ -359,12 +359,6 @@ class CoreAbstract {
       },
       get countRowsVisible() {
         return wot.wtViewport.rowsVisibleCalculator.count;
-      },
-      get columnHeaders() {
-        return wot.wtSettings.getSetting('columnHeaders');
-      },
-      get rowHeaders() {
-        return wot.wtSettings.getSetting('rowHeaders');
       }
     };
   }

package/3rdparty/walkontable/src/core/_base.mjs

@@ -27,7 +27,7 @@ export default class CoreAbstract {
     _defineProperty(this, "wtScroll", void 0);
     _defineProperty(this, "wtViewport", void 0);
     _defineProperty(this, "wtOverlays", void 0);
-    _defineProperty(this, "selectionManager", void 0);
+    _defineProperty(this, "selections", void 0);
     _defineProperty(this, "wtEvent", void 0);
     /**
      * The walkontable instance id.
@@ -305,8 +305,8 @@ export default class CoreAbstract {
         return wot.wtOverlays; // TODO refactoring: move outside dao, use IOC
       },
 
-      get selectionManager() {
-        return wot.selectionManager; // TODO refactoring: move outside dao, use IOC
+      get selections() {
+        return wot.selections; // TODO refactoring: move outside dao, use IOC
       },
 
       get drawn() {
@@ -355,12 +355,6 @@ export default class CoreAbstract {
       },
       get countRowsVisible() {
         return wot.wtViewport.rowsVisibleCalculator.count;
-      },
-      get columnHeaders() {
-        return wot.wtSettings.getSetting('columnHeaders');
-      },
-      get rowHeaders() {
-        return wot.wtSettings.getSetting('rowHeaders');
       }
     };
   }

package/3rdparty/walkontable/src/core/clone.js

@@ -26,8 +26,8 @@ class Clone extends _base.default {
     this.cloneOverlay = clone.overlay;
     this.wtTable = this.cloneOverlay.createTable(this.getTableDao(), facadeGetter, this.domBindings, this.wtSettings);
     this.wtViewport = clone.viewport;
-    this.selectionManager = clone.selectionManager;
-    this.wtEvent = new _event.default(facadeGetter, this.domBindings, this.wtSettings, this.eventManager, this.wtTable, this.selectionManager, clone.event);
+    this.selections = clone.selections;
+    this.wtEvent = new _event.default(facadeGetter, this.domBindings, this.wtSettings, this.eventManager, this.wtTable, this.selections, clone.event);
     this.findOriginalHeaders();
   }
 }

package/3rdparty/walkontable/src/core/clone.mjs

@@ -22,8 +22,8 @@ export default class Clone extends CoreAbstract {
     this.cloneOverlay = clone.overlay;
     this.wtTable = this.cloneOverlay.createTable(this.getTableDao(), facadeGetter, this.domBindings, this.wtSettings);
     this.wtViewport = clone.viewport;
-    this.selectionManager = clone.selectionManager;
-    this.wtEvent = new Event(facadeGetter, this.domBindings, this.wtSettings, this.eventManager, this.wtTable, this.selectionManager, clone.event);
+    this.selections = clone.selections;
+    this.wtEvent = new Event(facadeGetter, this.domBindings, this.wtSettings, this.eventManager, this.wtTable, this.selections, clone.event);
     this.findOriginalHeaders();
   }
 }

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

@@ -8,7 +8,6 @@ var _settings = _interopRequireDefault(require("../settings"));
 var _master = _interopRequireDefault(require("../table/master"));
 var _viewport = _interopRequireDefault(require("../viewport"));
 var _base = _interopRequireDefault(require("./_base"));
-var _manager = require("../selection/manager");
 var _object = require("../../../../helpers/object");
 var _element = require("../../../../helpers/dom/element");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -26,8 +25,8 @@ class Walkontable extends _base.default {
 
     this.wtTable = new _master.default(this.getTableDao(), facadeGetter, this.domBindings, this.wtSettings);
     this.wtViewport = new _viewport.default(this.getViewportDao(), this.domBindings, this.wtSettings, this.eventManager, this.wtTable);
-    this.selectionManager = new _manager.SelectionManager(this.wtSettings.getSetting('selections'));
-    this.wtEvent = new _event.default(facadeGetter, this.domBindings, this.wtSettings, this.eventManager, this.wtTable, this.selectionManager);
+    this.selections = this.wtSettings.getSetting('selections');
+    this.wtEvent = new _event.default(facadeGetter, this.domBindings, this.wtSettings, this.eventManager, this.wtTable, this.selections);
     this.wtOverlays = new _overlays.default(
     // TODO create DAO and remove reference to the Walkontable instance.
     this, facadeGetter, this.domBindings, this.wtSettings, this.eventManager, this.wtTable);

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

@@ -5,7 +5,6 @@ import Settings from "../settings.mjs";
 import MasterTable from "../table/master.mjs";
 import Viewport from "../viewport.mjs";
 import CoreAbstract from "./_base.mjs";
-import { SelectionManager } from "../selection/manager.mjs";
 import { objectEach } from "../../../../helpers/object.mjs";
 import { addClass, removeClass } from "../../../../helpers/dom/element.mjs";
 /**
@@ -22,8 +21,8 @@ export default class Walkontable extends CoreAbstract {
 
     this.wtTable = new MasterTable(this.getTableDao(), facadeGetter, this.domBindings, this.wtSettings);
     this.wtViewport = new Viewport(this.getViewportDao(), this.domBindings, this.wtSettings, this.eventManager, this.wtTable);
-    this.selectionManager = new SelectionManager(this.wtSettings.getSetting('selections'));
-    this.wtEvent = new Event(facadeGetter, this.domBindings, this.wtSettings, this.eventManager, this.wtTable, this.selectionManager);
+    this.selections = this.wtSettings.getSetting('selections');
+    this.wtEvent = new Event(facadeGetter, this.domBindings, this.wtSettings, this.eventManager, this.wtTable, this.selections);
     this.wtOverlays = new Overlays(
     // TODO create DAO and remove reference to the Walkontable instance.
     this, facadeGetter, this.domBindings, this.wtSettings, this.eventManager, this.wtTable);

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

@@ -18,15 +18,15 @@ class Event {
    * @param {Settings} wtSettings The walkontable settings.
    * @param {EventManager} eventManager The walkontable event manager.
    * @param {Table} wtTable The table.
-   * @param {SelectionManager} selectionManager Selections.
+   * @param {Selections} selections Selections.
    * @param {Event} [parent=null] The main Event instance.
    */
-  constructor(facadeGetter, domBindings, wtSettings, eventManager, wtTable, selectionManager) {
+  constructor(facadeGetter, domBindings, wtSettings, eventManager, wtTable, selections) {
     let parent = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : null;
     this.wtSettings = wtSettings;
     this.domBindings = domBindings;
     this.wtTable = wtTable;
-    this.selectionManager = selectionManager;
+    this.selections = selections;
     this.parent = parent;
 
     /**
@@ -41,8 +41,7 @@ class Event {
      * Should be use only for passing face called external origin methods, like registered event listeners.
      * It provides backward compatibility by getting instance facade.
      *
-     * @todo Consider about removing this from Event class, because it make relationship into facade (implicit circular
-     *   dependency).
+     * @todo Consider about removing this from Event class, because it make relationship into facade (implicit circular dependency).
      * @todo Con. Maybe passing listener caller as an ioc from faced resolves this issue. To rethink later.
      *
      * @type {FacadeGetter}
@@ -135,11 +134,11 @@ class Event {
       cell.coords = this.wtTable.getCoords(TD);
       cell.TD = TD;
     } else if ((0, _element.hasClass)(elem, 'wtBorder') && (0, _element.hasClass)(elem, 'current')) {
-      cell.coords = this.selectionManager.getFocusSelection().cellRange.highlight;
+      cell.coords = this.selections.getCell().cellRange.highlight;
       cell.TD = this.wtTable.getCell(cell.coords);
     } else if ((0, _element.hasClass)(elem, 'wtBorder') && (0, _element.hasClass)(elem, 'area')) {
-      if (this.selectionManager.getAreaSelection().cellRange) {
-        cell.coords = this.selectionManager.getAreaSelection().cellRange.to;
+      if (this.selections.createOrGetArea().cellRange) {
+        cell.coords = this.selections.createOrGetArea().cellRange.to;
         cell.TD = this.wtTable.getCell(cell.coords);
       }
     }
@@ -158,9 +157,8 @@ class Event {
     const getParentNode = (0, _function.partial)(_element.getParent, event.target);
     const realTarget = event.target;
 
-    // ignore non-TD focusable elements from mouse down processing
-    // (https://github.com/handsontable/handsontable/issues/3555)
-    if (!['TD', 'TH'].includes(activeElement.nodeName) && (realTarget === activeElement || getParentNode(0) === activeElement || getParentNode(1) === activeElement)) {
+    // ignore focusable element from mouse down processing (https://github.com/handsontable/handsontable/issues/3555)
+    if (realTarget === activeElement || getParentNode(0) === activeElement || getParentNode(1) === activeElement) {
       return;
     }
     const cell = this.parentCell(realTarget);
@@ -278,7 +276,7 @@ class Event {
    */
   onTouchStart(event) {
     const priv = privatePool.get(this);
-    priv.selectedCellBeforeTouchEnd = this.selectionManager.getFocusSelection().cellRange;
+    priv.selectedCellBeforeTouchEnd = this.selections.getCell().cellRange;
     this.touchApplied = true;
     this.onMouseDown(event);
   }