handsontable 0.0.0-next-48677e7-20230509 → 0.0.0-next-834f47e-20230509

package/plugins/undoRedo/undoRedo.mjs

@@ -585,7 +585,6 @@ UndoRedo.RemoveColumnAction.prototype.undo = function (instance, undoneCallback)
     });
   });
   instance.setSourceDataAtCell(changes, void 0, void 0, 'UndoRedo.undo');
-  instance.columnIndexMapper.insertIndexes(ascendingIndexes[0], ascendingIndexes.length);
   if (typeof this.headers !== 'undefined') {
     arrayEach(sortedHeaders, function (headerData, columnIndex) {
       instance.getSettings().colHeaders[ascendingIndexes[columnIndex]] = headerData;

package/renderers/baseRenderer/baseRenderer.js

@@ -42,8 +42,5 @@ function baseRenderer(instance, TD, row, col, prop, value, cellProperties) {
   }
   (0, _element.removeClass)(TD, classesToRemove);
   (0, _element.addClass)(TD, classesToAdd);
-  TD.ariaColIndex = "".concat(col);
-  TD.setAttribute('tabindex', '-1');
-  TD.setAttribute('role', 'gridcell');
 }
 baseRenderer.RENDERER_TYPE = RENDERER_TYPE;

package/renderers/baseRenderer/baseRenderer.mjs

@@ -35,8 +35,5 @@ export function baseRenderer(instance, TD, row, col, prop, value, cellProperties
   }
   removeClass(TD, classesToRemove);
   addClass(TD, classesToAdd);
-  TD.ariaColIndex = "".concat(col);
-  TD.setAttribute('tabindex', '-1');
-  TD.setAttribute('role', 'gridcell');
 }
 baseRenderer.RENDERER_TYPE = RENDERER_TYPE;

package/selection/highlight/constants.js

@@ -0,0 +1,16 @@
+"use strict";
+
+exports.__esModule = true;
+exports.HEADER_TYPE = exports.FILL_TYPE = exports.CUSTOM_SELECTION_TYPE = exports.CELL_TYPE = exports.AREA_TYPE = exports.ACTIVE_HEADER_TYPE = void 0;
+var ACTIVE_HEADER_TYPE = 'active-header';
+exports.ACTIVE_HEADER_TYPE = ACTIVE_HEADER_TYPE;
+var AREA_TYPE = 'area';
+exports.AREA_TYPE = AREA_TYPE;
+var CELL_TYPE = 'cell';
+exports.CELL_TYPE = CELL_TYPE;
+var FILL_TYPE = 'fill';
+exports.FILL_TYPE = FILL_TYPE;
+var HEADER_TYPE = 'header';
+exports.HEADER_TYPE = HEADER_TYPE;
+var CUSTOM_SELECTION_TYPE = 'custom-selection';
+exports.CUSTOM_SELECTION_TYPE = CUSTOM_SELECTION_TYPE;

package/selection/highlight/constants.mjs

@@ -0,0 +1,6 @@
+export var ACTIVE_HEADER_TYPE = 'active-header';
+export var AREA_TYPE = 'area';
+export var CELL_TYPE = 'cell';
+export var FILL_TYPE = 'fill';
+export var HEADER_TYPE = 'header';
+export var CUSTOM_SELECTION_TYPE = 'custom-selection';

package/selection/highlight/highlight.js

@@ -1,72 +1,49 @@
 "use strict";
 
-require("core-js/modules/es.symbol.to-primitive.js");
-require("core-js/modules/es.date.to-primitive.js");
-require("core-js/modules/es.number.constructor.js");
-require("core-js/modules/es.array.from.js");
-require("core-js/modules/es.array.slice.js");
-require("core-js/modules/es.function.name.js");
-require("core-js/modules/es.regexp.exec.js");
 require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/es.object.get-own-property-descriptors.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); }
+require("core-js/modules/es.array.from.js");
+require("core-js/modules/es.array.slice.js");
+require("core-js/modules/es.function.name.js");
+require("core-js/modules/es.regexp.exec.js");
 exports.__esModule = true;
 exports.default = void 0;
