handsontable 0.0.0-next-b7cca45-20230605 → 0.0.0-next-aa25cac-20230607

package/selection/highlight/types/header.mjs

@@ -15,7 +15,7 @@ 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";
-var _excluded = ["headerClassName", "rowClassName", "columnClassName"];
+var _excluded = ["headerClassName"];
 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; }
@@ -23,32 +23,23 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import { HEADER_TYPE } from "../constants.mjs";
+import { HIGHLIGHT_HEADER_TYPE } from "../../../3rdparty/walkontable/src/index.mjs";
 import VisualSelection from "../visualSelection.mjs";
 /**
- * Creates the new instance of Selection, responsible for highlighting row and column headers. This type of selection
- * can occur multiple times.
+ * Creates the new instance of Selection, responsible for highlighting column or row headers when
+ * any cell is selected.
+ * This type of selection can occur multiple times.
  *
  * @param {object} highlightParams A configuration object to create a highlight.
  * @param {string} highlightParams.headerClassName Highlighted headers' class name.
- * @param {string} highlightParams.rowClassName Highlighted row' class name.
- * @param {string} highlightParams.columnClassName Highlighted column' class name.
  * @returns {Selection}
  */
-function createHighlight(_ref) {
+export function createHighlight(_ref) {
   var headerClassName = _ref.headerClassName,
-    rowClassName = _ref.rowClassName,
-    columnClassName = _ref.columnClassName,
     restOptions = _objectWithoutProperties(_ref, _excluded);
-  var s = new VisualSelection(_objectSpread(_objectSpread({
-    className: 'highlight',
-    highlightHeaderClassName: headerClassName,
-    highlightRowClassName: rowClassName,
-    highlightColumnClassName: columnClassName
+  return new VisualSelection(_objectSpread(_objectSpread({
+    className: headerClassName
   }, restOptions), {}, {
-    highlightOnlyClosestHeader: true,
-    selectionType: HEADER_TYPE
+    selectionType: HIGHLIGHT_HEADER_TYPE
   }));
-  return s;
-}
-export default createHighlight;
+}

package/selection/highlight/types/{index.js → row.js}

@@ -1,6 +1,14 @@
 "use strict";
 
+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.object.keys.js");
+require("core-js/modules/es.array.index-of.js");
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.symbol.to-primitive.js");
+require("core-js/modules/es.date.to-primitive.js");
+require("core-js/modules/es.symbol.description.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.number.constructor.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");
@@ -11,44 +19,32 @@ require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 exports.__esModule = true;
 exports.createHighlight = createHighlight;
-require("core-js/modules/es.symbol.to-primitive.js");
-require("core-js/modules/es.date.to-primitive.js");
-require("core-js/modules/es.symbol.js");
-require("core-js/modules/es.symbol.description.js");
-require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/es.number.constructor.js");
-var _staticRegister2 = _interopRequireDefault(require("./../../../utils/staticRegister"));
-var _constants = require("../constants");
-var _activeHeader = _interopRequireDefault(require("./activeHeader"));
-var _area = _interopRequireDefault(require("./area"));
-var _cell = _interopRequireDefault(require("./cell"));
-var _customSelection = _interopRequireDefault(require("./customSelection"));
-var _fill = _interopRequireDefault(require("./fill"));
-var _header = _interopRequireDefault(require("./header"));
+var _src = require("../../../3rdparty/walkontable/src");
+var _visualSelection = _interopRequireDefault(require("../visualSelection"));
+var _excluded = ["rowClassName"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-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 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 _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); }
-var _staticRegister = (0, _staticRegister2.default)('highlight/types'),
-  register = _staticRegister.register,
-  getItem = _staticRegister.getItem;
-register(_constants.ACTIVE_HEADER_TYPE, _activeHeader.default);
-register(_constants.AREA_TYPE, _area.default);
-register(_constants.CELL_TYPE, _cell.default);
-register(_constants.CUSTOM_SELECTION_TYPE, _customSelection.default);
-register(_constants.FILL_TYPE, _fill.default);
-register(_constants.HEADER_TYPE, _header.default);
-
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 /**
- * @param {string} highlightType The selection type.
- * @param {object} options The selection options.
+ * Creates the new instance of Selection, responsible for highlighting cells in a rows and
+ * row headers.
+ * This type of selection can occur multiple times.
+ *
+ * @param {object} highlightParams A configuration object to create a highlight.
+ * @param {string} highlightParams.rowClassName Highlighted row' class name.
  * @returns {Selection}
  */
-function createHighlight(highlightType, options) {
-  return getItem(highlightType)(_objectSpread({
-    type: highlightType
-  }, options));
+function createHighlight(_ref) {
+  var rowClassName = _ref.rowClassName,
+    restOptions = _objectWithoutProperties(_ref, _excluded);
+  return new _visualSelection.default(_objectSpread(_objectSpread({
+    className: rowClassName
+  }, restOptions), {}, {
+    selectionType: _src.HIGHLIGHT_ROW_TYPE
+  }));
 }

package/selection/highlight/types/{index.mjs → row.mjs}

@@ -1,10 +1,12 @@
+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.object.keys.js";
+import "core-js/modules/es.array.index-of.js";
+import "core-js/modules/es.symbol.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.object.keys.js";
 import "core-js/modules/es.array.filter.js";
 import "core-js/modules/es.object.get-own-property-descriptor.js";
 import "core-js/modules/web.dom-collections.for-each.js";
@@ -13,38 +15,31 @@ 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); }
+var _excluded = ["rowClassName"];
 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 _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); }
