handsontable 0.0.0-next-010265d-20231005 → 0.0.0-next-9379dd1-20231020

package/plugins/dropdownMenu/dropdownMenu.js

@@ -3,13 +3,16 @@
 exports.__esModule = true;
 var _base = require("../base");
 var _array = require("../../helpers/array");
-var _commandExecutor = _interopRequireDefault(require("../contextMenu/commandExecutor"));
+var _object = require("../../helpers/object");
+var _commandExecutor = require("../contextMenu/commandExecutor");
+var _utils = require("../contextMenu/utils");
 var _eventManager = _interopRequireDefault(require("../../eventManager"));
 var _element = require("../../helpers/dom/element");
-var _itemsFactory = _interopRequireDefault(require("../contextMenu/itemsFactory"));
-var _menu = _interopRequireDefault(require("../contextMenu/menu"));
+var _itemsFactory = require("../contextMenu/itemsFactory");
+var _menu = require("../contextMenu/menu");
 var _pluginHooks = _interopRequireDefault(require("../../pluginHooks"));
 var _predefinedItems = require("../contextMenu/predefinedItems");
+var _a11y = require("../../helpers/a11y");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 _pluginHooks.default.getSingleton().register('afterDropdownMenuDefaultOptions');
 _pluginHooks.default.getSingleton().register('beforeDropdownMenuShow');
@@ -21,6 +24,7 @@ exports.PLUGIN_KEY = PLUGIN_KEY;
 const PLUGIN_PRIORITY = 230;
 exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
 const BUTTON_CLASS_NAME = 'changeType';
+const SHORTCUTS_GROUP = PLUGIN_KEY;
 
 /* eslint-disable jsdoc/require-description-complete-sentence */
 /**
@@ -107,7 +111,7 @@ class DropdownMenu extends _base.BasePlugin {
      * @private
      * @type {CommandExecutor}
      */
