fix: prevent back handler usage on web (#11458)

**Motivation** - fix #11316
react-navigation · Jul 31, 2023 · e5f753f · e5f753f
1 parent c4a6f87
commit e5f753f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/packages/drawer/src/views/DrawerView.tsx b/packages/drawer/src/views/DrawerView.tsx
@@ -169,6 +169,13 @@ function DrawerViewBase({
       }
     };
 
+    if (Platform.OS === 'web') {
+      document?.body?.addEventListener?.('keyup', handleEscape);
+      return () => {
+        document?.body?.removeEventListener?.('keyup', handleEscape);
+      };
+    }
+
     // We only add the listeners when drawer opens
     // This way we can make sure that the listener is added as late as possible
     // This will make sure that our handler will run first when back button is pressed
@@ -177,16 +184,8 @@ function DrawerViewBase({
       handleHardwareBack
     );
 
-    if (Platform.OS === 'web') {
-      document?.body?.addEventListener?.('keyup', handleEscape);
-    }
-
     return () => {
-      subscription.remove();
-
-      if (Platform.OS === 'web') {
-        document?.body?.removeEventListener?.('keyup', handleEscape);
-      }
+      subscription?.remove?.();
     };
   }, [
     defaultStatus,

diff --git a/packages/native/src/useBackButton.web.tsx b/packages/native/src/useBackButton.web.tsx
@@ -0,0 +1 @@
+export function useBackButton() {}