handsontable 0.0.0-next-9059914-20231025 → 0.0.0-next-cecf979-20231026

package/plugins/filters/filters.js

@@ -1,32 +1,47 @@
 "use strict";
 
+require("core-js/modules/es.error.cause.js");
 exports.__esModule = true;
+require("core-js/modules/es.array.unscopables.flat.js");
 require("core-js/modules/es.array.push.js");
 var _base = require("../base");
 var _array = require("../../helpers/array");
 var _templateLiteralTag = require("../../helpers/templateLiteralTag");
 var _console = require("../../helpers/console");
 var _number = require("../../helpers/number");
-var _eventManager = _interopRequireDefault(require("../../eventManager"));
 var _element = require("../../helpers/dom/element");
+var _unicode = require("../../helpers/unicode");
 var _predefinedItems = require("../contextMenu/predefinedItems");
 var constants = _interopRequireWildcard(require("../../i18n/constants"));
-var _condition = _interopRequireDefault(require("./component/condition"));
-var _operators = _interopRequireDefault(require("./component/operators"));
-var _value = _interopRequireDefault(require("./component/value"));
-var _actionBar = _interopRequireDefault(require("./component/actionBar"));
+var _condition = require("./component/condition");
+var _operators = require("./component/operators");
+var _value = require("./component/value");
+var _actionBar = require("./component/actionBar");
 var _conditionCollection = _interopRequireDefault(require("./conditionCollection"));
 var _dataFilter = _interopRequireDefault(require("./dataFilter"));
 var _conditionUpdateObserver = _interopRequireDefault(require("./conditionUpdateObserver"));
 var _utils = require("./utils");
+var _focusController = require("./menu/focusController");
 var _constants2 = require("./constants");
 var _translations = require("../../translations");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
