handsontable 0.0.0-next-a417c2b-20231124 → 0.0.0-next-301795f-20231127

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/tableView.js

@@ -11,11 +11,13 @@ var _mouseEventHandler = require("./selection/mouseEventHandler");
 var _rootInstance = require("./utils/rootInstance");
 var _a11y = require("./helpers/a11y");
 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 _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+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; }
@@ -32,11 +34,25 @@ var _mouseDown = /*#__PURE__*/new WeakMap();
 var _table = /*#__PURE__*/new WeakMap();
 var _lastWidth = /*#__PURE__*/new WeakMap();
 var _lastHeight = /*#__PURE__*/new WeakMap();
+var _getAriaColcount = /*#__PURE__*/new WeakSet();
+var _updateAriaColcount = /*#__PURE__*/new WeakSet();
 class TableView {
   /**
    * @param {Hanstontable} hotInstance Instance of {@link Handsontable}.
    */
   constructor(hotInstance) {
+    /**
+     * Update the `aria-colcount` attribute by the provided value.
+     *
+     * @param {number} delta The number of columns to add or remove to the aria tag.
+     */
+    _classPrivateMethodInitSpec(this, _updateAriaColcount);
+    /**
+     * Return the value of the `aria-colcount` attribute.
+     *
+     * @returns {number} The value of the `aria-colcount` attribute.
+     */
+    _classPrivateMethodInitSpec(this, _getAriaColcount);
     /**
      * Instance of {@link Handsontable}.
      *
@@ -273,7 +289,7 @@ class TableView {
     }
     if (this.settings.ariaTags) {
       (0, _element.setAttribute)(_classPrivateFieldGet(this, _table), [(0, _a11y.A11Y_PRESENTATION)()]);
-      (0, _element.setAttribute)(rootElement, [(0, _a11y.A11Y_TREEGRID)(), (0, _a11y.A11Y_ROWCOUNT)(this.hot.countRows()), (0, _a11y.A11Y_COLCOUNT)(this.hot.countCols()), (0, _a11y.A11Y_MULTISELECTABLE)()]);
+      (0, _element.setAttribute)(rootElement, [(0, _a11y.A11Y_TREEGRID)(), (0, _a11y.A11Y_ROWCOUNT)(-1), (0, _a11y.A11Y_COLCOUNT)(this.hot.countCols()), (0, _a11y.A11Y_MULTISELECTABLE)()]);
     }
     this.THEAD = rootDocument.createElement('THEAD');
     _classPrivateFieldGet(this, _table).appendChild(this.THEAD);
@@ -666,6 +682,13 @@ class TableView {
         }
         this.hot.runHooks('afterGetRowHeaderRenderers', headerRenderers);
         _classPrivateFieldSet(this, _rowHeadersCount, headerRenderers.length);
+        if (this.hot.getSettings().ariaTags) {
+          // Update the aria-colcount attribute.
+          // Only needs to be done once after initialization/data update.
+          if (_classPrivateMethodGet(this, _getAriaColcount, _getAriaColcount2).call(this) === this.hot.countCols()) {
+            _classPrivateMethodGet(this, _updateAriaColcount, _updateAriaColcount2).call(this, _classPrivateFieldGet(this, _rowHeadersCount));
+          }
+        }
         return headerRenderers;
       },
       columnHeaders: () => {
@@ -1305,7 +1328,6 @@ class TableView {
   getRowHeadersCount() {
     return _classPrivateFieldGet(this, _rowHeadersCount);
   }
-
   /**
    * Destroys internal WalkOnTable's instance. Detaches all of the bonded listeners.
    *
@@ -1316,5 +1338,12 @@ class TableView {
     this.eventManager.destroy();
   }
 }
+function _getAriaColcount2() {
+  return parseInt(this.hot.rootElement.getAttribute((0, _a11y.A11Y_COLCOUNT)()[0]), 10);
+}
+function _updateAriaColcount2(delta) {
+  const colCount = _classPrivateMethodGet(this, _getAriaColcount, _getAriaColcount2).call(this) + delta;
+  (0, _element.setAttribute)(this.hot.rootElement, ...(0, _a11y.A11Y_COLCOUNT)(colCount));
+}
 var _default = TableView;
 exports.default = _default;

package/tableView.mjs

@@ -1,10 +1,12 @@
 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 _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+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; }
@@ -28,11 +30,25 @@ var _mouseDown = /*#__PURE__*/new WeakMap();
 var _table = /*#__PURE__*/new WeakMap();
 var _lastWidth = /*#__PURE__*/new WeakMap();
 var _lastHeight = /*#__PURE__*/new WeakMap();
+var _getAriaColcount = /*#__PURE__*/new WeakSet();
+var _updateAriaColcount = /*#__PURE__*/new WeakSet();
 class TableView {
   /**
    * @param {Hanstontable} hotInstance Instance of {@link Handsontable}.
    */
   constructor(hotInstance) {
+    /**
+     * Update the `aria-colcount` attribute by the provided value.
+     *
+     * @param {number} delta The number of columns to add or remove to the aria tag.
+     */
+    _classPrivateMethodInitSpec(this, _updateAriaColcount);
+    /**
+     * Return the value of the `aria-colcount` attribute.
+     *
+     * @returns {number} The value of the `aria-colcount` attribute.
+     */
+    _classPrivateMethodInitSpec(this, _getAriaColcount);
     /**
      * Instance of {@link Handsontable}.
      *
@@ -269,7 +285,7 @@ class TableView {
     }
     if (this.settings.ariaTags) {
       setAttribute(_classPrivateFieldGet(this, _table), [A11Y_PRESENTATION()]);
-      setAttribute(rootElement, [A11Y_TREEGRID(), A11Y_ROWCOUNT(this.hot.countRows()), A11Y_COLCOUNT(this.hot.countCols()), A11Y_MULTISELECTABLE()]);
+      setAttribute(rootElement, [A11Y_TREEGRID(), A11Y_ROWCOUNT(-1), A11Y_COLCOUNT(this.hot.countCols()), A11Y_MULTISELECTABLE()]);
     }
     this.THEAD = rootDocument.createElement('THEAD');
     _classPrivateFieldGet(this, _table).appendChild(this.THEAD);
@@ -662,6 +678,13 @@ class TableView {
         }
         this.hot.runHooks('afterGetRowHeaderRenderers', headerRenderers);
         _classPrivateFieldSet(this, _rowHeadersCount, headerRenderers.length);
+        if (this.hot.getSettings().ariaTags) {
+          // Update the aria-colcount attribute.
+          // Only needs to be done once after initialization/data update.
+          if (_classPrivateMethodGet(this, _getAriaColcount, _getAriaColcount2).call(this) === this.hot.countCols()) {
+            _classPrivateMethodGet(this, _updateAriaColcount, _updateAriaColcount2).call(this, _classPrivateFieldGet(this, _rowHeadersCount));
+          }
+        }
         return headerRenderers;
       },
       columnHeaders: () => {
@@ -1301,7 +1324,6 @@ class TableView {
   getRowHeadersCount() {
     return _classPrivateFieldGet(this, _rowHeadersCount);
   }
-
   /**
    * Destroys internal WalkOnTable's instance. Detaches all of the bonded listeners.
    *
@@ -1312,4 +1334,11 @@ class TableView {
     this.eventManager.destroy();
   }
 }
+function _getAriaColcount2() {
+  return parseInt(this.hot.rootElement.getAttribute(A11Y_COLCOUNT()[0]), 10);
+}
+function _updateAriaColcount2(delta) {
+  const colCount = _classPrivateMethodGet(this, _getAriaColcount, _getAriaColcount2).call(this) + delta;
+  setAttribute(this.hot.rootElement, ...A11Y_COLCOUNT(colCount));
+}
 export default TableView;