handsontable 0.0.0-next-c81ae8e-20231123 → 0.0.0-next-a77544c-20231123

package/plugins/multiColumnSorting/multiColumnSorting.mjs

@@ -5,12 +5,10 @@ function _toPrimitive(input, hint) { if (typeof input !== "object" || input ===
 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, setAttribute, removeAttribute } from "../../helpers/dom/element.mjs";
+import { addClass, removeClass } 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';
@@ -269,25 +267,6 @@ 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.

package/plugins/nestedRows/nestedRows.js

@@ -367,8 +367,7 @@ class NestedRows extends _base.BasePlugin {
   /**
    * Updates the plugin's state.
    *
-   * This method is executed when [`updateSettings()`](@/api/core.md#updatesettings) is invoked with any of the
-   * following configuration options:
+   * This method is executed when [`updateSettings()`](@/api/core.md#updatesettings) is invoked with any of the following configuration options:
    *  - [`nestedRows`](@/api/options.md#nestedrows)
    */
   updatePlugin() {

package/plugins/nestedRows/nestedRows.mjs

@@ -361,8 +361,7 @@ export class NestedRows extends BasePlugin {
   /**
    * Updates the plugin's state.
    *
-   * This method is executed when [`updateSettings()`](@/api/core.md#updatesettings) is invoked with any of the
-   * following configuration options:
+   * This method is executed when [`updateSettings()`](@/api/core.md#updatesettings) is invoked with any of the following configuration options:
    *  - [`nestedRows`](@/api/options.md#nestedrows)
    */
   updatePlugin() {

package/plugins/nestedRows/ui/headers.js

@@ -6,7 +6,6 @@ var _number = require("../../../helpers/number");
 var _element = require("../../../helpers/dom/element");
 var _base = _interopRequireDefault(require("./_base"));
 var _a11y = require("../../../helpers/a11y");
-var _constants = require("../../../i18n/constants");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Class responsible for the UI in the Nested Rows' row headers.
@@ -25,6 +24,7 @@ class HeadersUI extends _base.default {
     return {
       indicatorContainer: 'ht_nestingLevels',
       parent: 'ht_nestingParent',
+      indicator: 'ht_nestingLevel',
       emptyIndicator: 'ht_nestingLevel_empty',
       button: 'ht_nestingButton',
       expandButton: 'ht_nestingExpand',
@@ -102,12 +102,12 @@ class HeadersUI extends _base.default {
       if (this.collapsingUI.areChildrenCollapsed(rowIndex)) {
         (0, _element.addClass)(buttonsContainer, `${HeadersUI.CSS_CLASSES.button} ${HeadersUI.CSS_CLASSES.expandButton}`);
         if (ariaEnabled) {
-          (0, _element.setAttribute)(TH, [(0, _a11y.A11Y_EXPANDED)(false), (0, _a11y.A11Y_DESCRIPTION)(this.hot.getTranslatedPhrase(_constants.ROW_HEADER_DESCRIPTION_EXPAND_ROW))]);
+          (0, _element.setAttribute)(TH, [(0, _a11y.A11Y_EXPANDED)(false)]);
         }
       } else {
         (0, _element.addClass)(buttonsContainer, `${HeadersUI.CSS_CLASSES.button} ${HeadersUI.CSS_CLASSES.collapseButton}`);
         if (ariaEnabled) {
-          (0, _element.setAttribute)(TH, [(0, _a11y.A11Y_EXPANDED)(true), (0, _a11y.A11Y_DESCRIPTION)(this.hot.getTranslatedPhrase(_constants.ROW_HEADER_DESCRIPTION_COLLAPSE_ROW))]);
+          (0, _element.setAttribute)(TH, [(0, _a11y.A11Y_EXPANDED)(true)]);
         }
       }
       innerDiv.appendChild(buttonsContainer);

package/plugins/nestedRows/ui/headers.mjs

@@ -2,8 +2,7 @@ import { arrayEach } from "../../../helpers/array.mjs";
 import { rangeEach } from "../../../helpers/number.mjs";
 import { addClass, setAttribute } from "../../../helpers/dom/element.mjs";
 import BaseUI from "./_base.mjs";
-import { A11Y_DESCRIPTION, A11Y_EXPANDED, A11Y_HIDDEN } from "../../../helpers/a11y.mjs";
-import { ROW_HEADER_DESCRIPTION_COLLAPSE_ROW, ROW_HEADER_DESCRIPTION_EXPAND_ROW } from "../../../i18n/constants.mjs";
+import { A11Y_EXPANDED, A11Y_HIDDEN } from "../../../helpers/a11y.mjs";
 /**
  * Class responsible for the UI in the Nested Rows' row headers.
  *
@@ -21,6 +20,7 @@ class HeadersUI extends BaseUI {
     return {
       indicatorContainer: 'ht_nestingLevels',
       parent: 'ht_nestingParent',
+      indicator: 'ht_nestingLevel',
       emptyIndicator: 'ht_nestingLevel_empty',
       button: 'ht_nestingButton',
       expandButton: 'ht_nestingExpand',
@@ -98,12 +98,12 @@ class HeadersUI extends BaseUI {
       if (this.collapsingUI.areChildrenCollapsed(rowIndex)) {
         addClass(buttonsContainer, `${HeadersUI.CSS_CLASSES.button} ${HeadersUI.CSS_CLASSES.expandButton}`);
         if (ariaEnabled) {
-          setAttribute(TH, [A11Y_EXPANDED(false), A11Y_DESCRIPTION(this.hot.getTranslatedPhrase(ROW_HEADER_DESCRIPTION_EXPAND_ROW))]);
+          setAttribute(TH, [A11Y_EXPANDED(false)]);
         }
       } else {
         addClass(buttonsContainer, `${HeadersUI.CSS_CLASSES.button} ${HeadersUI.CSS_CLASSES.collapseButton}`);
         if (ariaEnabled) {
-          setAttribute(TH, [A11Y_EXPANDED(true), A11Y_DESCRIPTION(this.hot.getTranslatedPhrase(ROW_HEADER_DESCRIPTION_COLLAPSE_ROW))]);
+          setAttribute(TH, [A11Y_EXPANDED(true)]);
         }
       }
       innerDiv.appendChild(buttonsContainer);

package/selection/highlight/types/focus.js

@@ -11,15 +11,21 @@ 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,
     border: {
       width: 2,
       color: '#4b89ff',

package/selection/highlight/types/focus.mjs

@@ -6,15 +6,21 @@ import VisualSelection from "../visualSelection.mjs";
  *
  * @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}
  */
 export function createHighlight(_ref) {
   let {
     cellCornerVisible,
+    cellAttributes,
+    headerAttributes,
     ...restOptions
   } = _ref;
   return new VisualSelection({
     className: 'current',
+    cellAttributes,
+    focusedHeaderAttributes: headerAttributes,
     border: {
       width: 2,
       color: '#4b89ff',

package/tableView.js

@@ -1158,6 +1158,8 @@ class TableView {
       const span = rootDocument.createElement('span');
       div.className = 'relative';
       span.className = 'colHeader';
+      (0, _element.setAttribute)(div, ...(0, _a11y.A11Y_PRESENTATION)());
+      (0, _element.setAttribute)(span, ...(0, _a11y.A11Y_PRESENTATION)());
       this.updateCellHeader(span, visualColumnIndex, label, headerLevel);
       div.appendChild(span);
       TH.appendChild(div);

package/tableView.mjs

@@ -1154,6 +1154,8 @@ class TableView {
       const span = rootDocument.createElement('span');
       div.className = 'relative';
       span.className = 'colHeader';
+      setAttribute(div, ...A11Y_PRESENTATION());
+      setAttribute(span, ...A11Y_PRESENTATION());
       this.updateCellHeader(span, visualColumnIndex, label, headerLevel);
       div.appendChild(span);
       TH.appendChild(div);