handsontable 0.0.0-next-be250b6-20230621 → 0.0.0-next-d1c8e0e-20230621

package/plugins/filters/filters.mjs

@@ -67,6 +67,7 @@ import { CONDITION_NONE, CONDITION_BY_VALUE, OPERATION_AND, OPERATION_OR, OPERAT
 import { TrimmingMap } from "../../translations/index.mjs";
 export var PLUGIN_KEY = 'filters';
 export var PLUGIN_PRIORITY = 250;
+var SHORTCUTS_GROUP = PLUGIN_KEY;
 
 /**
  * @plugin Filters
@@ -282,6 +283,7 @@ export var Filters = /*#__PURE__*/function (_BasePlugin) {
         this.dropdownMenuPlugin.disablePlugin();
         this.dropdownMenuPlugin.enablePlugin();
       }
+      this.registerShortcuts();
       _get(_getPrototypeOf(Filters.prototype), "enablePlugin", this).call(this);
     }
 
@@ -305,9 +307,41 @@ export var Filters = /*#__PURE__*/function (_BasePlugin) {
         this.conditionCollection = null;
         this.hot.rowIndexMapper.unregisterMap(this.pluginName);
       }
+      this.unregisterShortcuts();
       _get(_getPrototypeOf(Filters.prototype), "disablePlugin", this).call(this);
     }
 
