handsontable 0.0.0-next-50e428d-20231026 → 0.0.0-next-42d5bd7-20231027

package/plugins/filters/ui/input.js

@@ -63,11 +63,8 @@ class InputUI extends _base.BaseUI {
    */
   build() {
     super.build();
-    const icon = this.hot.rootDocument.createElement('div');
     _classPrivateFieldSet(this, _input, this._element.firstChild);
     (0, _element.addClass)(this._element, 'htUIInput');
-    (0, _element.addClass)(icon, 'htUIInputIcon');
-    this._element.appendChild(icon);
     this.update();
   }
 

package/plugins/filters/ui/input.mjs

@@ -60,11 +60,8 @@ export class InputUI extends BaseUI {
    */
   build() {
     super.build();
-    const icon = this.hot.rootDocument.createElement('div');
     _classPrivateFieldSet(this, _input, this._element.firstChild);
     addClass(this._element, 'htUIInput');
-    addClass(icon, 'htUIInputIcon');
-    this._element.appendChild(icon);
     this.update();
   }
 

package/plugins/filters/ui/select.js

@@ -5,9 +5,11 @@ exports.__esModule = true;
 var _menu2 = require("../../../plugins/contextMenu/menu");
 var _object = require("../../../helpers/object");
 var _array = require("../../../helpers/array");
+var _element = require("../../../helpers/dom/element");
 var C = _interopRequireWildcard(require("../../../i18n/constants"));
 var _predefinedItems = require("../../../plugins/contextMenu/predefinedItems");
 var _base = require("./_base");
+var _a11y = require("../../../helpers/a11y");
 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 _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
@@ -169,6 +171,10 @@ class SelectUI extends _base.BaseUI {
     _classPrivateFieldSet(this, _caption, caption);
     _classPrivateFieldSet(this, _captionElement, caption.element);
     _classPrivateFieldSet(this, _dropdown, dropdown);
+    if (this.hot.getSettings().ariaTags) {
+      (0, _element.setAttribute)(dropdown.element, [(0, _a11y.A11Y_HIDDEN)()]);
+      (0, _element.setAttribute)(this._element, [(0, _a11y.A11Y_LISTBOX)()]);
+    }
     (0, _array.arrayEach)([caption, dropdown], element => this._element.appendChild(element.element));
     _classPrivateFieldGet(this, _menu).addLocalHook('select', command => _classPrivateMethodGet(this, _onMenuSelect, _onMenuSelect2).call(this, command));
     _classPrivateFieldGet(this, _menu).addLocalHook('afterClose', () => _classPrivateMethodGet(this, _onMenuClosed, _onMenuClosed2).call(this));

package/plugins/filters/ui/select.mjs

@@ -11,9 +11,11 @@ function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) {
 import { Menu } from "../../../plugins/contextMenu/menu/index.mjs";
 import { clone, extend } from "../../../helpers/object.mjs";
 import { arrayEach } from "../../../helpers/array.mjs";
+import { setAttribute } from "../../../helpers/dom/element.mjs";
 import * as C from "../../../i18n/constants.mjs";
 import { SEPARATOR } from "../../../plugins/contextMenu/predefinedItems/index.mjs";
 import { BaseUI } from "./_base.mjs";
+import { A11Y_HIDDEN, A11Y_LISTBOX } from "../../../helpers/a11y.mjs";
 /**
  * @private
  * @class SelectUI
@@ -164,6 +166,10 @@ export class SelectUI extends BaseUI {
     _classPrivateFieldSet(this, _caption, caption);
     _classPrivateFieldSet(this, _captionElement, caption.element);
     _classPrivateFieldSet(this, _dropdown, dropdown);
+    if (this.hot.getSettings().ariaTags) {
+      setAttribute(dropdown.element, [A11Y_HIDDEN()]);
+      setAttribute(this._element, [A11Y_LISTBOX()]);
+    }
     arrayEach([caption, dropdown], element => this._element.appendChild(element.element));
     _classPrivateFieldGet(this, _menu).addLocalHook('select', command => _classPrivateMethodGet(this, _onMenuSelect, _onMenuSelect2).call(this, command));
     _classPrivateFieldGet(this, _menu).addLocalHook('afterClose', () => _classPrivateMethodGet(this, _onMenuClosed, _onMenuClosed2).call(this));

package/plugins/hiddenColumns/hiddenColumns.js

@@ -14,9 +14,13 @@ var _pluginHooks = _interopRequireDefault(require("../../pluginHooks"));
 var _hideColumn = _interopRequireDefault(require("./contextMenuItem/hideColumn"));
 var _showColumn = _interopRequireDefault(require("./contextMenuItem/showColumn"));
 var _translations = require("../../translations");
+var _a11y = require("../../helpers/a11y");
+var _constants = require("../../i18n/constants");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(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 _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
 function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
 function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
 function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set"); _classApplyDescriptorSet(receiver, descriptor, value); return value; }
@@ -29,6 +33,9 @@ _pluginHooks.default.getSingleton().register('afterUnhideColumns');
 const PLUGIN_KEY = 'hiddenColumns';
 exports.PLUGIN_KEY = PLUGIN_KEY;
 const PLUGIN_PRIORITY = 310;
+exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
+const BEFORE_INDICATOR_CLASSNAME = 'beforeHiddenColumnIndicator';
+const AFTER_INDICATOR_CLASSNAME = 'afterHiddenColumnIndicator';
 
 /* eslint-disable jsdoc/require-description-complete-sentence */
 
@@ -136,12 +143,18 @@ const PLUGIN_PRIORITY = 310;
  * ```
  * :::
  */
-exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
 var _settings = /*#__PURE__*/new WeakMap();
 var _hiddenColumnsMap = /*#__PURE__*/new WeakMap();
+var _clearIndicatorElements = /*#__PURE__*/new WeakSet();
 class HiddenColumns extends _base.BasePlugin {
   constructor() {
     super(...arguments);
+    /**
+     * Remove the indicator elements from the provided column header element.
+     *
+     * @param {HTMLElement} TH Column header element.
+     */
+    _classPrivateMethodInitSpec(this, _clearIndicatorElements);
     /**
      * Cached plugin settings.
      *
@@ -225,8 +238,15 @@ class HiddenColumns extends _base.BasePlugin {
    * Disables the plugin functionality for this Handsontable instance.
    */
   disablePlugin() {
+    const clearColHeader = (columnIndex, TH) => {
+      _classPrivateMethodGet(this, _clearIndicatorElements, _clearIndicatorElements2).call(this, TH);
+    };
     this.hot.columnIndexMapper.unregisterMap(this.pluginName);
     _classPrivateFieldSet(this, _settings, {});
+    this.hot.addHook('afterGetColHeader', clearColHeader);
+    this.hot.addHookOnce('afterViewRender', () => {
+      this.hot.removeHook('afterGetColHeader', clearColHeader);
+    });
     super.disablePlugin();
     this.resetCellsMeta();
   }
@@ -368,7 +388,6 @@ class HiddenColumns extends _base.BasePlugin {
       }
     });
   }
-
   /**
    * Adds the additional column width for the hidden column indicators.
    *
@@ -473,14 +492,35 @@ class HiddenColumns extends _base.BasePlugin {
    * @param {HTMLElement} TH Header's TH element.
    */
   onAfterGetColHeader(column, TH) {
+    const areAriaTagsEnabled = this.hot.getSettings().ariaTags;
+    const beforeHiddenColumnIndicatorElement = TH.querySelector('.beforeHiddenColumnIndicator');
+    const afterHiddenColumnIndicatorElement = TH.querySelector('.afterHiddenColumnIndicator');
     if (!_classPrivateFieldGet(this, _settings).indicators || column < 0) {
+      beforeHiddenColumnIndicatorElement === null || beforeHiddenColumnIndicatorElement === void 0 || beforeHiddenColumnIndicatorElement.remove();
+      afterHiddenColumnIndicatorElement === null || afterHiddenColumnIndicatorElement === void 0 || afterHiddenColumnIndicatorElement.remove();
       return;
     }
     const classList = [];
     if (column >= 1 && this.isHidden(column - 1)) {
+      if (!afterHiddenColumnIndicatorElement) {
+        const attributesToAdd = areAriaTagsEnabled ? [(0, _a11y.A11Y_LABEL)(this.hot.getTranslatedPhrase(_constants.COLUMN_HEADER_LABEL_AFTER_HIDDEN_COLUMN))] : [];
+        (0, _element.appendElement)(TH, {
+          tagName: 'div',
+          attributes: attributesToAdd,
+          className: AFTER_INDICATOR_CLASSNAME
+        });
+      }
       classList.push('afterHiddenColumn');
     }
     if (column < this.hot.countCols() - 1 && this.isHidden(column + 1)) {
+      if (!beforeHiddenColumnIndicatorElement) {
+        const attributesToAdd = areAriaTagsEnabled ? [(0, _a11y.A11Y_LABEL)(this.hot.getTranslatedPhrase(_constants.COLUMN_HEADER_LABEL_BEFORE_HIDDEN_COLUMN))] : [];
+        (0, _element.appendElement)(TH, {
+          tagName: 'div',
+          attributes: attributesToAdd,
+          className: BEFORE_INDICATOR_CLASSNAME
+        });
+      }
       classList.push('beforeHiddenColumn');
     }
     (0, _element.addClass)(TH, classList);
@@ -518,4 +558,9 @@ class HiddenColumns extends _base.BasePlugin {
     super.destroy();
   }
 }
-exports.HiddenColumns = HiddenColumns;
+exports.HiddenColumns = HiddenColumns;
+function _clearIndicatorElements2(TH) {
+  Array.from(TH.querySelectorAll(`.${AFTER_INDICATOR_CLASSNAME}, .${BEFORE_INDICATOR_CLASSNAME}`)).forEach(element => {
+    element.remove();
+  });
+}

package/plugins/hiddenColumns/hiddenColumns.mjs

@@ -1,14 +1,16 @@
 import "core-js/modules/es.array.push.js";
 import "core-js/modules/es.error.cause.js";
+function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(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 _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
 function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
 function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
 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; } }
 import { BasePlugin } from "../base/index.mjs";
-import { addClass } from "../../helpers/dom/element.mjs";
+import { addClass, appendElement } from "../../helpers/dom/element.mjs";
 import { rangeEach } from "../../helpers/number.mjs";
 import { arrayEach, arrayMap, arrayReduce } from "../../helpers/array.mjs";
 import { isObject } from "../../helpers/object.mjs";
@@ -18,12 +20,16 @@ import Hooks from "../../pluginHooks.mjs";
 import hideColumnItem from "./contextMenuItem/hideColumn.mjs";
 import showColumnItem from "./contextMenuItem/showColumn.mjs";
 import { HidingMap } from "../../translations/index.mjs";
+import { A11Y_LABEL } from "../../helpers/a11y.mjs";
+import { COLUMN_HEADER_LABEL_AFTER_HIDDEN_COLUMN, COLUMN_HEADER_LABEL_BEFORE_HIDDEN_COLUMN } from "../../i18n/constants.mjs";
 Hooks.getSingleton().register('beforeHideColumns');
 Hooks.getSingleton().register('afterHideColumns');
 Hooks.getSingleton().register('beforeUnhideColumns');
 Hooks.getSingleton().register('afterUnhideColumns');
 export const PLUGIN_KEY = 'hiddenColumns';
 export const PLUGIN_PRIORITY = 310;
+const BEFORE_INDICATOR_CLASSNAME = 'beforeHiddenColumnIndicator';
+const AFTER_INDICATOR_CLASSNAME = 'afterHiddenColumnIndicator';
 
 /* eslint-disable jsdoc/require-description-complete-sentence */
 
@@ -133,9 +139,16 @@ export const PLUGIN_PRIORITY = 310;
  */
 var _settings = /*#__PURE__*/new WeakMap();
 var _hiddenColumnsMap = /*#__PURE__*/new WeakMap();
+var _clearIndicatorElements = /*#__PURE__*/new WeakSet();
 export class HiddenColumns extends BasePlugin {
   constructor() {
     super(...arguments);
+    /**
+     * Remove the indicator elements from the provided column header element.
+     *
+     * @param {HTMLElement} TH Column header element.
+     */
+    _classPrivateMethodInitSpec(this, _clearIndicatorElements);
     /**
      * Cached plugin settings.
      *
@@ -219,8 +232,15 @@ export class HiddenColumns extends BasePlugin {
    * Disables the plugin functionality for this Handsontable instance.
    */
   disablePlugin() {
+    const clearColHeader = (columnIndex, TH) => {
+      _classPrivateMethodGet(this, _clearIndicatorElements, _clearIndicatorElements2).call(this, TH);
+    };
     this.hot.columnIndexMapper.unregisterMap(this.pluginName);
     _classPrivateFieldSet(this, _settings, {});
+    this.hot.addHook('afterGetColHeader', clearColHeader);
+    this.hot.addHookOnce('afterViewRender', () => {
+      this.hot.removeHook('afterGetColHeader', clearColHeader);
+    });
     super.disablePlugin();
     this.resetCellsMeta();
   }
@@ -362,7 +382,6 @@ export class HiddenColumns extends BasePlugin {
       }
     });
   }
-
   /**
    * Adds the additional column width for the hidden column indicators.
    *
@@ -467,14 +486,35 @@ export class HiddenColumns extends BasePlugin {
    * @param {HTMLElement} TH Header's TH element.
    */
   onAfterGetColHeader(column, TH) {
+    const areAriaTagsEnabled = this.hot.getSettings().ariaTags;
+    const beforeHiddenColumnIndicatorElement = TH.querySelector('.beforeHiddenColumnIndicator');
+    const afterHiddenColumnIndicatorElement = TH.querySelector('.afterHiddenColumnIndicator');
     if (!_classPrivateFieldGet(this, _settings).indicators || column < 0) {
+      beforeHiddenColumnIndicatorElement === null || beforeHiddenColumnIndicatorElement === void 0 || beforeHiddenColumnIndicatorElement.remove();
+      afterHiddenColumnIndicatorElement === null || afterHiddenColumnIndicatorElement === void 0 || afterHiddenColumnIndicatorElement.remove();
       return;
     }
     const classList = [];
     if (column >= 1 && this.isHidden(column - 1)) {
+      if (!afterHiddenColumnIndicatorElement) {
+        const attributesToAdd = areAriaTagsEnabled ? [A11Y_LABEL(this.hot.getTranslatedPhrase(COLUMN_HEADER_LABEL_AFTER_HIDDEN_COLUMN))] : [];
+        appendElement(TH, {
+          tagName: 'div',
+          attributes: attributesToAdd,
+          className: AFTER_INDICATOR_CLASSNAME
+        });
+      }
       classList.push('afterHiddenColumn');
     }
     if (column < this.hot.countCols() - 1 && this.isHidden(column + 1)) {
+      if (!beforeHiddenColumnIndicatorElement) {
+        const attributesToAdd = areAriaTagsEnabled ? [A11Y_LABEL(this.hot.getTranslatedPhrase(COLUMN_HEADER_LABEL_BEFORE_HIDDEN_COLUMN))] : [];
+        appendElement(TH, {
+          tagName: 'div',
+          attributes: attributesToAdd,
+          className: BEFORE_INDICATOR_CLASSNAME
+        });
+      }
       classList.push('beforeHiddenColumn');
     }
     addClass(TH, classList);
@@ -511,4 +551,9 @@ export class HiddenColumns extends BasePlugin {
     _classPrivateFieldSet(this, _hiddenColumnsMap, null);
     super.destroy();
   }
+}
+function _clearIndicatorElements2(TH) {
+  Array.from(TH.querySelectorAll(`.${AFTER_INDICATOR_CLASSNAME}, .${BEFORE_INDICATOR_CLASSNAME}`)).forEach(element => {
+    element.remove();
+  });
 }

package/plugins/hiddenRows/hiddenRows.js

@@ -14,9 +14,13 @@ var _pluginHooks = _interopRequireDefault(require("../../pluginHooks"));
 var _hideRow = _interopRequireDefault(require("./contextMenuItem/hideRow"));
 var _showRow = _interopRequireDefault(require("./contextMenuItem/showRow"));
 var _translations = require("../../translations");
+var _a11y = require("../../helpers/a11y");
+var _constants = require("../../i18n/constants");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(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 _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
 function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
 function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
 function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set"); _classApplyDescriptorSet(receiver, descriptor, value); return value; }
@@ -29,6 +33,9 @@ _pluginHooks.default.getSingleton().register('afterUnhideRows');
 const PLUGIN_KEY = 'hiddenRows';
 exports.PLUGIN_KEY = PLUGIN_KEY;
 const PLUGIN_PRIORITY = 320;
+exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
+const AFTER_INDICATOR_CLASSNAME = 'afterHiddenRowIndicator';
+const BEFORE_INDICATOR_CLASSNAME = 'beforeHiddenRowIndicator';
 
 /* eslint-disable jsdoc/require-description-complete-sentence */
 
@@ -136,12 +143,18 @@ const PLUGIN_PRIORITY = 320;
  * ```
  * :::
  */
-exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
 var _settings = /*#__PURE__*/new WeakMap();
 var _hiddenRowsMap = /*#__PURE__*/new WeakMap();
+var _clearIndicatorElements = /*#__PURE__*/new WeakSet();
 class HiddenRows extends _base.BasePlugin {
   constructor() {
     super(...arguments);
+    /**
+     * Remove the indicator elements from the provided row header element.
+     *
+     * @param {HTMLElement} TH Column header element.
+     */
+    _classPrivateMethodInitSpec(this, _clearIndicatorElements);
     /**
      * Cached settings from Handsontable settings.
      *
@@ -225,8 +238,15 @@ class HiddenRows extends _base.BasePlugin {
    * Disables the plugin functionality for this Handsontable instance.
    */
   disablePlugin() {
+    const clearRowHeader = (columnIndex, TH) => {
+      _classPrivateMethodGet(this, _clearIndicatorElements, _clearIndicatorElements2).call(this, TH);
+    };
     this.hot.rowIndexMapper.unregisterMap(this.pluginName);
     _classPrivateFieldSet(this, _settings, {});
+    this.hot.addHook('afterGetRowHeader', clearRowHeader);
+    this.hot.addHookOnce('afterViewRender', () => {
+      this.hot.removeHook('afterGetRowHeader', clearRowHeader);
+    });
     super.disablePlugin();
     this.resetCellsMeta();
   }
@@ -365,7 +385,6 @@ class HiddenRows extends _base.BasePlugin {
       }
     });
   }
-
   /**
    * Adds the additional row height for the hidden row indicators.
    *
@@ -465,14 +484,35 @@ class HiddenRows extends _base.BasePlugin {
    * @param {HTMLElement} TH Header's TH element.
    */
   onAfterGetRowHeader(row, TH) {
+    const areAriaTagsEnabled = this.hot.getSettings().ariaTags;
+    const beforeHiddenRowIndicatorElement = TH.querySelector('.beforeHiddenRowIndicator');
+    const afterHiddenRowIndicatorElement = TH.querySelector('.afterHiddenRowIndicator');
     if (!_classPrivateFieldGet(this, _settings).indicators || row < 0) {
+      beforeHiddenRowIndicatorElement === null || beforeHiddenRowIndicatorElement === void 0 || beforeHiddenRowIndicatorElement.remove();
+      afterHiddenRowIndicatorElement === null || afterHiddenRowIndicatorElement === void 0 || afterHiddenRowIndicatorElement.remove();
       return;
     }
     const classList = [];
     if (row >= 1 && this.isHidden(row - 1)) {
+      if (!afterHiddenRowIndicatorElement) {
+        const attributesToAdd = areAriaTagsEnabled ? [(0, _a11y.A11Y_LABEL)(this.hot.getTranslatedPhrase(_constants.ROW_HEADER_LABEL_AFTER_HIDDEN_ROW))] : [];
+        (0, _element.appendElement)(TH, {
+          tagName: 'div',
+          attributes: attributesToAdd,
+          className: AFTER_INDICATOR_CLASSNAME
+        });
+      }
       classList.push('afterHiddenRow');
     }
     if (row < this.hot.countRows() - 1 && this.isHidden(row + 1)) {
+      if (!beforeHiddenRowIndicatorElement) {
+        const attributesToAdd = areAriaTagsEnabled ? [(0, _a11y.A11Y_LABEL)(this.hot.getTranslatedPhrase(_constants.ROW_HEADER_LABEL_BEFORE_HIDDEN_ROW))] : [];
+        (0, _element.appendElement)(TH, {
+          tagName: 'div',
+          attributes: attributesToAdd,
+          className: BEFORE_INDICATOR_CLASSNAME
+        });
+      }
       classList.push('beforeHiddenRow');
     }
     (0, _element.addClass)(TH, classList);
@@ -510,4 +550,9 @@ class HiddenRows extends _base.BasePlugin {
     super.destroy();
   }
 }
-exports.HiddenRows = HiddenRows;
+exports.HiddenRows = HiddenRows;
+function _clearIndicatorElements2(TH) {
+  Array.from(TH.querySelectorAll(`.${AFTER_INDICATOR_CLASSNAME}, .${BEFORE_INDICATOR_CLASSNAME}`)).forEach(element => {
+    element.remove();
+  });
+}

package/plugins/hiddenRows/hiddenRows.mjs

@@ -1,14 +1,16 @@
 import "core-js/modules/es.array.push.js";
 import "core-js/modules/es.error.cause.js";
+function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(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 _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
 function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
 function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
 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; } }
 import { BasePlugin } from "../base/index.mjs";
-import { addClass } from "../../helpers/dom/element.mjs";
+import { addClass, appendElement } from "../../helpers/dom/element.mjs";
 import { rangeEach } from "../../helpers/number.mjs";
 import { arrayEach, arrayMap, arrayReduce } from "../../helpers/array.mjs";
 import { isObject } from "../../helpers/object.mjs";
@@ -18,12 +20,16 @@ import Hooks from "../../pluginHooks.mjs";
 import hideRowItem from "./contextMenuItem/hideRow.mjs";
 import showRowItem from "./contextMenuItem/showRow.mjs";
 import { HidingMap } from "../../translations/index.mjs";
+import { A11Y_LABEL } from "../../helpers/a11y.mjs";
+import { ROW_HEADER_LABEL_AFTER_HIDDEN_ROW, ROW_HEADER_LABEL_BEFORE_HIDDEN_ROW } from "../../i18n/constants.mjs";
 Hooks.getSingleton().register('beforeHideRows');
 Hooks.getSingleton().register('afterHideRows');
 Hooks.getSingleton().register('beforeUnhideRows');
 Hooks.getSingleton().register('afterUnhideRows');
 export const PLUGIN_KEY = 'hiddenRows';
 export const PLUGIN_PRIORITY = 320;
+const AFTER_INDICATOR_CLASSNAME = 'afterHiddenRowIndicator';
+const BEFORE_INDICATOR_CLASSNAME = 'beforeHiddenRowIndicator';
 
 /* eslint-disable jsdoc/require-description-complete-sentence */
 
@@ -133,9 +139,16 @@ export const PLUGIN_PRIORITY = 320;
  */
 var _settings = /*#__PURE__*/new WeakMap();
 var _hiddenRowsMap = /*#__PURE__*/new WeakMap();
+var _clearIndicatorElements = /*#__PURE__*/new WeakSet();
 export class HiddenRows extends BasePlugin {
   constructor() {
     super(...arguments);
+    /**
+     * Remove the indicator elements from the provided row header element.
+     *
+     * @param {HTMLElement} TH Column header element.
+     */
+    _classPrivateMethodInitSpec(this, _clearIndicatorElements);
     /**
      * Cached settings from Handsontable settings.
      *
@@ -219,8 +232,15 @@ export class HiddenRows extends BasePlugin {
    * Disables the plugin functionality for this Handsontable instance.
    */
   disablePlugin() {
+    const clearRowHeader = (columnIndex, TH) => {
+      _classPrivateMethodGet(this, _clearIndicatorElements, _clearIndicatorElements2).call(this, TH);
+    };
     this.hot.rowIndexMapper.unregisterMap(this.pluginName);
     _classPrivateFieldSet(this, _settings, {});
+    this.hot.addHook('afterGetRowHeader', clearRowHeader);
+    this.hot.addHookOnce('afterViewRender', () => {
+      this.hot.removeHook('afterGetRowHeader', clearRowHeader);
+    });
     super.disablePlugin();
     this.resetCellsMeta();
   }
@@ -359,7 +379,6 @@ export class HiddenRows extends BasePlugin {
       }
     });
   }
