Fixes initial screen size (#4781)

wix · Feb 24, 2019 · e036743 · e036743
1 parent f5ada51
commit e036743
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/lib/ios/RNNReactRootViewCreator.m b/lib/ios/RNNReactRootViewCreator.m
@@ -14,24 +14,25 @@ - (instancetype)initWithBridge:(RCTBridge*)bridge {
 	return self;
 }
 
-- (RNNReactView*)createRootView:(NSString*)name rootViewId:(NSString*)rootViewId reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock {
+- (RNNReactView*)createRootView:(NSString*)name rootViewId:(NSString*)rootViewId availableSize:(CGSize)availableSize reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock {
 	if (!rootViewId) {
 		@throw [NSException exceptionWithName:@"MissingViewId" reason:@"Missing view id" userInfo:nil];
 	}
 
 	RNNReactView *view = [[RNNReactView alloc] initWithBridge:_bridge
-														   moduleName:name
-													initialProperties:@{@"componentId": rootViewId}
-												  reactViewReadyBlock:reactViewReadyBlock];
+												   moduleName:name
+											initialProperties:@{@"componentId": rootViewId}
+												availableSize:availableSize
+										  reactViewReadyBlock:reactViewReadyBlock];
 	return view;
 }
 
 - (UIView*)createRootViewFromComponentOptions:(RNNComponentOptions*)componentOptions {
-	return [self createRootView:componentOptions.name.get rootViewId:componentOptions.componentId.get reactViewReadyBlock:nil];
+	return [self createRootView:componentOptions.name.get rootViewId:componentOptions.componentId.get availableSize:CGSizeZero reactViewReadyBlock:nil];
 }
 
 - (UIView*)createRootViewFromComponentOptions:(RNNComponentOptions*)componentOptions reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock {
-	return [self createRootView:componentOptions.name.get rootViewId:componentOptions.componentId.get reactViewReadyBlock:reactViewReadyBlock];
+	return [self createRootView:componentOptions.name.get rootViewId:componentOptions.componentId.get availableSize:CGSizeZero reactViewReadyBlock:reactViewReadyBlock];
 }
 
 @end
diff --git a/lib/ios/RNNReactView.h b/lib/ios/RNNReactView.h
@@ -5,7 +5,7 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
 
 @interface RNNReactView : RCTRootView <RCTRootViewDelegate>
 
-- (instancetype)initWithBridge:(RCTBridge *)bridge moduleName:(NSString *)moduleName initialProperties:(NSDictionary *)initialProperties reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock;
+- (instancetype)initWithBridge:(RCTBridge *)bridge moduleName:(NSString *)moduleName initialProperties:(NSDictionary *)initialProperties availableSize:(CGSize)availableSize reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock;
 
 @property (nonatomic, copy) void (^rootViewDidChangeIntrinsicSize)(CGSize intrinsicSize);
 @property (nonatomic, copy) RNNReactViewReadyCompletionBlock reactViewReadyBlock;

diff --git a/lib/ios/RNNReactView.m b/lib/ios/RNNReactView.m
@@ -4,10 +4,11 @@
 
 @implementation RNNReactView
 
-- (instancetype)initWithBridge:(RCTBridge *)bridge moduleName:(NSString *)moduleName initialProperties:(NSDictionary *)initialProperties reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock {
+- (instancetype)initWithBridge:(RCTBridge *)bridge moduleName:(NSString *)moduleName initialProperties:(NSDictionary *)initialProperties availableSize:(CGSize)availableSize reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock {
 	self = [super initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
 	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(contentDidAppear:) name:RCTContentDidAppearNotification object:nil];
 	 _reactViewReadyBlock = reactViewReadyBlock;
+	[bridge.uiManager setAvailableSize:availableSize forRootView:self];
 
 	return self;
 }

diff --git a/lib/ios/RNNRootViewController.m b/lib/ios/RNNRootViewController.m
@@ -97,7 +97,7 @@ - (void)renderTreeAndWait:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)r
 	}
 
 	__block RNNReactViewReadyCompletionBlock readyBlockCopy = readyBlock;
-	UIView* reactView = [_creator createRootView:self.layoutInfo.name rootViewId:self.layoutInfo.componentId reactViewReadyBlock:^{
+	UIView* reactView = [_creator createRootView:self.layoutInfo.name rootViewId:self.layoutInfo.componentId availableSize:[UIScreen mainScreen].bounds.size reactViewReadyBlock:^{
 		[_presenter renderComponents:self.resolveOptions perform:^{
 			if (readyBlockCopy) {
 				readyBlockCopy();

diff --git a/lib/ios/RNNRootViewCreator.h b/lib/ios/RNNRootViewCreator.h
@@ -5,7 +5,7 @@
 
 @protocol RNNRootViewCreator
 
-- (RNNReactView*)createRootView:(NSString*)name rootViewId:(NSString*)rootViewId reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock;
+- (RNNReactView*)createRootView:(NSString*)name rootViewId:(NSString*)rootViewId availableSize:(CGSize)availableSize reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock;
 
 - (UIView*)createRootViewFromComponentOptions:(RNNComponentOptions*)componentOptions;