+require("core-js/modules/es.array.fill.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.map.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/web.dom-collections.iterator.js");
-require("core-js/modules/es.array.fill.js");
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.symbol.iterator.js");
 require("core-js/modules/es.symbol.js");
 require("core-js/modules/es.symbol.description.js");
-require("core-js/modules/es.weak-set.js");
-var _activeHeader = require("./types/activeHeader");
-var _areaLayered = require("./types/areaLayered");
-var _area = require("./types/area");
-var _column = require("./types/column");
-var _focus = require("./types/focus");
-var _customSelection = require("./types/customSelection");
-var _fill = require("./types/fill");
-var _header = require("./types/header");
-var _row = require("./types/row");
-var _src = require("../../3rdparty/walkontable/src");
-exports.ACTIVE_HEADER_TYPE = _src.HIGHLIGHT_ACTIVE_HEADER_TYPE;
-exports.AREA_TYPE = _src.HIGHLIGHT_AREA_TYPE;
-exports.FOCUS_TYPE = _src.HIGHLIGHT_FOCUS_TYPE;
-exports.CUSTOM_SELECTION_TYPE = _src.HIGHLIGHT_CUSTOM_SELECTION_TYPE;
-exports.FILL_TYPE = _src.HIGHLIGHT_FILL_TYPE;
-exports.HEADER_TYPE = _src.HIGHLIGHT_HEADER_TYPE;
-exports.ROW_TYPE = _src.HIGHLIGHT_ROW_TYPE;
-exports.COLUMN_TYPE = _src.HIGHLIGHT_COLUMN_TYPE;
+require("core-js/modules/es.symbol.to-primitive.js");
+require("core-js/modules/es.date.to-primitive.js");
+require("core-js/modules/es.number.constructor.js");
+var _types = require("./types");
+var _constants = require("./constants");
 var _array = require("./../../helpers/array");
-var _Symbol$iterator;
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return 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 _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
-function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 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 _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
-var _createHighlight = /*#__PURE__*/new WeakSet();
-_Symbol$iterator = Symbol.iterator;
 /**
  * Highlight class responsible for managing Walkontable Selection classes.
  *
@@ -82,128 +59,68 @@ _Symbol$iterator = Symbol.iterator;
  * @class Highlight
  * @util
  */