-
   /**
    * Adds the additional row height for the hidden row indicators.
    *
@@ -459,14 +478,35 @@ export class HiddenRows extends BasePlugin {
    * @param {HTMLElement} TH Header's TH element.
    */
   onAfterGetRowHeader(row, TH) {
+    const areAriaTagsEnabled = this.hot.getSettings().ariaTags;
+    const beforeHiddenRowIndicatorElement = TH.querySelector('.beforeHiddenRowIndicator');
+    const afterHiddenRowIndicatorElement = TH.querySelector('.afterHiddenRowIndicator');
     if (!_classPrivateFieldGet(this, _settings).indicators || row < 0) {
+      beforeHiddenRowIndicatorElement === null || beforeHiddenRowIndicatorElement === void 0 || beforeHiddenRowIndicatorElement.remove();
+      afterHiddenRowIndicatorElement === null || afterHiddenRowIndicatorElement === void 0 || afterHiddenRowIndicatorElement.remove();
       return;
     }
     const classList = [];
     if (row >= 1 && this.isHidden(row - 1)) {
+      if (!afterHiddenRowIndicatorElement) {
+        const attributesToAdd = areAriaTagsEnabled ? [A11Y_LABEL(this.hot.getTranslatedPhrase(ROW_HEADER_LABEL_AFTER_HIDDEN_ROW))] : [];
+        appendElement(TH, {
+          tagName: 'div',
+          attributes: attributesToAdd,
+          className: AFTER_INDICATOR_CLASSNAME
+        });
+      }
       classList.push('afterHiddenRow');
     }
     if (row < this.hot.countRows() - 1 && this.isHidden(row + 1)) {
+      if (!beforeHiddenRowIndicatorElement) {
+        const attributesToAdd = areAriaTagsEnabled ? [A11Y_LABEL(this.hot.getTranslatedPhrase(ROW_HEADER_LABEL_BEFORE_HIDDEN_ROW))] : [];
+        appendElement(TH, {
+          tagName: 'div',
+          attributes: attributesToAdd,
+          className: BEFORE_INDICATOR_CLASSNAME
+        });
+      }
       classList.push('beforeHiddenRow');
     }
     addClass(TH, classList);
@@ -503,4 +543,9 @@ export class HiddenRows extends BasePlugin {
     _classPrivateFieldSet(this, _hiddenRowsMap, null);
     super.destroy();
   }
+}
+function _clearIndicatorElements2(TH) {
+  Array.from(TH.querySelectorAll(`.${AFTER_INDICATOR_CLASSNAME}, .${BEFORE_INDICATOR_CLASSNAME}`)).forEach(element => {
+    element.remove();
+  });
 }

