handsontable 0.0.0-next-221e46b-20240307 → 0.0.0-next-2becb78-20240313

package/plugins/multiColumnSorting/multiColumnSorting.js

@@ -9,6 +9,7 @@ var _element = require("../../helpers/dom/element");
 var _rootComparator = require("./rootComparator");
 var _utils2 = require("./utils");
 var _domHelpers = require("./domHelpers");
+var _shortcutContexts = require("../../shortcutContexts");
 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); }
@@ -130,12 +131,17 @@ class MultiColumnSorting extends _columnSorting.ColumnSorting {
         if (highlight.row === -1 && highlight.col >= 0) {
           this.sort(this.getNextSortConfig(highlight.col, _columnSorting.APPEND_COLUMN_CONFIG_STRATEGY));
         }
+
+        // prevent default Enter behavior (move to the next row within a selection range)
+        return false;
       },
       runOnlyIf: () => {
         var _this$hot$getSelected;
         const highlight = (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
         return highlight && this.hot.selection.isCellVisible(highlight) && highlight.isHeader();
       },
+      relativeToGroup: _shortcutContexts.EDITOR_EDIT_GROUP,
+      position: 'before',
       group: SHORTCUTS_GROUP
     });
   }

package/plugins/multiColumnSorting/multiColumnSorting.mjs

@@ -9,6 +9,7 @@ import { addClass, removeClass } from "../../helpers/dom/element.mjs";
 import { rootComparator } from "./rootComparator.mjs";
 import { warnAboutPluginsConflict } from "./utils.mjs";
 import { getClassesToAdd, getClassesToRemove } from "./domHelpers.mjs";
+import { EDITOR_EDIT_GROUP as SHORTCUTS_GROUP_EDITOR } from "../../shortcutContexts/index.mjs";
 export const PLUGIN_KEY = 'multiColumnSorting';
 export const PLUGIN_PRIORITY = 170;
 const CONFLICTED_PLUGIN_KEY = 'columnSorting';
@@ -127,12 +128,17 @@ export class MultiColumnSorting extends ColumnSorting {
         if (highlight.row === -1 && highlight.col >= 0) {
           this.sort(this.getNextSortConfig(highlight.col, APPEND_COLUMN_CONFIG_STRATEGY));
         }
+
+        // prevent default Enter behavior (move to the next row within a selection range)
+        return false;
       },
       runOnlyIf: () => {
         var _this$hot$getSelected;
         const highlight = (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
         return highlight && this.hot.selection.isCellVisible(highlight) && highlight.isHeader();
       },
+      relativeToGroup: SHORTCUTS_GROUP_EDITOR,
+      position: 'before',
       group: SHORTCUTS_GROUP
     });
   }

package/plugins/nestedHeaders/nestedHeaders.js

@@ -364,6 +364,7 @@ class NestedHeaders extends _base.BasePlugin {
       return _classPrivateMethodGet(_this, _onModifyTransformStart, _onModifyTransformStart2).call(_this, ...args);
     });
     this.addHook('afterSelection', () => _classPrivateMethodGet(this, _updateFocusHighlightPosition, _updateFocusHighlightPosition2).call(this));
+    this.addHook('afterSelectionFocusSet', () => _classPrivateMethodGet(this, _updateFocusHighlightPosition, _updateFocusHighlightPosition2).call(this));
     this.addHook('beforeViewportScrollHorizontally', function () {
       for (var _len8 = arguments.length, args = new Array(_len8), _key8 = 0; _key8 < _len8; _key8++) {
         args[_key8] = arguments[_key8];

package/plugins/nestedHeaders/nestedHeaders.mjs

@@ -360,6 +360,7 @@ export class NestedHeaders extends BasePlugin {
       return _classPrivateMethodGet(_this, _onModifyTransformStart, _onModifyTransformStart2).call(_this, ...args);
     });
     this.addHook('afterSelection', () => _classPrivateMethodGet(this, _updateFocusHighlightPosition, _updateFocusHighlightPosition2).call(this));
+    this.addHook('afterSelectionFocusSet', () => _classPrivateMethodGet(this, _updateFocusHighlightPosition, _updateFocusHighlightPosition2).call(this));
     this.addHook('beforeViewportScrollHorizontally', function () {
       for (var _len8 = arguments.length, args = new Array(_len8), _key8 = 0; _key8 < _len8; _key8++) {
         args[_key8] = arguments[_key8];

package/plugins/nestedRows/nestedRows.js

@@ -11,6 +11,7 @@ var _contextMenu = _interopRequireDefault(require("./ui/contextMenu"));
 var _console = require("../../helpers/console");
 var _data = require("../../helpers/data");
 var _translations = require("../../translations");
+var _shortcutContexts = require("../../shortcutContexts");
 var _rowMoveController = _interopRequireDefault(require("./utils/rowMoveController"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
@@ -400,13 +401,18 @@ class NestedRows extends _base.BasePlugin {
             this.collapsingUI.collapseChildren(row);
           }
         }
+
+        // prevent default Enter behavior (move to the next row within a selection range)
+        return false;
       },
       runOnlyIf: () => {
         var _this$hot$getSelected;
         const highlight = (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
         return highlight && this.hot.selection.isCellVisible(highlight) && highlight.isHeader();
       },
-      group: SHORTCUTS_GROUP
+      group: SHORTCUTS_GROUP,
+      relativeToGroup: _shortcutContexts.EDITOR_EDIT_GROUP,
+      position: 'before'
     });
   }
 

package/plugins/nestedRows/nestedRows.mjs

@@ -20,6 +20,7 @@ import ContextMenuUI from "./ui/contextMenu.mjs";
 import { error } from "../../helpers/console.mjs";
 import { isArrayOfObjects } from "../../helpers/data.mjs";
 import { TrimmingMap } from "../../translations/index.mjs";
+import { EDITOR_EDIT_GROUP as SHORTCUTS_GROUP_EDITOR } from "../../shortcutContexts/index.mjs";
 import RowMoveController from "./utils/rowMoveController.mjs";
 export const PLUGIN_KEY = 'nestedRows';
 export const PLUGIN_PRIORITY = 300;
@@ -396,13 +397,18 @@ export class NestedRows extends BasePlugin {
             this.collapsingUI.collapseChildren(row);
           }
         }
+
+        // prevent default Enter behavior (move to the next row within a selection range)
+        return false;
       },
       runOnlyIf: () => {
         var _this$hot$getSelected;
         const highlight = (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
         return highlight && this.hot.selection.isCellVisible(highlight) && highlight.isHeader();
       },
-      group: SHORTCUTS_GROUP
+      group: SHORTCUTS_GROUP,
+      relativeToGroup: SHORTCUTS_GROUP_EDITOR,
+      position: 'before'
     });
   }
 

