Fix/dialog on dismiss (#755)

* Revert change that caused onDismiss issue in DateTimePicker component

* in Dialog add parity for Android with iOS Modal onDismiss

* expose onDialogDismissed prop for both iOS and Android

* add deprecation warning

* Add check for prop existence

Co-authored-by: Miki Leib <michaelle@wix.com>

Author: ethanshar

src/components/dialog/index.js

@@ -5,6 +5,7 @@ import {StyleSheet} from 'react-native';
 import {Constants} from '../../helpers';
 import {Colors} from '../../style';
 import {BaseComponent} from '../../commons';
+import {LogService} from '../../services';
 import Modal from '../modal';
 import View from '../view';
 import PanListenerView from '../panningViews/panListenerView';
@@ -59,9 +60,13 @@ class Dialog extends BaseComponent {
      */
     useSafeArea: PropTypes.bool,
     /**
-     * Called once the modal has been dissmissed (iOS only)
+     * Called once the modal has been dismissed (iOS only) - Deprecated, use onDialogDismissed instead
      */
     onModalDismissed: PropTypes.func,
+    /**
+     * Called once the dialog has been dismissed completely
+     */
+    onDialogDismissed: PropTypes.func,
     /**
      * If this is added only the header will be pannable;
      * this allows for scrollable content (the children of the dialog)
@@ -93,6 +98,10 @@ class Dialog extends BaseComponent {
     };
 
     this.setAlignment();
+
+    if (!_.isUndefined(props.onModalDismissed)) {
+      LogService.deprecationWarn({component: 'Dialog', oldProp: 'onModalDismissed', newProp: 'onDialogDismissed'});
+    }
   }
 
   componentDidMount() {
@@ -137,9 +146,20 @@ class Dialog extends BaseComponent {
   onDismiss = () => {
     this.setState({modalVisibility: false}, () => {
       const props = this.getThemeProps();
-      _.invoke(props, 'onDismiss', props);
+      if (props.visible) {
+        _.invoke(props, 'onDismiss', props);
+      }
+      // Parity with iOS Modal's onDismiss
+      if (Constants.isAndroid) {
+        _.invoke(props, 'onDialogDismissed', props);
+      }
     });
   };
+  
+  onModalDismissed = () => {
+    _.invoke(this.props, 'onDialogDismissed', this.props);
+    _.invoke(this.props, 'onModalDismissed', this.props);
+  }
 
   hideDialogView = () => {
     this.setState({dialogVisibility: false});
@@ -197,7 +217,7 @@ class Dialog extends BaseComponent {
 
   render = () => {
     const {orientationKey, modalVisibility} = this.state;
-    const {overlayBackgroundColor, onModalDismissed, supportedOrientations, accessibilityLabel} = this.getThemeProps();
+    const {overlayBackgroundColor, supportedOrientations, accessibilityLabel} = this.getThemeProps();
 
     return (
       <Modal
@@ -208,7 +228,7 @@ class Dialog extends BaseComponent {
         onBackgroundPress={this.hideDialogView}
         onRequestClose={this.hideDialogView}
         overlayBackgroundColor={overlayBackgroundColor}
-        onDismiss={onModalDismissed}
+        onDismiss={this.onModalDismissed}
         supportedOrientations={supportedOrientations}
         accessibilityLabel={accessibilityLabel}
       >