package/plugins/multiColumnSorting/multiColumnSorting.js

@@ -8,6 +8,8 @@ var _element = require("../../helpers/dom/element");
 var _rootComparator = require("./rootComparator");
 var _utils2 = require("./utils");
 var _domHelpers = require("./domHelpers");
+var _a11y = require("../../helpers/a11y");
+var _constants = require("../../i18n/constants");
 const PLUGIN_KEY = 'multiColumnSorting';
 exports.PLUGIN_KEY = PLUGIN_KEY;
 const PLUGIN_PRIORITY = 170;
@@ -268,6 +270,25 @@ class MultiColumnSorting extends _columnSorting.ColumnSorting {
     }
   }
 
+  /**
+   * Update sorting indicator.
+   *
+   * @private
+   * @param {number} column Visual column index.
+   * @param {HTMLElement} headerSpanElement Header span element.
+   */
+  updateSortingIndicator(column, headerSpanElement) {
+    super.updateSortingIndicator(column, headerSpanElement);
+    const indicatorElement = headerSpanElement.querySelector('.columnSortingIndicator');
+    if (!indicatorElement || !this.hot.getSettings().ariaTags || !this.columnStatesManager.isColumnSorted(column) || this.columnStatesManager.getNumberOfSortedColumns() <= 1) {
+      return;
+    }
+    const multiColumnSortingOrder = this.columnStatesManager.getIndexOfColumnInSortQueue(column) + 1;
+    const a11yLabelAttribute = (0, _a11y.A11Y_LABEL)(`${this.hot.getTranslatedPhrase(_constants.COLUMN_HEADER_LABEL_MULTI_COLUMN_SORT_ORDER)} ${multiColumnSortingOrder}.`);
+    (0, _element.removeAttribute)(indicatorElement, (0, _a11y.A11Y_HIDDEN)()[0]);
+    (0, _element.setAttribute)(indicatorElement, ...a11yLabelAttribute);
+  }
+
   /**
    * Overwriting base plugin's `onUpdateSettings` method. Please keep in mind that `onAfterUpdateSettings` isn't called
    * for `updateSettings` in specific situations.

package/plugins/multiColumnSorting/multiColumnSorting.mjs

@@ -1,10 +1,12 @@
 import { APPEND_COLUMN_CONFIG_STRATEGY, ColumnSorting } from "../columnSorting/index.mjs";
 import { registerRootComparator } from "../columnSorting/sortService/index.mjs";
 import { wasHeaderClickedProperly } from "../columnSorting/utils.mjs";
-import { addClass, removeClass } from "../../helpers/dom/element.mjs";
+import { addClass, removeClass, setAttribute, removeAttribute } from "../../helpers/dom/element.mjs";
 import { rootComparator } from "./rootComparator.mjs";
 import { warnAboutPluginsConflict } from "./utils.mjs";
 import { getClassesToAdd, getClassesToRemove } from "./domHelpers.mjs";
+import { A11Y_HIDDEN, A11Y_LABEL } from "../../helpers/a11y.mjs";
+import { COLUMN_HEADER_LABEL_MULTI_COLUMN_SORT_ORDER } from "../../i18n/constants.mjs";
 export const PLUGIN_KEY = 'multiColumnSorting';
 export const PLUGIN_PRIORITY = 170;
 const CONFLICTED_PLUGIN_KEY = 'columnSorting';
@@ -263,6 +265,25 @@ export class MultiColumnSorting extends ColumnSorting {
     }
   }
 
+  /**
+   * Update sorting indicator.
+   *
+   * @private
+   * @param {number} column Visual column index.
+   * @param {HTMLElement} headerSpanElement Header span element.
+   */
+  updateSortingIndicator(column, headerSpanElement) {
+    super.updateSortingIndicator(column, headerSpanElement);
+    const indicatorElement = headerSpanElement.querySelector('.columnSortingIndicator');
+    if (!indicatorElement || !this.hot.getSettings().ariaTags || !this.columnStatesManager.isColumnSorted(column) || this.columnStatesManager.getNumberOfSortedColumns() <= 1) {
+      return;
+    }
+    const multiColumnSortingOrder = this.columnStatesManager.getIndexOfColumnInSortQueue(column) + 1;
+    const a11yLabelAttribute = A11Y_LABEL(`${this.hot.getTranslatedPhrase(COLUMN_HEADER_LABEL_MULTI_COLUMN_SORT_ORDER)} ${multiColumnSortingOrder}.`);
+    removeAttribute(indicatorElement, A11Y_HIDDEN()[0]);
+    setAttribute(indicatorElement, ...a11yLabelAttribute);
+  }
+
   /**
    * Overwriting base plugin's `onUpdateSettings` method. Please keep in mind that `onAfterUpdateSettings` isn't called
    * for `updateSettings` in specific situations.