handsontable 0.0.0-next-200799f-20240311 → 0.0.0-next-bff5041-20240315

package/selection/highlight/highlight.mjs

@@ -6,7 +6,7 @@ function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollect
 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(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
+function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
 import { createHighlight as createActiveHighlight } from "./types/activeHeader.mjs";
 import { createHighlight as createAreaLayeredHighlight } from "./types/areaLayered.mjs";
 import { createHighlight as createAreaHighlight } from "./types/area.mjs";
@@ -35,7 +35,7 @@ export { HIGHLIGHT_ACTIVE_HEADER_TYPE as ACTIVE_HEADER_TYPE, HIGHLIGHT_AREA_TYPE
  * @class Highlight
  * @util
  */
-var _createHighlight = /*#__PURE__*/new WeakSet();
+var _Highlight_brand = /*#__PURE__*/new WeakSet();
 _Symbol$iterator = Symbol.iterator;
 class Highlight {
   constructor(options) {
@@ -46,7 +46,7 @@ class Highlight {
      * @param {Function} highlightFactory The function factory.
      * @returns {VisualSelection}
      */
-    _classPrivateMethodInitSpec(this, _createHighlight);
+    _classPrivateMethodInitSpec(this, _Highlight_brand);
     /**
      * Options consumed by Highlight class and Walkontable Selection classes.
      *
@@ -214,7 +214,7 @@ class Highlight {
    * @returns {Selection}
    */
   createLayeredArea() {
-    return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.layeredAreas, createAreaLayeredHighlight);
+    return _assertClassBrand(_Highlight_brand, this, _createHighlight).call(this, this.layeredAreas, createAreaLayeredHighlight);
   }
 
   /**
@@ -233,7 +233,7 @@ class Highlight {
    * @returns {Selection}
    */
   createArea() {
-    return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.areas, createAreaHighlight);
+    return _assertClassBrand(_Highlight_brand, this, _createHighlight).call(this, this.areas, createAreaHighlight);
   }
 
   /**
@@ -252,7 +252,7 @@ class Highlight {
    * @returns {Selection}
    */
   createRowHeader() {
-    return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.rowHeaders, createHeaderHighlight);
+    return _assertClassBrand(_Highlight_brand, this, _createHighlight).call(this, this.rowHeaders, createHeaderHighlight);
   }
 
   /**
@@ -271,7 +271,7 @@ class Highlight {
    * @returns {Selection}
    */
   createColumnHeader() {
-    return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.columnHeaders, createHeaderHighlight);
+    return _assertClassBrand(_Highlight_brand, this, _createHighlight).call(this, this.columnHeaders, createHeaderHighlight);
   }
 
   /**
@@ -290,7 +290,7 @@ class Highlight {
    * @returns {Selection}
    */
   createActiveRowHeader() {
-    return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.activeRowHeaders, createActiveHighlight);
+    return _assertClassBrand(_Highlight_brand, this, _createHighlight).call(this, this.activeRowHeaders, createActiveHighlight);
   }
 
   /**
@@ -309,7 +309,7 @@ class Highlight {
    * @returns {Selection}
    */
   createActiveColumnHeader() {
-    return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.activeColumnHeaders, createActiveHighlight);
+    return _assertClassBrand(_Highlight_brand, this, _createHighlight).call(this, this.activeColumnHeaders, createActiveHighlight);
   }
 
   /**
@@ -328,7 +328,7 @@ class Highlight {
    * @returns {Selection}
    */
   createActiveCornerHeader() {
-    return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.activeCornerHeaders, createActiveHighlight);
+    return _assertClassBrand(_Highlight_brand, this, _createHighlight).call(this, this.activeCornerHeaders, createActiveHighlight);
   }
 
   /**
@@ -347,7 +347,7 @@ class Highlight {
    * @returns {Selection}
    */
   createRowHighlight() {
-    return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.rowHighlights, createRowHighlight);
+    return _assertClassBrand(_Highlight_brand, this, _createHighlight).call(this, this.rowHighlights, createRowHighlight);
   }
 
   /**
@@ -366,7 +366,7 @@ class Highlight {
    * @returns {Selection}
    */
   createColumnHighlight() {
-    return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.columnHighlights, createColumnHighlight);
+    return _assertClassBrand(_Highlight_brand, this, _createHighlight).call(this, this.columnHighlights, createColumnHighlight);
   }
 
   /**
@@ -424,7 +424,7 @@ class Highlight {
     return [this.focus, this.fill, ...this.areas.values(), ...this.layeredAreas.values(), ...this.rowHeaders.values(), ...this.columnHeaders.values(), ...this.activeRowHeaders.values(), ...this.activeColumnHeaders.values(), ...this.activeCornerHeaders.values(), ...this.rowHighlights.values(), ...this.columnHighlights.values(), ...this.customSelections][Symbol.iterator]();
   }
 }
-function _createHighlight2(cacheMap, highlightFactory) {
+function _createHighlight(cacheMap, highlightFactory) {
   const layerLevel = this.layerLevel;
   if (cacheMap.has(layerLevel)) {
     return cacheMap.get(layerLevel);

package/selection/highlight/visualSelection.js

@@ -147,25 +147,13 @@ class VisualSelection extends _src.Selection {
    * @returns {VisualSelection}
    */
   syncWith(broaderCellRange) {
-    const highlight = this.visualCellRange.highlight.clone().normalize();
+    const coordsFrom = broaderCellRange.from.clone().normalize();
     const rowDirection = broaderCellRange.getVerticalDirection() === 'N-S' ? 1 : -1;
     const columnDirection = broaderCellRange.getHorizontalDirection() === 'W-E' ? 1 : -1;
     const renderableHighlight = this.settings.visualToRenderableCoords(this.visualCellRange.highlight);
     let cellCoordsVisual = null;
     if (renderableHighlight === null || renderableHighlight.col === null || renderableHighlight.row === null) {
-      const topStartCorder = broaderCellRange.getTopStartCorner();
-      const bottomEndCorner = broaderCellRange.getBottomEndCorner();
-      let nextVisibleRow = this.settings.rowIndexMapper.getNearestNotHiddenIndex(highlight.row, rowDirection);
-      if (nextVisibleRow === null || rowDirection === 1 && nextVisibleRow > bottomEndCorner.row || rowDirection === -1 && nextVisibleRow < topStartCorder.row) {
-        nextVisibleRow = this.settings.rowIndexMapper.getNearestNotHiddenIndex(highlight.row, -rowDirection);
-      }
-      let nextVisibleColumn = this.settings.columnIndexMapper.getNearestNotHiddenIndex(highlight.col, columnDirection);
-      if (nextVisibleColumn === null || columnDirection === 1 && nextVisibleColumn > bottomEndCorner.col || columnDirection === -1 && nextVisibleColumn < topStartCorder.col) {
-        nextVisibleColumn = this.settings.columnIndexMapper.getNearestNotHiddenIndex(highlight.col, -columnDirection);
-      }
-      if (nextVisibleRow !== null && nextVisibleColumn !== null) {
-        cellCoordsVisual = this.settings.createCellCoords(nextVisibleRow, nextVisibleColumn);
-      }
+      cellCoordsVisual = this.getNearestNotHiddenCoords(coordsFrom, rowDirection, columnDirection);
     }
     if (cellCoordsVisual !== null && broaderCellRange.overlaps(cellCoordsVisual)) {
       const currentHighlight = broaderCellRange.highlight.clone();
@@ -182,13 +170,11 @@ class VisualSelection extends _src.Selection {
         this.cellRange = this.settings.createCellRange(cellCoordsRenderable);
       }
 
-      // TODO
       // 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(currentHighlight);
     }
 
-    // TODO
     // 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);

package/selection/highlight/visualSelection.mjs

@@ -144,25 +144,13 @@ class VisualSelection extends Selection {
    * @returns {VisualSelection}
    */
   syncWith(broaderCellRange) {
-    const highlight = this.visualCellRange.highlight.clone().normalize();
+    const coordsFrom = broaderCellRange.from.clone().normalize();
     const rowDirection = broaderCellRange.getVerticalDirection() === 'N-S' ? 1 : -1;
     const columnDirection = broaderCellRange.getHorizontalDirection() === 'W-E' ? 1 : -1;
     const renderableHighlight = this.settings.visualToRenderableCoords(this.visualCellRange.highlight);
     let cellCoordsVisual = null;
     if (renderableHighlight === null || renderableHighlight.col === null || renderableHighlight.row === null) {
-      const topStartCorder = broaderCellRange.getTopStartCorner();
-      const bottomEndCorner = broaderCellRange.getBottomEndCorner();
-      let nextVisibleRow = this.settings.rowIndexMapper.getNearestNotHiddenIndex(highlight.row, rowDirection);
-      if (nextVisibleRow === null || rowDirection === 1 && nextVisibleRow > bottomEndCorner.row || rowDirection === -1 && nextVisibleRow < topStartCorder.row) {
-        nextVisibleRow = this.settings.rowIndexMapper.getNearestNotHiddenIndex(highlight.row, -rowDirection);
-      }
-      let nextVisibleColumn = this.settings.columnIndexMapper.getNearestNotHiddenIndex(highlight.col, columnDirection);
-      if (nextVisibleColumn === null || columnDirection === 1 && nextVisibleColumn > bottomEndCorner.col || columnDirection === -1 && nextVisibleColumn < topStartCorder.col) {
-        nextVisibleColumn = this.settings.columnIndexMapper.getNearestNotHiddenIndex(highlight.col, -columnDirection);
-      }
-      if (nextVisibleRow !== null && nextVisibleColumn !== null) {
-        cellCoordsVisual = this.settings.createCellCoords(nextVisibleRow, nextVisibleColumn);
-      }
+      cellCoordsVisual = this.getNearestNotHiddenCoords(coordsFrom, rowDirection, columnDirection);
     }
     if (cellCoordsVisual !== null && broaderCellRange.overlaps(cellCoordsVisual)) {
       const currentHighlight = broaderCellRange.highlight.clone();
@@ -179,13 +167,11 @@ class VisualSelection extends Selection {
         this.cellRange = this.settings.createCellRange(cellCoordsRenderable);
       }
 
-      // TODO
       // 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(currentHighlight);
     }
 
-    // TODO
     // 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);