+function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+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); }
+function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set"); _classApplyDescriptorSet(receiver, descriptor, value); return value; }
+function _classApplyDescriptorSet(receiver, descriptor, value) { if (descriptor.set) { descriptor.set.call(receiver, value); } else { if (!descriptor.writable) { throw new TypeError("attempted to set read only private field"); } descriptor.value = value; } }
+function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
+function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!privateMap.has(receiver)) { throw new TypeError("attempted to " + action + " private field on non-instance"); } return privateMap.get(receiver); }
+function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
 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 +78,7 @@ const PLUGIN_PRIORITY = 250;
  * ```
  * :::
  */
-exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
+var _menuFocusNavigator = /*#__PURE__*/new WeakMap();
 class Filters extends _base.BasePlugin {
   static get PLUGIN_KEY() {
     return PLUGIN_KEY;
@@ -74,52 +89,55 @@ class Filters extends _base.BasePlugin {
   static get PLUGIN_DEPS() {
     return ['plugin:DropdownMenu', 'plugin:HiddenRows', 'cell-type:checkbox'];
   }
+
+  /**
+   * Instance of {@link DropdownMenu}.
+   *
+   * @private
+   * @type {DropdownMenu}
+   */
+
   constructor(hotInstance) {
     super(hotInstance);
-    /**
-     * Instance of {@link EventManager}.
-     *
-     * @private
-     * @type {EventManager}
-     */
-    this.eventManager = new _eventManager.default(this);
-    /**
-     * Instance of {@link DropdownMenu}.
-     *
-     * @private
-     * @type {DropdownMenu}
-     */
-    this.dropdownMenuPlugin = null;
+    // One listener for the enable/disable functionality
+    _defineProperty(this, "dropdownMenuPlugin", null);
     /**
      * Instance of {@link ConditionCollection}.
      *
      * @private
      * @type {ConditionCollection}
      */
-    this.conditionCollection = null;
+    _defineProperty(this, "conditionCollection", null);
     /**
      * Instance of {@link ConditionUpdateObserver}.
      *
      * @private
      * @type {ConditionUpdateObserver}
      */
-    this.conditionUpdateObserver = null;
+    _defineProperty(this, "conditionUpdateObserver", null);
     /**
      * Map, where key is component identifier and value represent `BaseComponent` element or it derivatives.
      *
      * @private
      * @type {Map}
      */
-    this.components = new Map([['filter_by_condition', null], ['filter_operators', null], ['filter_by_condition2', null], ['filter_by_value', null], ['filter_action_bar', null]]);
+    _defineProperty(this, "components", new Map([['filter_by_condition', null], ['filter_operators', null], ['filter_by_condition2', null], ['filter_by_value', null], ['filter_action_bar', null]]));
     /**
      * Map of skipped rows by plugin.
      *
      * @private
      * @type {null|TrimmingMap}
      */
-    this.filtersRowsMap = null;
-
-    // One listener for the enable/disable functionality
+    _defineProperty(this, "filtersRowsMap", null);
+    /**
+     * Menu focus navigator allows switching the focus position through Tab and Shift Tab keys.
+     *
+     * @type {MenuFocusNavigator|undefined}
+     */
+    _classPrivateFieldInitSpec(this, _menuFocusNavigator, {
+      writable: true,
+      value: void 0
+    });
     this.hot.addHook('afterGetColHeader', (col, TH) => this.onAfterGetColHeader(col, TH));
   }
 
@@ -154,7 +172,7 @@ class Filters extends _base.BasePlugin {
     const filterByConditionLabel = () => `${this.hot.getTranslatedPhrase(constants.FILTERS_DIVS_FILTER_BY_CONDITION)}:`;
     const filterValueLabel = () => `${this.hot.getTranslatedPhrase(constants.FILTERS_DIVS_FILTER_BY_VALUE)}:`;
     if (!this.components.get('filter_by_condition')) {
-      const conditionComponent = new _condition.default(this.hot, {
+      const conditionComponent = new _condition.ConditionComponent(this.hot, {
         id: 'filter_by_condition',
         name: filterByConditionLabel,
         addSeparator: false,
@@ -164,13 +182,13 @@ class Filters extends _base.BasePlugin {
       this.components.set('filter_by_condition', addConfirmationHooks(conditionComponent));
     }
     if (!this.components.get('filter_operators')) {
-      this.components.set('filter_operators', new _operators.default(this.hot, {
+      this.components.set('filter_operators', new _operators.OperatorsComponent(this.hot, {
         id: 'filter_operators',
         name: 'Operators'
       }));
     }
     if (!this.components.get('filter_by_condition2')) {
-      const conditionComponent = new _condition.default(this.hot, {
+      const conditionComponent = new _condition.ConditionComponent(this.hot, {
         id: 'filter_by_condition2',
         name: '',
         addSeparator: true,
@@ -180,13 +198,13 @@ class Filters extends _base.BasePlugin {
       this.components.set('filter_by_condition2', addConfirmationHooks(conditionComponent));
     }
     if (!this.components.get('filter_by_value')) {
-      this.components.set('filter_by_value', addConfirmationHooks(new _value.default(this.hot, {
+      this.components.set('filter_by_value', addConfirmationHooks(new _value.ValueComponent(this.hot, {
         id: 'filter_by_value',
         name: filterValueLabel
       })));
     }
     if (!this.components.get('filter_action_bar')) {
-      this.components.set('filter_action_bar', addConfirmationHooks(new _actionBar.default(this.hot, {
+      this.components.set('filter_action_bar', addConfirmationHooks(new _actionBar.ActionBarComponent(this.hot, {
         id: 'filter_action_bar',
         name: 'Action bar'
       })));
@@ -199,7 +217,6 @@ class Filters extends _base.BasePlugin {
       this.conditionUpdateObserver.addLocalHook('update', conditionState => this.updateComponents(conditionState));
     }
     this.components.forEach(component => component.show());
-    this.addHook('beforeDropdownMenuSetItems', items => this.onBeforeDropdownMenuSetItems(items));
     this.addHook('afterDropdownMenuDefaultOptions', defaultOptions => this.onAfterDropdownMenuDefaultOptions(defaultOptions));
     this.addHook('afterDropdownMenuShow', () => this.onAfterDropdownMenuShow());
     this.addHook('afterDropdownMenuHide', () => this.onAfterDropdownMenuHide());
@@ -210,6 +227,33 @@ class Filters extends _base.BasePlugin {
       this.dropdownMenuPlugin.disablePlugin();
       this.dropdownMenuPlugin.enablePlugin();
     }
+    if (!_classPrivateFieldGet(this, _menuFocusNavigator) && this.dropdownMenuPlugin.enabled) {
+      const mainMenu = this.dropdownMenuPlugin.menu;
+      const focusableItems = [
+      // A fake menu item that once focused allows escaping from the focus navigation (using Tab keys)
+      // to the menu navigation using arrow keys.
+      {
+        focus: () => mainMenu.focus()
+      }, ...Array.from(this.components).map(_ref => {
+        let [, component] = _ref;
+        return component.getElements();
+      }).flat()];
+      _classPrivateFieldSet(this, _menuFocusNavigator, (0, _focusController.createMenuFocusController)(mainMenu, focusableItems));
+      const forwardToFocusNavigation = event => {
+        _classPrivateFieldGet(this, _menuFocusNavigator).listen();
+        event.preventDefault();
+        if ((0, _unicode.isKey)(event.keyCode, 'TAB')) {
+          if (event.shiftKey) {
+            _classPrivateFieldGet(this, _menuFocusNavigator).toPreviousItem();
+          } else {
+            _classPrivateFieldGet(this, _menuFocusNavigator).toNextItem();
+          }
+        }
+      };
+      this.components.get('filter_by_value').addLocalHook('listTabKeydown', forwardToFocusNavigation);
+      this.components.get('filter_by_condition').addLocalHook('selectTabKeydown', forwardToFocusNavigation);
+    }
+    this.registerShortcuts();
     super.enablePlugin();
   }
 
@@ -230,9 +274,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 +493,6 @@ class Filters extends _base.BasePlugin {
     this.hot.runHooks('afterFilter', conditions);
     this.hot.view.adjustElementsSize(true);
     this.hot.render();
-    this.clearColumnSelection();
   }
 
   /**
@@ -444,18 +514,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.
    *
@@ -562,21 +620,6 @@ class Filters extends _base.BasePlugin {
     this.components.get('filter_by_condition2').getSelectElement().closeOptions();
   }
 
-  /**
-   * Before dropdown menu set menu items listener.
-   *
-   * @private
-   */
-  onBeforeDropdownMenuSetItems() {
-    if (this.dropdownMenuPlugin) {
-      this.dropdownMenuPlugin.menu.addLocalHook('afterOpen', () => {
-        this.dropdownMenuPlugin.menu.hotMenu.updateSettings({
-          hiddenRows: true
-        });
-      });
-    }
-  }
-
   /**
    * After dropdown menu default options listener.
    *
@@ -655,6 +698,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 || _this$dropdownMenuPlu3.close();
   }
@@ -668,7 +712,7 @@ class Filters extends _base.BasePlugin {
    */
   onComponentChange(component, command) {
     this.updateDependentComponentsVisibility();
-    if (component.constructor === _condition.default && !command.inputsCount) {
+    if (component.constructor === _condition.ConditionComponent && !command.inputsCount) {
       this.setListeningDropdownMenu();
     }
   }

package/plugins/filters/filters.mjs

@@ -1,25 +1,39 @@
+import "core-js/modules/es.array.unscopables.flat.js";
 import "core-js/modules/es.array.push.js";
+import "core-js/modules/es.error.cause.js";
+function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
+function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+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); }
+function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set"); _classApplyDescriptorSet(receiver, descriptor, value); return value; }
+function _classApplyDescriptorSet(receiver, descriptor, value) { if (descriptor.set) { descriptor.set.call(receiver, value); } else { if (!descriptor.writable) { throw new TypeError("attempted to set read only private field"); } descriptor.value = value; } }
+function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
+function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!privateMap.has(receiver)) { throw new TypeError("attempted to " + action + " private field on non-instance"); } return privateMap.get(receiver); }
+function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
 import { BasePlugin } from "../base/index.mjs";
 import { arrayEach, arrayMap } from "../../helpers/array.mjs";
 import { toSingleLine } from "../../helpers/templateLiteralTag.mjs";
 import { warn } from "../../helpers/console.mjs";
 import { rangeEach } from "../../helpers/number.mjs";
-import EventManager from "../../eventManager.mjs";
 import { addClass, removeClass } from "../../helpers/dom/element.mjs";
-import { SEPARATOR } from "../contextMenu/predefinedItems.mjs";
+import { isKey } from "../../helpers/unicode.mjs";
+import { SEPARATOR } from "../contextMenu/predefinedItems/index.mjs";
 import * as constants from "../../i18n/constants.mjs";
-import ConditionComponent from "./component/condition.mjs";
-import OperatorsComponent from "./component/operators.mjs";
-import ValueComponent from "./component/value.mjs";
-import ActionBarComponent from "./component/actionBar.mjs";
+import { ConditionComponent } from "./component/condition.mjs";
+import { OperatorsComponent } from "./component/operators.mjs";
+import { ValueComponent } from "./component/value.mjs";
+import { ActionBarComponent } from "./component/actionBar.mjs";
 import ConditionCollection from "./conditionCollection.mjs";
 import DataFilter from "./dataFilter.mjs";
 import ConditionUpdateObserver from "./conditionUpdateObserver.mjs";
 import { createArrayAssertion, toEmptyString, unifyColumnValues } from "./utils.mjs";
+import { createMenuFocusController } from "./menu/focusController.mjs";
 import { CONDITION_NONE, CONDITION_BY_VALUE, OPERATION_AND, OPERATION_OR, OPERATION_OR_THEN_VARIABLE } from "./constants.mjs";
 import { TrimmingMap } from "../../translations/index.mjs";
 export const PLUGIN_KEY = 'filters';
 export const PLUGIN_PRIORITY = 250;
+const SHORTCUTS_GROUP = PLUGIN_KEY;
 
 /**
  * @plugin Filters
@@ -56,6 +70,7 @@ export const PLUGIN_PRIORITY = 250;
  * ```
  * :::
  */
