Added aria-activedescendant prop

bvaughn · Apr 8, 2021 · 6a0f677 · 6a0f677
1 parent 595fc9f
commit 6a0f677
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/source/Collection/Collection.js b/source/Collection/Collection.js
@@ -12,7 +12,7 @@ import type {ScrollPosition, SizeInfo} from './types';
  */
 export default class Collection extends React.PureComponent {
   static propTypes = {
-    'aria-label': PropTypes.string,
+    'aria-label'?: PropTypes.string,
 
     /**
      * Number of cells in Collection.
@@ -48,7 +48,6 @@ export default class Collection extends React.PureComponent {
   };
 
   static defaultProps = {
-    'aria-label': 'grid',
     cellGroupRenderer: defaultCellGroupRenderer,
   };
 

diff --git a/source/Collection/CollectionView.js b/source/Collection/CollectionView.js
@@ -29,7 +29,7 @@ const SCROLL_POSITION_CHANGE_REASONS = {
  */
 class CollectionView extends React.PureComponent {
   static propTypes = {
-    'aria-label': PropTypes.string,
+    'aria-label'?: PropTypes.string,
 
     /**
      * Removes fixed height from the scrollingContainer so that the total height
@@ -129,7 +129,6 @@ class CollectionView extends React.PureComponent {
   };
 
   static defaultProps = {
-    'aria-label': 'grid',
     horizontalOverscanSize: 0,
     noContentRenderer: () => null,
     onScroll: () => null,

diff --git a/source/Grid/Grid.js b/source/Grid/Grid.js
@@ -58,8 +58,9 @@ type ScrollPosition = {
 };
 
 type Props = {
-  'aria-label': string,
+  'aria-label'?: string,
   'aria-readonly'?: boolean,
+  'aria-activedescendant'?: string,
 
   /**
    * Set the width of the inner scrollable container to 'auto'.
@@ -1044,6 +1045,7 @@ class Grid extends React.PureComponent<Props, State> {
         {...containerProps}
         aria-label={this.props['aria-label']}
         aria-readonly={this.props['aria-readonly']}
+        aria-activedescendant={this.props['aria-activedescendant']}
         className={clsx('ReactVirtualized__Grid', className)}
         id={id}
         onScroll={this._onScroll}

diff --git a/source/List/List.js b/source/List/List.js
@@ -27,6 +27,7 @@ import clsx from 'clsx';
 
 type Props = {
   'aria-label'?: string,
+  'aria-activedescendant'?: string,
 
   /**
    * Removes fixed height from the scrollingContainer so that the total height

diff --git a/source/Table/Table.js b/source/Table/Table.js
@@ -20,7 +20,8 @@ import SortDirection from './SortDirection';
 export default class Table extends React.PureComponent {
   static propTypes = {
     /** This is just set on the grid top element. */
-    'aria-label': PropTypes.string,
+    'aria-label'?: PropTypes.string,
+    'aria-activedescendant'?: PropTypes.string,
 
     /** This is just set on the grid top element. */
     'aria-labelledby': PropTypes.string,
@@ -430,6 +431,7 @@ export default class Table extends React.PureComponent {
 
         <Grid
           {...this.props}
+          aria-activedescendant={this.props['aria-activedescendant']}
           aria-readonly={null}
           autoContainerWidth
           className={clsx('ReactVirtualized__Table__Grid', gridClassName)}