-import staticRegister from "./../../../utils/staticRegister.mjs";
-import { ACTIVE_HEADER_TYPE, AREA_TYPE, CELL_TYPE, CUSTOM_SELECTION_TYPE, FILL_TYPE, HEADER_TYPE } from "../constants.mjs";
-import activeHeaderHighlight from "./activeHeader.mjs";
-import areaHighlight from "./area.mjs";
-import cellHighlight from "./cell.mjs";
-import customSelection from "./customSelection.mjs";
-import fillHighlight from "./fill.mjs";
-import headerHighlight from "./header.mjs";
-var _staticRegister = staticRegister('highlight/types'),
-  register = _staticRegister.register,
-  getItem = _staticRegister.getItem;
-register(ACTIVE_HEADER_TYPE, activeHeaderHighlight);
-register(AREA_TYPE, areaHighlight);
-register(CELL_TYPE, cellHighlight);
-register(CUSTOM_SELECTION_TYPE, customSelection);
-register(FILL_TYPE, fillHighlight);
-register(HEADER_TYPE, headerHighlight);
-
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import { HIGHLIGHT_ROW_TYPE } from "../../../3rdparty/walkontable/src/index.mjs";
+import VisualSelection from "../visualSelection.mjs";
 /**
- * @param {string} highlightType The selection type.
- * @param {object} options The selection options.
+ * Creates the new instance of Selection, responsible for highlighting cells in a rows and
+ * row headers.
+ * This type of selection can occur multiple times.
+ *
+ * @param {object} highlightParams A configuration object to create a highlight.
+ * @param {string} highlightParams.rowClassName Highlighted row' class name.
  * @returns {Selection}
  */
-function createHighlight(highlightType, options) {
-  return getItem(highlightType)(_objectSpread({
-    type: highlightType
-  }, options));
-}
-export { createHighlight };
+export function createHighlight(_ref) {
+  var rowClassName = _ref.rowClassName,
+    restOptions = _objectWithoutProperties(_ref, _excluded);
+  return new VisualSelection(_objectSpread(_objectSpread({
+    className: rowClassName
+  }, restOptions), {}, {
+    selectionType: HIGHLIGHT_ROW_TYPE
+  }));
+}

package/selection/highlight/visualSelection.js

