fix: cleanup modal backhandler listener on unmount (#3049)

Co-authored-by: David Gruseck <[email protected]>
callstack · Jan 26, 2022 · 1fd0e2a · 1fd0e2a
1 parent 8d1cfa1
commit 1fd0e2a
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/components/Modal.tsx b/src/components/Modal.tsx
@@ -148,13 +148,16 @@ export default function Modal({
     }).start();
   };
 
-  const hideModal = () => {
+  const removeListeners = () => {
     if (subscription.current?.remove) {
       subscription.current?.remove();
     } else {
       BackHandler.removeEventListener('hardwareBackPress', handleBack);
     }
+  };
 
+  const hideModal = () => {
+    removeListeners();
     const { scale } = animation;
 
     Animated.timing(opacity, {
@@ -192,6 +195,10 @@ export default function Modal({
     prevVisible.current = visible;
   });
 
+  React.useEffect(() => {
+    return removeListeners;
+  }, []);
+
   if (!rendered) return null;
 
   return (