handsontable 13.1.0 → 14.0.0-next-d97b156-20231027

package/plugins/autoRowSize/autoRowSize.mjs

@@ -141,12 +141,19 @@ export class AutoRowSize extends BasePlugin {
      * @private
      * @type {SamplesGenerator}
      */
-    this.samplesGenerator = new SamplesGenerator((row, col) => {
+    this.samplesGenerator = new SamplesGenerator((row, column) => {
+      if (row >= 0 && column >= 0) {
+        const cellMeta = this.hot.getCellMeta(row, column);
+        if (cellMeta.hidden) {
+          // do not generate samples for cells that are covered by merged cell (null values)
+          return false;
+        }
+      }
       let cellValue;
       if (row >= 0) {
-        cellValue = this.hot.getDataAtCell(row, col);
+        cellValue = this.hot.getDataAtCell(row, column);
       } else if (row === -1) {
-        cellValue = this.hot.getColHeader(col);
+        cellValue = this.hot.getColHeader(column);
       }
       return {
         value: cellValue
@@ -181,7 +188,7 @@ export class AutoRowSize extends BasePlugin {
     this.hot.rowIndexMapper.registerMap(ROW_WIDTHS_MAP_NAME, this.rowHeightsMap);
 
     // Leave the listener active to allow auto-sizing the rows when the plugin is disabled.
-    // This is necesseary for height recalculation for resize handler doubleclick (ManualRowResize).
+    // This is necessary for height recalculation for resize handler doubleclick (ManualRowResize).
     this.addHook('beforeRowResize', (size, row, isDblClick) => this.onBeforeRowResize(size, row, isDblClick));
   }
 
@@ -571,11 +578,11 @@ export class AutoRowSize extends BasePlugin {
       this.recalculateAllRowsHeight();
     } else {
       // first load - initialization
-      setTimeout(() => {
+      this.hot._registerTimeout(() => {
         if (this.hot) {
           this.recalculateAllRowsHeight();
         }
-      }, 0);
+      });
     }
   }
 

package/plugins/autofill/autofill.js

@@ -12,10 +12,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 _pluginHooks.default.getSingleton().register('modifyAutofillRange');
 _pluginHooks.default.getSingleton().register('beforeAutofill');
 _pluginHooks.default.getSingleton().register('afterAutofill');
-const PLUGIN_KEY = 'autofill';
-exports.PLUGIN_KEY = PLUGIN_KEY;
-const PLUGIN_PRIORITY = 20;
-exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
+const PLUGIN_KEY = exports.PLUGIN_KEY = 'autofill';
+const PLUGIN_PRIORITY = exports.PLUGIN_PRIORITY = 20;
 const SETTING_KEYS = ['fillHandle'];
 const INSERT_ROW_ALTER_ACTION_NAME = 'insert_row_below';
 const INTERVAL_FOR_ADDING_ROW = 200;

package/plugins/autofill/utils.js

@@ -5,7 +5,7 @@ exports.getDragDirectionAndRange = getDragDirectionAndRange;
 exports.getMappedFillHandleSetting = getMappedFillHandleSetting;
 var _object = require("../../helpers/object");
 var _mixed = require("../../helpers/mixed");
-const DIRECTIONS = {
+const DIRECTIONS = exports.DIRECTIONS = {
   horizontal: 'horizontal',
   vertical: 'vertical'
 };
@@ -18,7 +18,6 @@ const DIRECTIONS = {
  * @param {Function} cellCoordsFactory The function factory for CellCoords objects.
  * @returns {{direction: string, start: CellCoords, end: CellCoords}}
  */
-exports.DIRECTIONS = DIRECTIONS;
 function getDragDirectionAndRange(startSelection, endSelection, cellCoordsFactory) {
   let startOfDragCoords;
   let endOfDragCoords;

package/plugins/base/base.js

@@ -14,8 +14,7 @@ function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclarati
 function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
 function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
 const DEPS_TYPE_CHECKERS = new Map([['plugin', _registry.hasPlugin], ['cell-type', _registry2.hasCellType], ['editor', _registry3.hasEditor], ['renderer', _registry4.hasRenderer], ['validator', _registry5.hasValidator]]);
-const PLUGIN_KEY = 'base';
-exports.PLUGIN_KEY = PLUGIN_KEY;
+const PLUGIN_KEY = exports.PLUGIN_KEY = 'base';
 const privatePool = new WeakMap();
 const missingDependeciesMsgs = [];
 let initializedPlugins = null;

package/plugins/bindRowsWithHeaders/bindRowsWithHeaders.js

@@ -5,10 +5,8 @@ var _base = require("../base");
 var _looseBindsMap = _interopRequireDefault(require("./maps/looseBindsMap"));
 var _strictBindsMap = _interopRequireDefault(require("./maps/strictBindsMap"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const PLUGIN_KEY = 'bindRowsWithHeaders';
-exports.PLUGIN_KEY = PLUGIN_KEY;
-const PLUGIN_PRIORITY = 210;
-exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
+const PLUGIN_KEY = exports.PLUGIN_KEY = 'bindRowsWithHeaders';
+const PLUGIN_PRIORITY = exports.PLUGIN_PRIORITY = 210;
 const DEFAULT_BIND = 'loose';
 const bindTypeToMapStrategy = new Map([['loose', _looseBindsMap.default], ['strict', _strictBindsMap.default]]);
 

package/plugins/bindRowsWithHeaders/maps/looseBindsMap.js

@@ -40,5 +40,4 @@ class LooseBindsMap extends _translations.IndexMap {
     super.remove(removedIndexes);
   }
 }
-var _default = LooseBindsMap;
-exports.default = _default;
+var _default = exports.default = LooseBindsMap;

package/plugins/bindRowsWithHeaders/maps/strictBindsMap.js

@@ -48,5 +48,4 @@ class StrictBindsMap extends _translations.IndexMap {
     return Math.max(...this.getValues()) + 1 + ordinalNumber;
   }
 }
-var _default = StrictBindsMap;
-exports.default = _default;
+var _default = exports.default = StrictBindsMap;

package/plugins/collapsibleColumns/collapsibleColumns.js

@@ -10,6 +10,8 @@ var _console = require("../../helpers/console");
 var _element = require("../../helpers/dom/element");
 var _eventManager = _interopRequireDefault(require("../../eventManager"));
 var _event = require("../../helpers/dom/event");
+var _a11y = require("../../helpers/a11y");
+var _constants = require("../../i18n/constants");
 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"); } }
@@ -21,12 +23,11 @@ function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) {
 function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set"); _classApplyDescriptorSet(receiver, descriptor, value); return value; }
 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 _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; } }
-const PLUGIN_KEY = 'collapsibleColumns';
-exports.PLUGIN_KEY = PLUGIN_KEY;
-const PLUGIN_PRIORITY = 290;
-exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
+const PLUGIN_KEY = exports.PLUGIN_KEY = 'collapsibleColumns';
+const PLUGIN_PRIORITY = exports.PLUGIN_PRIORITY = 290;
 const SETTING_KEYS = ['nestedHeaders'];
 const COLLAPSIBLE_ELEMENT_CLASS = 'collapsibleIndicator';
+const SHORTCUTS_GROUP = PLUGIN_KEY;
 const actionDictionary = new Map([['collapse', {
   hideColumn: true,
   beforeHook: 'beforeColumnCollapse',
@@ -191,6 +192,7 @@ class CollapsibleColumns extends _base.BasePlugin {
       return _this.onAfterGetColHeader(...arguments);
     });
     this.addHook('beforeOnCellMouseDown', (event, coords, TD) => this.onBeforeOnCellMouseDown(event, coords, TD));
+    this.registerShortcuts();
     super.enablePlugin();
     // @TODO: Workaround for broken plugin initialization abstraction (#6806).
     this.updatePlugin();
@@ -238,10 +240,62 @@ class CollapsibleColumns extends _base.BasePlugin {
     this.hot.columnIndexMapper.unregisterMap(this.pluginName);
     _classPrivateFieldSet(this, _collapsedColumnsMap, null);
     this.nestedHeadersPlugin = null;
+    this.unregisterShortcuts();
     this.clearButtons();
     super.disablePlugin();
   }
 
+  /**
+   * Register shortcuts responsible for toggling collapsible columns.
+   *
+   * @private
+   */
+  registerShortcuts() {
+    this.hot.getShortcutManager().getContext('grid').addShortcut({
+      keys: [['Enter']],
+      callback: () => {
+        var _this$headerStateMana;
+        const {
+          row,
+          col
+        } = this.hot.getSelectedRangeLast().highlight;
+        const {
+          collapsible,
+          isCollapsed,
+          columnIndex
+        } = (_this$headerStateMana = this.headerStateManager.getHeaderTreeNodeData(row, col)) !== null && _this$headerStateMana !== void 0 ? _this$headerStateMana : {};
+        if (!collapsible) {
+          return;
+        }
+        if (isCollapsed) {
+          this.expandSection({
+            row,
+            col: columnIndex
+          });
+        } else {
+          this.collapseSection({
+            row,
+            col: columnIndex
+          });
+        }
+      },
+      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 collapsible columns.
+   *
+   * @private
+   */
+  unregisterShortcuts() {
+    this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
+  }
+
   /**
    * Clears the expand/collapse buttons.
    *
@@ -362,7 +416,7 @@ class CollapsibleColumns extends _base.BasePlugin {
     });
     let isActionPossible = filteredCoords.length > 0;
     (0, _array.arrayEach)(filteredCoords, _ref2 => {
-      var _this$headerStateMana;
+      var _this$headerStateMana2;
       let {
         row,
         col: column
@@ -370,7 +424,7 @@ class CollapsibleColumns extends _base.BasePlugin {
       const {
         collapsible,
         isCollapsed
-      } = (_this$headerStateMana = this.headerStateManager.getHeaderSettings(row, column)) !== null && _this$headerStateMana !== void 0 ? _this$headerStateMana : {};
+      } = (_this$headerStateMana2 = this.headerStateManager.getHeaderSettings(row, column)) !== null && _this$headerStateMana2 !== void 0 ? _this$headerStateMana2 : {};
       if (!collapsible || isCollapsed && action === 'collapse' || !isCollapsed && action === 'expand') {
         isActionPossible = false;
         return false;
@@ -442,14 +496,16 @@ class CollapsibleColumns extends _base.BasePlugin {
    *                             values counting from 0 to N).
    */
   onAfterGetColHeader(column, TH, headerLevel) {
-    var _this$headerStateMana2;
+    var _this$headerStateMana3;
     const {
       collapsible,
       origColspan,
       isCollapsed
-    } = (_this$headerStateMana2 = this.headerStateManager.getHeaderSettings(headerLevel, column)) !== null && _this$headerStateMana2 !== void 0 ? _this$headerStateMana2 : {};
+    } = (_this$headerStateMana3 = this.headerStateManager.getHeaderSettings(headerLevel, column)) !== null && _this$headerStateMana3 !== void 0 ? _this$headerStateMana3 : {};
     const isNodeCollapsible = collapsible && origColspan > 1 && column >= this.hot.getSettings().fixedColumnsStart;
+    const isAriaTagsEnabled = this.hot.getSettings().ariaTags;
     let collapsibleElement = TH.querySelector(`.${COLLAPSIBLE_ELEMENT_CLASS}`);
+    (0, _element.removeAttribute)(TH, [(0, _a11y.A11Y_EXPANDED)('')[0]]);
     if (isNodeCollapsible) {
       if (!collapsibleElement) {
         collapsibleElement = this.hot.rootDocument.createElement('div');
@@ -460,9 +516,22 @@ class CollapsibleColumns extends _base.BasePlugin {
       if (isCollapsed) {
         (0, _element.addClass)(collapsibleElement, 'collapsed');
         (0, _element.fastInnerText)(collapsibleElement, '+');
+
+        // Add ARIA tags
+        if (isAriaTagsEnabled) {
+          (0, _element.setAttribute)(TH, [(0, _a11y.A11Y_EXPANDED)(false), (0, _a11y.A11Y_DESCRIPTION)(this.hot.getTranslatedPhrase(_constants.COLUMN_HEADER_DESCRIPTION_EXPAND_COLUMN))]);
+        }
       } else {
         (0, _element.addClass)(collapsibleElement, 'expanded');
         (0, _element.fastInnerText)(collapsibleElement, '-');
+
+        // Add ARIA tags
+        if (isAriaTagsEnabled) {
+          (0, _element.setAttribute)(TH, [(0, _a11y.A11Y_EXPANDED)(true), (0, _a11y.A11Y_DESCRIPTION)(this.hot.getTranslatedPhrase(_constants.COLUMN_HEADER_DESCRIPTION_COLLAPSE_COLUMN))]);
+        }
+      }
+      if (isAriaTagsEnabled) {
+        (0, _element.setAttribute)(collapsibleElement, ...(0, _a11y.A11Y_HIDDEN)());
       }
     } else {
       var _collapsibleElement;

package/plugins/collapsibleColumns/collapsibleColumns.mjs

@@ -14,13 +14,16 @@ import { BasePlugin } from "../base/index.mjs";
 import { arrayEach, arrayFilter, arrayUnique } from "../../helpers/array.mjs";
 import { rangeEach } from "../../helpers/number.mjs";
 import { warn } from "../../helpers/console.mjs";
-import { addClass, hasClass, removeClass, fastInnerText } from "../../helpers/dom/element.mjs";
+import { addClass, hasClass, removeClass, fastInnerText, removeAttribute, setAttribute } from "../../helpers/dom/element.mjs";
 import EventManager from "../../eventManager.mjs";
 import { stopImmediatePropagation } from "../../helpers/dom/event.mjs";
+import { A11Y_DESCRIPTION, A11Y_EXPANDED, A11Y_HIDDEN } from "../../helpers/a11y.mjs";
+import { COLUMN_HEADER_DESCRIPTION_COLLAPSE_COLUMN, COLUMN_HEADER_DESCRIPTION_EXPAND_COLUMN } from "../../i18n/constants.mjs";
 export const PLUGIN_KEY = 'collapsibleColumns';
 export const PLUGIN_PRIORITY = 290;
 const SETTING_KEYS = ['nestedHeaders'];
 const COLLAPSIBLE_ELEMENT_CLASS = 'collapsibleIndicator';
+const SHORTCUTS_GROUP = PLUGIN_KEY;
 const actionDictionary = new Map([['collapse', {
   hideColumn: true,
   beforeHook: 'beforeColumnCollapse',
@@ -185,6 +188,7 @@ export class CollapsibleColumns extends BasePlugin {
       return _this.onAfterGetColHeader(...arguments);
     });
     this.addHook('beforeOnCellMouseDown', (event, coords, TD) => this.onBeforeOnCellMouseDown(event, coords, TD));
+    this.registerShortcuts();
     super.enablePlugin();
     // @TODO: Workaround for broken plugin initialization abstraction (#6806).
     this.updatePlugin();
@@ -232,10 +236,62 @@ export class CollapsibleColumns extends BasePlugin {
     this.hot.columnIndexMapper.unregisterMap(this.pluginName);
     _classPrivateFieldSet(this, _collapsedColumnsMap, null);
     this.nestedHeadersPlugin = null;
+    this.unregisterShortcuts();
     this.clearButtons();
     super.disablePlugin();
   }
 
+  /**
+   * Register shortcuts responsible for toggling collapsible columns.
+   *
+   * @private
+   */
+  registerShortcuts() {
+    this.hot.getShortcutManager().getContext('grid').addShortcut({
+      keys: [['Enter']],
+      callback: () => {
+        var _this$headerStateMana;
+        const {
+          row,
+          col
+        } = this.hot.getSelectedRangeLast().highlight;
+        const {
+          collapsible,
+          isCollapsed,
+          columnIndex
+        } = (_this$headerStateMana = this.headerStateManager.getHeaderTreeNodeData(row, col)) !== null && _this$headerStateMana !== void 0 ? _this$headerStateMana : {};
+        if (!collapsible) {
+          return;
+        }
+        if (isCollapsed) {
+          this.expandSection({
+            row,
+            col: columnIndex
+          });
+        } else {
+          this.collapseSection({
+            row,
+            col: columnIndex
+          });
+        }
+      },
+      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 collapsible columns.
+   *
+   * @private
+   */
+  unregisterShortcuts() {
+    this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
+  }
+
   /**
    * Clears the expand/collapse buttons.
    *
@@ -356,7 +412,7 @@ export class CollapsibleColumns extends BasePlugin {
     });
     let isActionPossible = filteredCoords.length > 0;
     arrayEach(filteredCoords, _ref2 => {
-      var _this$headerStateMana;
+      var _this$headerStateMana2;
       let {
         row,
         col: column
@@ -364,7 +420,7 @@ export class CollapsibleColumns extends BasePlugin {
       const {
         collapsible,
         isCollapsed
-      } = (_this$headerStateMana = this.headerStateManager.getHeaderSettings(row, column)) !== null && _this$headerStateMana !== void 0 ? _this$headerStateMana : {};
+      } = (_this$headerStateMana2 = this.headerStateManager.getHeaderSettings(row, column)) !== null && _this$headerStateMana2 !== void 0 ? _this$headerStateMana2 : {};
       if (!collapsible || isCollapsed && action === 'collapse' || !isCollapsed && action === 'expand') {
         isActionPossible = false;
         return false;
@@ -436,14 +492,16 @@ export class CollapsibleColumns extends BasePlugin {
    *                             values counting from 0 to N).
    */
   onAfterGetColHeader(column, TH, headerLevel) {
-    var _this$headerStateMana2;
+    var _this$headerStateMana3;
     const {
       collapsible,
       origColspan,
       isCollapsed
-    } = (_this$headerStateMana2 = this.headerStateManager.getHeaderSettings(headerLevel, column)) !== null && _this$headerStateMana2 !== void 0 ? _this$headerStateMana2 : {};
+    } = (_this$headerStateMana3 = this.headerStateManager.getHeaderSettings(headerLevel, column)) !== null && _this$headerStateMana3 !== void 0 ? _this$headerStateMana3 : {};
     const isNodeCollapsible = collapsible && origColspan > 1 && column >= this.hot.getSettings().fixedColumnsStart;
+    const isAriaTagsEnabled = this.hot.getSettings().ariaTags;
     let collapsibleElement = TH.querySelector(`.${COLLAPSIBLE_ELEMENT_CLASS}`);
+    removeAttribute(TH, [A11Y_EXPANDED('')[0]]);
     if (isNodeCollapsible) {
       if (!collapsibleElement) {
         collapsibleElement = this.hot.rootDocument.createElement('div');
@@ -454,9 +512,22 @@ export class CollapsibleColumns extends BasePlugin {
       if (isCollapsed) {
         addClass(collapsibleElement, 'collapsed');
         fastInnerText(collapsibleElement, '+');
+
+        // Add ARIA tags
+        if (isAriaTagsEnabled) {
+          setAttribute(TH, [A11Y_EXPANDED(false), A11Y_DESCRIPTION(this.hot.getTranslatedPhrase(COLUMN_HEADER_DESCRIPTION_EXPAND_COLUMN))]);
+        }
       } else {
         addClass(collapsibleElement, 'expanded');
         fastInnerText(collapsibleElement, '-');
+
+        // Add ARIA tags
+        if (isAriaTagsEnabled) {
+          setAttribute(TH, [A11Y_EXPANDED(true), A11Y_DESCRIPTION(this.hot.getTranslatedPhrase(COLUMN_HEADER_DESCRIPTION_COLLAPSE_COLUMN))]);
+        }
+      }
+      if (isAriaTagsEnabled) {
+        setAttribute(collapsibleElement, ...A11Y_HIDDEN());
       }
     } else {
       var _collapsibleElement;

package/plugins/columnSorting/columnSorting.js

@@ -15,13 +15,15 @@ var _utils = require("./utils");
 var _domHelpers = require("./domHelpers");
 var _rootComparator = require("./rootComparator");
 var _sortService = require("./sortService");
+var _a11y = require("../../helpers/a11y");
+var _constants = require("../../i18n/constants");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const PLUGIN_KEY = 'columnSorting';
-exports.PLUGIN_KEY = PLUGIN_KEY;
-const PLUGIN_PRIORITY = 50;
-exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
-const APPEND_COLUMN_CONFIG_STRATEGY = 'append';
-const REPLACE_COLUMN_CONFIG_STRATEGY = 'replace';
+const PLUGIN_KEY = exports.PLUGIN_KEY = 'columnSorting';
+const PLUGIN_PRIORITY = exports.PLUGIN_PRIORITY = 50;
+const APPEND_COLUMN_CONFIG_STRATEGY = exports.APPEND_COLUMN_CONFIG_STRATEGY = 'append';
+const REPLACE_COLUMN_CONFIG_STRATEGY = exports.REPLACE_COLUMN_CONFIG_STRATEGY = 'replace';
+const SHORTCUTS_GROUP = PLUGIN_KEY;
+const SORTING_INDICATOR_CLASS = 'columnSortingIndicator';
 (0, _sortService.registerRootComparator)(PLUGIN_KEY, _rootComparator.rootComparator);
 _pluginHooks.default.getSingleton().register('beforeColumnSort');
 _pluginHooks.default.getSingleton().register('afterColumnSort');
@@ -156,6 +158,7 @@ class ColumnSorting extends _base.BasePlugin {
     if (this.hot.view) {
       this.loadOrSortBySettings();
     }
+    this.registerShortcuts();
     super.enablePlugin();
   }
 
@@ -186,9 +189,43 @@ class ColumnSorting extends _base.BasePlugin {
     this.columnStatesManager.destroy();
     this.columnMetaCache = null;
     this.columnStatesManager = null;
+    this.unregisterShortcuts();
     super.disablePlugin();
   }
 
+  /**
+   * Register shortcuts responsible for toggling column sorting functionality.
+   *
+   * @private
+   */
+  registerShortcuts() {
+    this.hot.getShortcutManager().getContext('grid').addShortcut({
+      keys: [['Enter']],
+      callback: () => {
+        const {
+          highlight
+        } = this.hot.getSelectedRangeLast();
+        if (highlight.row === -1 && highlight.col >= 0) {
+          this.sort(this.getColumnNextConfig(highlight.col));
+        }
+      },
+      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() {
+    this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
+  }
+
   // DIFF - MultiColumnSorting & ColumnSorting: changed function documentation.
   /**
    * Sorts the table by chosen columns and orders.
@@ -605,9 +642,15 @@ class ColumnSorting extends _base.BasePlugin {
       return;
     }
     const pluginSettingsForColumn = this.getFirstCellSettings(column)[this.pluginKey];
+    const ariaTags = this.hot.getSettings().ariaTags;
     const showSortIndicator = pluginSettingsForColumn.indicator;
     const headerActionEnabled = pluginSettingsForColumn.headerAction;
+    const currentSortState = this.columnStatesManager.getSortOrderOfColumn(column);
     this.updateHeaderClasses(headerSpanElement, this.columnStatesManager, column, showSortIndicator, headerActionEnabled);
+    this.updateSortingIndicator(column, headerSpanElement);
+    if (ariaTags) {
+      (0, _element.setAttribute)(TH, [(0, _a11y.A11Y_SORT)(currentSortState ? `${currentSortState}ending` : 'none'), (0, _a11y.A11Y_DESCRIPTION)(this.hot.getTranslatedPhrase(_constants.COLUMN_HEADER_DESCRIPTION_SORT_ROWS))]);
+    }
   }
 
   /**
@@ -627,6 +670,28 @@ class ColumnSorting extends _base.BasePlugin {
     }
   }
 
+  /**
+   * Update sorting indicator.
+   *
+   * @private
+   * @param {number} column Visual column index.
+   * @param {HTMLElement} headerSpanElement Header span element.
+   */
+  updateSortingIndicator(column, headerSpanElement) {
+    const pluginSettingsForColumn = this.getFirstCellSettings(column)[this.pluginKey];
+    const ariaTags = this.hot.getSettings().ariaTags;
+    const showSortIndicator = pluginSettingsForColumn.indicator;
+    const isColumnSorted = this.columnStatesManager.isColumnSorted(column);
+    const indicatorElement = headerSpanElement.querySelector(`.${SORTING_INDICATOR_CLASS}`);
+    if (showSortIndicator && isColumnSorted && !indicatorElement) {
+      (0, _element.appendElement)(headerSpanElement, {
+        tagName: 'div',
+        className: SORTING_INDICATOR_CLASS,
+        attributes: ariaTags ? [(0, _a11y.A11Y_HIDDEN)()] : []
+      });
+    }
+  }
+
   /**
    * Overwriting base plugin's `onUpdateSettings` method. Please keep in mind that `onAfterUpdateSettings` isn't called
    * for `updateSettings` in specific situations.

package/plugins/columnSorting/columnSorting.mjs

@@ -1,5 +1,5 @@
 import "core-js/modules/es.array.push.js";
-import { addClass, removeClass } from "../../helpers/dom/element.mjs";
+import { addClass, appendElement, removeClass, setAttribute } from "../../helpers/dom/element.mjs";
 import { isUndefined, isDefined } from "../../helpers/mixed.mjs";
 import { isObject } from "../../helpers/object.mjs";
 import { isFunction } from "../../helpers/function.mjs";
@@ -12,10 +12,14 @@ import { getNextSortOrder, areValidSortStates, getHeaderSpanElement, isFirstLeve
 import { getClassesToRemove, getClassesToAdd } from "./domHelpers.mjs";
 import { rootComparator } from "./rootComparator.mjs";
 import { registerRootComparator, sort } from "./sortService/index.mjs";
+import { A11Y_DESCRIPTION, A11Y_HIDDEN, A11Y_SORT } from "../../helpers/a11y.mjs";
+import { COLUMN_HEADER_DESCRIPTION_SORT_ROWS } from "../../i18n/constants.mjs";
 export const PLUGIN_KEY = 'columnSorting';
 export const PLUGIN_PRIORITY = 50;
-const APPEND_COLUMN_CONFIG_STRATEGY = 'append';
-const REPLACE_COLUMN_CONFIG_STRATEGY = 'replace';
+export const APPEND_COLUMN_CONFIG_STRATEGY = 'append';
+export const REPLACE_COLUMN_CONFIG_STRATEGY = 'replace';
+const SHORTCUTS_GROUP = PLUGIN_KEY;
+const SORTING_INDICATOR_CLASS = 'columnSortingIndicator';
 registerRootComparator(PLUGIN_KEY, rootComparator);
 Hooks.getSingleton().register('beforeColumnSort');
 Hooks.getSingleton().register('afterColumnSort');
@@ -150,6 +154,7 @@ export class ColumnSorting extends BasePlugin {
     if (this.hot.view) {
       this.loadOrSortBySettings();
     }
+    this.registerShortcuts();
     super.enablePlugin();
   }
 
@@ -180,9 +185,43 @@ export class ColumnSorting extends BasePlugin {
     this.columnStatesManager.destroy();
     this.columnMetaCache = null;
     this.columnStatesManager = null;
+    this.unregisterShortcuts();
     super.disablePlugin();
   }
 
+  /**
+   * Register shortcuts responsible for toggling column sorting functionality.
+   *
+   * @private
+   */
+  registerShortcuts() {
+    this.hot.getShortcutManager().getContext('grid').addShortcut({
+      keys: [['Enter']],
+      callback: () => {
+        const {
+          highlight
+        } = this.hot.getSelectedRangeLast();
+        if (highlight.row === -1 && highlight.col >= 0) {
+          this.sort(this.getColumnNextConfig(highlight.col));
+        }
+      },
+      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() {
+    this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
+  }
+
   // DIFF - MultiColumnSorting & ColumnSorting: changed function documentation.
   /**
    * Sorts the table by chosen columns and orders.
@@ -599,9 +638,15 @@ export class ColumnSorting extends BasePlugin {
       return;
     }
     const pluginSettingsForColumn = this.getFirstCellSettings(column)[this.pluginKey];
+    const ariaTags = this.hot.getSettings().ariaTags;
     const showSortIndicator = pluginSettingsForColumn.indicator;
     const headerActionEnabled = pluginSettingsForColumn.headerAction;
+    const currentSortState = this.columnStatesManager.getSortOrderOfColumn(column);
     this.updateHeaderClasses(headerSpanElement, this.columnStatesManager, column, showSortIndicator, headerActionEnabled);
+    this.updateSortingIndicator(column, headerSpanElement);
+    if (ariaTags) {
+      setAttribute(TH, [A11Y_SORT(currentSortState ? `${currentSortState}ending` : 'none'), A11Y_DESCRIPTION(this.hot.getTranslatedPhrase(COLUMN_HEADER_DESCRIPTION_SORT_ROWS))]);
+    }
   }
 
   /**
@@ -621,6 +666,28 @@ export class ColumnSorting extends BasePlugin {
     }
   }
 
+  /**
+   * Update sorting indicator.
+   *
+   * @private
+   * @param {number} column Visual column index.
+   * @param {HTMLElement} headerSpanElement Header span element.
+   */
+  updateSortingIndicator(column, headerSpanElement) {
+    const pluginSettingsForColumn = this.getFirstCellSettings(column)[this.pluginKey];
+    const ariaTags = this.hot.getSettings().ariaTags;
+    const showSortIndicator = pluginSettingsForColumn.indicator;
+    const isColumnSorted = this.columnStatesManager.isColumnSorted(column);
+    const indicatorElement = headerSpanElement.querySelector(`.${SORTING_INDICATOR_CLASS}`);
+    if (showSortIndicator && isColumnSorted && !indicatorElement) {
+      appendElement(headerSpanElement, {
+        tagName: 'div',
+        className: SORTING_INDICATOR_CLASS,
+        attributes: ariaTags ? [A11Y_HIDDEN()] : []
+      });
+    }
+  }
+
   /**
    * Overwriting base plugin's `onUpdateSettings` method. Please keep in mind that `onAfterUpdateSettings` isn't called
    * for `updateSettings` in specific situations.

package/plugins/columnSorting/index.js

@@ -4,4 +4,6 @@ exports.__esModule = true;
 var _columnSorting = require("./columnSorting");
 exports.PLUGIN_KEY = _columnSorting.PLUGIN_KEY;
 exports.PLUGIN_PRIORITY = _columnSorting.PLUGIN_PRIORITY;
-exports.ColumnSorting = _columnSorting.ColumnSorting;
+exports.ColumnSorting = _columnSorting.ColumnSorting;
+exports.APPEND_COLUMN_CONFIG_STRATEGY = _columnSorting.APPEND_COLUMN_CONFIG_STRATEGY;
+exports.REPLACE_COLUMN_CONFIG_STRATEGY = _columnSorting.REPLACE_COLUMN_CONFIG_STRATEGY;

package/plugins/columnSorting/index.mjs

@@ -1 +1 @@
-export { PLUGIN_KEY, PLUGIN_PRIORITY, ColumnSorting } from "./columnSorting.mjs";
+export { PLUGIN_KEY, PLUGIN_PRIORITY, ColumnSorting, APPEND_COLUMN_CONFIG_STRATEGY, REPLACE_COLUMN_CONFIG_STRATEGY } from "./columnSorting.mjs";