feat: Remove usage of deprecated function removeListener (#594)

antoinewg · web-flow · commit 378f36798352 · 2021-08-24T12:12:44.000+02:00
BREAKING CHANGE: From now on, we require `react-native&gt;=0.65` in order to work correctly (because `react-native@0.65` deprecates the `removeListener` API that `react-native-modal` was using before this change).
diff --git a/package.json b/package.json
@@ -79,7 +79,7 @@
   },
   "peerDependencies": {
     "react": "*",
-    "react-native": "*"
+    "react-native": ">=0.65.0"
   },
   "jest": {
     "preset": "react-native"
diff --git a/src/modal.tsx b/src/modal.tsx
@@ -3,6 +3,7 @@ import {
   Animated,
   DeviceEventEmitter,
   Dimensions,
+  EmitterSubscription,
   InteractionManager,
   KeyboardAvoidingView,
   Modal,
@@ -202,6 +203,7 @@ export class ReactNativeModal extends React.Component<ModalProps, State> {
   backdropRef: any;
   contentRef: any;
   panResponder: OrNull<PanResponderInstance> = null;
+  didUpdateDimensionsEmitter: OrNull<EmitterSubscription> = null;
 
   interactionHandle: OrNull<number> = null;
 
@@ -243,7 +245,7 @@ export class ReactNativeModal extends React.Component<ModalProps, State> {
         '`<Modal onSwipe="..." />` is deprecated and will be removed starting from 13.0.0. Use `<Modal onSwipeComplete="..." />` instead.',
       );
     }
-    DeviceEventEmitter.addListener(
+    this.didUpdateDimensionsEmitter = DeviceEventEmitter.addListener(
       'didUpdateDimensions',
       this.handleDimensionsUpdate,
     );
@@ -258,10 +260,9 @@ export class ReactNativeModal extends React.Component<ModalProps, State> {
       'hardwareBackPress',
       this.onBackButtonPress,
     );
-    DeviceEventEmitter.removeListener(
-      'didUpdateDimensions',
-      this.handleDimensionsUpdate,
-    );
+    if (this.didUpdateDimensionsEmitter) {
+      this.didUpdateDimensionsEmitter.remove();
+    }
     if (this.interactionHandle) {
       InteractionManager.clearInteractionHandle(this.interactionHandle);
       this.interactionHandle = null;
