From 695d222e2a53468236947daef1cc4beb14b1e283 Mon Sep 17 00:00:00 2001 From: Yogev Ben David Date: Mon, 16 Mar 2020 08:22:11 +0200 Subject: [PATCH] Removes unable to find UIManager module warning (#6043) --- lib/ios/ModalTransitionDelegate.h | 2 +- lib/ios/ModalTransitionDelegate.m | 4 ++-- lib/ios/RNNBridgeManager.m | 2 +- lib/ios/RNNModalManager.h | 4 ++-- lib/ios/RNNModalManager.m | 11 +++++------ lib/ios/StackControllerDelegate.m | 4 ++-- lib/ios/StackTransitionDelegate.h | 2 +- lib/ios/StackTransitionDelegate.m | 4 ++-- lib/ios/TransitionDelegate.h | 2 +- lib/ios/TransitionDelegate.m | 8 ++++---- 10 files changed, 21 insertions(+), 22 deletions(-) diff --git a/lib/ios/ModalTransitionDelegate.h b/lib/ios/ModalTransitionDelegate.h index 926511deb87..0c06b3ddfec 100644 --- a/lib/ios/ModalTransitionDelegate.h +++ b/lib/ios/ModalTransitionDelegate.h @@ -4,7 +4,7 @@ @interface ModalTransitionDelegate : TransitionDelegate -- (instancetype)initWithContentTransition:(TransitionOptions *)contentTransition uiManager:(RCTUIManager *)uiManager; +- (instancetype)initWithContentTransition:(TransitionOptions *)contentTransition bridge:(RCTBridge *)bridge; @property (nonatomic, strong) TransitionOptions* contentTransitionOptions; diff --git a/lib/ios/ModalTransitionDelegate.m b/lib/ios/ModalTransitionDelegate.m index 97e0ac3724a..08ef897fdcd 100644 --- a/lib/ios/ModalTransitionDelegate.m +++ b/lib/ios/ModalTransitionDelegate.m @@ -2,8 +2,8 @@ @implementation ModalTransitionDelegate -- (instancetype)initWithContentTransition:(TransitionOptions *)contentTransitionOptions uiManager:(RCTUIManager *)uiManager { - self = [super initWithUIManager:uiManager]; +- (instancetype)initWithContentTransition:(TransitionOptions *)contentTransitionOptions bridge:(RCTBridge *)bridge { + self = [super initWithBridge:bridge]; _contentTransitionOptions = contentTransitionOptions; return self; } diff --git a/lib/ios/RNNBridgeManager.m b/lib/ios/RNNBridgeManager.m index 73fe030c813..85bc35b5cd3 100644 --- a/lib/ios/RNNBridgeManager.m +++ b/lib/ios/RNNBridgeManager.m @@ -88,7 +88,7 @@ - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge { - (NSArray> *)extraModulesForBridge:(RCTBridge *)bridge { RNNEventEmitter *eventEmitter = [[RNNEventEmitter alloc] init]; - _modalManager = [[RNNModalManager alloc] initWithUIManager:_bridge.uiManager]; + _modalManager = [[RNNModalManager alloc] initWithBridge:bridge]; id rootViewCreator = [[RNNReactRootViewCreator alloc] initWithBridge:bridge eventEmitter:eventEmitter]; _componentRegistry = [[RNNReactComponentRegistry alloc] initWithCreator:rootViewCreator]; diff --git a/lib/ios/RNNModalManager.h b/lib/ios/RNNModalManager.h index a519efd28a9..201ad63664b 100644 --- a/lib/ios/RNNModalManager.h +++ b/lib/ios/RNNModalManager.h @@ -1,6 +1,6 @@ #import #import -#import +#import typedef void (^RNNTransitionCompletionBlock)(void); typedef void (^RNNTransitionWithComponentIdCompletionBlock)(NSString *componentId); @@ -16,7 +16,7 @@ typedef void (^RNNTransitionRejectionBlock)(NSString *code, NSString *message, N @interface RNNModalManager : NSObject -- (instancetype)initWithUIManager:(RCTUIManager *)uiManager; +- (instancetype)initWithBridge:(RCTBridge *)bridge; @property (nonatomic, weak) id delegate; diff --git a/lib/ios/RNNModalManager.m b/lib/ios/RNNModalManager.m index 3cde70e32d1..af84d03b98d 100644 --- a/lib/ios/RNNModalManager.m +++ b/lib/ios/RNNModalManager.m @@ -12,7 +12,7 @@ @interface RNNModalManager () @implementation RNNModalManager { NSMutableArray* _pendingModalIdsToDismiss; NSMutableArray* _presentedModals; - RCTUIManager* _uiManager; + RCTBridge* _bridge; } @@ -20,13 +20,12 @@ - (instancetype)init { self = [super init]; _pendingModalIdsToDismiss = [[NSMutableArray alloc] init]; _presentedModals = [[NSMutableArray alloc] init]; - return self; } -- (instancetype)initWithUIManager:(RCTUIManager *)uiManager { +- (instancetype)initWithBridge:(RCTBridge *)bridge { self = [self init]; - _uiManager = uiManager; + _bridge = bridge; return self; } @@ -45,7 +44,7 @@ - (void)showModal:(UIViewController *)viewController animated } if (viewController.resolveOptionsWithDefault.animations.showModal.hasAnimation) { - _modalTransitionDelegate = [[ModalTransitionDelegate alloc] initWithContentTransition:viewController.resolveOptionsWithDefault.animations.showModal uiManager:_uiManager]; + _modalTransitionDelegate = [[ModalTransitionDelegate alloc] initWithContentTransition:viewController.resolveOptionsWithDefault.animations.showModal bridge:_bridge]; viewController.transitioningDelegate = _modalTransitionDelegate; viewController.modalPresentationStyle = UIModalPresentationCustom; } @@ -101,7 +100,7 @@ - (void)removePendingNextModalIfOnTop:(RNNTransitionCompletionBlock)completion { UIViewController* topPresentedVC = [self topPresentedVC]; if (optionsWithDefault.animations.dismissModal.hasAnimation) { - _modalTransitionDelegate = [[ModalDismissTransitionDelegate alloc] initWithContentTransition:modalToDismiss.resolveOptionsWithDefault.animations.dismissModal uiManager:_uiManager]; + _modalTransitionDelegate = [[ModalDismissTransitionDelegate alloc] initWithContentTransition:modalToDismiss.resolveOptionsWithDefault.animations.dismissModal bridge:_bridge]; [self topViewControllerParent:modalToDismiss].transitioningDelegate = _modalTransitionDelegate; } diff --git a/lib/ios/StackControllerDelegate.m b/lib/ios/StackControllerDelegate.m index 4f144f2c3ed..9f1fd0c6a08 100644 --- a/lib/ios/StackControllerDelegate.m +++ b/lib/ios/StackControllerDelegate.m @@ -30,9 +30,9 @@ - (void)sendScreenPoppedEvent:(UIViewController *)poppedScreen { fromViewController:(UIViewController*)fromVC toViewController:(UIViewController*)toVC { if (operation == UINavigationControllerOperationPush && toVC.resolveOptions.animations.push.hasCustomAnimation) { - return [[StackTransitionDelegate alloc] initWithScreenTransition:toVC.resolveOptions.animations.push uiManager:_eventEmitter.bridge.uiManager]; + return [[StackTransitionDelegate alloc] initWithScreenTransition:toVC.resolveOptions.animations.push bridge:_eventEmitter.bridge]; } else if (operation == UINavigationControllerOperationPop && fromVC.resolveOptions.animations.pop.hasCustomAnimation) { - return [[StackTransitionDelegate alloc] initWithScreenTransition:fromVC.resolveOptions.animations.pop uiManager:_eventEmitter.bridge.uiManager]; + return [[StackTransitionDelegate alloc] initWithScreenTransition:fromVC.resolveOptions.animations.pop bridge:_eventEmitter.bridge]; } else { return nil; } diff --git a/lib/ios/StackTransitionDelegate.h b/lib/ios/StackTransitionDelegate.h index 3df4fe23c4d..2bf0d4f4891 100644 --- a/lib/ios/StackTransitionDelegate.h +++ b/lib/ios/StackTransitionDelegate.h @@ -5,6 +5,6 @@ @interface StackTransitionDelegate : TransitionDelegate -- (instancetype)initWithScreenTransition:(RNNScreenTransition *)screenTransition uiManager:(RCTUIManager *)uiManager; +- (instancetype)initWithScreenTransition:(RNNScreenTransition *)screenTransition bridge:(RCTBridge *)bridge; @end diff --git a/lib/ios/StackTransitionDelegate.m b/lib/ios/StackTransitionDelegate.m index 92379816040..4987e625ad7 100644 --- a/lib/ios/StackTransitionDelegate.m +++ b/lib/ios/StackTransitionDelegate.m @@ -7,8 +7,8 @@ @implementation StackTransitionDelegate { RNNScreenTransition* _screenTransition; } -- (instancetype)initWithScreenTransition:(RNNScreenTransition *)screenTransition uiManager:(RCTUIManager *)uiManager { - self = [super initWithUIManager:uiManager]; +- (instancetype)initWithScreenTransition:(RNNScreenTransition *)screenTransition bridge:(RCTBridge *)bridge { + self = [super initWithBridge:bridge]; _screenTransition = screenTransition; return self; } diff --git a/lib/ios/TransitionDelegate.h b/lib/ios/TransitionDelegate.h index d41bc9a3e42..f1caca59ce4 100644 --- a/lib/ios/TransitionDelegate.h +++ b/lib/ios/TransitionDelegate.h @@ -5,7 +5,7 @@ @interface TransitionDelegate : NSObject -- (instancetype)initWithUIManager:(RCTUIManager *)uiManager; +- (instancetype)initWithBridge:(RCTBridge *)bridge; - (NSArray *)createTransitionsFromVC:(UIViewController *)fromVC toVC:(UIViewController *)toVC containerView:(UIView *)containerView; diff --git a/lib/ios/TransitionDelegate.m b/lib/ios/TransitionDelegate.m index a16083e4977..6f709f2036c 100644 --- a/lib/ios/TransitionDelegate.m +++ b/lib/ios/TransitionDelegate.m @@ -2,19 +2,19 @@ #import "DisplayLinkAnimator.h" @implementation TransitionDelegate { - RCTUIManager* _uiManager; + RCTBridge* _bridge; id _transitionContext; BOOL _animate; } -- (instancetype)initWithUIManager:(RCTUIManager *)uiManager { +- (instancetype)initWithBridge:(RCTBridge *)bridge { self = [super init]; - _uiManager = uiManager; - [_uiManager.observerCoordinator addObserver:self]; + _bridge = bridge; return self; } - (void)animateTransition:(id)transitionContext { + [_bridge.uiManager.observerCoordinator addObserver:self]; _animate = YES; _transitionContext = transitionContext; [self prepareTransitionContext:transitionContext];