handsontable 0.0.0-next-85c3085-20230713 → 0.0.0-next-08765b9-20230714

package/plugins/filters/filters.js

@@ -27,6 +27,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const PLUGIN_KEY = 'filters';
 exports.PLUGIN_KEY = PLUGIN_KEY;
 const PLUGIN_PRIORITY = 250;
+exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
+const SHORTCUTS_GROUP = PLUGIN_KEY;
 
 /**
  * @plugin Filters
@@ -63,7 +65,6 @@ const PLUGIN_PRIORITY = 250;
  * ```
  * :::
  */
-exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
 class Filters extends _base.BasePlugin {
   static get PLUGIN_KEY() {
     return PLUGIN_KEY;
@@ -210,6 +211,7 @@ class Filters extends _base.BasePlugin {
       this.dropdownMenuPlugin.disablePlugin();
       this.dropdownMenuPlugin.enablePlugin();
     }
+    this.registerShortcuts();
     super.enablePlugin();
   }
 
@@ -230,9 +232,36 @@ class Filters extends _base.BasePlugin {
       this.conditionCollection = null;
       this.hot.rowIndexMapper.unregisterMap(this.pluginName);
     }
+    this.unregisterShortcuts();
     super.disablePlugin();
   }
 
+  /**
+   * Register shortcuts responsible for clearing the filters.
+   *
+   * @private
+   */
+  registerShortcuts() {
+    this.hot.getShortcutManager().getContext('grid').addShortcut({
+      keys: [['Alt', 'A']],
+      stopPropagation: true,
+      callback: () => {
+        this.clearConditions();
+        this.filter();
+      },
+      group: SHORTCUTS_GROUP
+    });
+  }
+
+  /**
+   * Unregister shortcuts responsible for clearing the filters.
+   *
+   * @private
+   */
+  unregisterShortcuts() {
+    this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
+  }
+
   /* eslint-disable jsdoc/require-description-complete-sentence */
   /**
    * @memberof Filters#
@@ -422,7 +451,6 @@ class Filters extends _base.BasePlugin {
     this.hot.runHooks('afterFilter', conditions);
     this.hot.view.adjustElementsSize(true);
     this.hot.render();
-    this.clearColumnSelection();
   }
 
   /**
@@ -444,18 +472,6 @@ class Filters extends _base.BasePlugin {
     };
   }
 
-  /**
-   * Clears column selection.
-   *
-   * @private
-   */
-  clearColumnSelection() {
-    const selectedColumn = this.getSelectedColumn();
-    if (selectedColumn !== null) {
-      this.hot.selectCell(0, selectedColumn.visualIndex);
-    }
-  }
-
   /**
    * Returns handsontable source data with cell meta based on current selection.
    *
@@ -655,6 +671,7 @@ class Filters extends _base.BasePlugin {
       this.components.forEach(component => component.saveState(physicalIndex));
       this.filtersRowsMap.clear();
       this.filter();
+      this.hot.selectCell(0, selectedColumn.visualIndex);
     }
     (_this$dropdownMenuPlu3 = this.dropdownMenuPlugin) === null || _this$dropdownMenuPlu3 === void 0 ? void 0 : _this$dropdownMenuPlu3.close();
   }

package/plugins/filters/filters.mjs

@@ -20,6 +20,7 @@ import { CONDITION_NONE, CONDITION_BY_VALUE, OPERATION_AND, OPERATION_OR, OPERAT
 import { TrimmingMap } from "../../translations/index.mjs";
 export const PLUGIN_KEY = 'filters';
 export const PLUGIN_PRIORITY = 250;
+const SHORTCUTS_GROUP = PLUGIN_KEY;
 
 /**
  * @plugin Filters
@@ -202,6 +203,7 @@ export class Filters extends BasePlugin {
       this.dropdownMenuPlugin.disablePlugin();
       this.dropdownMenuPlugin.enablePlugin();
     }
+    this.registerShortcuts();
     super.enablePlugin();
   }
 
@@ -222,9 +224,36 @@ export class Filters extends BasePlugin {
       this.conditionCollection = null;
       this.hot.rowIndexMapper.unregisterMap(this.pluginName);
     }
+    this.unregisterShortcuts();
     super.disablePlugin();
   }
 
+  /**
+   * Register shortcuts responsible for clearing the filters.
+   *
+   * @private
+   */
+  registerShortcuts() {
+    this.hot.getShortcutManager().getContext('grid').addShortcut({
+      keys: [['Alt', 'A']],
+      stopPropagation: true,
+      callback: () => {
+        this.clearConditions();
+        this.filter();
+      },
+      group: SHORTCUTS_GROUP
+    });
+  }
+
+  /**
+   * Unregister shortcuts responsible for clearing the filters.
+   *
+   * @private
+   */
+  unregisterShortcuts() {
+    this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
+  }
+
   /* eslint-disable jsdoc/require-description-complete-sentence */
   /**
    * @memberof Filters#
@@ -414,7 +443,6 @@ export class Filters extends BasePlugin {
     this.hot.runHooks('afterFilter', conditions);
     this.hot.view.adjustElementsSize(true);
     this.hot.render();
-    this.clearColumnSelection();
   }
 
   /**
@@ -436,18 +464,6 @@ export class Filters extends BasePlugin {
     };
   }
 
-  /**
-   * Clears column selection.
-   *
-   * @private
-   */
-  clearColumnSelection() {
-    const selectedColumn = this.getSelectedColumn();
-    if (selectedColumn !== null) {
-      this.hot.selectCell(0, selectedColumn.visualIndex);
-    }
-  }
-
   /**
    * Returns handsontable source data with cell meta based on current selection.
    *
@@ -647,6 +663,7 @@ export class Filters extends BasePlugin {
       this.components.forEach(component => component.saveState(physicalIndex));
       this.filtersRowsMap.clear();
       this.filter();
+      this.hot.selectCell(0, selectedColumn.visualIndex);
     }
     (_this$dropdownMenuPlu3 = this.dropdownMenuPlugin) === null || _this$dropdownMenuPlu3 === void 0 ? void 0 : _this$dropdownMenuPlu3.close();
   }

package/plugins/mergeCells/mergeCells.js

@@ -188,9 +188,6 @@ class MergeCells extends _base.BasePlugin {
     this.addHook('afterDrawSelection', function () {
       return _this.onAfterDrawSelection(...arguments);
     });
-    this.addHook('beforeRemoveCellClassNames', function () {
-      return _this.onBeforeRemoveCellClassNames(...arguments);
-    });
     this.addHook('beforeUndoStackChange', (action, source) => {
       if (source === 'MergeCells') {
         return false;
@@ -574,8 +571,11 @@ class MergeCells extends _base.BasePlugin {
     gridContext.addShortcut({
       keys: [['Control', 'm']],
       callback: () => {
-        this.toggleMerge(this.hot.getSelectedRangeLast());
-        this.hot.render();
+        const range = this.hot.getSelectedRangeLast();
+        if (range && !range.isSingleHeader()) {
+          this.toggleMerge(range);
+          this.hot.render();
+        }
       },
       runOnlyIf: event => !event.altKey,
       // right ALT in some systems triggers ALT+CTRL
@@ -1198,16 +1198,5 @@ class MergeCells extends _base.BasePlugin {
     }
     return this.selectionCalculations.getSelectedMergedCellClassName(currentRow, currentColumn, cornersOfSelection, layerLevel);
   }
-
-  /**
-   * `beforeRemoveCellClassNames` hook callback. Used to remove additional class name from all cells in the table.
-   *
-   * @private
-   * @returns {string[]} An `Array` of `String`s. Each of these strings will act like class names to be removed from
-   *   all the cells in the table.
-   */
-  onBeforeRemoveCellClassNames() {
-    return this.selectionCalculations.getSelectedMergedCellClassNameToRemove();
-  }
 }
 exports.MergeCells = MergeCells;