-var Highlight = /*#__PURE__*/function () {
-  /**
-   * Options consumed by Highlight class and Walkontable Selection classes.
-   *
-   * @type {object}
-   */
-
-  /**
-   * The property which describes which layer level of the visual selection will be modified.
-   * This option is valid only for `area` and `header` highlight types which occurs multiple times on
-   * the table (as a non-consecutive selection).
-   *
-   * An order of the layers is the same as the order of added new non-consecutive selections.
-   *
-   * @type {number}
-   * @default 0
-   */
-
-  /**
-   * `cell` highlight object which describes attributes for the currently selected cell.
-   * It can only occur only once on the table.
-   *
-   * @type {Selection}
-   */
-
-  /**
-   * `fill` highlight object which describes attributes for the borders for autofill functionality.
-   * It can only occur only once on the table.
-   *
-   * @type {Selection}
-   */
-
-  /**
-   * Collection of the `area` highlights. That objects describes attributes for the borders and selection of
-   * the multiple selected cells. It can occur multiple times on the table.
-   *
-   * @type {Map.<number, Selection>}
-   */
-
-  /**
-   * Collection of the `highlight` highlights. That objects describes attributes for the borders and selection of
-   * the multiple selected cells. It can occur multiple times on the table.
-   *
-   * @type {Map.<number, Selection>}
-   */
-
-  /**
-   * Collection of the `header` highlights. That objects describes attributes for the selection of
-   * the multiple selected rows in the table header. It can occur multiple times on the table.
-   *
-   * @type {Map.<number, Selection>}
-   */
-
-  /**
-   * Collection of the `header` highlights. That objects describes attributes for the selection of
-   * the multiple selected columns in the table header. It can occur multiple times on the table.
-   *
-   * @type {Map.<number, Selection>}
-   */
-
-  /**
-   * Collection of the `active-header` highlights. That objects describes attributes for the selection of
-   * the multiple selected rows in the table header. The table headers which have selected all items in
-   * a row will be marked as `active-header`.
-   *
-   * @type {Map.<number, Selection>}
-   */
-
-  /**
-   * Collection of the `active-header` highlights. That objects describes attributes for the selection of
-   * the multiple selected columns in the table header. The table headers which have selected all items in
-   * a row will be marked as `active-header`.
-   *
-   * @type {Map.<number, Selection>}
-   */
-
-  /**
-   * Collection of the `rows` highlights. That objects describes attributes for the selection of
-   * the multiple selected cells in a row. It can occur multiple times on the table.
-   *
-   * @type {Map.<number, Selection>}
-   */
-
-  /**
-   * Collection of the `columns` highlights. That objects describes attributes for the selection of
-   * the multiple selected cells in a column. It can occur multiple times on the table.
-   *
-   * @type {Map.<number, Selection>}
-   */
-
-  /**
-   * Collection of the `custom-selection`, holder for example borders added through CustomBorders plugin.
-   *
-   * @type {Selection[]}
-   */
-
+var Highlight = /*#__PURE__*/function (_Symbol$iterator) {
   function Highlight(options) {
     _classCallCheck(this, Highlight);
     /**
-     * Creates (if not exist in the cache) Walkontable Selection instance.
+     * Options consumed by Highlight class and Walkontable Selection classes.
      *
-     * @param {Map} cacheMap The map where the instance will be cached.
-     * @param {Function} highlightFactory The function factory.
-     * @returns {VisualSelection}
+     * @type {object}
      */
-    _classPrivateMethodInitSpec(this, _createHighlight);
-    _defineProperty(this, "options", void 0);
-    _defineProperty(this, "layerLevel", 0);
-    _defineProperty(this, "focus", void 0);
-    _defineProperty(this, "fill", void 0);
-    _defineProperty(this, "layeredAreas", new Map());
-    _defineProperty(this, "areas", new Map());
-    _defineProperty(this, "rowHeaders", new Map());
-    _defineProperty(this, "columnHeaders", new Map());
-    _defineProperty(this, "activeRowHeaders", new Map());
-    _defineProperty(this, "activeColumnHeaders", new Map());
-    _defineProperty(this, "rowHighlights", new Map());
-    _defineProperty(this, "columnHighlights", new Map());
-    _defineProperty(this, "customSelections", []);
     this.options = options;
-    this.focus = (0, _focus.createHighlight)(options);
-    this.fill = (0, _fill.createHighlight)(options);
+    /**
+     * The property which describes which layer level of the visual selection will be modified.
+     * This option is valid only for `area` and `header` highlight types which occurs multiple times on
+     * the table (as a non-consecutive selection).
+     *
+     * An order of the layers is the same as the order of added new non-consecutive selections.
+     *
+     * @type {number}
+     * @default 0
+     */
+    this.layerLevel = 0;
+    /**
+     * `cell` highlight object which describes attributes for the currently selected cell.
+     * It can only occur only once on the table.
+     *
+     * @type {Selection}
+     */
+    this.cell = (0, _types.createHighlight)(_constants.CELL_TYPE, options);
+    /**
+     * `fill` highlight object which describes attributes for the borders for autofill functionality.
+     * It can only occur only once on the table.
+     *
+     * @type {Selection}
+     */
+    this.fill = (0, _types.createHighlight)(_constants.FILL_TYPE, options);
+    /**
+     * Collection of the `area` highlights. That objects describes attributes for the borders and selection of
+     * the multiple selected cells. It can occur multiple times on the table.
+     *
+     * @type {Map.<number, Selection>}
+     */
+    this.areas = new Map();
+    /**
+     * Collection of the `header` highlights. That objects describes attributes for the selection of
+     * the multiple selected rows and columns in the table header. It can occur multiple times on the table.
+     *
+     * @type {Map.<number, Selection>}
+     */
+    this.headers = new Map();
+    /**
+     * Collection of the `active-header` highlights. That objects describes attributes for the selection of
+     * the multiple selected rows and columns in the table header. The table headers which have selected all items in
+     * a row will be marked as `active-header`.
+     *
+     * @type {Map.<number, Selection>}
+     */
+    this.activeHeaders = new Map();
+    /**
+     * Collection of the `custom-selection`, holder for example borders added through CustomBorders plugin.
+     *
+     * @type {Selection[]}
+     */
+    this.customSelections = [];
   }
 
   /**
@@ -219,14 +136,11 @@ var Highlight = /*#__PURE__*/function () {
       var type = highlightType;
 
       // Legacy compatibility.
-      if (highlightType === _src.HIGHLIGHT_FOCUS_TYPE) {
+      if (highlightType === _constants.CELL_TYPE) {
         type = 'current'; // One from settings for `disableVisualSelection` up to Handsontable 0.36/Handsontable Pro 1.16.0.
       }
 
-      var disableHighlight = false;
-      if (coords.isCell()) {
-        disableHighlight = this.options.disabledCellSelection(coords.row, coords.col);
-      }
+      var disableHighlight = this.options.disabledCellSelection(coords.row, coords.col);
       if (typeof disableHighlight === 'string') {
         disableHighlight = [disableHighlight];
       }
@@ -248,15 +162,14 @@ var Highlight = /*#__PURE__*/function () {
     }
 
     /**
-     * Get Walkontable Selection instance created for controlling highlight of the currently
-     * focused cell (or header).
+     * Get Walkontable Selection instance created for controlling highlight of the currently selected/edited cell.
      *
      * @returns {Selection}
      */
   }, {
-    key: "getFocus",
-    value: function getFocus() {
-      return this.focus;
+    key: "getCell",
+    value: function getCell() {
+      return this.cell;
     }
 
     /**
@@ -271,38 +184,25 @@ var Highlight = /*#__PURE__*/function () {
     }
 
     /**
-     * Creates (if not exist in the cache) Walkontable Selection instance created for controlling
-     * `area` highlights.
-     *
-     * @returns {Selection}
-     */
-  }, {
-    key: "createLayeredArea",
-    value: function createLayeredArea() {
-      return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.layeredAreas, _areaLayered.createHighlight);
-    }
-
-    /**
-     * Get all Walkontable Selection instances which describes the state of the visual highlight of the cells.
-     *
-     * @returns {Selection[]}
-     */
-  }, {
-    key: "getLayeredAreas",
-    value: function getLayeredAreas() {
-      return _toConsumableArray(this.layeredAreas.values());
-    }
-
-    /**
-     * Creates (if not exist in the cache) Walkontable Selection instance created for controlling
-     * `highlight` highlights.
+     * Get or create (if not exist in the cache) Walkontable Selection instance created for controlling highlight
+     * of the multiple selected cells.
      *
      * @returns {Selection}
      */
   }, {
-    key: "createArea",
-    value: function createArea() {
-      return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.areas, _area.createHighlight);
+    key: "createOrGetArea",
+    value: function createOrGetArea() {
+      var layerLevel = this.layerLevel;
+      var area;
+      if (this.areas.has(layerLevel)) {
+        area = this.areas.get(layerLevel);
+      } else {
+        area = (0, _types.createHighlight)(_constants.AREA_TYPE, _objectSpread({
+          layerLevel: layerLevel
+        }, this.options));
+        this.areas.set(layerLevel, area);
+      }
+      return area;
     }
 
     /**
@@ -317,38 +217,23 @@ var Highlight = /*#__PURE__*/function () {
     }
 
     /**
-     * Creates (if not exist in the cache) Walkontable Selection instance created for controlling
-     * header highlight for rows.
-     *
-     * @returns {Selection}
-     */
-  }, {
-    key: "createRowHeader",
-    value: function createRowHeader() {
-      return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.rowHeaders, _header.createHighlight);
-    }
-
-    /**
-     * Get all Walkontable Selection instances which describes the state of the visual highlight of the headers.
-     *
-     * @returns {Selection[]}
-     */
-  }, {
-    key: "getRowHeaders",
-    value: function getRowHeaders() {
-      return _toConsumableArray(this.rowHeaders.values());
-    }
-
-    /**
-     * Creates (if not exist in the cache) Walkontable Selection instance created for controlling
-     * header highlight for columns.
+     * Get or create (if not exist in the cache) Walkontable Selection instance created for controlling highlight
+     * of the multiple selected header cells.
      *
      * @returns {Selection}
      */
   }, {
-    key: "createColumnHeader",
-    value: function createColumnHeader() {
-      return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.columnHeaders, _header.createHighlight);
+    key: "createOrGetHeader",
+    value: function createOrGetHeader() {
+      var layerLevel = this.layerLevel;
+      var header;
+      if (this.headers.has(layerLevel)) {
+        header = this.headers.get(layerLevel);
+      } else {
+        header = (0, _types.createHighlight)(_constants.HEADER_TYPE, _objectSpread({}, this.options));
+        this.headers.set(layerLevel, header);
+      }
+      return header;
     }
 
     /**
@@ -357,44 +242,29 @@ var Highlight = /*#__PURE__*/function () {
      * @returns {Selection[]}
      */
   }, {
-    key: "getColumnHeaders",
-    value: function getColumnHeaders() {
-      return _toConsumableArray(this.columnHeaders.values());
-    }
-
-    /**
-     * Creates (if not exist in the cache) Walkontable Selection instance created for controlling
-     * highlight for active row headers.
-     *
-     * @returns {Selection}
-     */
-  }, {
-    key: "createActiveRowHeader",
-    value: function createActiveRowHeader() {
-      return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.activeRowHeaders, _activeHeader.createHighlight);
-    }
-
-    /**
-     * Get all Walkontable Selection instances which describes the state of the visual highlight of the active headers.
-     *
-     * @returns {Selection[]}
-     */
-  }, {
-    key: "getActiveRowHeaders",
-    value: function getActiveRowHeaders() {
-      return _toConsumableArray(this.activeRowHeaders.values());
+    key: "getHeaders",
+    value: function getHeaders() {
+      return _toConsumableArray(this.headers.values());
     }
 
     /**
-     * Creates (if not exist in the cache) Walkontable Selection instance created for controlling
-     * highlight for active column headers.
+     * Get or create (if not exist in the cache) Walkontable Selection instance created for controlling highlight
+     * of the multiple selected active header cells.
      *
      * @returns {Selection}
      */
   }, {
-    key: "createActiveColumnHeader",
-    value: function createActiveColumnHeader() {
-      return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.activeColumnHeaders, _activeHeader.createHighlight);
+    key: "createOrGetActiveHeader",
+    value: function createOrGetActiveHeader() {
+      var layerLevel = this.layerLevel;
+      var header;
+      if (this.activeHeaders.has(layerLevel)) {
+        header = this.activeHeaders.get(layerLevel);
+      } else {
+        header = (0, _types.createHighlight)(_constants.ACTIVE_HEADER_TYPE, _objectSpread({}, this.options));
+        this.activeHeaders.set(layerLevel, header);
+      }
+      return header;
     }
 
     /**
@@ -403,55 +273,9 @@ var Highlight = /*#__PURE__*/function () {
      * @returns {Selection[]}
      */
   }, {
-    key: "getActiveColumnHeaders",
-    value: function getActiveColumnHeaders() {
-      return _toConsumableArray(this.activeColumnHeaders.values());
-    }
-
-    /**
-     * Creates (if not exist in the cache) Walkontable Selection instance created for controlling
-     * highlight cells in a row.
-     *
-     * @returns {Selection}
-     */
-  }, {
-    key: "createRowHighlight",
-    value: function createRowHighlight() {
-      return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.rowHighlights, _row.createHighlight);
-    }
-
-    /**
-     * Get all Walkontable Selection instances which describes the state of the rows highlighting.
-     *
-     * @returns {Selection[]}
-     */
-  }, {
-    key: "getRowHighlights",
-    value: function getRowHighlights() {
-      return _toConsumableArray(this.rowHighlights.values());
-    }
-
-    /**
-     * Creates (if not exist in the cache) Walkontable Selection instance created for controlling
-     * highlight cells in a column.
-     *
-     * @returns {Selection}
-     */
-  }, {
-    key: "createColumnHighlight",
-    value: function createColumnHighlight() {
-      return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.columnHighlights, _column.createHighlight);
-    }
-
-    /**
-     * Get all Walkontable Selection instances which describes the state of the columns highlighting.
-     *
-     * @returns {Selection[]}
-     */
-  }, {
-    key: "getColumnHighlights",
-    value: function getColumnHighlights() {
-      return _toConsumableArray(this.columnHighlights.values());
+    key: "getActiveHeaders",
+    value: function getActiveHeaders() {
+      return _toConsumableArray(this.activeHeaders.values());
     }
 
     /**
@@ -473,7 +297,7 @@ var Highlight = /*#__PURE__*/function () {
   }, {
     key: "addCustomSelection",
     value: function addCustomSelection(selectionInstance) {
-      this.customSelections.push((0, _customSelection.createHighlight)(_objectSpread(_objectSpread({}, this.options), selectionInstance)));
+      this.customSelections.push((0, _types.createHighlight)(_constants.CUSTOM_SELECTION_TYPE, _objectSpread(_objectSpread({}, this.options), selectionInstance)));
     }
 
     /**
@@ -482,57 +306,31 @@ var Highlight = /*#__PURE__*/function () {
   }, {
     key: "clear",
     value: function clear() {
-      this.focus.clear();
+      this.cell.clear();
       this.fill.clear();
       (0, _array.arrayEach)(this.areas.values(), function (highlight) {
         return void highlight.clear();
       });
-      (0, _array.arrayEach)(this.layeredAreas.values(), function (highlight) {
-        return void highlight.clear();
-      });
-      (0, _array.arrayEach)(this.rowHeaders.values(), function (highlight) {
-        return void highlight.clear();
-      });
-      (0, _array.arrayEach)(this.columnHeaders.values(), function (highlight) {
+      (0, _array.arrayEach)(this.headers.values(), function (highlight) {
         return void highlight.clear();
       });
-      (0, _array.arrayEach)(this.activeRowHeaders.values(), function (highlight) {
-        return void highlight.clear();
-      });
-      (0, _array.arrayEach)(this.activeColumnHeaders.values(), function (highlight) {
-        return void highlight.clear();
-      });
-      (0, _array.arrayEach)(this.rowHighlights.values(), function (highlight) {
-        return void highlight.clear();
-      });
-      (0, _array.arrayEach)(this.columnHighlights.values(), function (highlight) {
+      (0, _array.arrayEach)(this.activeHeaders.values(), function (highlight) {
         return void highlight.clear();
       });
     }
-  }, {
-    key: _Symbol$iterator,
-    value:
+
     /**
      * This object can be iterate over using `for of` syntax or using internal `arrayEach` helper.
      *
      * @returns {Selection[]}
      */
-    function value() {
-      return [this.focus, this.fill].concat(_toConsumableArray(this.areas.values()), _toConsumableArray(this.layeredAreas.values()), _toConsumableArray(this.rowHeaders.values()), _toConsumableArray(this.columnHeaders.values()), _toConsumableArray(this.activeRowHeaders.values()), _toConsumableArray(this.activeColumnHeaders.values()), _toConsumableArray(this.rowHighlights.values()), _toConsumableArray(this.columnHighlights.values()), _toConsumableArray(this.customSelections))[Symbol.iterator]();
+  }, {
+    key: _Symbol$iterator,
+    value: function value() {
+      return [this.cell, this.fill].concat(_toConsumableArray(this.areas.values()), _toConsumableArray(this.headers.values()), _toConsumableArray(this.activeHeaders.values()), _toConsumableArray(this.customSelections))[Symbol.iterator]();
     }
   }]);
   return Highlight;
-}();
-function _createHighlight2(cacheMap, highlightFactory) {
-  var layerLevel = this.layerLevel;
-  if (cacheMap.has(layerLevel)) {
-    return cacheMap.get(layerLevel);
-  }
-  var highlight = highlightFactory(_objectSpread({
-    layerLevel: layerLevel
-  }, this.options));
-  cacheMap.set(layerLevel, highlight);
-  return highlight;
-}
+}(Symbol.iterator);
 var _default = Highlight;
 exports.default = _default;