+    /**
+     * Register shortcuts responsible for clearing the filters.
+     *
+     * @private
+     */
+  }, {
+    key: "registerShortcuts",
+    value: function registerShortcuts() {
+      var _this4 = this;
+      this.hot.getShortcutManager().getContext('grid').addShortcut({
+        keys: [['Alt', 'A']],
+        stopPropagation: true,
+        callback: function callback() {
+          _this4.clearConditions();
+          _this4.filter();
+        },
+        group: SHORTCUTS_GROUP
+      });
+    }
+
+    /**
+     * Unregister shortcuts responsible for clearing the filters.
+     *
+     * @private
+     */
+  }, {
+    key: "unregisterShortcuts",
+    value: function unregisterShortcuts() {
+      this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
+    }
+
     /* eslint-disable jsdoc/require-description-complete-sentence */
     /**
      * @memberof Filters#
@@ -474,7 +508,7 @@ export var Filters = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "filter",
     value: function filter() {
-      var _this4 = this;
+      var _this5 = this;
       var dataFilter = this._createDataFilter();
       var needToFilter = !this.conditionCollection.isEmpty();
       var visibleVisualRows = [];
@@ -484,18 +518,18 @@ export var Filters = /*#__PURE__*/function (_BasePlugin) {
         if (needToFilter) {
           var trimmedRows = [];
           this.hot.batchExecution(function () {
-            _this4.filtersRowsMap.clear();
+            _this5.filtersRowsMap.clear();
             visibleVisualRows = arrayMap(dataFilter.filter(), function (rowData) {
               return rowData.meta.visualRow;
             });
             var visibleVisualRowsAssertion = createArrayAssertion(visibleVisualRows);
-            rangeEach(_this4.hot.countSourceRows() - 1, function (row) {
+            rangeEach(_this5.hot.countSourceRows() - 1, function (row) {
               if (!visibleVisualRowsAssertion(row)) {
                 trimmedRows.push(row);
               }
             });
             arrayEach(trimmedRows, function (physicalRow) {
-              _this4.filtersRowsMap.setValueAtIndex(physicalRow, true);
+              _this5.filtersRowsMap.setValueAtIndex(physicalRow, true);
             });
           }, true);
           if (!visibleVisualRows.length) {
@@ -508,7 +542,6 @@ export var Filters = /*#__PURE__*/function (_BasePlugin) {
       this.hot.runHooks('afterFilter', conditions);
       this.hot.view.adjustElementsSize(true);
       this.hot.render();
-      this.clearColumnSelection();
     }
 
     /**
@@ -532,20 +565,6 @@ export var Filters = /*#__PURE__*/function (_BasePlugin) {
       };
     }
 
-    /**
-     * Clears column selection.
-     *
-     * @private
-     */
-  }, {
-    key: "clearColumnSelection",
-    value: function clearColumnSelection() {
-      var selectedColumn = this.getSelectedColumn();
-      if (selectedColumn !== null) {
-        this.hot.selectCell(0, selectedColumn.visualIndex);
-      }
-    }
-
     /**
      * Returns handsontable source data with cell meta based on current selection.
      *
@@ -555,21 +574,21 @@ export var Filters = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "getDataMapAtColumn",
     value: function getDataMapAtColumn(column) {
-      var _this5 = this;
+      var _this6 = this;
       var visualColumn = this.hot.toVisualColumn(column);
       var data = [];
       arrayEach(this.hot.getSourceDataAtCol(visualColumn), function (value, rowIndex) {
-        var _this5$hot$getDataAtC;
-        var _this5$hot$getCellMet = _this5.hot.getCellMeta(rowIndex, visualColumn),
-          row = _this5$hot$getCellMet.row,
-          col = _this5$hot$getCellMet.col,
-          visualCol = _this5$hot$getCellMet.visualCol,
-          visualRow = _this5$hot$getCellMet.visualRow,
-          type = _this5$hot$getCellMet.type,
-          instance = _this5$hot$getCellMet.instance,
-          dateFormat = _this5$hot$getCellMet.dateFormat,
-          locale = _this5$hot$getCellMet.locale;
-        var dataValue = (_this5$hot$getDataAtC = _this5.hot.getDataAtCell(_this5.hot.toVisualRow(rowIndex), visualColumn)) !== null && _this5$hot$getDataAtC !== void 0 ? _this5$hot$getDataAtC : value;
+        var _this6$hot$getDataAtC;
+        var _this6$hot$getCellMet = _this6.hot.getCellMeta(rowIndex, visualColumn),
+          row = _this6$hot$getCellMet.row,
+          col = _this6$hot$getCellMet.col,
+          visualCol = _this6$hot$getCellMet.visualCol,
+          visualRow = _this6$hot$getCellMet.visualRow,
+          type = _this6$hot$getCellMet.type,
+          instance = _this6$hot$getCellMet.instance,
+          dateFormat = _this6$hot$getCellMet.dateFormat,
+          locale = _this6$hot$getCellMet.locale;
+        var dataValue = (_this6$hot$getDataAtC = _this6.hot.getDataAtCell(_this6.hot.toVisualRow(rowIndex), visualColumn)) !== null && _this6$hot$getDataAtC !== void 0 ? _this6$hot$getDataAtC : value;
         data.push({
           meta: {
             row: row,
@@ -596,14 +615,14 @@ export var Filters = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "onAfterChange",
     value: function onAfterChange(changes) {
-      var _this6 = this;
+      var _this7 = this;
       if (changes) {
         arrayEach(changes, function (change) {
           var _change = _slicedToArray(change, 2),
             prop = _change[1];
-          var columnIndex = _this6.hot.propToCol(prop);
-          if (_this6.conditionCollection.hasConditions(columnIndex)) {
-            _this6.updateValueComponentCondition(columnIndex);
+          var columnIndex = _this7.hot.propToCol(prop);
+          if (_this7.conditionCollection.hasConditions(columnIndex)) {
+            _this7.updateValueComponentCondition(columnIndex);
           }
         });
       }
@@ -674,10 +693,10 @@ export var Filters = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "onBeforeDropdownMenuSetItems",
     value: function onBeforeDropdownMenuSetItems() {
-      var _this7 = this;
+      var _this8 = this;
       if (this.dropdownMenuPlugin) {
         this.dropdownMenuPlugin.menu.addLocalHook('afterOpen', function () {
-          _this7.dropdownMenuPlugin.menu.hotMenu.updateSettings({
+          _this8.dropdownMenuPlugin.menu.hotMenu.updateSettings({
             hiddenRows: true
           });
         });
@@ -768,6 +787,7 @@ export var Filters = /*#__PURE__*/function (_BasePlugin) {
         });
         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();
     }
@@ -860,10 +880,10 @@ export var Filters = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "_createDataFilter",
     value: function _createDataFilter() {
-      var _this8 = this;
+      var _this9 = this;
       var conditionCollection = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.conditionCollection;
       return new DataFilter(conditionCollection, function (physicalColumn) {
-        return _this8.getDataMapAtColumn(physicalColumn);
+        return _this9.getDataMapAtColumn(physicalColumn);
       });
     }
 
@@ -995,12 +1015,12 @@ export var Filters = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "destroy",
     value: function destroy() {
-      var _this9 = this;
+      var _this10 = this;
       if (this.enabled) {
         this.components.forEach(function (component, key) {
           if (component !== null) {
             component.destroy();
-            _this9.components.set(key, null);
+            _this10.components.set(key, null);
           }
         });
         this.conditionCollection.destroy();

package/shortcutContexts/commands/index.js

@@ -20,7 +20,6 @@ var _editor = require("./editor");
 var _extendCellsSelection = require("./extendCellsSelection");
 var _moveCellSelection = require("./moveCellSelection");
 var _emptySelectedCells = require("./emptySelectedCells");
-var _scrollToFocusedCell = require("./scrollToFocusedCell");
 var _selectAll = require("./selectAll");
 var _populateSelectedCellsData = require("./populateSelectedCellsData");
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -29,7 +28,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-var allCommands = [].concat(_toConsumableArray((0, _editor.getAllCommands)()), _toConsumableArray((0, _extendCellsSelection.getAllCommands)()), _toConsumableArray((0, _moveCellSelection.getAllCommands)()), [_emptySelectedCells.command, _scrollToFocusedCell.command, _selectAll.command, _populateSelectedCellsData.command]);
+var allCommands = [].concat(_toConsumableArray((0, _editor.getAllCommands)()), _toConsumableArray((0, _extendCellsSelection.getAllCommands)()), _toConsumableArray((0, _moveCellSelection.getAllCommands)()), [_emptySelectedCells.command, _selectAll.command, _populateSelectedCellsData.command]);
 
 /**
  * Prepares and creates an object with all available commands to trigger.

package/shortcutContexts/commands/index.mjs

@@ -22,10 +22,9 @@ import { getAllCommands as getAllEditorCommands } from "./editor/index.mjs";
 import { getAllCommands as getAllSelectionExtendCommands } from "./extendCellsSelection/index.mjs";
 import { getAllCommands as getAllSelectionMoveCommands } from "./moveCellSelection/index.mjs";
 import { command as emptySelectedCells } from "./emptySelectedCells.mjs";
-import { command as scrollToFocusedCell } from "./scrollToFocusedCell.mjs";
 import { command as selectAll } from "./selectAll.mjs";
 import { command as populateSelectedCellsData } from "./populateSelectedCellsData.mjs";
-var allCommands = [].concat(_toConsumableArray(getAllEditorCommands()), _toConsumableArray(getAllSelectionExtendCommands()), _toConsumableArray(getAllSelectionMoveCommands()), [emptySelectedCells, scrollToFocusedCell, selectAll, populateSelectedCellsData]);
+var allCommands = [].concat(_toConsumableArray(getAllEditorCommands()), _toConsumableArray(getAllSelectionExtendCommands()), _toConsumableArray(getAllSelectionMoveCommands()), [emptySelectedCells, selectAll, populateSelectedCellsData]);
 
 /**
  * Prepares and creates an object with all available commands to trigger.

package/shortcutContexts/grid.js

@@ -243,10 +243,5 @@ function shortcutsGridContext(hot) {
     callback: function callback() {
       return commandsPool.moveCellSelectionInlineEnd();
     }
-  }, {
-    keys: [['Control/Meta', 'Backspace']],
-    callback: function callback() {
-      return commandsPool.scrollToFocusedCell();
-    }
   }], config);
 }

package/shortcutContexts/grid.mjs

@@ -239,10 +239,5 @@ export function shortcutsGridContext(hot) {
     callback: function callback() {
       return commandsPool.moveCellSelectionInlineEnd();
     }
-  }, {
-    keys: [['Control/Meta', 'Backspace']],
-    callback: function callback() {
-      return commandsPool.scrollToFocusedCell();
-    }
   }], config);
 }

package/shortcuts/recorder.js

@@ -88,7 +88,7 @@ function useRecorder(ownerWindow, handleEvent, beforeKeyDown, afterKeyDown, call
     if (event.keyCode === 229 || result === false || (0, _event.isImmediatePropagationStopped)(event)) {
       return;
     }
-    var pressedKey = (0, _utils.normalizeEventKey)(event.key);
+    var pressedKey = (0, _utils.normalizeEventKey)(event);
     var extraModifierKeys = [];
     if (isModifierKey(pressedKey)) {
       modifierKeysObserver.press(pressedKey);
@@ -114,7 +114,7 @@ function useRecorder(ownerWindow, handleEvent, beforeKeyDown, afterKeyDown, call
     if (handleEvent(event) === false) {
       return;
     }
-    var pressedKey = (0, _utils.normalizeEventKey)(event.key);
+    var pressedKey = (0, _utils.normalizeEventKey)(event);
     if (isModifierKey(pressedKey) === false) {
       return;
     }

package/shortcuts/recorder.mjs

@@ -84,7 +84,7 @@ export function useRecorder(ownerWindow, handleEvent, beforeKeyDown, afterKeyDow
     if (event.keyCode === 229 || result === false || isImmediatePropagationStopped(event)) {
       return;
     }
-    var pressedKey = normalizeEventKey(event.key);
+    var pressedKey = normalizeEventKey(event);
     var extraModifierKeys = [];
     if (isModifierKey(pressedKey)) {
       modifierKeysObserver.press(pressedKey);
@@ -110,7 +110,7 @@ export function useRecorder(ownerWindow, handleEvent, beforeKeyDown, afterKeyDow
     if (handleEvent(event) === false) {
       return;
     }
-    var pressedKey = normalizeEventKey(event.key);
+    var pressedKey = normalizeEventKey(event);
     if (isModifierKey(pressedKey) === false) {
       return;
     }

package/shortcuts/utils.js

@@ -10,6 +10,10 @@ require("core-js/modules/web.dom-collections.iterator.js");
 require("core-js/modules/es.array.join.js");
 require("core-js/modules/es.array.sort.js");
 require("core-js/modules/es.array.map.js");
+require("core-js/modules/es.regexp.constructor.js");
+require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.regexp.to-string.js");
+require("core-js/modules/es.string.replace.js");
 // This file handles key-name discrepancies between browsers.
 // For the list of discrepancies, go to: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values.
 var mappings = new Map([[' ', 'space'],
@@ -46,13 +50,25 @@ var getKeysList = function getKeysList(normalizedKeys) {
 };
 
 /**
- * Normalize a `KeyboardEvent.key` property, to use it for keyboard shortcuts.
+ * The regex tests if the event.code matches to the pattern and it's used to extract letters and digits from
+ * the string.
+ */
+exports.getKeysList = getKeysList;
+var codeToKeyRegExp = new RegExp('^(?:Key|Digit)([A-Z0-9])$');
+
+/**
+ * Normalizes a keyboard event key value to a key before its modification. When the keyboard event
+ * is triggered with Alt, Control or Shift keys the `key` property contains modified key e.g. for Alt+L
+ * it will be `ł`. But that value is only valid for polish keyboard layout. To fix that limitations, for
+ * letters and digits the value is taken from the `code` property which holds original value before
+ * transformation.
  *
- * @param {string} key KeyboardEvent's key property.
+ * @param {Event} event The KeyboardEvent object.
  * @returns {string}
  */
-exports.getKeysList = getKeysList;
-var normalizeEventKey = function normalizeEventKey(key) {
-  return key.toLowerCase();
+var normalizeEventKey = function normalizeEventKey(_ref) {
+  var key = _ref.key,
+    code = _ref.code;
+  return (codeToKeyRegExp.test(code) ? code.replace(codeToKeyRegExp, '$1') : key).toLowerCase();
 };
 exports.normalizeEventKey = normalizeEventKey;

package/shortcuts/utils.mjs

@@ -6,6 +6,10 @@ import "core-js/modules/web.dom-collections.iterator.js";
 import "core-js/modules/es.array.join.js";
 import "core-js/modules/es.array.sort.js";
 import "core-js/modules/es.array.map.js";
+import "core-js/modules/es.regexp.constructor.js";
+import "core-js/modules/es.regexp.exec.js";
+import "core-js/modules/es.regexp.to-string.js";
+import "core-js/modules/es.string.replace.js";
 // This file handles key-name discrepancies between browsers.
 // For the list of discrepancies, go to: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values.
 var mappings = new Map([[' ', 'space'],
@@ -41,11 +45,23 @@ export var getKeysList = function getKeysList(normalizedKeys) {
 };
 
 /**
- * Normalize a `KeyboardEvent.key` property, to use it for keyboard shortcuts.
+ * The regex tests if the event.code matches to the pattern and it's used to extract letters and digits from
+ * the string.
+ */
+var codeToKeyRegExp = new RegExp('^(?:Key|Digit)([A-Z0-9])$');
+
+/**
+ * Normalizes a keyboard event key value to a key before its modification. When the keyboard event
+ * is triggered with Alt, Control or Shift keys the `key` property contains modified key e.g. for Alt+L
+ * it will be `ł`. But that value is only valid for polish keyboard layout. To fix that limitations, for
+ * letters and digits the value is taken from the `code` property which holds original value before
+ * transformation.
  *
- * @param {string} key KeyboardEvent's key property.
+ * @param {Event} event The KeyboardEvent object.
  * @returns {string}
  */
-export var normalizeEventKey = function normalizeEventKey(key) {
-  return key.toLowerCase();
+export var normalizeEventKey = function normalizeEventKey(_ref) {
+  var key = _ref.key,
+    code = _ref.code;
+  return (codeToKeyRegExp.test(code) ? code.replace(codeToKeyRegExp, '$1') : key).toLowerCase();
 };

package/shortcutContexts/commands/scrollToFocusedCell.js

@@ -1,38 +0,0 @@
-"use strict";
-
-exports.__esModule = true;
-exports.command = void 0;
-require("core-js/modules/es.array.includes.js");
-require("core-js/modules/es.string.includes.js");
-var command = {
-  name: 'scrollToFocusedCell',
-  callback: function callback(hot) {
-    var _hot$getSelectedRange = hot.getSelectedRangeLast(),
-      highlight = _hot$getSelectedRange.highlight;
-    var firstVisibleRow = hot.view.getFirstFullyVisibleRow() - 1;
-    var firstVisibleColumn = hot.view.getFirstFullyVisibleColumn() - 1;
-    var lastVisibleRow = hot.view.getLastFullyVisibleRow() + 1;
-    var lastVisibleColumn = hot.view.getLastFullyVisibleColumn() + 1;
-    var visibleCoordsFrom = hot._createCellCoords(firstVisibleRow, firstVisibleColumn);
-    var visibleCoordsTo = hot._createCellCoords(lastVisibleRow, lastVisibleColumn);
-    var visibleRange = hot._createCellRange(visibleCoordsFrom, visibleCoordsFrom, visibleCoordsTo);
-    if (!visibleRange.includes(highlight) && (highlight.row >= 0 || highlight.col >= 0)) {
-      var offsetRows = Math.floor(hot.countVisibleRows() / 2);
-      var offsetColumns = Math.floor(hot.countVisibleCols() / 2);
-      var scrollX = Math.max(highlight.row - offsetRows, 0);
-      var scrollY = Math.max(highlight.col - offsetColumns, 0);
-      var scrollCoords = [scrollX, scrollY];
-
-      // for row header focus do not change the scroll Y position, leave as it is
-      if (highlight.col < 0) {
-        scrollCoords[1] = null;
-
-        // for column header focus do not change the scroll X position, leave as it is
-      } else if (highlight.row < 0) {
-        scrollCoords[0] = null;
-      }
-      hot.scrollViewportTo.apply(hot, scrollCoords);
-    }
-  }
-};
-exports.command = command;

package/shortcutContexts/commands/scrollToFocusedCell.mjs

@@ -1,33 +0,0 @@
-import "core-js/modules/es.array.includes.js";
-import "core-js/modules/es.string.includes.js";
-export var command = {
-  name: 'scrollToFocusedCell',
-  callback: function callback(hot) {
-    var _hot$getSelectedRange = hot.getSelectedRangeLast(),
-      highlight = _hot$getSelectedRange.highlight;
-    var firstVisibleRow = hot.view.getFirstFullyVisibleRow() - 1;
-    var firstVisibleColumn = hot.view.getFirstFullyVisibleColumn() - 1;
-    var lastVisibleRow = hot.view.getLastFullyVisibleRow() + 1;
-    var lastVisibleColumn = hot.view.getLastFullyVisibleColumn() + 1;
-    var visibleCoordsFrom = hot._createCellCoords(firstVisibleRow, firstVisibleColumn);
-    var visibleCoordsTo = hot._createCellCoords(lastVisibleRow, lastVisibleColumn);
-    var visibleRange = hot._createCellRange(visibleCoordsFrom, visibleCoordsFrom, visibleCoordsTo);
-    if (!visibleRange.includes(highlight) && (highlight.row >= 0 || highlight.col >= 0)) {
-      var offsetRows = Math.floor(hot.countVisibleRows() / 2);
-      var offsetColumns = Math.floor(hot.countVisibleCols() / 2);
-      var scrollX = Math.max(highlight.row - offsetRows, 0);
-      var scrollY = Math.max(highlight.col - offsetColumns, 0);
-      var scrollCoords = [scrollX, scrollY];
-
-      // for row header focus do not change the scroll Y position, leave as it is
-      if (highlight.col < 0) {
-        scrollCoords[1] = null;
-
-        // for column header focus do not change the scroll X position, leave as it is
-      } else if (highlight.row < 0) {
-        scrollCoords[0] = null;
-      }
-      hot.scrollViewportTo.apply(hot, scrollCoords);
-    }
-  }
-};