handsontable 0.0.0-next-b66c79f-20230713 → 0.0.0-next-08765b9-20230714

package/selection/highlight/visualSelection.mjs

@@ -1,13 +1,17 @@
+import "core-js/modules/es.error.cause.js";
+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 { Selection } from "./../../3rdparty/walkontable/src/index.mjs";
 class VisualSelection extends Selection {
-  /**
-   * Range of selection visually. Visual representation may have representation in a rendered selection.
-   *
-   * @type {null|CellRange}
-   */
-  visualCellRange = null;
   constructor(settings, visualCellRange) {
     super(settings, null);
+    /**
+     * Range of selection visually. Visual representation may have representation in a rendered selection.
+     *
+     * @type {null|CellRange}
+     */
+    _defineProperty(this, "visualCellRange", null);
     this.visualCellRange = visualCellRange || null;
     this.commit();
   }
@@ -55,10 +59,6 @@ class VisualSelection extends Selection {
       return null;
     }
     if (visibleFromCoords.row > visibleToCoords.row || visibleFromCoords.col > visibleToCoords.col) {
-      const isHeaderTypeSelection = this.settings.type === 'header' || this.settings.type === 'active-header';
-      if (!isHeaderTypeSelection) {
-        return null;
-      }
       visibleFromCoords = from;
       visibleToCoords = to;
     }
@@ -78,13 +78,13 @@ class VisualSelection extends Selection {
    */
   getNearestNotHiddenCoords(coords, rowSearchDirection) {
     let columnSearchDirection = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : rowSearchDirection;
-    const nextVisibleRow = this.getNearestNotHiddenIndex(this.settings.rowIndexMapper(), coords.row, rowSearchDirection);
+    const nextVisibleRow = this.getNearestNotHiddenIndex(this.settings.rowIndexMapper, coords.row, rowSearchDirection);
 
     // There are no more visual rows in the range.
     if (nextVisibleRow === null) {
       return null;
     }
-    const nextVisibleColumn = this.getNearestNotHiddenIndex(this.settings.columnIndexMapper(), coords.col, columnSearchDirection);
+    const nextVisibleColumn = this.getNearestNotHiddenIndex(this.settings.columnIndexMapper, coords.col, columnSearchDirection);
 
     // There are no more visual columns in the range.
     if (nextVisibleColumn === null) {
@@ -107,12 +107,7 @@ class VisualSelection extends Selection {
     if (visualIndex < 0) {
       return visualIndex;
     }
-    const nearestVisualIndex = indexMapper.getNearestNotHiddenIndex(visualIndex, searchDirection);
-    const isHeaderSelectionType = this.settings.type === 'header' || this.settings.type === 'active-header';
-    if (isHeaderSelectionType && nearestVisualIndex === null) {
-      return -1;
-    }
-    return nearestVisualIndex;
+    return indexMapper.getNearestNotHiddenIndex(visualIndex, searchDirection);
   }
 
   /**
@@ -149,24 +144,38 @@ class VisualSelection extends Selection {
    * @returns {VisualSelection}
    */
   syncWith(broaderCellRange) {
+    const coordsFrom = broaderCellRange.from.clone().normalize();
     const rowDirection = broaderCellRange.getVerticalDirection() === 'N-S' ? 1 : -1;
     const columnDirection = broaderCellRange.getHorizontalDirection() === 'W-E' ? 1 : -1;
-    const 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.
+    const renderableHighlight = this.settings.visualToRenderableCoords(this.visualCellRange.highlight);
+    let cellCoordsVisual = null;
+    if (renderableHighlight === null || renderableHighlight.col === null || renderableHighlight.row === null) {
+      cellCoordsVisual = this.getNearestNotHiddenCoords(coordsFrom, rowDirection, columnDirection);
+    }
+    if (cellCoordsVisual !== null && broaderCellRange.overlaps(cellCoordsVisual)) {
+      const 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) {
-        const singleCellRangeRenderable = this.settings.visualToRenderableCoords(singleCellRangeVisual);
-        this.cellRange = this.settings.createCellRange(singleCellRangeRenderable);
+        const 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;
   }
 
@@ -183,11 +192,7 @@ class VisualSelection extends Selection {
       from,
       to
     } = this.cellRange;
-    const isRowUndefined = from.row === null || to.row === null;
-    const isColumnUndefined = from.col === null || to.col === null;
-    const topLeftCorner = this.settings.createCellCoords(isRowUndefined ? null : Math.min(from.row, to.row), isColumnUndefined ? null : Math.min(from.col, to.col));
-    const 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)];
   }
 
   /**
@@ -210,11 +215,14 @@ class VisualSelection extends 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}
    */
   createRenderableCellRange(visualFromCoords, visualToCoords) {
     const renderableFromCoords = this.settings.visualToRenderableCoords(visualFromCoords);
     const 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

@@ -2,14 +2,11 @@
 
 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");
@@ -17,11 +14,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

@@ -65,7 +65,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

@@ -59,7 +59,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

@@ -69,7 +69,7 @@ class SelectionRange {
    * @returns {CellRange|undefined}
    */
   current() {
-    return this.peekByIndex(0);
+    return this.peekByIndex(this.size() - 1);
   }
 
   /**
@@ -78,7 +78,7 @@ class SelectionRange {
    * @returns {CellRange|undefined}
    */
   previous() {
-    return this.peekByIndex(-1);
+    return this.peekByIndex(this.size() - 2);
   }
 
   /**
@@ -112,17 +112,17 @@ class SelectionRange {
   }
 
   /**
-   * 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}
    */
   peekByIndex() {
-    let offset = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-    const rangeIndex = this.size() + offset - 1;
+    let index = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
     let cellRange;
-    if (rangeIndex >= 0) {
-      cellRange = this.ranges[rangeIndex];
+    if (index >= 0 && index < this.size()) {
+      cellRange = this.ranges[index];
     }
     return cellRange;
   }

package/selection/range.mjs

@@ -66,7 +66,7 @@ class SelectionRange {
    * @returns {CellRange|undefined}
    */
   current() {
-    return this.peekByIndex(0);
+    return this.peekByIndex(this.size() - 1);
   }
 
   /**
@@ -75,7 +75,7 @@ class SelectionRange {
    * @returns {CellRange|undefined}
    */
   previous() {
-    return this.peekByIndex(-1);
+    return this.peekByIndex(this.size() - 2);
   }
 
   /**
@@ -109,17 +109,17 @@ class SelectionRange {
   }
 
   /**
-   * 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}
    */
   peekByIndex() {
-    let offset = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-    const rangeIndex = this.size() + offset - 1;
+    let index = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
     let cellRange;
-    if (rangeIndex >= 0) {
-      cellRange = this.ranges[rangeIndex];
+    if (index >= 0 && index < this.size()) {
+      cellRange = this.ranges[index];
     }
     return cellRange;
   }