handsontable 0.0.0-next-a1e4b4f-20230628 → 0.0.0-next-e697250-20230707

package/selection/highlight/visualSelection.mjs

@@ -33,16 +33,15 @@ import { Selection } from "./../../3rdparty/walkontable/src/index.mjs";
 var VisualSelection = /*#__PURE__*/function (_Selection) {
   _inherits(VisualSelection, _Selection);
   var _super = _createSuper(VisualSelection);
-  /**
-   * Range of selection visually. Visual representation may have representation in a rendered selection.
-   *
-   * @type {null|CellRange}
-   */
-
   function VisualSelection(settings, visualCellRange) {
     var _this;
     _classCallCheck(this, VisualSelection);
     _this = _super.call(this, settings, null);
+    /**
+     * Range of selection visually. Visual representation may have representation in a rendered selection.
+     *
+     * @type {null|CellRange}
+     */
     _defineProperty(_assertThisInitialized(_this), "visualCellRange", null);
     _this.visualCellRange = visualCellRange || null;
     _this.commit();
@@ -117,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) {
@@ -189,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;
     }
 

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;
     }