+var _menuFocusNavigator = /*#__PURE__*/new WeakMap();
 export class Filters extends BasePlugin {
   static get PLUGIN_KEY() {
     return PLUGIN_KEY;
@@ -66,52 +81,55 @@ export class Filters extends BasePlugin {
   static get PLUGIN_DEPS() {
     return ['plugin:DropdownMenu', 'plugin:HiddenRows', 'cell-type:checkbox'];
   }
+
+  /**
+   * Instance of {@link DropdownMenu}.
+   *
+   * @private
+   * @type {DropdownMenu}
+   */
+
   constructor(hotInstance) {
     super(hotInstance);
-    /**
-     * Instance of {@link EventManager}.
-     *
-     * @private
-     * @type {EventManager}
-     */
-    this.eventManager = new EventManager(this);
-    /**
-     * Instance of {@link DropdownMenu}.
-     *
-     * @private
-     * @type {DropdownMenu}
-     */
-    this.dropdownMenuPlugin = null;
+    // One listener for the enable/disable functionality
+    _defineProperty(this, "dropdownMenuPlugin", null);
     /**
      * Instance of {@link ConditionCollection}.
      *
      * @private
      * @type {ConditionCollection}
      */
-    this.conditionCollection = null;
+    _defineProperty(this, "conditionCollection", null);
     /**
      * Instance of {@link ConditionUpdateObserver}.
      *
      * @private
      * @type {ConditionUpdateObserver}
      */
-    this.conditionUpdateObserver = null;
+    _defineProperty(this, "conditionUpdateObserver", null);
     /**
      * Map, where key is component identifier and value represent `BaseComponent` element or it derivatives.
      *
      * @private
      * @type {Map}
      */
-    this.components = new Map([['filter_by_condition', null], ['filter_operators', null], ['filter_by_condition2', null], ['filter_by_value', null], ['filter_action_bar', null]]);
+    _defineProperty(this, "components", new Map([['filter_by_condition', null], ['filter_operators', null], ['filter_by_condition2', null], ['filter_by_value', null], ['filter_action_bar', null]]));
     /**
      * Map of skipped rows by plugin.
      *
      * @private
      * @type {null|TrimmingMap}
      */
-    this.filtersRowsMap = null;
-
-    // One listener for the enable/disable functionality
+    _defineProperty(this, "filtersRowsMap", null);
+    /**
+     * Menu focus navigator allows switching the focus position through Tab and Shift Tab keys.
+     *
+     * @type {MenuFocusNavigator|undefined}
+     */
+    _classPrivateFieldInitSpec(this, _menuFocusNavigator, {
+      writable: true,
+      value: void 0
+    });
     this.hot.addHook('afterGetColHeader', (col, TH) => this.onAfterGetColHeader(col, TH));
   }
 
@@ -191,7 +209,6 @@ export class Filters extends BasePlugin {
       this.conditionUpdateObserver.addLocalHook('update', conditionState => this.updateComponents(conditionState));
     }
     this.components.forEach(component => component.show());
-    this.addHook('beforeDropdownMenuSetItems', items => this.onBeforeDropdownMenuSetItems(items));
     this.addHook('afterDropdownMenuDefaultOptions', defaultOptions => this.onAfterDropdownMenuDefaultOptions(defaultOptions));
     this.addHook('afterDropdownMenuShow', () => this.onAfterDropdownMenuShow());
     this.addHook('afterDropdownMenuHide', () => this.onAfterDropdownMenuHide());
@@ -202,6 +219,33 @@ export class Filters extends BasePlugin {
       this.dropdownMenuPlugin.disablePlugin();
       this.dropdownMenuPlugin.enablePlugin();
     }
+    if (!_classPrivateFieldGet(this, _menuFocusNavigator) && this.dropdownMenuPlugin.enabled) {
+      const mainMenu = this.dropdownMenuPlugin.menu;
+      const focusableItems = [
+      // A fake menu item that once focused allows escaping from the focus navigation (using Tab keys)
+      // to the menu navigation using arrow keys.
+      {
+        focus: () => mainMenu.focus()
+      }, ...Array.from(this.components).map(_ref => {
+        let [, component] = _ref;
+        return component.getElements();
+      }).flat()];
+      _classPrivateFieldSet(this, _menuFocusNavigator, createMenuFocusController(mainMenu, focusableItems));
+      const forwardToFocusNavigation = event => {
+        _classPrivateFieldGet(this, _menuFocusNavigator).listen();
+        event.preventDefault();
+        if (isKey(event.keyCode, 'TAB')) {
+          if (event.shiftKey) {
+            _classPrivateFieldGet(this, _menuFocusNavigator).toPreviousItem();
+          } else {
+            _classPrivateFieldGet(this, _menuFocusNavigator).toNextItem();
+          }
+        }
+      };
+      this.components.get('filter_by_value').addLocalHook('listTabKeydown', forwardToFocusNavigation);
+      this.components.get('filter_by_condition').addLocalHook('selectTabKeydown', forwardToFocusNavigation);
+    }
+    this.registerShortcuts();
     super.enablePlugin();
   }
 
@@ -222,9 +266,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 +485,6 @@ export class Filters extends BasePlugin {
     this.hot.runHooks('afterFilter', conditions);
     this.hot.view.adjustElementsSize(true);
     this.hot.render();
-    this.clearColumnSelection();
   }
 
   /**
@@ -436,18 +506,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.
    *
@@ -554,21 +612,6 @@ export class Filters extends BasePlugin {
     this.components.get('filter_by_condition2').getSelectElement().closeOptions();
   }
 
-  /**
-   * Before dropdown menu set menu items listener.
-   *
-   * @private
-   */
-  onBeforeDropdownMenuSetItems() {
-    if (this.dropdownMenuPlugin) {
-      this.dropdownMenuPlugin.menu.addLocalHook('afterOpen', () => {
-        this.dropdownMenuPlugin.menu.hotMenu.updateSettings({
-          hiddenRows: true
-        });
-      });
-    }
-  }
-
   /**
    * After dropdown menu default options listener.
    *
@@ -647,6 +690,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 || _this$dropdownMenuPlu3.close();
   }