package/renderers/checkboxRenderer/checkboxRenderer.js

@@ -139,7 +139,9 @@ function checkboxRenderer(hotInstance, TD, row, col, prop, value, cellProperties
     const shortcutManager = hotInstance.getShortcutManager();
     const gridContext = shortcutManager.getContext('grid');
     const config = {
-      group: SHORTCUTS_GROUP
+      group: SHORTCUTS_GROUP,
+      relativeToGroup: _shortcutContexts.EDITOR_EDIT_GROUP,
+      position: 'before'
     };
     gridContext.addShortcuts([{
       keys: [['space']],
@@ -153,15 +155,16 @@ function checkboxRenderer(hotInstance, TD, row, col, prop, value, cellProperties
         changeSelectedCheckboxesState();
         return !areSelectedCheckboxCells(); // False blocks next action associated with the keyboard shortcut.
       },
-      runOnlyIf: () => hotInstance.getSettings().enterBeginsEditing
+      runOnlyIf: () => {
+        var _hotInstance$getSelec;
+        return hotInstance.getSettings().enterBeginsEditing && ((_hotInstance$getSelec = hotInstance.getSelectedRangeLast()) === null || _hotInstance$getSelec === void 0 ? void 0 : _hotInstance$getSelec.isSingle());
+      }
     }, {
       keys: [['delete'], ['backspace']],
       callback: () => {
         changeSelectedCheckboxesState(true);
         return !areSelectedCheckboxCells(); // False blocks next action associated with the keyboard shortcut.
-      },
-      relativeToGroup: _shortcutContexts.EDITOR_EDIT_GROUP,
-      position: 'before'
+      }
     }], config);
   }
 

package/renderers/checkboxRenderer/checkboxRenderer.mjs

@@ -134,7 +134,9 @@ export function checkboxRenderer(hotInstance, TD, row, col, prop, value, cellPro
     const shortcutManager = hotInstance.getShortcutManager();
     const gridContext = shortcutManager.getContext('grid');
     const config = {
-      group: SHORTCUTS_GROUP
+      group: SHORTCUTS_GROUP,
+      relativeToGroup: SHORTCUTS_GROUP_EDITOR,
+      position: 'before'
     };
     gridContext.addShortcuts([{
       keys: [['space']],
@@ -148,15 +150,16 @@ export function checkboxRenderer(hotInstance, TD, row, col, prop, value, cellPro
         changeSelectedCheckboxesState();
         return !areSelectedCheckboxCells(); // False blocks next action associated with the keyboard shortcut.
       },
-      runOnlyIf: () => hotInstance.getSettings().enterBeginsEditing
+      runOnlyIf: () => {
+        var _hotInstance$getSelec;
+        return hotInstance.getSettings().enterBeginsEditing && ((_hotInstance$getSelec = hotInstance.getSelectedRangeLast()) === null || _hotInstance$getSelec === void 0 ? void 0 : _hotInstance$getSelec.isSingle());
+      }
     }, {
       keys: [['delete'], ['backspace']],
       callback: () => {
         changeSelectedCheckboxesState(true);
         return !areSelectedCheckboxCells(); // False blocks next action associated with the keyboard shortcut.
-      },
-      relativeToGroup: SHORTCUTS_GROUP_EDITOR,
-      position: 'before'
+      }
     }], config);
   }
 

package/selection/highlight/visualSelection.js

@@ -147,13 +147,25 @@ class VisualSelection extends _src.Selection {
    * @returns {VisualSelection}
    */
   syncWith(broaderCellRange) {
-    const coordsFrom = broaderCellRange.from.clone().normalize();
+    const highlight = this.visualCellRange.highlight.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) {
-      cellCoordsVisual = this.getNearestNotHiddenCoords(coordsFrom, rowDirection, columnDirection);
+      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);
+      }
     }
     if (cellCoordsVisual !== null && broaderCellRange.overlaps(cellCoordsVisual)) {
       const currentHighlight = broaderCellRange.highlight.clone();
@@ -170,11 +182,13 @@ 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,13 +144,25 @@ class VisualSelection extends Selection {
    * @returns {VisualSelection}
    */
   syncWith(broaderCellRange) {
-    const coordsFrom = broaderCellRange.from.clone().normalize();
+    const highlight = this.visualCellRange.highlight.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) {
-      cellCoordsVisual = this.getNearestNotHiddenCoords(coordsFrom, rowDirection, columnDirection);
+      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);
+      }
     }
     if (cellCoordsVisual !== null && broaderCellRange.overlaps(cellCoordsVisual)) {
       const currentHighlight = broaderCellRange.highlight.clone();
@@ -167,11 +179,13 @@ 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);