@@ -99,10 +99,6 @@ var VisualSelection = /*#__PURE__*/function (_Selection) {
         return null;
       }
       if (visibleFromCoords.row > visibleToCoords.row || visibleFromCoords.col > visibleToCoords.col) {
-        var isHeaderTypeSelection = this.settings.type === 'header' || this.settings.type === 'active-header';
-        if (!isHeaderTypeSelection) {
-          return null;
-        }
         visibleFromCoords = from;
         visibleToCoords = to;
       }
@@ -124,13 +120,13 @@ var VisualSelection = /*#__PURE__*/function (_Selection) {
     key: "getNearestNotHiddenCoords",
     value: function getNearestNotHiddenCoords(coords, rowSearchDirection) {
       var columnSearchDirection = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : rowSearchDirection;
-      var nextVisibleRow = this.getNearestNotHiddenIndex(this.settings.rowIndexMapper(), coords.row, rowSearchDirection);
+      var nextVisibleRow = this.getNearestNotHiddenIndex(this.settings.rowIndexMapper, coords.row, rowSearchDirection);
 
       // There are no more visual rows in the range.
       if (nextVisibleRow === null) {
         return null;
       }
-      var nextVisibleColumn = this.getNearestNotHiddenIndex(this.settings.columnIndexMapper(), coords.col, columnSearchDirection);
+      var nextVisibleColumn = this.getNearestNotHiddenIndex(this.settings.columnIndexMapper, coords.col, columnSearchDirection);
 
       // There are no more visual columns in the range.
       if (nextVisibleColumn === null) {
@@ -155,12 +151,7 @@ var VisualSelection = /*#__PURE__*/function (_Selection) {
       if (visualIndex < 0) {
         return visualIndex;
       }
-      var nearestVisualIndex = indexMapper.getNearestNotHiddenIndex(visualIndex, searchDirection);
-      var isHeaderSelectionType = this.settings.type === 'header' || this.settings.type === 'active-header';
-      if (isHeaderSelectionType && nearestVisualIndex === null) {
-        return -1;
-      }
-      return nearestVisualIndex;
+      return indexMapper.getNearestNotHiddenIndex(visualIndex, searchDirection);
     }
 
     /**
@@ -201,24 +192,38 @@ var VisualSelection = /*#__PURE__*/function (_Selection) {
   }, {
     key: "syncWith",
     value: function syncWith(broaderCellRange) {
+      var coordsFrom = broaderCellRange.from.clone().normalize();
       var rowDirection = broaderCellRange.getVerticalDirection() === 'N-S' ? 1 : -1;
       var columnDirection = broaderCellRange.getHorizontalDirection() === 'W-E' ? 1 : -1;
-      var singleCellRangeVisual = this.getNearestNotHiddenCoords(broaderCellRange.from.clone().normalize(), rowDirection, columnDirection);
-      if (singleCellRangeVisual !== null && broaderCellRange.overlaps(singleCellRangeVisual)) {
-        // We can't show selection visually now, but we found fist visible range in the broader cell range.
+      var renderableHighlight = this.settings.visualToRenderableCoords(this.visualCellRange.highlight);
+      var cellCoordsVisual = null;
+      if (renderableHighlight === null || renderableHighlight.col === null || renderableHighlight.row === null) {
+        cellCoordsVisual = this.getNearestNotHiddenCoords(coordsFrom, rowDirection, columnDirection);
+      }
+      if (cellCoordsVisual !== null && broaderCellRange.overlaps(cellCoordsVisual)) {
+        var currentHighlight = broaderCellRange.highlight.clone();
+        if (currentHighlight.row >= 0) {
+          currentHighlight.row = cellCoordsVisual.row;
+        }
+        if (currentHighlight.col >= 0) {
+          currentHighlight.col = cellCoordsVisual.col;
+        }
+
+        // We can't show selection visually now, but we found first visible range in the broader cell range.
         if (this.cellRange === null) {
-          var singleCellRangeRenderable = this.settings.visualToRenderableCoords(singleCellRangeVisual);
-          this.cellRange = this.settings.createCellRange(singleCellRangeRenderable);
+          var cellCoordsRenderable = this.settings.visualToRenderableCoords(currentHighlight);
+          this.cellRange = this.settings.createCellRange(cellCoordsRenderable);
         }
 
         // We set new highlight as it might change (for example, when showing/hiding some cells from the broader selection range)
         // TODO: It is also handled by the `MergeCells` plugin while adjusting already modified coordinates. Should it?
-        broaderCellRange.setHighlight(singleCellRangeVisual);
-        return this;
+        broaderCellRange.setHighlight(currentHighlight);
       }
 
-      // Fallback to the start of the range. It resets the previous highlight (for example, when all columns have been hidden).
-      broaderCellRange.setHighlight(broaderCellRange.from);
+      // Sync the highlight coords from the visual selection layer with logical coords.
+      if (this.settings.selectionType === 'focus' && renderableHighlight !== null && cellCoordsVisual === null) {
+        broaderCellRange.setHighlight(this.visualCellRange.highlight);
+      }
       return this;
     }
 
@@ -236,11 +241,7 @@ var VisualSelection = /*#__PURE__*/function (_Selection) {
       var _this$cellRange = this.cellRange,
         from = _this$cellRange.from,
         to = _this$cellRange.to;
-      var isRowUndefined = from.row === null || to.row === null;
-      var isColumnUndefined = from.col === null || to.col === null;
-      var topLeftCorner = this.settings.createCellCoords(isRowUndefined ? null : Math.min(from.row, to.row), isColumnUndefined ? null : Math.min(from.col, to.col));
-      var bottomRightCorner = this.settings.createCellCoords(isRowUndefined ? null : Math.max(from.row, to.row), isColumnUndefined ? null : Math.max(from.col, to.col));
-      return [topLeftCorner.row, topLeftCorner.col, bottomRightCorner.row, bottomRightCorner.col];
+      return [Math.min(from.row, to.row), Math.min(from.col, to.col), Math.max(from.row, to.row), Math.max(from.col, to.col)];
     }
 
     /**
@@ -265,13 +266,16 @@ var VisualSelection = /*#__PURE__*/function (_Selection) {
      *                                      points to the beginning of the selection.
      * @param {CellCoords} visualToCoords The CellCoords object which contains coordinates that
      *                                    points to the end of the selection.
-     * @returns {CellRange}
+     * @returns {CellRange|null}
      */
   }, {
     key: "createRenderableCellRange",
     value: function createRenderableCellRange(visualFromCoords, visualToCoords) {
       var renderableFromCoords = this.settings.visualToRenderableCoords(visualFromCoords);
       var renderableToCoords = this.settings.visualToRenderableCoords(visualToCoords);
+      if (renderableFromCoords.row === null || renderableFromCoords.col === null || renderableToCoords.row === null || renderableToCoords.col === null) {
+        return null;
+      }
       return this.settings.createCellRange(renderableFromCoords, renderableFromCoords, renderableToCoords);
     }
   }]);

package/selection/highlight/visualSelection.mjs

@@ -95,10 +95,6 @@ var VisualSelection = /*#__PURE__*/function (_Selection) {
         return null;
       }
       if (visibleFromCoords.row > visibleToCoords.row || visibleFromCoords.col > visibleToCoords.col) {
-        var isHeaderTypeSelection = this.settings.type === 'header' || this.settings.type === 'active-header';
-        if (!isHeaderTypeSelection) {
-          return null;
-        }
         visibleFromCoords = from;
         visibleToCoords = to;
       }
@@ -120,13 +116,13 @@ var VisualSelection = /*#__PURE__*/function (_Selection) {
     key: "getNearestNotHiddenCoords",
     value: function getNearestNotHiddenCoords(coords, rowSearchDirection) {
       var columnSearchDirection = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : rowSearchDirection;
-      var nextVisibleRow = this.getNearestNotHiddenIndex(this.settings.rowIndexMapper(), coords.row, rowSearchDirection);
+      var nextVisibleRow = this.getNearestNotHiddenIndex(this.settings.rowIndexMapper, coords.row, rowSearchDirection);
 
       // There are no more visual rows in the range.
       if (nextVisibleRow === null) {
         return null;
       }
-      var nextVisibleColumn = this.getNearestNotHiddenIndex(this.settings.columnIndexMapper(), coords.col, columnSearchDirection);
+      var nextVisibleColumn = this.getNearestNotHiddenIndex(this.settings.columnIndexMapper, coords.col, columnSearchDirection);
 
       // There are no more visual columns in the range.
       if (nextVisibleColumn === null) {
@@ -151,12 +147,7 @@ var VisualSelection = /*#__PURE__*/function (_Selection) {
       if (visualIndex < 0) {
         return visualIndex;
       }
-      var nearestVisualIndex = indexMapper.getNearestNotHiddenIndex(visualIndex, searchDirection);
-      var isHeaderSelectionType = this.settings.type === 'header' || this.settings.type === 'active-header';
-      if (isHeaderSelectionType && nearestVisualIndex === null) {
-        return -1;
-      }
-      return nearestVisualIndex;
+      return indexMapper.getNearestNotHiddenIndex(visualIndex, searchDirection);
     }
 
     /**
@@ -197,24 +188,38 @@ var VisualSelection = /*#__PURE__*/function (_Selection) {
   }, {
     key: "syncWith",
     value: function syncWith(broaderCellRange) {
+      var coordsFrom = broaderCellRange.from.clone().normalize();
       var rowDirection = broaderCellRange.getVerticalDirection() === 'N-S' ? 1 : -1;
       var columnDirection = broaderCellRange.getHorizontalDirection() === 'W-E' ? 1 : -1;
-      var singleCellRangeVisual = this.getNearestNotHiddenCoords(broaderCellRange.from.clone().normalize(), rowDirection, columnDirection);
-      if (singleCellRangeVisual !== null && broaderCellRange.overlaps(singleCellRangeVisual)) {
-        // We can't show selection visually now, but we found fist visible range in the broader cell range.
+      var renderableHighlight = this.settings.visualToRenderableCoords(this.visualCellRange.highlight);
+      var cellCoordsVisual = null;
+      if (renderableHighlight === null || renderableHighlight.col === null || renderableHighlight.row === null) {
+        cellCoordsVisual = this.getNearestNotHiddenCoords(coordsFrom, rowDirection, columnDirection);
+      }
+      if (cellCoordsVisual !== null && broaderCellRange.overlaps(cellCoordsVisual)) {
+        var currentHighlight = broaderCellRange.highlight.clone();
+        if (currentHighlight.row >= 0) {
+          currentHighlight.row = cellCoordsVisual.row;
+        }
+        if (currentHighlight.col >= 0) {
+          currentHighlight.col = cellCoordsVisual.col;
+        }
+
+        // We can't show selection visually now, but we found first visible range in the broader cell range.
         if (this.cellRange === null) {
-          var singleCellRangeRenderable = this.settings.visualToRenderableCoords(singleCellRangeVisual);
-          this.cellRange = this.settings.createCellRange(singleCellRangeRenderable);
+          var cellCoordsRenderable = this.settings.visualToRenderableCoords(currentHighlight);
+          this.cellRange = this.settings.createCellRange(cellCoordsRenderable);
         }
 
         // We set new highlight as it might change (for example, when showing/hiding some cells from the broader selection range)
         // TODO: It is also handled by the `MergeCells` plugin while adjusting already modified coordinates. Should it?
-        broaderCellRange.setHighlight(singleCellRangeVisual);
-        return this;
+        broaderCellRange.setHighlight(currentHighlight);
       }
 
-      // Fallback to the start of the range. It resets the previous highlight (for example, when all columns have been hidden).
-      broaderCellRange.setHighlight(broaderCellRange.from);
+      // Sync the highlight coords from the visual selection layer with logical coords.
+      if (this.settings.selectionType === 'focus' && renderableHighlight !== null && cellCoordsVisual === null) {
+        broaderCellRange.setHighlight(this.visualCellRange.highlight);
+      }
       return this;
     }
 
@@ -232,11 +237,7 @@ var VisualSelection = /*#__PURE__*/function (_Selection) {
       var _this$cellRange = this.cellRange,
         from = _this$cellRange.from,
         to = _this$cellRange.to;
-      var isRowUndefined = from.row === null || to.row === null;
-      var isColumnUndefined = from.col === null || to.col === null;
-      var topLeftCorner = this.settings.createCellCoords(isRowUndefined ? null : Math.min(from.row, to.row), isColumnUndefined ? null : Math.min(from.col, to.col));
-      var bottomRightCorner = this.settings.createCellCoords(isRowUndefined ? null : Math.max(from.row, to.row), isColumnUndefined ? null : Math.max(from.col, to.col));
-      return [topLeftCorner.row, topLeftCorner.col, bottomRightCorner.row, bottomRightCorner.col];
+      return [Math.min(from.row, to.row), Math.min(from.col, to.col), Math.max(from.row, to.row), Math.max(from.col, to.col)];
     }
 
     /**
@@ -261,13 +262,16 @@ var VisualSelection = /*#__PURE__*/function (_Selection) {
      *                                      points to the beginning of the selection.
      * @param {CellCoords} visualToCoords The CellCoords object which contains coordinates that
      *                                    points to the end of the selection.
-     * @returns {CellRange}
+     * @returns {CellRange|null}
      */
   }, {
     key: "createRenderableCellRange",
     value: function createRenderableCellRange(visualFromCoords, visualToCoords) {
       var renderableFromCoords = this.settings.visualToRenderableCoords(visualFromCoords);
       var renderableToCoords = this.settings.visualToRenderableCoords(visualToCoords);
+      if (renderableFromCoords.row === null || renderableFromCoords.col === null || renderableToCoords.row === null || renderableToCoords.col === null) {
+        return null;
+      }
       return this.settings.createCellRange(renderableFromCoords, renderableFromCoords, renderableToCoords);
     }
   }]);

package/selection/index.js

@@ -5,14 +5,11 @@ require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/es.object.keys.js");
 exports.__esModule = true;
 var _exportNames = {
-  Highlight: true,
   Selection: true,
   handleMouseEvent: true,
   detectSelectionType: true,
   normalizeSelectionFactory: true
 };
-var _highlight = _interopRequireDefault(require("./highlight/highlight"));
-exports.Highlight = _highlight.default;
 var _selection = _interopRequireDefault(require("./selection"));
 exports.Selection = _selection.default;
 var _mouseEventHandler = require("./mouseEventHandler");
@@ -20,11 +17,11 @@ exports.handleMouseEvent = _mouseEventHandler.handleMouseEvent;
 var _utils = require("./utils");
 exports.detectSelectionType = _utils.detectSelectionType;
 exports.normalizeSelectionFactory = _utils.normalizeSelectionFactory;
-var _constants = require("./highlight/constants");
-Object.keys(_constants).forEach(function (key) {
+var _highlight = require("./highlight/highlight");
+Object.keys(_highlight).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _constants[key]) return;
-  exports[key] = _constants[key];
+  if (key in exports && exports[key] === _highlight[key]) return;
+  exports[key] = _highlight[key];
 });
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/selection/index.mjs

@@ -1,6 +1,5 @@
-import Highlight from "./highlight/highlight.mjs";
 import Selection from "./selection.mjs";
 import { handleMouseEvent } from "./mouseEventHandler.mjs";
 import { detectSelectionType, normalizeSelectionFactory } from "./utils.mjs";
-export * from "./highlight/constants.mjs";
-export { handleMouseEvent, Highlight, Selection, detectSelectionType, normalizeSelectionFactory };
+export * from "./highlight/highlight.mjs";
+export { handleMouseEvent, Selection, detectSelectionType, normalizeSelectionFactory };

package/selection/mouseEventHandler.js

@@ -68,7 +68,7 @@ function mouseDown(_ref) {
         selection.setRangeStart(coords);
       }
     } else if (coords.col < 0 && coords.row < 0) {
-      selection.selectAll(true, true);
+      selection.selectAll(true, true, coords);
     }
   }
 }

package/selection/mouseEventHandler.mjs

@@ -62,7 +62,7 @@ export function mouseDown(_ref) {
         selection.setRangeStart(coords);
       }
     } else if (coords.col < 0 && coords.row < 0) {
-      selection.selectAll(true, true);
+      selection.selectAll(true, true, coords);
     }
   }
 }