-    this.commandExecutor = new _commandExecutor.default(this.hot);
+    this.commandExecutor = new _commandExecutor.CommandExecutor(this.hot);
     /**
      * Instance of {@link ItemsFactory}.
      *
@@ -148,7 +152,7 @@ class DropdownMenu extends _base.BasePlugin {
     if (this.enabled) {
       return;
     }
-    this.itemsFactory = new _itemsFactory.default(this.hot, DropdownMenu.DEFAULT_ITEMS);
+    this.itemsFactory = new _itemsFactory.ItemsFactory(this.hot, DropdownMenu.DEFAULT_ITEMS);
     const settings = this.hot.getSettings()[PLUGIN_KEY];
     const predefinedItems = {
       items: this.itemsFactory.getItems(settings)
@@ -157,6 +161,7 @@ class DropdownMenu extends _base.BasePlugin {
     if (typeof settings.callback === 'function') {
       this.commandExecutor.setCommonCallback(settings.callback);
     }
+    this.registerShortcuts();
     super.enablePlugin();
     this.callOnPluginsReady(() => {
       this.hot.runHooks('afterDropdownMenuDefaultOptions', predefinedItems);
@@ -165,7 +170,7 @@ class DropdownMenu extends _base.BasePlugin {
       if (this.menu) {
         this.menu.destroy();
       }
-      this.menu = new _menu.default(this.hot, {
+      this.menu = new _menu.Menu(this.hot, {
         className: 'htDropdownMenu',
         keepInViewport: true,
         container: settings.uiContainer || this.hot.rootDocument.body
@@ -207,9 +212,66 @@ class DropdownMenu extends _base.BasePlugin {
     if (this.menu) {
       this.menu.destroy();
     }
+    this.unregisterShortcuts();
     super.disablePlugin();
   }
 
+  /**
+   * Register shortcuts responsible for toggling dropdown menu.
+   *
+   * @private
+   */
+  registerShortcuts() {
+    const context = this.hot.getShortcutManager().getContext('grid');
+    const callback = () => {
+      const {
+        highlight
+      } = this.hot.getSelectedRangeLast();
+      if ((highlight.isHeader() && highlight.row === -1 || highlight.isCell()) && highlight.col >= 0) {
+        this.hot.selectColumns(highlight.col, highlight.col, -1);
+        const {
+          from
+        } = this.hot.getSelectedRangeLast();
+        const offset = (0, _utils.getDocumentOffsetByElement)(this.menu.container, this.hot.rootDocument);
+        const target = this.hot.getCell(-1, from.col, true);
+        const rect = target.getBoundingClientRect();
+        this.open({
+          left: rect.left + offset.left,
+          top: rect.top + target.offsetHeight + offset.top
+        }, {
+          left: rect.width
+        });
+      }
+    };
+    context.addShortcuts([{
+      keys: [['Shift', 'Alt', 'ArrowDown'], ['Control/Meta', 'Enter']],
+      callback,
+      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()) && !this.menu.isOpened();
+      },
+      captureCtrl: true,
+      group: SHORTCUTS_GROUP
+    }, {
+      keys: [['Shift', 'Alt', 'ArrowDown']],
+      callback,
+      runOnlyIf: () => {
+        var _this$hot$getSelected2;
+        return ((_this$hot$getSelected2 = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected2 === void 0 ? void 0 : _this$hot$getSelected2.highlight.isCell()) && !this.menu.isOpened();
+      },
+      group: SHORTCUTS_GROUP
+    }]);
+  }
+
+  /**
+   * Unregister shortcuts responsible for toggling dropdown menu.
+   *
+   * @private
+   */
+  unregisterShortcuts() {
+    this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
+  }
+
   /**
    * Registers the DOM listeners.
    *
@@ -222,23 +284,30 @@ class DropdownMenu extends _base.BasePlugin {
   /**
    * Opens menu and re-position it based on the passed coordinates.
    *
-   * @param {object|Event} position An object with `pageX` and `pageY` properties which contains values relative to
-   *                                the top left of the fully rendered content area in the browser or with `clientX`
-   *                                and `clientY`  properties which contains values relative to the upper left edge
-   *                                of the content area (the viewport) of the browser window. This object is structurally
-   *                                compatible with native mouse event so it can be used either.
+   * @param {{ top: number, left: number }|Event} position An object with `top` and `left` properties
+   * which contains coordinates relative to the browsers viewport (without included scroll offsets).
+   * Or if the native event is passed the menu will be positioned based on the `pageX` and `pageY`
+   * coordinates.
+   * @param {{ above: number, below: number, left: number, right: number }} offset An object allows applying
+   * the offset to the menu position.
    * @fires Hooks#beforeDropdownMenuShow
    * @fires Hooks#afterDropdownMenuShow
    */
-
   open(position) {
-    if (!this.menu) {
+    var _this$menu;
+    let offset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+      above: 0,
+      below: 0,
+      left: 0,
+      right: 0
+    };
+    if ((_this$menu = this.menu) !== null && _this$menu !== void 0 && _this$menu.isOpened()) {
       return;
     }
     this.menu.open();
-    if (position.width) {
-      this.menu.setOffset('left', position.width);
-    }
+    (0, _object.objectEach)(offset, (value, key) => {
+      this.menu.setOffset(key, value);
+    });
     this.menu.setPosition(position);
   }
 
