Fix top bar component layout frame size (#5015)

* Fix top bar component layout frame size * Update RNNReactView.m
wix · Apr 23, 2019 · 1993b93 · 1993b93
1 parent 0e888fb
commit 1993b93
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/lib/ios/RNNReactView.m b/lib/ios/RNNReactView.m
@@ -45,6 +45,10 @@ - (void)setAlignment:(NSString *)alignment {
 		self.sizeFlexibility = RCTRootViewSizeFlexibilityNone;
 	} else {
 		self.sizeFlexibility = RCTRootViewSizeFlexibilityWidthAndHeight;
+		__weak RNNReactView *weakSelf = self;
+		[self setRootViewDidChangeIntrinsicSize:^(CGSize intrinsicSize) {
+			[weakSelf setFrame:CGRectMake(0, 0, intrinsicSize.width, intrinsicSize.height)];
+		}];
 	}
 }
 

diff --git a/lib/ios/RNNViewControllerPresenter.m b/lib/ios/RNNViewControllerPresenter.m
@@ -166,22 +166,9 @@ - (void)setCustomNavigationTitleView:(RNNNavigationOptions *)options perform:(RN
 	if (options.topBar.title.component.name.hasValue) {
 		_customTitleView = (RNNReactView*)[_componentRegistry createComponentIfNotExists:options.topBar.title.component parentComponentId:viewController.layoutInfo.componentId reactViewReadyBlock:readyBlock];
 		_customTitleView.backgroundColor = UIColor.clearColor;
-
 		NSString* alignment = [options.topBar.title.component.alignment getWithDefaultValue:@""];
 		[_customTitleView setAlignment:alignment];
-
-		BOOL isCenter = [alignment isEqualToString:@"center"];
-		__weak RNNReactView *weakTitleView = _customTitleView;
-		CGRect frame = viewController.navigationController.navigationBar.bounds;
-		[_customTitleView setFrame:frame];
-		[_customTitleView setRootViewDidChangeIntrinsicSize:^(CGSize intrinsicContentSize) {
-			if (isCenter) {
-				[weakTitleView setFrame:CGRectMake(0, 0, intrinsicContentSize.width, intrinsicContentSize.height)];
-			} else {
-				[weakTitleView setFrame:frame];
-			}
-		}];
-
+
 		viewController.navigationItem.titleView = _customTitleView;
 	} else {
 		[_customTitleView removeFromSuperview];