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

bartolkaruza · bartolkaruza · commit c37d813d7bcb · 2019-09-18T16:59:17.000+02:00
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);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -169,13 +169,10 @@ class Modal extends React.Component<Props> {`
`169`	`169`	`};`
`170`	`170`	`}`
`171`	`171`
`172`		`- componentWillUnmount() {`
`173`		`- if (this.props.onDismiss != null) {`
	`172`	`+ UNSAFE_componentWillReceiveProps(nextProps: Props) {`
	`173`	`+ if (!nextProps.visible && this.props.visible && this.props.onDismiss) {`
`174`	`174`	`this.props.onDismiss();`
`175`	`175`	`}`
`176`		`- }`
`177`		`-`
`178`		`- UNSAFE_componentWillReceiveProps(nextProps: Props) {`
`179`	`176`	`Modal._confirmProps(nextProps);`
`180`	`177`	`}`
`181`	`178`