@@ -246,10 +315,8 @@ class DropdownMenu extends _base.BasePlugin {
    * Closes dropdown menu.
    */
   close() {
-    if (!this.menu) {
-      return;
-    }
-    this.menu.close();
+    var _this$menu2;
+    (_this$menu2 = this.menu) === null || _this$menu2 === void 0 || _this$menu2.close();
   }
 
   /**
@@ -314,26 +381,14 @@ class DropdownMenu extends _base.BasePlugin {
    */
   onTableClick(event) {
     event.stopPropagation();
-    if ((0, _element.hasClass)(event.target, BUTTON_CLASS_NAME) && !this.menu.isOpened()) {
-      let offsetTop = 0;
-      let offsetLeft = 0;
-      if (this.hot.rootDocument !== this.menu.container.ownerDocument) {
-        const {
-          frameElement
-        } = this.hot.rootWindow;
-        const {
-          top,
-          left
-        } = frameElement.getBoundingClientRect();
-        offsetTop = top;
-        offsetLeft = left;
-      }
+    if ((0, _element.hasClass)(event.target, BUTTON_CLASS_NAME)) {
+      const offset = (0, _utils.getDocumentOffsetByElement)(this.menu.container, this.hot.rootDocument);
       const rect = event.target.getBoundingClientRect();
       this.open({
-        left: rect.left + offsetLeft,
-        top: rect.top + event.target.offsetHeight + 3 + offsetTop,
-        width: rect.width,
-        height: rect.height
+        left: rect.left + offset.left,
+        top: rect.top + event.target.offsetHeight + 3 + offset.top
+      }, {
+        left: rect.width
       });
     }
   }
@@ -372,6 +427,10 @@ class DropdownMenu extends _base.BasePlugin {
     const button = this.hot.rootDocument.createElement('button');
     button.className = BUTTON_CLASS_NAME;
     button.type = 'button';
+    button.tabIndex = -1;
+    if (this.hot.getSettings().ariaTags) {
+      (0, _element.setAttribute)(button, [(0, _a11y.A11Y_HIDDEN)()]);
+    }
 
     // prevent page reload on button click
     button.onclick = function () {

package/plugins/dropdownMenu/dropdownMenu.mjs

@@ -1,12 +1,15 @@
 import { BasePlugin } from "../base/index.mjs";
 import { arrayEach } from "../../helpers/array.mjs";
-import CommandExecutor from "../contextMenu/commandExecutor.mjs";
+import { objectEach } from "../../helpers/object.mjs";
+import { CommandExecutor } from "../contextMenu/commandExecutor.mjs";
+import { getDocumentOffsetByElement } from "../contextMenu/utils.mjs";
 import EventManager from "../../eventManager.mjs";
-import { hasClass } from "../../helpers/dom/element.mjs";
-import ItemsFactory from "../contextMenu/itemsFactory.mjs";
-import Menu from "../contextMenu/menu.mjs";
+import { hasClass, setAttribute } from "../../helpers/dom/element.mjs";
+import { ItemsFactory } from "../contextMenu/itemsFactory.mjs";
+import { Menu } from "../contextMenu/menu/index.mjs";
 import Hooks from "../../pluginHooks.mjs";
-import { COLUMN_LEFT, COLUMN_RIGHT, REMOVE_COLUMN, CLEAR_COLUMN, READ_ONLY, ALIGNMENT, SEPARATOR } from "../contextMenu/predefinedItems.mjs";
+import { COLUMN_LEFT, COLUMN_RIGHT, REMOVE_COLUMN, CLEAR_COLUMN, READ_ONLY, ALIGNMENT, SEPARATOR } from "../contextMenu/predefinedItems/index.mjs";
+import { A11Y_HIDDEN } from "../../helpers/a11y.mjs";
 Hooks.getSingleton().register('afterDropdownMenuDefaultOptions');
 Hooks.getSingleton().register('beforeDropdownMenuShow');
 Hooks.getSingleton().register('afterDropdownMenuShow');
@@ -15,6 +18,7 @@ Hooks.getSingleton().register('afterDropdownMenuExecute');
 export const PLUGIN_KEY = 'dropdownMenu';
 export const PLUGIN_PRIORITY = 230;
 const BUTTON_CLASS_NAME = 'changeType';
+const SHORTCUTS_GROUP = PLUGIN_KEY;
 
 /* eslint-disable jsdoc/require-description-complete-sentence */
 /**
@@ -151,6 +155,7 @@ export class DropdownMenu extends BasePlugin {
     if (typeof settings.callback === 'function') {
       this.commandExecutor.setCommonCallback(settings.callback);
     }
+    this.registerShortcuts();
     super.enablePlugin();
     this.callOnPluginsReady(() => {
       this.hot.runHooks('afterDropdownMenuDefaultOptions', predefinedItems);
@@ -201,9 +206,66 @@ export class DropdownMenu extends BasePlugin {
     if (this.menu) {
       this.menu.destroy();
     }
+    this.unregisterShortcuts();
     super.disablePlugin();
   }
 
+  /**
+   * Register shortcuts responsible for toggling dropdown menu.
+   *
+   * @private
+   */
+  registerShortcuts() {
+    const context = this.hot.getShortcutManager().getContext('grid');
+    const callback = () => {
+      const {
+        highlight
+      } = this.hot.getSelectedRangeLast();
+      if ((highlight.isHeader() && highlight.row === -1 || highlight.isCell()) && highlight.col >= 0) {
+        this.hot.selectColumns(highlight.col, highlight.col, -1);
+        const {
+          from
+        } = this.hot.getSelectedRangeLast();
+        const offset = getDocumentOffsetByElement(this.menu.container, this.hot.rootDocument);
+        const target = this.hot.getCell(-1, from.col, true);
+        const rect = target.getBoundingClientRect();
+        this.open({
+          left: rect.left + offset.left,
+          top: rect.top + target.offsetHeight + offset.top
+        }, {
+          left: rect.width
+        });
+      }
+    };
+    context.addShortcuts([{
+      keys: [['Shift', 'Alt', 'ArrowDown'], ['Control/Meta', 'Enter']],
+      callback,
+      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()) && !this.menu.isOpened();
+      },
+      captureCtrl: true,
+      group: SHORTCUTS_GROUP
+    }, {
+      keys: [['Shift', 'Alt', 'ArrowDown']],
+      callback,
+      runOnlyIf: () => {
+        var _this$hot$getSelected2;
+        return ((_this$hot$getSelected2 = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected2 === void 0 ? void 0 : _this$hot$getSelected2.highlight.isCell()) && !this.menu.isOpened();
+      },
+      group: SHORTCUTS_GROUP
+    }]);
+  }
+
+  /**
+   * Unregister shortcuts responsible for toggling dropdown menu.
+   *
+   * @private
+   */
+  unregisterShortcuts() {
+    this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
+  }
+
   /**
    * Registers the DOM listeners.
    *
@@ -216,23 +278,30 @@ export class DropdownMenu extends BasePlugin {
   /**
    * Opens menu and re-position it based on the passed coordinates.
    *
-   * @param {object|Event} position An object with `pageX` and `pageY` properties which contains values relative to
-   *                                the top left of the fully rendered content area in the browser or with `clientX`
-   *                                and `clientY`  properties which contains values relative to the upper left edge
-   *                                of the content area (the viewport) of the browser window. This object is structurally
-   *                                compatible with native mouse event so it can be used either.
+   * @param {{ top: number, left: number }|Event} position An object with `top` and `left` properties
+   * which contains coordinates relative to the browsers viewport (without included scroll offsets).
+   * Or if the native event is passed the menu will be positioned based on the `pageX` and `pageY`
+   * coordinates.
+   * @param {{ above: number, below: number, left: number, right: number }} offset An object allows applying
+   * the offset to the menu position.
    * @fires Hooks#beforeDropdownMenuShow
    * @fires Hooks#afterDropdownMenuShow
    */
-
   open(position) {
-    if (!this.menu) {
+    var _this$menu;
+    let offset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+      above: 0,
+      below: 0,
+      left: 0,
+      right: 0
+    };
+    if ((_this$menu = this.menu) !== null && _this$menu !== void 0 && _this$menu.isOpened()) {
       return;
     }
     this.menu.open();
-    if (position.width) {
-      this.menu.setOffset('left', position.width);
-    }
+    objectEach(offset, (value, key) => {
+      this.menu.setOffset(key, value);
+    });
     this.menu.setPosition(position);
   }
 
@@ -240,10 +309,8 @@ export class DropdownMenu extends BasePlugin {
    * Closes dropdown menu.
    */
   close() {
-    if (!this.menu) {
-      return;
-    }
-    this.menu.close();
+    var _this$menu2;
+    (_this$menu2 = this.menu) === null || _this$menu2 === void 0 || _this$menu2.close();
   }
 
   /**
@@ -308,26 +375,14 @@ export class DropdownMenu extends BasePlugin {
    */
   onTableClick(event) {
     event.stopPropagation();
-    if (hasClass(event.target, BUTTON_CLASS_NAME) && !this.menu.isOpened()) {
-      let offsetTop = 0;
-      let offsetLeft = 0;
-      if (this.hot.rootDocument !== this.menu.container.ownerDocument) {
-        const {
-          frameElement
-        } = this.hot.rootWindow;
-        const {
-          top,
-          left
-        } = frameElement.getBoundingClientRect();
-        offsetTop = top;
-        offsetLeft = left;
-      }
+    if (hasClass(event.target, BUTTON_CLASS_NAME)) {
+      const offset = getDocumentOffsetByElement(this.menu.container, this.hot.rootDocument);
       const rect = event.target.getBoundingClientRect();
       this.open({
-        left: rect.left + offsetLeft,
-        top: rect.top + event.target.offsetHeight + 3 + offsetTop,
-        width: rect.width,
-        height: rect.height
+        left: rect.left + offset.left,
+        top: rect.top + event.target.offsetHeight + 3 + offset.top
+      }, {
+        left: rect.width
       });
     }
   }
@@ -366,6 +421,10 @@ export class DropdownMenu extends BasePlugin {
     const button = this.hot.rootDocument.createElement('button');
     button.className = BUTTON_CLASS_NAME;
     button.type = 'button';
+    button.tabIndex = -1;
+    if (this.hot.getSettings().ariaTags) {
+      setAttribute(button, [A11Y_HIDDEN()]);
+    }
 
     // prevent page reload on button click
     button.onclick = function () {

package/plugins/filters/constants.mjs

@@ -1,7 +1,7 @@
 import "core-js/modules/es.array.push.js";
 import { clone } from "../../helpers/object.mjs";
 import { arrayEach } from "../../helpers/array.mjs";
-import { SEPARATOR } from "../contextMenu/predefinedItems.mjs";
+import { SEPARATOR } from "../contextMenu/predefinedItems/index.mjs";
 import { getConditionDescriptor } from "./conditionRegisterer.mjs";
 import { CONDITION_NAME as CONDITION_NONE } from "./condition/none.mjs";
 import { CONDITION_NAME as CONDITION_EMPTY } from "./condition/empty.mjs";

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 || _this$dropdownMenuPlu3.close();
   }

package/plugins/filters/filters.mjs

@@ -6,7 +6,7 @@ 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 { 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";
@@ -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 || _this$dropdownMenuPlu3.close();
   }

package/plugins/filters/ui/select.js

@@ -1,15 +1,15 @@
 "use strict";
 
 exports.__esModule = true;
-var _menu = _interopRequireDefault(require("../../../plugins/contextMenu/menu"));
+var _menu = require("../../../plugins/contextMenu/menu");
 var _object = require("../../../helpers/object");
 var _array = require("../../../helpers/array");
 var C = _interopRequireWildcard(require("../../../i18n/constants"));
 var _predefinedItems = require("../../../plugins/contextMenu/predefinedItems");
 var _base = _interopRequireDefault(require("./_base"));
+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 }; }
 const privatePool = new WeakMap();
 
 /**
@@ -78,7 +78,7 @@ class SelectUI extends _base.default {
    */
   build() {
     super.build();
-    this.menu = new _menu.default(this.hot, {
+    this.menu = new _menu.Menu(this.hot, {
       className: 'htSelectUI htFiltersConditionsMenu',
       keepInViewport: false,
       standalone: true,

package/plugins/filters/ui/select.mjs

@@ -1,8 +1,8 @@
-import Menu from "../../../plugins/contextMenu/menu.mjs";
+import { Menu } from "../../../plugins/contextMenu/menu/index.mjs";
 import { clone, extend } from "../../../helpers/object.mjs";
 import { arrayEach } from "../../../helpers/array.mjs";
 import * as C from "../../../i18n/constants.mjs";
-import { SEPARATOR } from "../../../plugins/contextMenu/predefinedItems.mjs";
+import { SEPARATOR } from "../../../plugins/contextMenu/predefinedItems/index.mjs";
 import BaseUI from "./_base.mjs";
 const privatePool = new WeakMap();
 

package/plugins/hiddenColumns/hiddenColumns.mjs

@@ -13,7 +13,7 @@ import { rangeEach } from "../../helpers/number.mjs";
 import { arrayEach, arrayMap, arrayReduce } from "../../helpers/array.mjs";
 import { isObject } from "../../helpers/object.mjs";
 import { isUndefined } from "../../helpers/mixed.mjs";
-import { SEPARATOR } from "../contextMenu/predefinedItems.mjs";
+import { SEPARATOR } from "../contextMenu/predefinedItems/index.mjs";
 import Hooks from "../../pluginHooks.mjs";
 import hideColumnItem from "./contextMenuItem/hideColumn.mjs";
 import showColumnItem from "./contextMenuItem/showColumn.mjs";