handsontable 0.0.0-next-f11b1a2-20231123 → 0.0.0-next-44acfea-20231127

package/editors/dateEditor/dateEditor.js

@@ -7,7 +7,6 @@ var _pikaday = _interopRequireDefault(require("pikaday"));
 var _textEditor = require("../textEditor");
 var _eventManager = _interopRequireDefault(require("../../eventManager"));
 var _element = require("../../helpers/dom/element");
-var _a11y = require("../../helpers/a11y");
 var _object = require("../../helpers/object");
 var _unicode = require("../../helpers/unicode");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -134,9 +133,6 @@ class DateEditor extends _textEditor.TextEditor {
     const editorContext = shortcutManager.getContext('editor');
     super.open();
     this.showDatepicker(event);
-    if (this.hot.getSettings().ariaTags) {
-      (0, _element.setAttribute)(this.TD, [(0, _a11y.A11Y_EXPANDED)('true')]);
-    }
     editorContext.addShortcut({
       keys: [['Enter']],
       callback: keyboardEvent => {
@@ -162,9 +158,6 @@ class DateEditor extends _textEditor.TextEditor {
     this.hot._registerTimeout(() => {
       this.hot._refreshBorders();
     });
-    if (this.TD && this.hot.getSettings().ariaTags) {
-      (0, _element.setAttribute)(this.TD, [(0, _a11y.A11Y_EXPANDED)('false')]);
-    }
     const shortcutManager = this.hot.getShortcutManager();
     const editorContext = shortcutManager.getContext('editor');
     editorContext.removeShortcutsByGroup(SHORTCUTS_GROUP_EDITOR);

package/editors/dateEditor/dateEditor.mjs

@@ -6,8 +6,7 @@ import moment from 'moment';
 import Pikaday from 'pikaday';
 import { TextEditor } from "../textEditor/index.mjs";
 import EventManager from "../../eventManager.mjs";
-import { addClass, hasClass, outerHeight, outerWidth, setAttribute } from "../../helpers/dom/element.mjs";
-import { A11Y_EXPANDED } from "../../helpers/a11y.mjs";
+import { addClass, hasClass, outerHeight, outerWidth } from "../../helpers/dom/element.mjs";
 import { deepExtend } from "../../helpers/object.mjs";
 import { isFunctionKey } from "../../helpers/unicode.mjs";
 export const EDITOR_TYPE = 'date';
@@ -129,9 +128,6 @@ export class DateEditor extends TextEditor {
     const editorContext = shortcutManager.getContext('editor');
     super.open();
     this.showDatepicker(event);
-    if (this.hot.getSettings().ariaTags) {
-      setAttribute(this.TD, [A11Y_EXPANDED('true')]);
-    }
     editorContext.addShortcut({
       keys: [['Enter']],
       callback: keyboardEvent => {
@@ -157,9 +153,6 @@ export class DateEditor extends TextEditor {
     this.hot._registerTimeout(() => {
       this.hot._refreshBorders();
     });
-    if (this.TD && this.hot.getSettings().ariaTags) {
-      setAttribute(this.TD, [A11Y_EXPANDED('false')]);
-    }
     const shortcutManager = this.hot.getShortcutManager();
     const editorContext = shortcutManager.getContext('editor');
     editorContext.removeShortcutsByGroup(SHORTCUTS_GROUP_EDITOR);

package/editors/handsontableEditor/handsontableEditor.js

@@ -6,7 +6,6 @@ var _element = require("../../helpers/dom/element");
 var _event = require("../../helpers/dom/event");
 var _object = require("../../helpers/object");
 var _editorManager = require("../../editorManager");
-var _a11y = require("../../helpers/a11y");
 const SHORTCUTS_GROUP = 'handsontableEditor';
 const EDITOR_TYPE = 'handsontable';
 
@@ -43,9 +42,6 @@ class HandsontableEditor extends _textEditor.TextEditor {
     }
     (0, _element.setCaretPosition)(this.TEXTAREA, 0, this.TEXTAREA.value.length);
     this.refreshDimensions();
-    if (this.hot.getSettings().ariaTags) {
-      (0, _element.setAttribute)(this.TD, [(0, _a11y.A11Y_EXPANDED)('true')]);
-    }
   }
 
   /**
@@ -57,9 +53,6 @@ class HandsontableEditor extends _textEditor.TextEditor {
     }
     this.removeHooksByKey('beforeKeyDown');
     super.close();
-    if (this.TD && this.hot.getSettings().ariaTags) {
-      (0, _element.setAttribute)(this.TD, [(0, _a11y.A11Y_EXPANDED)('false')]);
-    }
   }
 
   /**

package/editors/handsontableEditor/handsontableEditor.mjs

@@ -1,9 +1,8 @@
 import { TextEditor } from "../textEditor/index.mjs";
-import { setAttribute, setCaretPosition } from "../../helpers/dom/element.mjs";
+import { setCaretPosition } from "../../helpers/dom/element.mjs";
 import { stopImmediatePropagation } from "../../helpers/dom/event.mjs";
 import { extend } from "../../helpers/object.mjs";
 import { SHORTCUTS_GROUP_NAVIGATION } from "../../editorManager.mjs";
-import { A11Y_EXPANDED } from "../../helpers/a11y.mjs";
 const SHORTCUTS_GROUP = 'handsontableEditor';
 export const EDITOR_TYPE = 'handsontable';
 
@@ -39,9 +38,6 @@ export class HandsontableEditor extends TextEditor {
     }
     setCaretPosition(this.TEXTAREA, 0, this.TEXTAREA.value.length);
     this.refreshDimensions();
-    if (this.hot.getSettings().ariaTags) {
-      setAttribute(this.TD, [A11Y_EXPANDED('true')]);
-    }
   }
 
   /**
@@ -53,9 +49,6 @@ export class HandsontableEditor extends TextEditor {
     }
     this.removeHooksByKey('beforeKeyDown');
     super.close();
-    if (this.TD && this.hot.getSettings().ariaTags) {
-      setAttribute(this.TD, [A11Y_EXPANDED('false')]);
-    }
   }
 
   /**

package/editors/passwordEditor/passwordEditor.js

@@ -3,6 +3,7 @@
 exports.__esModule = true;
 var _textEditor = require("../textEditor");
 var _element = require("../../helpers/dom/element");
+var _a11y = require("../../helpers/a11y");
 const EDITOR_TYPE = 'password';
 
 /**
@@ -23,6 +24,9 @@ class PasswordEditor extends _textEditor.TextEditor {
     this.textareaStyle = this.TEXTAREA.style;
     this.textareaStyle.width = 0;
     this.textareaStyle.height = 0;
+    if (this.hot.getSettings().ariaTags) {
+      (0, _element.setAttribute)(this.TEXTAREA, [(0, _a11y.A11Y_HIDDEN)()]);
+    }
     (0, _element.empty)(this.TEXTAREA_PARENT);
     this.TEXTAREA_PARENT.appendChild(this.TEXTAREA);
   }

package/editors/passwordEditor/passwordEditor.mjs

@@ -1,5 +1,6 @@
 import { TextEditor } from "../textEditor/index.mjs";
-import { empty } from "../../helpers/dom/element.mjs";
+import { empty, setAttribute } from "../../helpers/dom/element.mjs";
+import { A11Y_HIDDEN } from "../../helpers/a11y.mjs";
 export const EDITOR_TYPE = 'password';
 
 /**
@@ -19,6 +20,9 @@ export class PasswordEditor extends TextEditor {
     this.textareaStyle = this.TEXTAREA.style;
     this.textareaStyle.width = 0;
     this.textareaStyle.height = 0;
+    if (this.hot.getSettings().ariaTags) {
+      setAttribute(this.TEXTAREA, [A11Y_HIDDEN()]);
+    }
     empty(this.TEXTAREA_PARENT);
     this.TEXTAREA_PARENT.appendChild(this.TEXTAREA);
   }

package/helpers/a11y.js

@@ -11,6 +11,8 @@ const A11Y_GRIDCELL = () => ['role', 'gridcell'];
 exports.A11Y_GRIDCELL = A11Y_GRIDCELL;
 const A11Y_ROWHEADER = () => ['role', 'rowheader'];
 exports.A11Y_ROWHEADER = A11Y_ROWHEADER;
+const A11Y_ROWGROUP = () => ['role', 'rowgroup'];
+exports.A11Y_ROWGROUP = A11Y_ROWGROUP;
 const A11Y_COLUMNHEADER = () => ['role', 'columnheader'];
 exports.A11Y_COLUMNHEADER = A11Y_COLUMNHEADER;
 const A11Y_ROW = () => ['role', 'row'];

package/helpers/a11y.mjs

@@ -3,6 +3,7 @@ export const A11Y_TREEGRID = () => ['role', 'treegrid'];
 export const A11Y_PRESENTATION = () => ['role', 'presentation'];
 export const A11Y_GRIDCELL = () => ['role', 'gridcell'];
 export const A11Y_ROWHEADER = () => ['role', 'rowheader'];
+export const A11Y_ROWGROUP = () => ['role', 'rowgroup'];
 export const A11Y_COLUMNHEADER = () => ['role', 'columnheader'];
 export const A11Y_ROW = () => ['role', 'row'];
 export const A11Y_MENU = () => ['role', 'menu'];

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 = "0.0.0-next-f11b1a2-20231123";
+  const hotVersion = "0.0.0-next-44acfea-20231127";
   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 = "0.0.0-next-f11b1a2-20231123";
+  const hotVersion = "0.0.0-next-44acfea-20231127";
   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": "0.0.0-next-f11b1a2-20231123",
+  "version": "0.0.0-next-44acfea-20231127",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/plugins/filters/filters.js

@@ -297,7 +297,16 @@ class Filters extends _base.BasePlugin {
       // A fake menu item that once focused allows escaping from the focus navigation (using Tab keys)
       // to the menu navigation using arrow keys.
       {
-        focus: () => mainMenu.focus()
+        focus: () => {
+          const menuNavigator = mainMenu.getNavigator();
+          const lastSelectedMenuItem = _classPrivateFieldGet(this, _menuFocusNavigator).getLastMenuPage();
+          mainMenu.focus();
+          if (lastSelectedMenuItem > 0) {
+            menuNavigator.setCurrentPage(lastSelectedMenuItem);
+          } else {
+            menuNavigator.toFirstItem();
+          }
+        }
       }, ...Array.from(this.components).map(_ref => {
         let [, component] = _ref;
         return component.getElements();

package/plugins/filters/filters.mjs

@@ -289,7 +289,16 @@ export class Filters extends BasePlugin {
       // A fake menu item that once focused allows escaping from the focus navigation (using Tab keys)
       // to the menu navigation using arrow keys.
       {
-        focus: () => mainMenu.focus()
+        focus: () => {
+          const menuNavigator = mainMenu.getNavigator();
+          const lastSelectedMenuItem = _classPrivateFieldGet(this, _menuFocusNavigator).getLastMenuPage();
+          mainMenu.focus();
+          if (lastSelectedMenuItem > 0) {
+            menuNavigator.setCurrentPage(lastSelectedMenuItem);
+          } else {
+            menuNavigator.toFirstItem();
+          }
+        }
       }, ...Array.from(this.components).map(_ref => {
         let [, component] = _ref;
         return component.getElements();

package/plugins/filters/menu/focusController.js

@@ -27,12 +27,17 @@ const SHORTCUTS_MENU_CONTEXT = 'filters';
  * @returns {Paginator}
  */
 function createMenuFocusController(mainMenu, menuItems) {
-  const navigator = (0, _focusNavigator.createFocusNavigator)(menuItems);
+  /**
+   * @type {number} The last selected menu item (before clearing the the menu state after going
+   * into the focus mode triggered by the TAB or SHIFT+TAB keys).
+   */
+  let lastSelectedMenuItem = -1;
+  const focusNavigator = (0, _focusNavigator.createFocusNavigator)(menuItems);
   const updateNavigatorPosition = element => () => {
     if (mainMenu.isOpened()) {
       mainMenu.getKeyboardShortcutsCtrl().listen(SHORTCUTS_MENU_CONTEXT);
     }
-    navigator.setCurrentPage(menuItems.indexOf(element));
+    focusNavigator.setCurrentPage(menuItems.indexOf(element));
   };
 
   // update navigator position (internal state) to element that was recently clicked or focused
@@ -45,7 +50,7 @@ function createMenuFocusController(mainMenu, menuItems) {
   });
   mainMenu.addLocalHook('afterSelectionChange', selectedItem => {
     if (!selectedItem.key.startsWith('filter_')) {
-      navigator.clear();
+      focusNavigator.clear();
     }
   });
 
@@ -57,7 +62,7 @@ function createMenuFocusController(mainMenu, menuItems) {
   function addKeyboardShortcuts(menu) {
     const mainMenuShortcutsCtrl = mainMenu.getKeyboardShortcutsCtrl();
     const currentMenuShortcutsCtrl = menu.getKeyboardShortcutsCtrl();
-    navigator.clear();
+    focusNavigator.clear();
     currentMenuShortcutsCtrl.addCustomShortcuts([{
       keys: [['Tab'], ['Shift', 'Tab']],
       forwardToContext: mainMenuShortcutsCtrl.getContext(SHORTCUTS_MENU_CONTEXT),
@@ -74,11 +79,15 @@ function createMenuFocusController(mainMenu, menuItems) {
     mainMenuShortcutsCtrl.addCustomShortcuts([{
       keys: [['Tab'], ['Shift', 'Tab']],
       callback: event => {
-        mainMenu.getNavigator().clear();
+        const menuNavigator = mainMenu.getNavigator();
+        if (menuNavigator.getCurrentPage() > -1) {
+          lastSelectedMenuItem = menuNavigator.getCurrentPage();
+        }
+        menuNavigator.clear();
         if (event.shiftKey) {
-          navigator.toPreviousItem();
+          focusNavigator.toPreviousItem();
         } else {
-          navigator.toNextItem();
+          focusNavigator.toNextItem();
         }
       }
     }, {
@@ -90,7 +99,7 @@ function createMenuFocusController(mainMenu, menuItems) {
       keys: [['Enter'], ['Space']],
       preventDefault: false,
       callback: event => {
-        const element = menuItems[navigator.getCurrentPage()];
+        const element = menuItems[focusNavigator.getCurrentPage()];
         if (element instanceof _select.SelectUI) {
           element.openOptions();
           event.preventDefault();
@@ -116,8 +125,18 @@ function createMenuFocusController(mainMenu, menuItems) {
     mainMenu.focus();
     mainMenu.getKeyboardShortcutsCtrl().listen(SHORTCUTS_MENU_CONTEXT);
   }
+
+  /**
+   * Retrieves the last selected menu item (before clearing the state after going into the focus mode).
+   *
+   * @returns {number} The last selected menu item.
+   */
+  function getLastMenuPage() {
+    return lastSelectedMenuItem;
+  }
   return {
-    ...navigator,
-    listen
+    ...focusNavigator,
+    listen,
+    getLastMenuPage
   };
 }

package/plugins/filters/menu/focusController.mjs

@@ -23,12 +23,17 @@ const SHORTCUTS_MENU_CONTEXT = 'filters';
  * @returns {Paginator}
  */
 export function createMenuFocusController(mainMenu, menuItems) {
-  const navigator = createFocusNavigator(menuItems);
+  /**
+   * @type {number} The last selected menu item (before clearing the the menu state after going
+   * into the focus mode triggered by the TAB or SHIFT+TAB keys).
+   */
+  let lastSelectedMenuItem = -1;
+  const focusNavigator = createFocusNavigator(menuItems);
   const updateNavigatorPosition = element => () => {
     if (mainMenu.isOpened()) {
       mainMenu.getKeyboardShortcutsCtrl().listen(SHORTCUTS_MENU_CONTEXT);
     }
-    navigator.setCurrentPage(menuItems.indexOf(element));
+    focusNavigator.setCurrentPage(menuItems.indexOf(element));
   };
 
   // update navigator position (internal state) to element that was recently clicked or focused
@@ -41,7 +46,7 @@ export function createMenuFocusController(mainMenu, menuItems) {
   });
   mainMenu.addLocalHook('afterSelectionChange', selectedItem => {
     if (!selectedItem.key.startsWith('filter_')) {
-      navigator.clear();
+      focusNavigator.clear();
     }
   });
 
@@ -53,7 +58,7 @@ export function createMenuFocusController(mainMenu, menuItems) {
   function addKeyboardShortcuts(menu) {
     const mainMenuShortcutsCtrl = mainMenu.getKeyboardShortcutsCtrl();
     const currentMenuShortcutsCtrl = menu.getKeyboardShortcutsCtrl();
-    navigator.clear();
+    focusNavigator.clear();
     currentMenuShortcutsCtrl.addCustomShortcuts([{
       keys: [['Tab'], ['Shift', 'Tab']],
       forwardToContext: mainMenuShortcutsCtrl.getContext(SHORTCUTS_MENU_CONTEXT),
@@ -70,11 +75,15 @@ export function createMenuFocusController(mainMenu, menuItems) {
     mainMenuShortcutsCtrl.addCustomShortcuts([{
       keys: [['Tab'], ['Shift', 'Tab']],
       callback: event => {
-        mainMenu.getNavigator().clear();
+        const menuNavigator = mainMenu.getNavigator();
+        if (menuNavigator.getCurrentPage() > -1) {
+          lastSelectedMenuItem = menuNavigator.getCurrentPage();
+        }
+        menuNavigator.clear();
         if (event.shiftKey) {
-          navigator.toPreviousItem();
+          focusNavigator.toPreviousItem();
         } else {
-          navigator.toNextItem();
+          focusNavigator.toNextItem();
         }
       }
     }, {
@@ -86,7 +95,7 @@ export function createMenuFocusController(mainMenu, menuItems) {
       keys: [['Enter'], ['Space']],
       preventDefault: false,
       callback: event => {
-        const element = menuItems[navigator.getCurrentPage()];
+        const element = menuItems[focusNavigator.getCurrentPage()];
         if (element instanceof SelectUI) {
           element.openOptions();
           event.preventDefault();
@@ -112,8 +121,18 @@ export function createMenuFocusController(mainMenu, menuItems) {
     mainMenu.focus();
     mainMenu.getKeyboardShortcutsCtrl().listen(SHORTCUTS_MENU_CONTEXT);
   }
+
+  /**
+   * Retrieves the last selected menu item (before clearing the state after going into the focus mode).
+   *
+   * @returns {number} The last selected menu item.
+   */
+  function getLastMenuPage() {
+    return lastSelectedMenuItem;
+  }
   return {
-    ...navigator,
-    listen
+    ...focusNavigator,
+    listen,
+    getLastMenuPage
   };
 }

package/plugins/nestedRows/nestedRows.js

@@ -441,6 +441,7 @@ class NestedRows extends _base.BasePlugin {
   /**
    * The modifyRowData hook callback.
    *
+   * @private
    * @param {number} row Visual row index.
    * @returns {boolean}
    */
@@ -454,6 +455,7 @@ class NestedRows extends _base.BasePlugin {
   /**
    * Modify the source data length to match the length of the nested structure.
    *
+   * @private
    * @returns {number}
    */
   onModifySourceLength() {
@@ -464,6 +466,7 @@ class NestedRows extends _base.BasePlugin {
   }
 
   /**
+   * @private
    * @param {number} index The index where the data was spliced.
    * @param {number} amount An amount of items to remove.
    * @param {object} element An element to add.

package/plugins/nestedRows/nestedRows.mjs

@@ -435,6 +435,7 @@ export class NestedRows extends BasePlugin {
   /**
    * The modifyRowData hook callback.
    *
+   * @private
    * @param {number} row Visual row index.
    * @returns {boolean}
    */
@@ -448,6 +449,7 @@ export class NestedRows extends BasePlugin {
   /**
    * Modify the source data length to match the length of the nested structure.
    *
+   * @private
    * @returns {number}
    */
   onModifySourceLength() {
@@ -458,6 +460,7 @@ export class NestedRows extends BasePlugin {
   }
 
   /**
+   * @private
    * @param {number} index The index where the data was spliced.
    * @param {number} amount An amount of items to remove.
    * @param {object} element An element to add.

package/renderers/autocompleteRenderer/autocompleteRenderer.js

@@ -45,9 +45,6 @@ function autocompleteRenderer(hotInstance, TD, row, col, prop, value, cellProper
 
   TD.insertBefore(ARROW, TD.firstChild);
   (0, _element.addClass)(TD, 'htAutocomplete');
-  if (isAriaEnabled) {
-    TD.setAttribute(...(0, _a11y.A11Y_HASPOPUP)('listbox'));
-  }
   if (!hotInstance.acArrowListener) {
     const eventManager = new _eventManager.default(hotInstance);
 

package/renderers/autocompleteRenderer/autocompleteRenderer.mjs

@@ -2,7 +2,7 @@ import { htmlRenderer } from "../htmlRenderer/index.mjs";
 import { textRenderer } from "../textRenderer/index.mjs";
 import EventManager from "../../eventManager.mjs";
 import { addClass, hasClass } from "../../helpers/dom/element.mjs";
-import { A11Y_HASPOPUP, A11Y_HIDDEN } from "../../helpers/a11y.mjs";
+import { A11Y_HIDDEN } from "../../helpers/a11y.mjs";
 export const RENDERER_TYPE = 'autocomplete';
 
 /**
@@ -39,9 +39,6 @@ export function autocompleteRenderer(hotInstance, TD, row, col, prop, value, cel
 
   TD.insertBefore(ARROW, TD.firstChild);
   addClass(TD, 'htAutocomplete');
-  if (isAriaEnabled) {
-    TD.setAttribute(...A11Y_HASPOPUP('listbox'));
-  }
   if (!hotInstance.acArrowListener) {
     const eventManager = new EventManager(hotInstance);
 

package/renderers/checkboxRenderer/checkboxRenderer.js

@@ -295,7 +295,6 @@ function createInput(rootDocument) {
   const input = rootDocument.createElement('input');
   input.className = 'htCheckboxRendererInput';
   input.type = 'checkbox';
-  input.setAttribute('autocomplete', 'off');
   input.setAttribute('tabindex', '-1');
   return input.cloneNode(false);
 }

package/renderers/checkboxRenderer/checkboxRenderer.mjs

@@ -289,7 +289,6 @@ function createInput(rootDocument) {
   const input = rootDocument.createElement('input');
   input.className = 'htCheckboxRendererInput';
   input.type = 'checkbox';
-  input.setAttribute('autocomplete', 'off');
   input.setAttribute('tabindex', '-1');
   return input.cloneNode(false);
 }

package/renderers/dateRenderer/dateRenderer.js

@@ -3,8 +3,6 @@
 exports.__esModule = true;
 exports.dateRenderer = dateRenderer;
 var _autocompleteRenderer = require("../autocompleteRenderer");
-var _a11y = require("../../helpers/a11y");
-var _element = require("../../helpers/dom/element");
 const RENDERER_TYPE = 'date';
 
 /**
@@ -22,8 +20,5 @@ const RENDERER_TYPE = 'date';
 exports.RENDERER_TYPE = RENDERER_TYPE;
 function dateRenderer(hotInstance, TD, row, col, prop, value, cellProperties) {
   _autocompleteRenderer.autocompleteRenderer.apply(this, [hotInstance, TD, row, col, prop, value, cellProperties]);
-  if (hotInstance.getSettings().ariaTags) {
-    (0, _element.setAttribute)(TD, [(0, _a11y.A11Y_HASPOPUP)('dialog'), (0, _a11y.A11Y_EXPANDED)('false')]);
-  }
 }
 dateRenderer.RENDERER_TYPE = RENDERER_TYPE;

package/renderers/dateRenderer/dateRenderer.mjs

@@ -1,6 +1,4 @@
 import { autocompleteRenderer } from "../autocompleteRenderer/index.mjs";
-import { A11Y_EXPANDED, A11Y_HASPOPUP } from "../../helpers/a11y.mjs";
-import { setAttribute } from "../../helpers/dom/element.mjs";
 export const RENDERER_TYPE = 'date';
 
 /**
@@ -17,8 +15,5 @@ export const RENDERER_TYPE = 'date';
  */
 export function dateRenderer(hotInstance, TD, row, col, prop, value, cellProperties) {
   autocompleteRenderer.apply(this, [hotInstance, TD, row, col, prop, value, cellProperties]);
-  if (hotInstance.getSettings().ariaTags) {
-    setAttribute(TD, [A11Y_HASPOPUP('dialog'), A11Y_EXPANDED('false')]);
-  }
 }
 dateRenderer.RENDERER_TYPE = RENDERER_TYPE;

package/renderers/handsontableRenderer/handsontableRenderer.js

@@ -3,8 +3,6 @@
 exports.__esModule = true;
 exports.handsontableRenderer = handsontableRenderer;
 var _autocompleteRenderer = require("../autocompleteRenderer");
-var _a11y = require("../../helpers/a11y");
-var _element = require("../../helpers/dom/element");
 const RENDERER_TYPE = 'handsontable';
 
 /**
@@ -22,8 +20,5 @@ const RENDERER_TYPE = 'handsontable';
 exports.RENDERER_TYPE = RENDERER_TYPE;
 function handsontableRenderer(hotInstance, TD, row, col, prop, value, cellProperties) {
   _autocompleteRenderer.autocompleteRenderer.apply(this, [hotInstance, TD, row, col, prop, value, cellProperties]);
-  if (hotInstance.getSettings().ariaTags) {
-    (0, _element.setAttribute)(TD, [(0, _a11y.A11Y_HASPOPUP)('true'), (0, _a11y.A11Y_EXPANDED)('false')]);
-  }
 }
 handsontableRenderer.RENDERER_TYPE = RENDERER_TYPE;

package/renderers/handsontableRenderer/handsontableRenderer.mjs

@@ -1,6 +1,4 @@
 import { autocompleteRenderer } from "../autocompleteRenderer/index.mjs";
-import { A11Y_EXPANDED, A11Y_HASPOPUP } from "../../helpers/a11y.mjs";
-import { setAttribute } from "../../helpers/dom/element.mjs";
 export const RENDERER_TYPE = 'handsontable';
 
 /**
@@ -17,8 +15,5 @@ export const RENDERER_TYPE = 'handsontable';
  */
 export function handsontableRenderer(hotInstance, TD, row, col, prop, value, cellProperties) {
   autocompleteRenderer.apply(this, [hotInstance, TD, row, col, prop, value, cellProperties]);
-  if (hotInstance.getSettings().ariaTags) {
-    setAttribute(TD, [A11Y_HASPOPUP('true'), A11Y_EXPANDED('false')]);
-  }
 }
 handsontableRenderer.RENDERER_TYPE = RENDERER_TYPE;

package/renderers/selectRenderer/selectRenderer.js

@@ -3,8 +3,6 @@
 exports.__esModule = true;
 exports.selectRenderer = selectRenderer;
 var _textRenderer = require("../textRenderer");
-var _a11y = require("../../helpers/a11y");
-var _element = require("../../helpers/dom/element");
 const RENDERER_TYPE = 'select';
 
 /**
@@ -20,8 +18,5 @@ const RENDERER_TYPE = 'select';
 exports.RENDERER_TYPE = RENDERER_TYPE;
 function selectRenderer(hotInstance, TD, row, col, prop, value, cellProperties) {
   _textRenderer.textRenderer.apply(this, [hotInstance, TD, row, col, prop, value, cellProperties]);
-  if (hotInstance.getSettings().ariaTags) {
-    (0, _element.setAttribute)(TD, ...(0, _a11y.A11Y_HASPOPUP)('listbox'));
-  }
 }
 selectRenderer.RENDERER_TYPE = RENDERER_TYPE;

package/renderers/selectRenderer/selectRenderer.mjs

@@ -1,6 +1,4 @@
 import { textRenderer } from "../textRenderer/index.mjs";
-import { A11Y_HASPOPUP } from "../../helpers/a11y.mjs";
-import { setAttribute } from "../../helpers/dom/element.mjs";
 export const RENDERER_TYPE = 'select';
 
 /**
@@ -15,8 +13,5 @@ export const RENDERER_TYPE = 'select';
  */
 export function selectRenderer(hotInstance, TD, row, col, prop, value, cellProperties) {
   textRenderer.apply(this, [hotInstance, TD, row, col, prop, value, cellProperties]);
-  if (hotInstance.getSettings().ariaTags) {
-    setAttribute(TD, ...A11Y_HASPOPUP('listbox'));
-  }
 }
 selectRenderer.RENDERER_TYPE = RENDERER_TYPE;

package/selection/highlight/types/focus.js

@@ -4,6 +4,7 @@ exports.__esModule = true;
 exports.createHighlight = createHighlight;
 var _src = require("../../../3rdparty/walkontable/src");
 var _visualSelection = _interopRequireDefault(require("../visualSelection"));
+var _a11y = require("../../../helpers/a11y");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Creates the new instance of Selection responsible for highlighting currently selected cell. This type of selection
@@ -11,21 +12,16 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  *
  * @param {object} highlightParams A configuration object to create a highlight.
  * @param {Function} highlightParams.cellCornerVisible Function to determine if cell's corner should be visible.
- * @param {Function} highlightParams.cellAttributes Array of cell attributes.
- * @param {Function} highlightParams.headerAttributes Array of header attributes.
  * @returns {Selection}
  */
 function createHighlight(_ref) {
   let {
     cellCornerVisible,
-    cellAttributes,
-    headerAttributes,
     ...restOptions
   } = _ref;
   return new _visualSelection.default({
     className: 'current',
-    cellAttributes,
-    focusedHeaderAttributes: headerAttributes,
+    headerAttributes: [(0, _a11y.A11Y_SELECTED)()],
     border: {
       width: 2,
       color: '#4b89ff',