Revert D19235758: Implement onRequestClose for iOS 13+ modals

Differential Revision: D19235758 Original commit changeset: c0f1d946c77c fbshipit-source-id: c4a9d7876aa8d07ff5b8419f097b02e9c28e2880
facebook · Feb 6, 2020 · ed11a12 · ed11a12 · jacobp100 · Feb 13, 2020
1 parent 1e9db7b
commit ed11a12
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 38 deletions.
diff --git a/Libraries/Modal/Modal.js b/Libraries/Modal/Modal.js
@@ -95,8 +95,7 @@ export type Props = $ReadOnly<{|
 
   /**
    * The `onRequestClose` callback is called when the user taps the hardware
-   * back button on Android, the menu button on Apple TV, or a modal is dismissed
-   * with a gesture on iOS 13+.
+   * back button on Android or the menu button on Apple TV.
    *
    * This is required on Apple TV and Android.
    *

diff --git a/Libraries/Modal/RCTModalHostViewNativeComponent.js b/Libraries/Modal/RCTModalHostViewNativeComponent.js
@@ -70,8 +70,7 @@ type NativeProps = $ReadOnly<{|
 
   /**
    * The `onRequestClose` callback is called when the user taps the hardware
-   * back button on Android, the menu button on Apple TV, or a modal is dismissed
-   * with a gesture on iOS 13+.
+   * back button on Android or the menu button on Apple TV.
    *
    * This is required on Apple TV and Android.
    *

diff --git a/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm
@@ -94,9 +94,7 @@ static UIModalPresentationStyle presentationConfiguration(ModalHostViewProps con
   return {orientation};
 }
 
-@interface RCTModalHostViewComponentView () <
-    RCTFabricModalHostViewControllerDelegate,
-    UIAdaptivePresentationControllerDelegate>
+@interface RCTModalHostViewComponentView () <RCTFabricModalHostViewControllerDelegate>
 
 @end
 
@@ -115,7 +113,6 @@ - (instancetype)initWithFrame:(CGRect)frame
     _viewController = [RCTFabricModalHostViewController new];
     _viewController.modalTransitionStyle = UIModalTransitionStyleCoverVertical;
     _viewController.delegate = self;
-    _viewController.presentationController.delegate = self;
   }
 
   return self;
@@ -220,19 +217,6 @@ - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompo
   [childComponentView removeFromSuperview];
 }
 
-#pragma mark - UIAdaptivePresentationControllerDelegate
-
-- (void)presentationControllerDidDismiss:(UIPresentationController *)presentationController
-{
-  if (!_eventEmitter) {
-    return;
-  }
-
-  assert(std::dynamic_pointer_cast<ModalHostViewEventEmitter const>(_eventEmitter));
-  auto eventEmitter = std::static_pointer_cast<ModalHostViewEventEmitter const>(_eventEmitter);
-  eventEmitter->onRequestClose({});
-}
-
 @end
 
 Class<RCTComponentViewProtocol> RCTModalHostViewCls(void)

diff --git a/React/Views/RCTModalHostView.h b/React/Views/RCTModalHostView.h
@@ -32,9 +32,8 @@
 @property (nonatomic, copy) NSArray<NSString *> *supportedOrientations;
 @property (nonatomic, copy) RCTDirectEventBlock onOrientationChange;
 
-@property (nonatomic, copy) RCTDirectEventBlock onRequestClose;
-
 #if TARGET_OS_TV
+@property (nonatomic, copy) RCTDirectEventBlock onRequestClose;
 @property (nonatomic, strong) RCTTVRemoteHandler *tvRemoteHandler;
 #endif
 

diff --git a/React/Views/RCTModalHostView.m b/React/Views/RCTModalHostView.m
@@ -20,10 +20,6 @@
 #import "RCTTVRemoteHandler.h"
 #endif
 
-@interface RCTModalHostView () <UIAdaptivePresentationControllerDelegate>
-
-@end
-
 @implementation RCTModalHostView
 {
   __weak RCTBridge *_bridge;
@@ -50,7 +46,6 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
     UIView *containerView = [UIView new];
     containerView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
     _modalViewController.view = containerView;
-    _modalViewController.presentationController.delegate = self;
     _touchHandler = [[RCTTouchHandler alloc] initWithBridge:bridge];
 #if TARGET_OS_TV
     _menuButtonGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(menuButtonPressed:)];
@@ -75,21 +70,19 @@ - (void)menuButtonPressed:(__unused UIGestureRecognizer *)gestureRecognizer
         _onRequestClose(nil);
     }
 }
-#endif
 
 - (void)setOnRequestClose:(RCTDirectEventBlock)onRequestClose
 {
   _onRequestClose = onRequestClose;
-  #if TARGET_OS_TV
   if (_reactSubview) {
     if (_onRequestClose && _menuButtonGestureRecognizer) {
       [_reactSubview addGestureRecognizer:_menuButtonGestureRecognizer];
     } else {
       [_reactSubview removeGestureRecognizer:_menuButtonGestureRecognizer];
     }
   }
-  #endif
 }
+#endif
 
 - (void)notifyForBoundsChange:(CGRect)newBounds
 {
@@ -264,11 +257,4 @@ - (UIInterfaceOrientationMask)supportedOrientationsMask
 }
 #endif
 
-- (void)presentationControllerDidDismiss:(UIPresentationController *)presentationController
-{
-  if (_onRequestClose) {
-    _onRequestClose(nil);
-  }
-}
-
 @end
diff --git a/React/Views/RCTModalHostViewManager.m b/React/Views/RCTModalHostViewManager.m
@@ -108,6 +108,9 @@ - (void)invalidate
 RCT_EXPORT_VIEW_PROPERTY(identifier, NSNumber)
 RCT_EXPORT_VIEW_PROPERTY(supportedOrientations, NSArray)
 RCT_EXPORT_VIEW_PROPERTY(onOrientationChange, RCTDirectEventBlock)
+
+#if TARGET_OS_TV
 RCT_EXPORT_VIEW_PROPERTY(onRequestClose, RCTDirectEventBlock)
+#endif
 
 @end