Role and item announcement in Flatlist #31666
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -606,24 +606,71 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> { | |||||
| return ( | ||||||
| <View style={StyleSheet.compose(styles.row, columnWrapperStyle)}> | ||||||
| {item.map((it, kk) => { | ||||||
| const accessibilityCollectionItemInfo = { | ||||||
| rowIndex: index, | ||||||
| rowSpan: 1, | ||||||
| columnIndex: (index * numColumns + kk) % numColumns, | ||||||
| columnSpan: 1, | ||||||
| heading: false, | ||||||
| itemIndex: index * numColumns + kk, | ||||||
| }; | ||||||
|
|
||||||
| const element = ( | ||||||
| <View | ||||||
| importantForAccessibility="yes" | ||||||
| style={styles.cellStyle} | ||||||
| accessibilityCollectionItemInfo={ | ||||||
| accessibilityCollectionItemInfo | ||||||
| }> | ||||||
| {renderer({ | ||||||
| item: it, | ||||||
| index: index * numColumns + kk, | ||||||
| separators: info.separators, | ||||||
| })} | ||||||
| </View> | ||||||
| ); | ||||||
| return element != null ? ( | ||||||
| <React.Fragment key={kk}>{element}</React.Fragment> | ||||||
| ) : null; | ||||||
| })} | ||||||
| </View> | ||||||
| ); | ||||||
| } else { | ||||||
| const {index} = info; | ||||||
|
|
||||||
| const accessibilityCollectionItemInfo = { | ||||||
| rowIndex: index, | ||||||
| rowSpan: 1, | ||||||
| columnIndex: 0, | ||||||
| columnSpan: 1, | ||||||
| heading: false, | ||||||
| itemIndex: index, | ||||||
| }; | ||||||
|
|
||||||
| return ( | ||||||
| <View | ||||||
| importantForAccessibility="yes" | ||||||
| style={styles.cellStyle} | ||||||
| accessibilityCollectionItemInfo={accessibilityCollectionItemInfo}> | ||||||
| {renderer(info)} | ||||||
| </View> | ||||||
| ); | ||||||
| } | ||||||
| }, | ||||||
| }; | ||||||
| }; | ||||||
|
|
||||||
| _getAccessibilityCollectionInfo = () => { | ||||||
| const accessibilityCollectionProps = { | ||||||
| itemCount: this.props.data ? this.props.data.length : 0, | ||||||
| rowCount: this._getItemCount(this.props.data), | ||||||
| columnCount: this.props.numColumns, | ||||||
|
Contributor
There was a problem hiding this comment.
Suggested change
Contributor
There was a problem hiding this comment. Thanks @blavalla
|
||||||
| hierarchical: false, | ||||||
| }; | ||||||
|
|
||||||
| return accessibilityCollectionProps; | ||||||
| }; | ||||||
|
|
||||||
| render(): React.Node { | ||||||
| const {numColumns, columnWrapperStyle, ...restProps} = this.props; | ||||||
|
|
||||||
|
|
@@ -633,6 +680,10 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> { | |||||
| getItem={this._getItem} | ||||||
| getItemCount={this._getItemCount} | ||||||
| keyExtractor={this._keyExtractor} | ||||||
| accessibilityCollectionInfo={this._getAccessibilityCollectionInfo()} | ||||||
| accessibilityRole={Platform.select({ | ||||||
| android: this.props.numColumns > 1 ? 'grid' : 'list', | ||||||
| })} | ||||||
| ref={this._captureRef} | ||||||
| viewabilityConfigCallbackPairs={this._virtualizedListPairs} | ||||||
| {...this._renderer()} | ||||||
|
|
@@ -643,6 +694,7 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> { | |||||
|
|
||||||
| const styles = StyleSheet.create({ | ||||||
| row: {flexDirection: 'row'}, | ||||||
| cellStyle: {flex: 1}, | ||||||
| }); | ||||||
|
|
||||||
| module.exports = FlatList; | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The only issue I can think of with this approach is that it needs an additional wrapper View so that we can get the accessibility collection info on the native side.
The solution would be if we can create accessibility-only Views. I think @amarlette had created an issue for the same, but I am able to find it.