package/selection/range.js

@@ -98,7 +98,7 @@ var SelectionRange = /*#__PURE__*/function (_Symbol$iterator) {
   }, {
     key: "current",
     value: function current() {
-      return this.peekByIndex(0);
+      return this.peekByIndex(this.size() - 1);
     }
 
     /**
@@ -109,7 +109,7 @@ var SelectionRange = /*#__PURE__*/function (_Symbol$iterator) {
   }, {
     key: "previous",
     value: function previous() {
-      return this.peekByIndex(-1);
+      return this.peekByIndex(this.size() - 2);
     }
 
     /**
@@ -151,19 +151,19 @@ var SelectionRange = /*#__PURE__*/function (_Symbol$iterator) {
     }
 
     /**
-     * Peek the coordinates based on the offset where that coordinate resides in the collection.
+     * Peek the coordinates based on the index where that coordinate resides in the collection.
      *
-     * @param {number} [offset=0] An offset where the coordinate will be retrieved from.
+     * @param {number} [index=0] An index where the coordinate will be retrieved from. The index '0' gets the
+     * latest range.
      * @returns {CellRange|undefined}
      */
   }, {
     key: "peekByIndex",
     value: function peekByIndex() {
-      var offset = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-      var rangeIndex = this.size() + offset - 1;
+      var index = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
       var cellRange;
-      if (rangeIndex >= 0) {
-        cellRange = this.ranges[rangeIndex];
+      if (index >= 0 && index < this.size()) {
+        cellRange = this.ranges[index];
       }
       return cellRange;
     }

package/selection/range.mjs

@@ -94,7 +94,7 @@ var SelectionRange = /*#__PURE__*/function (_Symbol$iterator) {
   }, {
     key: "current",
     value: function current() {
-      return this.peekByIndex(0);
+      return this.peekByIndex(this.size() - 1);
     }
 
     /**
@@ -105,7 +105,7 @@ var SelectionRange = /*#__PURE__*/function (_Symbol$iterator) {
   }, {
     key: "previous",
     value: function previous() {
-      return this.peekByIndex(-1);
+      return this.peekByIndex(this.size() - 2);
     }
 
     /**
@@ -147,19 +147,19 @@ var SelectionRange = /*#__PURE__*/function (_Symbol$iterator) {
     }
 
     /**
-     * Peek the coordinates based on the offset where that coordinate resides in the collection.
+     * Peek the coordinates based on the index where that coordinate resides in the collection.
      *
-     * @param {number} [offset=0] An offset where the coordinate will be retrieved from.
+     * @param {number} [index=0] An index where the coordinate will be retrieved from. The index '0' gets the
+     * latest range.
      * @returns {CellRange|undefined}
      */
   }, {
     key: "peekByIndex",
     value: function peekByIndex() {
-      var offset = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-      var rangeIndex = this.size() + offset - 1;
+      var index = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
       var cellRange;
-      if (rangeIndex >= 0) {
-        cellRange = this.ranges[rangeIndex];
+      if (index >= 0 && index < this.size()) {
+        cellRange = this.ranges[index];
       }
       return cellRange;
     }