fix(modal): fix onDismiss logic for the modal component on iOS

facebook · Sep 18, 2019 · c37d813 · c37d813
1 parent d898574
commit c37d813
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/Libraries/Modal/Modal.js b/Libraries/Modal/Modal.js
@@ -169,13 +169,10 @@ class Modal extends React.Component<Props> {
     };
   }
 
-  componentWillUnmount() {
-    if (this.props.onDismiss != null) {
+  UNSAFE_componentWillReceiveProps(nextProps: Props) {
+    if (!nextProps.visible && this.props.visible && this.props.onDismiss) {
       this.props.onDismiss();
     }
-  }
-
-  UNSAFE_componentWillReceiveProps(nextProps: Props) {
     Modal._confirmProps(nextProps);
   }