package/plugins/mergeCells/mergeCells.mjs

@@ -182,9 +182,6 @@ export class MergeCells extends BasePlugin {
     this.addHook('afterDrawSelection', function () {
       return _this.onAfterDrawSelection(...arguments);
     });
-    this.addHook('beforeRemoveCellClassNames', function () {
-      return _this.onBeforeRemoveCellClassNames(...arguments);
-    });
     this.addHook('beforeUndoStackChange', (action, source) => {
       if (source === 'MergeCells') {
         return false;
@@ -568,8 +565,11 @@ export class MergeCells extends BasePlugin {
     gridContext.addShortcut({
       keys: [['Control', 'm']],
       callback: () => {
-        this.toggleMerge(this.hot.getSelectedRangeLast());
-        this.hot.render();
+        const range = this.hot.getSelectedRangeLast();
+        if (range && !range.isSingleHeader()) {
+          this.toggleMerge(range);
+          this.hot.render();
+        }
       },
       runOnlyIf: event => !event.altKey,
       // right ALT in some systems triggers ALT+CTRL
@@ -1192,15 +1192,4 @@ export class MergeCells extends BasePlugin {
     }
     return this.selectionCalculations.getSelectedMergedCellClassName(currentRow, currentColumn, cornersOfSelection, layerLevel);
   }
-
-  /**
-   * `beforeRemoveCellClassNames` hook callback. Used to remove additional class name from all cells in the table.
-   *
-   * @private
-   * @returns {string[]} An `Array` of `String`s. Each of these strings will act like class names to be removed from
-   *   all the cells in the table.
-   */
-  onBeforeRemoveCellClassNames() {
-    return this.selectionCalculations.getSelectedMergedCellClassNameToRemove();
-  }
 }

package/plugins/multiColumnSorting/multiColumnSorting.js

@@ -12,8 +12,8 @@ const PLUGIN_KEY = 'multiColumnSorting';
 exports.PLUGIN_KEY = PLUGIN_KEY;
 const PLUGIN_PRIORITY = 170;
 exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
-const APPEND_COLUMN_CONFIG_STRATEGY = 'append';
 const CONFLICTED_PLUGIN_KEY = 'columnSorting';
+const SHORTCUTS_GROUP = PLUGIN_KEY;
 (0, _sortService.registerRootComparator)(PLUGIN_KEY, _rootComparator.rootComparator);
 
 /**
@@ -113,6 +113,41 @@ class MultiColumnSorting extends _columnSorting.ColumnSorting {
     super.disablePlugin();
   }
 
+  /**
+   * Register shortcuts responsible for toggling column sorting functionality.
+   *
+   * @private
+   */
+  registerShortcuts() {
+    super.registerShortcuts();
+    this.hot.getShortcutManager().getContext('grid').addShortcut({
+      keys: [['Control/Meta', 'Enter']],
+      callback: () => {
+        const {
+          highlight
+        } = this.hot.getSelectedRangeLast();
+        if (highlight.row === -1 && highlight.col >= 0) {
+          this.sort(this.getNextSortConfig(highlight.col, _columnSorting.APPEND_COLUMN_CONFIG_STRATEGY));
+        }
+      },
+      runOnlyIf: () => {
+        var _this$hot$getSelected;
+        return (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight.isHeader();
+      },
+      group: SHORTCUTS_GROUP
+    });
+  }
+
+  /**
+   * Unregister shortcuts responsible for toggling column sorting functionality.
+   *
+   * @private
+   */
+  unregisterShortcuts() {
+    super.unregisterShortcuts();
+    this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
+  }
+
   /**
    * Sorts the table by chosen columns and orders.
    *
@@ -262,7 +297,7 @@ class MultiColumnSorting extends _columnSorting.ColumnSorting {
       if (this.hot.getShortcutManager().isCtrlPressed()) {
         this.hot.deselectCell();
         this.hot.selectColumns(coords.col);
-        this.sort(this.getNextSortConfig(coords.col, APPEND_COLUMN_CONFIG_STRATEGY));
+        this.sort(this.getNextSortConfig(coords.col, _columnSorting.APPEND_COLUMN_CONFIG_STRATEGY));
       } else {
         this.sort(this.getColumnNextConfig(coords.col));
       }

package/plugins/multiColumnSorting/multiColumnSorting.mjs

@@ -1,4 +1,4 @@
-import { ColumnSorting } from "../columnSorting/index.mjs";
+import { APPEND_COLUMN_CONFIG_STRATEGY, ColumnSorting } from "../columnSorting/index.mjs";
 import { registerRootComparator } from "../columnSorting/sortService/index.mjs";
 import { wasHeaderClickedProperly } from "../columnSorting/utils.mjs";
 import { addClass, removeClass } from "../../helpers/dom/element.mjs";
@@ -7,8 +7,8 @@ import { warnAboutPluginsConflict } from "./utils.mjs";
 import { getClassesToAdd, getClassesToRemove } from "./domHelpers.mjs";
 export const PLUGIN_KEY = 'multiColumnSorting';
 export const PLUGIN_PRIORITY = 170;
-const APPEND_COLUMN_CONFIG_STRATEGY = 'append';
 const CONFLICTED_PLUGIN_KEY = 'columnSorting';
+const SHORTCUTS_GROUP = PLUGIN_KEY;
 registerRootComparator(PLUGIN_KEY, rootComparator);
 
 /**
@@ -108,6 +108,41 @@ export class MultiColumnSorting extends ColumnSorting {
     super.disablePlugin();
   }
 
+  /**
+   * Register shortcuts responsible for toggling column sorting functionality.
+   *
+   * @private
+   */
+  registerShortcuts() {
+    super.registerShortcuts();
+    this.hot.getShortcutManager().getContext('grid').addShortcut({
+      keys: [['Control/Meta', 'Enter']],
+      callback: () => {
+        const {
+          highlight
+        } = this.hot.getSelectedRangeLast();
+        if (highlight.row === -1 && highlight.col >= 0) {
+          this.sort(this.getNextSortConfig(highlight.col, APPEND_COLUMN_CONFIG_STRATEGY));
+        }
+      },
+      runOnlyIf: () => {
+        var _this$hot$getSelected;
+        return (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight.isHeader();
+      },
+      group: SHORTCUTS_GROUP
+    });
+  }
+
+  /**
+   * Unregister shortcuts responsible for toggling column sorting functionality.
+   *
+   * @private
+   */
+  unregisterShortcuts() {
+    super.unregisterShortcuts();
+    this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
+  }
+
   /**
    * Sorts the table by chosen columns and orders.
    *

package/plugins/nestedHeaders/nestedHeaders.js

@@ -5,8 +5,8 @@ exports.__esModule = true;
 require("core-js/modules/es.array.push.js");
 var _element = require("../../helpers/dom/element");
 var _number = require("../../helpers/number");
-var _event = require("../../helpers/dom/event");
 var _templateLiteralTag = require("../../helpers/templateLiteralTag");
+var _event = require("../../helpers/dom/event");
 var _console = require("../../helpers/console");
 var _selection = require("../../selection");
 var _base = require("../base");
@@ -158,6 +158,10 @@ class NestedHeaders extends _base.BasePlugin {
     this.addHook('beforeOnCellMouseOver', function () {
       return _this.onBeforeOnCellMouseOver(...arguments);
     });
+    this.addHook('modifyTransformStart', function () {
+      return _this.onModifyTransformStart(...arguments);
+    });
+    this.addHook('afterSelection', () => this.updateFocusHighlightPosition());
     this.addHook('afterGetColumnHeaderRenderers', array => this.onAfterGetColumnHeaderRenderers(array));
     this.addHook('modifyColWidth', function () {
       return _this.onModifyColWidth(...arguments);
@@ -171,9 +175,14 @@ class NestedHeaders extends _base.BasePlugin {
     this.addHook('beforeCopy', function () {
       return _this.onBeforeCopy(...arguments);
     });
+    this.addHook('beforeSelectColumns', function () {
+      return _this.onBeforeSelectColumns(...arguments);
+    });
     this.addHook('afterViewportColumnCalculatorOverride', function () {
       return _this.onAfterViewportColumnCalculatorOverride(...arguments);
     });
+    this.hot.columnIndexMapper.addLocalHook('cacheUpdated', () => this.updateFocusHighlightPosition());
+    this.hot.rowIndexMapper.addLocalHook('cacheUpdated', () => this.updateFocusHighlightPosition());
     super.enablePlugin();
     this.updatePlugin(); // @TODO: Workaround for broken plugin initialization abstraction.
   }
@@ -389,6 +398,34 @@ class NestedHeaders extends _base.BasePlugin {
     return this.hot.getColHeader(visualColumnIndex, headerLevel);
   }
 
+  /**
+   * Updates the selection focus highlight position to point to the nested header root element (TH)
+   * even when the logical coordinates point in-between the header.
+   *
+   * @private
+   */
+  updateFocusHighlightPosition() {
+    var _this$hot;
+    const selection = (_this$hot = this.hot) === null || _this$hot === void 0 ? void 0 : _this$hot.getSelectedRangeLast();
+    if (!selection) {
+      return;
+    }
+    const {
+      highlight
+    } = selection;
+    const isNestedHeadersRange = highlight.isHeader() && highlight.col >= 0;
+    if (isNestedHeadersRange) {
+      const columnIndex = _classPrivateFieldGet(this, _stateManager).findLeftMostColumnIndex(highlight.row, highlight.col);
+      const focusHighlight = this.hot.selection.highlight.getFocus();
+
+      // Correct the highlight/focus selection to highlight the correct TH element
+      focusHighlight.visualCellRange.highlight.col = columnIndex;
+      focusHighlight.visualCellRange.from.col = columnIndex;
+      focusHighlight.visualCellRange.to.col = columnIndex;
+      focusHighlight.commit();
+    }
+  }
+
   /**
    * Allows to control which header DOM element will be used to highlight.
    *
@@ -404,7 +441,6 @@ class NestedHeaders extends _base.BasePlugin {
       return visualColumn;
     }
     const {
-      classNames,
       columnCursor,
       selectionType,
       selectionWidth
@@ -419,8 +455,8 @@ class NestedHeaders extends _base.BasePlugin {
       }
     } else if (selectionType === _selection.ACTIVE_HEADER_TYPE) {
       if (colspan > selectionWidth - columnCursor || !isRoot) {
-        // Reset the class names array so the generated TH element won't be modified.
-        classNames.length = 0;
+        // Prevents adding any CSS class names to the TH element
+        return null;
       }
     }
     return visualColumn;
@@ -574,13 +610,90 @@ class NestedHeaders extends _base.BasePlugin {
     controller.cell = true;
     const columnsToSelect = [];
     if (coords.col < from.col) {
-      columnsToSelect.push(bottomEndCoords.col, columnIndex);
+      columnsToSelect.push(bottomEndCoords.col, columnIndex, coords.row);
     } else if (coords.col > from.col) {
-      columnsToSelect.push(topStartCoords.col, columnIndex + origColspan - 1);
+      columnsToSelect.push(topStartCoords.col, columnIndex + origColspan - 1, coords.row);
     } else {
-      columnsToSelect.push(columnIndex, columnIndex + origColspan - 1);
+      columnsToSelect.push(columnIndex, columnIndex + origColspan - 1, coords.row);
+    }
+    this.hot.selection.selectColumns(...columnsToSelect);
+  }
+
+  /**
+   * `modifyTransformStart` hook is called every time the keyboard navigation is used.
+   *
+   * @private
+   * @param {object} delta The transformation delta.
+   */
+  onModifyTransformStart(delta) {
+    const {
+      highlight
+    } = this.hot.getSelectedRangeLast();
+    const nextCoords = this.hot._createCellCoords(highlight.row + delta.row, highlight.col + delta.col);
+    const isNestedHeadersRange = nextCoords.isHeader() && nextCoords.col >= 0;
+    if (!isNestedHeadersRange) {
+      return;
+    }
+    const visualColumnIndexStart = _classPrivateFieldGet(this, _stateManager).findLeftMostColumnIndex(nextCoords.row, nextCoords.col);
+    const visualColumnIndexEnd = _classPrivateFieldGet(this, _stateManager).findRightMostColumnIndex(nextCoords.row, nextCoords.col);
+    if (delta.col < 0) {
+      const nextColumn = highlight.col >= visualColumnIndexStart && highlight.col <= visualColumnIndexEnd ? visualColumnIndexStart - 1 : visualColumnIndexEnd;
+      const notHiddenColumnIndex = this.hot.columnIndexMapper.getNearestNotHiddenIndex(nextColumn, -1);
+      if (notHiddenColumnIndex === null) {
+        // There are no visible columns anymore, so move the selection out of the table edge. This will
+        // be processed by the selection Transformer class as a move selection to the previous row (if autoWrapRow is enabled).
+        delta.col = -this.hot.view.countRenderableColumnsInRange(0, highlight.col);
+      } else {
+        delta.col = -Math.max(this.hot.view.countRenderableColumnsInRange(notHiddenColumnIndex, highlight.col) - 1, 1);
+      }
+    } else if (delta.col > 0) {
+      const nextColumn = highlight.col >= visualColumnIndexStart && highlight.col <= visualColumnIndexEnd ? visualColumnIndexEnd + 1 : visualColumnIndexStart;
+      const notHiddenColumnIndex = this.hot.columnIndexMapper.getNearestNotHiddenIndex(nextColumn, 1);
+      if (notHiddenColumnIndex === null) {
+        // There are no visible columns anymore, so move the selection out of the table edge. This will
+        // be processed by the selection Transformer class as a move selection to the next row (if autoWrapRow is enabled).
+        delta.col = this.hot.view.countRenderableColumnsInRange(highlight.col, this.hot.countCols());
+      } else {
+        delta.col = Math.max(this.hot.view.countRenderableColumnsInRange(highlight.col, notHiddenColumnIndex) - 1, 1);
+      }
+    }
+  }
+
+  /**
+   * The hook observes the column selection from the Selection API and modifies the column range to
+   * ensure that the whole nested column will be covered.
+   *
+   * @private
+   * @param {*} from The coords object where the selection starts.
+   * @param {*} to The coords object where the selection ends.
+   */
+  onBeforeSelectColumns(from, to) {
+    const headerLevel = from.row;
+    const startNodeData = this._getHeaderTreeNodeDataByCoords({
+      row: headerLevel,
+      col: from.col
+    });
+    const endNodeData = this._getHeaderTreeNodeDataByCoords({
+      row: headerLevel,
+      col: to.col
+    });
+    if (to.col < from.col) {
+      // Column selection from right to left
+      if (startNodeData) {
+        from.col = startNodeData.columnIndex + startNodeData.origColspan - 1;
+      }
+      if (endNodeData) {
+        to.col = endNodeData.columnIndex;
+      }
+    } else if (to.col >= from.col) {
+      // Column selection from left to right or a single column selection
+      if (startNodeData) {
+        from.col = startNodeData.columnIndex;
+      }
+      if (endNodeData) {
+        to.col = endNodeData.columnIndex + endNodeData.origColspan - 1;
+      }
     }
-    this.hot.selectColumns(...columnsToSelect);
   }
 
   /**