Removes unable to find UIManager module warning (wix#6043)

stachu2k · Apr 8, 2020 · 695d222 · 695d222
1 parent 1885a8a
commit 695d222
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 22 deletions.
diff --git 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
@@ -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
@@ -88,7 +88,7 @@ - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge {
 
 - (NSArray<id<RCTBridgeModule>> *)extraModulesForBridge:(RCTBridge *)bridge {
 	RNNEventEmitter *eventEmitter = [[RNNEventEmitter alloc] init];
-    _modalManager = [[RNNModalManager alloc] initWithUIManager:_bridge.uiManager];
+    _modalManager = [[RNNModalManager alloc] initWithBridge:bridge];
 
 	id<RNNComponentViewCreator> rootViewCreator = [[RNNReactRootViewCreator alloc] initWithBridge:bridge eventEmitter:eventEmitter];
 	_componentRegistry = [[RNNReactComponentRegistry alloc] initWithCreator:rootViewCreator];

diff --git a/lib/ios/RNNModalManager.h b/lib/ios/RNNModalManager.h
@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-#import <React/RCTUIManager.h>
+#import <React/RCTBridge.h>
 
 typedef void (^RNNTransitionCompletionBlock)(void);
 typedef void (^RNNTransitionWithComponentIdCompletionBlock)(NSString *componentId);
@@ -16,7 +16,7 @@ typedef void (^RNNTransitionRejectionBlock)(NSString *code, NSString *message, N
 
 @interface RNNModalManager : NSObject <UIAdaptivePresentationControllerDelegate>
 
-- (instancetype)initWithUIManager:(RCTUIManager *)uiManager;
+- (instancetype)initWithBridge:(RCTBridge *)bridge;
 
 @property (nonatomic, weak) id<RNNModalManagerDelegate> delegate;
 

diff --git a/lib/ios/RNNModalManager.m b/lib/ios/RNNModalManager.m
@@ -12,21 +12,20 @@ @interface RNNModalManager ()
 @implementation RNNModalManager {
 	NSMutableArray* _pendingModalIdsToDismiss;
 	NSMutableArray* _presentedModals;
-    RCTUIManager* _uiManager;
+    RCTBridge* _bridge;
 }
 
 
 - (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<RNNLayoutProtocol> *)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
@@ -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
@@ -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
@@ -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
@@ -5,7 +5,7 @@
 
 @interface TransitionDelegate : NSObject <UIViewControllerTransitioningDelegate, UIViewControllerAnimatedTransitioning, RCTUIManagerObserver>
 
-- (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
@@ -2,19 +2,19 @@
 #import "DisplayLinkAnimator.h"
 
 @implementation TransitionDelegate {
-    RCTUIManager* _uiManager;
+    RCTBridge* _bridge;
     id <UIViewControllerContextTransitioning> _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<UIViewControllerContextTransitioning>)transitionContext {
+    [_bridge.uiManager.observerCoordinator addObserver:self];
     _animate = YES;
     _transitionContext = transitionContext;
     [self prepareTransitionContext:transitionContext];