fixed custom top bar alignment

wix · Mar 4, 2018 · 0294405 · 0294405
1 parent d240378
commit 0294405
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/ios/RCCCustomTitleView.m b/ios/RCCCustomTitleView.m
@@ -29,9 +29,10 @@ - (instancetype)initWithFrame:(CGRect)frame subView:(RCTRootView*)subView alignm
 
         if ([alignment isEqualToString:@"fill"]) {
             self.frame = frame;
-            self.subView.frame = self.frame;
+            subView.sizeFlexibility = RCTRootViewSizeFlexibilityNone;
         } else {
             self.subView.delegate = self;
+            subView.sizeFlexibility = RCTRootViewSizeFlexibilityWidthAndHeight;
         }
 
         [self addSubview:subView];
@@ -40,6 +41,17 @@ - (instancetype)initWithFrame:(CGRect)frame subView:(RCTRootView*)subView alignm
     return self;
 }
 
+- (void)layoutSubviews {
+    [super layoutSubviews];
+    if ([self.alignment isEqualToString:@"fill"]) {
+        [self.subView setFrame:self.bounds];
+    }
+}
+
+- (NSString *)alignment {
+    return _alignment ? _alignment : @"center";
+}
+
 - (void)rootViewDidChangeIntrinsicSize:(RCTRootView *)rootView {
     if ([self.alignment isEqualToString:@"center"]) {
         [self setFrame:CGRectMake(0, 0, rootView.intrinsicContentSize.width, rootView.intrinsicContentSize.height)];

diff --git a/ios/RCCViewController.m b/ios/RCCViewController.m
@@ -642,12 +642,11 @@ -(void)setStyleOnAppearForViewController:(UIViewController*)viewController appea
 
       NSDictionary *initialProps = self.navigatorStyle[@"navBarCustomViewInitialProps"];
       RCTRootView *reactView = [[RCTRootView alloc] initWithBridge:bridge moduleName:navBarCustomView initialProperties:initialProps];
-      reactView.sizeFlexibility = RCTRootViewSizeFlexibilityWidthAndHeight;
-
+
       RCCCustomTitleView *titleView = [[RCCCustomTitleView alloc] initWithFrame:self.navigationController.navigationBar.bounds
                                                                         subView:reactView
                                                                       alignment:self.navigatorStyle[@"navBarComponentAlignment"]];
-      
+
       self.navigationItem.titleView = titleView;
       self.navigationItem.titleView.backgroundColor = [UIColor clearColor];
       self.navigationItem.titleView.clipsToBounds = YES;