From e32f367b0c7bb55b151551e6bf970808e276179c Mon Sep 17 00:00:00 2001
From: Marco Zehe <MarcoZehe@users.noreply.github.com>
Date: Fri, 10 Apr 2020 15:07:48 +0200
Subject: [PATCH] React Native accessibility fixes (#5825)

* Accessibility: Make the native toolbox item communicate that it is a button.

* Accessibility: If an item is toggled, mark it as selected for accessibility

* Accessibility: Make the toolbox a toolbar for accessibility

* Accessibility: Mark the bottom sheet as a menu for accessibility

* Fix typo, AccessibilityRole, not AccessibleRole

* Statement fix

* Appease the linter

* Fix linting errors for real this time
---
 react/features/base/dialog/components/native/BottomSheet.js  | 2 ++
 react/features/base/toolbox/components/ToolboxItem.native.js | 5 ++++-
 react/features/toolbox/components/native/Toolbox.js          | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/react/features/base/dialog/components/native/BottomSheet.js b/react/features/base/dialog/components/native/BottomSheet.js
index bdd2f29a1..0f747d1fb 100644
--- a/react/features/base/dialog/components/native/BottomSheet.js
+++ b/react/features/base/dialog/components/native/BottomSheet.js
@@ -84,6 +84,8 @@ class BottomSheet extends PureComponent<Props> {
 
         return (
             <SlidingView
+                accessibilityRole = 'menu'
+                accessibilityViewIsModal = { true }
                 onHide = { this.props.onCancel }
                 position = 'bottom'
                 show = { true }>
diff --git a/react/features/base/toolbox/components/ToolboxItem.native.js b/react/features/base/toolbox/components/ToolboxItem.native.js
index 9bc7c6c49..819ddf82a 100644
--- a/react/features/base/toolbox/components/ToolboxItem.native.js
+++ b/react/features/base/toolbox/components/ToolboxItem.native.js
@@ -41,7 +41,8 @@ export default class ToolboxItem extends AbstractToolboxItem<Props> {
             elementAfter,
             onClick,
             showLabel,
-            styles
+            styles,
+            toggled
         } = this.props;
 
         let children = this._renderIcon();
@@ -72,6 +73,8 @@ export default class ToolboxItem extends AbstractToolboxItem<Props> {
         return (
             <TouchableHighlight
                 accessibilityLabel = { this.accessibilityLabel }
+                accessibilityRole = 'button'
+                accessibilityState = {{ 'selected': toggled }}
                 disabled = { disabled }
                 onPress = { onClick }
                 style = { style }
diff --git a/react/features/toolbox/components/native/Toolbox.js b/react/features/toolbox/components/native/Toolbox.js
index f808ef24e..13e5bebca 100644
--- a/react/features/toolbox/components/native/Toolbox.js
+++ b/react/features/toolbox/components/native/Toolbox.js
@@ -110,6 +110,7 @@ class Toolbox extends PureComponent<Props> {
 
         return (
             <View
+                accessibilityRole = 'toolbar'
                 pointerEvents = 'box-none'
                 style = { styles.toolbar }>
                 {