From d5482f7779d41b7ec40ec27944260f353f7e617f Mon Sep 17 00:00:00 2001
From: Agne Lukoseviciute <agnel@microsoft.com>
Date: Tue, 30 Aug 2022 19:06:05 -0700
Subject: [PATCH] napvane items removed from tabindex when menu is closed

---
 src/App.tsx | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/App.tsx b/src/App.tsx
index 87a39773..7bedde5e 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -114,8 +114,10 @@ function RNGalleryScreenWrapper({navigation}) {
 }
 
 function RenderDrawerItem(props, i: number) {
+  const isDrawerOpen = getIsDrawerOpenFromState(props.navigation.getState());
   return (
     <DrawerItem
+      importantForAccessibility={isDrawerOpen ? 'auto' : 'no-hide-descendants'}
       key={RNGalleryList[i].key}
       label={() => {
         return <Text style={styles.drawerText}>{RNGalleryList[i].key}</Text>;
@@ -141,9 +143,14 @@ function RenderDrawer(props) {
 
 // @ts-ignore
 function CustomDrawerContent(props) {
+  const isDrawerOpen = getIsDrawerOpenFromState(props.navigation.getState());
+
   return (
     <View style={styles.drawer}>
       <TouchableHighlight
+        importantForAccessibility={
+          isDrawerOpen ? 'auto' : 'no-hide-descendants'
+        }
         accessibilityRole="button"
         accessibilityLabel="Navigation bar expanded"
         {...{tooltip: 'Collapse Menu'}}
@@ -154,6 +161,9 @@ function CustomDrawerContent(props) {
         <Text style={styles.icon}>&#xE700;</Text>
       </TouchableHighlight>
       <DrawerItem
+        importantForAccessibility={
+          isDrawerOpen ? 'auto' : 'no-hide-descendants'
+        }
         label={() => {
           return <Text style={styles.drawerText}>Home</Text>;
         }}
@@ -166,6 +176,9 @@ function CustomDrawerContent(props) {
       />
       <ScrollView {...props}>{RenderDrawer(props)}</ScrollView>
       <DrawerItem
+        importantForAccessibility={
+          isDrawerOpen ? 'auto' : 'no-hide-descendants'
+        }
         label={() => {
           return <Text style={styles.drawerText}>Settings</Text>;
         }}