handsontable 14.0.0-next-d97b156-20231027 → 14.0.0-next-c22ab6f-20231030

package/helpers/mixed.js

@@ -134,7 +134,7 @@ const domMessages = {
 function _injectProductInfo(key, element) {
   const hasValidType = !isEmpty(key);
   const isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  const hotVersion = "14.0.0-next-d97b156-20231027";
+  const hotVersion = "14.0.0-next-c22ab6f-20231030";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';

package/helpers/mixed.mjs

@@ -124,7 +124,7 @@ const domMessages = {
 export function _injectProductInfo(key, element) {
   const hasValidType = !isEmpty(key);
   const isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  const hotVersion = "14.0.0-next-d97b156-20231027";
+  const hotVersion = "14.0.0-next-c22ab6f-20231030";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';

package/package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/handsontable/handsontable/issues"
   },
   "author": "Handsoncode <hello@handsontable.com>",
-  "version": "14.0.0-next-d97b156-20231027",
+  "version": "14.0.0-next-c22ab6f-20231030",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/plugins/filters/filters.js

@@ -286,8 +286,12 @@ class Filters extends _base.BasePlugin {
       keys: [['Alt', 'A']],
       stopPropagation: true,
       callback: () => {
+        const selection = this.hot.getSelected();
         this.clearConditions();
         this.filter();
+        if (selection) {
+          this.hot.selectCells(selection);
+        }
       },
       group: SHORTCUTS_GROUP
     });
@@ -460,6 +464,9 @@ class Filters extends _base.BasePlugin {
    * @fires Hooks#afterFilter
    */
   filter() {
+    const {
+      navigableHeaders
+    } = this.hot.getSettings();
     const dataFilter = this._createDataFilter();
     const needToFilter = !this.conditionCollection.isEmpty();
     let visibleVisualRows = [];
@@ -481,7 +488,7 @@ class Filters extends _base.BasePlugin {
             this.filtersRowsMap.setValueAtIndex(physicalRow, true);
           });
         }, true);
-        if (!visibleVisualRows.length) {
+        if (!navigableHeaders && !visibleVisualRows.length) {
           this.hot.deselectCell();
         }
       } else {
@@ -491,6 +498,9 @@ class Filters extends _base.BasePlugin {
     this.hot.runHooks('afterFilter', conditions);
     this.hot.view.adjustElementsSize(true);
     this.hot.render();
+    if (this.hot.selection.isSelected()) {
+      this.hot.selectCell(navigableHeaders ? -1 : 0, this.hot.getSelectedRangeLast().highlight.col);
+    }
   }
 
   /**
@@ -696,7 +706,6 @@ 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

@@ -280,8 +280,12 @@ export class Filters extends BasePlugin {
       keys: [['Alt', 'A']],
       stopPropagation: true,
       callback: () => {
+        const selection = this.hot.getSelected();
         this.clearConditions();
         this.filter();
+        if (selection) {
+          this.hot.selectCells(selection);
+        }
       },
       group: SHORTCUTS_GROUP
     });
@@ -454,6 +458,9 @@ export class Filters extends BasePlugin {
    * @fires Hooks#afterFilter
    */
   filter() {
+    const {
+      navigableHeaders
+    } = this.hot.getSettings();
     const dataFilter = this._createDataFilter();
     const needToFilter = !this.conditionCollection.isEmpty();
     let visibleVisualRows = [];
@@ -475,7 +482,7 @@ export class Filters extends BasePlugin {
             this.filtersRowsMap.setValueAtIndex(physicalRow, true);
           });
         }, true);
-        if (!visibleVisualRows.length) {
+        if (!navigableHeaders && !visibleVisualRows.length) {
           this.hot.deselectCell();
         }
       } else {
@@ -485,6 +492,9 @@ export class Filters extends BasePlugin {
     this.hot.runHooks('afterFilter', conditions);
     this.hot.view.adjustElementsSize(true);
     this.hot.render();
+    if (this.hot.selection.isSelected()) {
+      this.hot.selectCell(navigableHeaders ? -1 : 0, this.hot.getSelectedRangeLast().highlight.col);
+    }
   }
 
   /**
@@ -690,7 +700,6 @@ 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();
   }