Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deallocate UIViewController after it was used in Modal component

Browse Source 
Summary:
Changelog: [Internal]

# Problem
`RCTModalHostViewComponentView` reuses the same UIViewController between recycles. This can be a problem if dismissal of the modal is animated as the UIViewController is still presented while it is being dismissed. That's when "Application tried to present modally an active controller" exception can happen.

# Solution
Deallocate UIViewController when `RCTModalHostViewComponentView` is recycled.

Reviewed By: PeteTheHeat

Differential Revision: D23345711

fbshipit-source-id: da540571184afcb88b52758c4a1f0b4ec5874eb1
This commit is contained in:
Samuel Susla
2020-08-26 18:49:21 -07:00
committed by Facebook GitHub Bot
parent 694e22de84
commit 33c16689a8
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm
+18 -9
View File
@@ -111,15 +111,23 @@ static ModalHostViewEventEmitter::OnOrientationChange onOrientationChangeStruct(
static const auto defaultProps = std::make_shared<const ModalHostViewProps>();
_props = defaultProps;
_shouldAnimatePresentation = YES;
_viewController = [RCTFabricModalHostViewController new];
_viewController.modalTransitionStyle = UIModalTransitionStyleCoverVertical;
_viewController.delegate = self;
_isPresented = NO;
}
return self;
}
- (RCTFabricModalHostViewController *)viewController
{
if (!_viewController) {
_viewController = [RCTFabricModalHostViewController new];
_viewController.modalTransitionStyle = UIModalTransitionStyleCoverVertical;
_viewController.delegate = self;
}
return _viewController;
}
- (void)presentViewController:(UIViewController *)modalViewController
animated:(BOOL)animated
completion:(void (^)(void))completion
@@ -138,7 +146,7 @@ static ModalHostViewEventEmitter::OnOrientationChange onOrientationChangeStruct(
BOOL shouldBePresented = !_isPresented && self.window;
if (shouldBePresented) {
_isPresented = YES;
[self presentViewController:_viewController
[self presentViewController:self.viewController
animated:_shouldAnimatePresentation
completion:^{
if (!self->_eventEmitter) {
@@ -155,7 +163,7 @@ static ModalHostViewEventEmitter::OnOrientationChange onOrientationChangeStruct(
BOOL shouldBeHidden = _isPresented && !self.superview;
if (shouldBeHidden) {
_isPresented = NO;
[self dismissViewController:_viewController animated:_shouldAnimatePresentation];
[self dismissViewController:self.viewController animated:_shouldAnimatePresentation];
}
}
@@ -197,6 +205,7 @@ static ModalHostViewEventEmitter::OnOrientationChange onOrientationChangeStruct(
{
[super prepareForRecycle];
_stateTeller.invalidate();
_viewController = nil;
_isPresented = NO;
}
@@ -205,14 +214,14 @@ static ModalHostViewEventEmitter::OnOrientationChange onOrientationChangeStruct(
const auto &newProps = *std::static_pointer_cast<const ModalHostViewProps>(props);
#if !TARGET_OS_TV
_viewController.supportedInterfaceOrientations = supportedOrientationsMask(newProps.supportedOrientations);
self.viewController.supportedInterfaceOrientations = supportedOrientationsMask(newProps.supportedOrientations);
#endif
std::tuple<BOOL, UIModalTransitionStyle> result = animationConfiguration(newProps.animationType);
_shouldAnimatePresentation = std::get<0>(result);
_viewController.modalTransitionStyle = std::get<1>(result);
self.viewController.modalTransitionStyle = std::get<1>(result);
_viewController.modalPresentationStyle = presentationConfiguration(newProps);
self.viewController.modalPresentationStyle = presentationConfiguration(newProps);
[super updateProps:props oldProps:oldProps];
}
@@ -224,7 +233,7 @@ static ModalHostViewEventEmitter::OnOrientationChange onOrientationChangeStruct(
- (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
{
[_viewController.view insertSubview:childComponentView atIndex:index];
[self.viewController.view insertSubview:childComponentView atIndex:index];
}
- (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index