refactor!: mark A11yMixin methods as private (#9718)

Author: vursen

packages/grid/src/vaadin-grid-a11y-mixin.js

@@ -22,73 +22,74 @@ export const A11yMixin = (superClass) =>
       };
     }
     static get observers() {
-      return ['_a11yUpdateGridSize(size, _columnTree, __emptyState)'];
+      return ['__a11yUpdateGridSize(size, _columnTree, __emptyState)'];
     }
 
     /** @private */
-    _a11yGetHeaderRowCount(_columnTree) {
+    __a11yGetHeaderRowCount(_columnTree) {
       return _columnTree.filter((level) =>
         level.some((col) => col.headerRenderer || (col.path && col.header !== null) || col.header),
       ).length;
     }
 
     /** @private */
-    _a11yGetFooterRowCount(_columnTree) {
+    __a11yGetFooterRowCount(_columnTree) {
       return _columnTree.filter((level) => level.some((col) => col.footerRenderer)).length;
     }
 
     /** @private */
-    _a11yUpdateGridSize(size, _columnTree, emptyState) {
+    __a11yUpdateGridSize(size, _columnTree, emptyState) {
       if (size === undefined || _columnTree === undefined) {
         return;
       }
 
-      const headerRowsCount = this._a11yGetHeaderRowCount(_columnTree);
-      const footerRowsCount = this._a11yGetFooterRowCount(_columnTree);
+      const headerRowsCount = this.__a11yGetHeaderRowCount(_columnTree);
+      const footerRowsCount = this.__a11yGetFooterRowCount(_columnTree);
       const bodyRowsCount = emptyState ? 1 : size;
       const rowsCount = bodyRowsCount + headerRowsCount + footerRowsCount;
 
       this.$.table.setAttribute('aria-rowcount', rowsCount);
 
       const bodyColumns = _columnTree[_columnTree.length - 1];
+
       // If no header and footer rows while the empty state is active, count as one column
       // Otherwise, use the number of body columns, if present
       const columnsCount = emptyState ? 1 : (rowsCount && bodyColumns && bodyColumns.length) || 0;
       this.$.table.setAttribute('aria-colcount', columnsCount);
 
-      this._a11yUpdateHeaderRows();
-      this._a11yUpdateFooterRows();
+      this.__a11yUpdateHeaderRows();
+      this.__a11yUpdateFooterRows();
     }
 
-    /** @protected */
-    _a11yUpdateHeaderRows() {
+    /** @private */
+    __a11yUpdateHeaderRows() {
       iterateChildren(this.$.header, (headerRow, index) => {
         headerRow.setAttribute('aria-rowindex', index + 1);
       });
     }
 
-    /** @protected */
-    _a11yUpdateFooterRows() {
+    /** @private */
+    __a11yUpdateFooterRows() {
       iterateChildren(this.$.footer, (footerRow, index) => {
-        footerRow.setAttribute('aria-rowindex', this._a11yGetHeaderRowCount(this._columnTree) + this.size + index + 1);
+        footerRow.setAttribute('aria-rowindex', this.__a11yGetHeaderRowCount(this._columnTree) + this.size + index + 1);
       });
     }
 
     /**
      * @param {!HTMLElement} row
      * @param {number} index
-     * @protected
+     * @private
      */
-    _a11yUpdateRowRowindex(row, index) {
-      row.setAttribute('aria-rowindex', index + this._a11yGetHeaderRowCount(this._columnTree) + 1);
+    __a11yUpdateRowRowindex(row, index) {
+      row.setAttribute('aria-rowindex', index + this.__a11yGetHeaderRowCount(this._columnTree) + 1);
     }
 
     /**
      * @param {!HTMLElement} row
      * @param {boolean} selected
-     * @protected
+     * @private
      */
-    _a11yUpdateRowSelected(row, selected) {
+    __a11yUpdateRowSelected(row, selected) {
       // Jaws reads selection only for rows, NVDA only for cells
       row.setAttribute('aria-selected', Boolean(selected));
       iterateRowCells(row, (cell) => {
@@ -98,9 +99,9 @@ export const A11yMixin = (superClass) =>
 
     /**
      * @param {!HTMLElement} row
-     * @protected
+     * @private
      */
-    _a11yUpdateRowExpanded(row) {
+    __a11yUpdateRowExpanded(row) {
       const toggleCell = findTreeToggleCell(row);
       if (this.__isRowExpandable(row)) {
         row.setAttribute('aria-expanded', 'false');
@@ -123,9 +124,9 @@ export const A11yMixin = (superClass) =>
     /**
      * @param {!HTMLElement} row
      * @param {number} level
-     * @protected
+     * @private
      */
-    _a11yUpdateRowLevel(row, level) {
+    __a11yUpdateRowLevel(row, level) {
       // Set level for the expandable rows itself, and all the nested rows.
       if (level > 0 || this.__isRowCollapsible(row) || this.__isRowExpandable(row)) {
         row.setAttribute('aria-level', level + 1);
@@ -137,9 +138,9 @@ export const A11yMixin = (superClass) =>
     /**
      * @param {!HTMLElement} row
      * @param {!HTMLElement} detailsCell
-     * @protected
+     * @private
      */
-    _a11ySetRowDetailsCell(row, detailsCell) {
+    __a11ySetRowDetailsCell(row, detailsCell) {
       iterateRowCells(row, (cell) => {
         if (cell !== detailsCell) {
           cell.setAttribute('aria-controls', detailsCell.id);
@@ -150,14 +151,14 @@ export const A11yMixin = (superClass) =>
     /**
      * @param {!HTMLElement} cell
      * @param {number} colspan
-     * @protected
+     * @private
      */
-    _a11yUpdateCellColspan(cell, colspan) {
+    __a11yUpdateCellColspan(cell, colspan) {
       cell.setAttribute('aria-colspan', Number(colspan));
     }
 
-    /** @protected */
-    _a11yUpdateSorters() {
+    /** @private */
+    __a11yUpdateSorters() {
       Array.from(this.querySelectorAll('vaadin-grid-sorter')).forEach((sorter) => {
         let cellContent = sorter.parentNode;
         while (cellContent && cellContent.localName !== 'vaadin-grid-cell-content') {

packages/grid/src/vaadin-grid-column-group-mixin.js

@@ -314,13 +314,13 @@ export const GridColumnGroupMixin = (superClass) =>
       if (headerCell) {
         headerCell.setAttribute('colspan', colSpan);
         if (this._grid) {
-          this._grid._a11yUpdateCellColspan(headerCell, colSpan);
+          this._grid.__a11yUpdateCellColspan(headerCell, colSpan);
         }
       }
       if (footerCell) {
         footerCell.setAttribute('colspan', colSpan);
         if (this._grid) {
-          this._grid._a11yUpdateCellColspan(footerCell, colSpan);
+          this._grid.__a11yUpdateCellColspan(footerCell, colSpan);
         }
       }
     }

packages/grid/src/vaadin-grid-mixin.js

@@ -532,7 +532,7 @@ export const GridMixin = (superClass) =>
               row.appendChild(detailsCell);
               // Cache the details cell reference
               row.__detailsCell = detailsCell;
-              this._a11ySetRowDetailsCell(row, detailsCell);
+              this.__a11ySetRowDetailsCell(row, detailsCell);
               detailsCell._vacant = false;
             }
 
@@ -649,7 +649,7 @@ export const GridMixin = (superClass) =>
 
       // Make sure the section has a tabbable element
       this._resetKeyboardNavigation();
-      this._a11yUpdateGridSize(this.size, this._columnTree, this.__emptyState);
+      this.__a11yUpdateGridSize(this.size, this._columnTree, this.__emptyState);
     }
 
     /** @private */
@@ -664,7 +664,7 @@ export const GridMixin = (superClass) =>
 
       this._updateRowOrderParts(row, index);
 
-      this._a11yUpdateRowRowindex(row, index);
+      this.__a11yUpdateRowRowindex(row, index);
 
       this.__ensureRowItem(row);
       this.__ensureRowHierarchy(row);
@@ -758,8 +758,8 @@ export const GridMixin = (superClass) =>
       this._frozenCellsChanged();
       this._updateFirstAndLastColumn();
       this._resetKeyboardNavigation();
-      this._a11yUpdateHeaderRows();
-      this._a11yUpdateFooterRows();
+      this.__a11yUpdateHeaderRows();
+      this.__a11yUpdateFooterRows();
       this.generateCellClassNames();
       this.generateCellPartNames();
       this.__updateHeaderAndFooter();
@@ -804,8 +804,8 @@ export const GridMixin = (superClass) =>
 
       this._toggleDetailsCell(row, model.detailsOpened);
 
-      this._a11yUpdateRowLevel(row, model.level);
-      this._a11yUpdateRowSelected(row, model.selected);
+      this.__a11yUpdateRowLevel(row, model.level);
+      this.__a11yUpdateRowSelected(row, model.selected);
 
       this._updateRowStateParts(row, model);
 
@@ -826,7 +826,7 @@ export const GridMixin = (superClass) =>
 
       this._updateDetailsCellHeight(row);
 
-      this._a11yUpdateRowExpanded(row, model.expanded);
+      this.__a11yUpdateRowExpanded(row, model.expanded);
     }
 
     /** @private */

packages/grid/src/vaadin-grid-sort-mixin.js

@@ -162,7 +162,7 @@ export const SortMixin = (superClass) =>
         this.__debounceClearCache();
       }
 
-      this._a11yUpdateSorters();
+      this.__a11yUpdateSorters();
 
       this._previousSorters = this._mapSorters();
     }