Merge pull request #15498 from Expensify/revert-15495-revert-15298-fi…

…x-issue-14848 Revert "Revert "replace onModalHide with onDismiss for the web""
Expensify · Feb 25, 2023 · b663634 · b663634
2 parents 44d2958 + 71a8084
commit b663634
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/components/Modal/BaseModal.js b/src/components/Modal/BaseModal.js
@@ -16,11 +16,15 @@ const propTypes = {
 
     /** The ref to the modal container */
     forwardedRef: PropTypes.func,
+
+    /** Ensure that callback and trap deactivation are in the same loop on the web platform */
+    shouldUseOnDismiss: PropTypes.bool,
 };
 
 const defaultProps = {
     ...modalDefaultProps,
     forwardedRef: () => {},
+    shouldUseOnDismiss: false,
 };
 
 class BaseModal extends PureComponent {
@@ -109,7 +113,8 @@ class BaseModal extends PureComponent {
                     this.props.onModalShow();
                 }}
                 propagateSwipe={this.props.propagateSwipe}
-                onModalHide={this.hideModal}
+                onDismiss={this.props.shouldUseOnDismiss ? this.hideModal : () => {}}
+                onModalHide={!this.props.shouldUseOnDismiss ? this.hideModal : () => {}}
                 onSwipeComplete={this.props.onClose}
                 swipeDirection={swipeDirection}
                 isVisible={this.props.isVisible}

diff --git a/src/components/Modal/index.web.js b/src/components/Modal/index.web.js
@@ -29,6 +29,7 @@ const Modal = (props) => {
         <BaseModal
             // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
+            shouldUseOnDismiss={props.fullscreen}
             onModalHide={hideModal}
             onModalShow={showModal}
         >