react-native-navigation 7.33.0-alpha.9 → 7.33.1

package/lib/Mock/Components/LayoutComponent.tsx

@@ -19,10 +19,8 @@ export const LayoutComponent = class extends Component<ComponentProps> {
     return <View />;
   }
   componentDidCatch(error: Error, errorInfo: React.ErrorInfo) {
-    console.error(
-      `Error while trying to render layout ${this.props.layoutNode.nodeId} of type ${this.props.layoutNode.type}`,
-      error,
-      errorInfo
+    throw new Error(
+      `Error while trying to render layout ${this.props.layoutNode.nodeId} of type ${this.props.layoutNode.type}: ${error}\n${errorInfo?.componentStack}`
     );
   }
 };

package/lib/android/app/src/reactNative71/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -2,44 +2,17 @@ package com.reactnativenavigation.views.stack.topbar.titlebar
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.children
 import com.facebook.react.ReactInstanceManager
 import com.reactnativenavigation.react.ReactView
 
-
 @SuppressLint("ViewConstructor")
 class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
                         componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
-
-    private data class Coordinates(var left: Int = Int.MAX_VALUE,
-                                   var top: Int = Int.MAX_VALUE,
-                                   var right: Int = 0,
-                                   var bottom: Int = 0) {
-        fun width(): Int {
-            return if (left < Int.MAX_VALUE) right - left else 0
-        }
-
-        fun height(): Int {
-            return if (top < Int.MAX_VALUE) bottom - top else 0
-        }
-
-        fun set(left: Int, top: Int, right: Int, bottom: Int) {
-            this.left = left
-            this.top = top
-            this.right = right
-            this.bottom = bottom
-        }
-    }
-
-    private val titleCoordinates = Coordinates()
-
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        if (titleCoordinates.right == 0) {
-            setSize(titleCoordinates)
-        }
-        super.onMeasure(interceptReactRootViewMeasureSpecWidth(widthMeasureSpec),
-                interceptReactRootViewMeasureSpecHeight(heightMeasureSpec))
+        super.onMeasure(interceptReactRootViewMeasureSpecWidth(widthMeasureSpec), interceptReactRootViewMeasureSpecHeight(heightMeasureSpec))
     }
 
     private fun interceptReactRootViewMeasureSpecWidth(widthMeasureSpec: Int): Int {
@@ -48,9 +21,9 @@ class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceMa
         // It's causing infinite measurements, that hung up the UI.
         // Intercepting largest child by width, and use its width as (parent) ReactRootView width fixed that.
         // See for more details https://github.com/wix/react-native-navigation/pull/7096
-        val width = titleCoordinates.width()
-        return if (width > 0) MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY) else
-            widthMeasureSpec
+        val measuredWidth = this.getLastRootViewChildMaxWidth()
+
+        return MeasureSpec.makeMeasureSpec(measuredWidth, MeasureSpec.EXACTLY)
     }
 
     private fun interceptReactRootViewMeasureSpecHeight(heightMeasureSpec: Int): Int {
@@ -59,62 +32,40 @@ class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceMa
         // It's causing infinite measurements, that hung up the UI.
         // Intercepting largest child by height, and use its height as (parent) ReactRootView width fixed that.
         // See for more details https://github.com/wix/react-native-navigation/pull/7096
+        val measuredHeight = this.getLastRootViewChild()?.height
 
-        val height = titleCoordinates.height()
-        return if (height > 0) MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY) else
+        return if (measuredHeight != null) MeasureSpec.makeMeasureSpec(measuredHeight, MeasureSpec.EXACTLY) else
             heightMeasureSpec
     }
 
-    private fun setSize(coordinates: Coordinates) {
-        if (!setSizeByFirstViewGroup(coordinates)) {
-            setSizeByAllChildren(rootViewGroup, coordinates)
+    private fun getLastRootViewChildMaxWidth(): Int {
+        if (rootViewGroup.children.count() == 0) {
+            return 0
         }
-    }
-
-    private fun setSizeByFirstViewGroup(coordinates: Coordinates): Boolean {
-        for (child in rootViewGroup.children) {
-            if (child.isShown && child is ViewGroup) {
-                val location = IntArray(2)
-                child.getLocationOnScreen(location)
-                val left = location[0]
-                val top = location[1]
-                val height = child.bottom - child.top
-                val width = child.right - child.left
-                if (width < context.resources.displayMetrics.widthPixels) {
-                    coordinates.set(left, top, left + width, top + height)
-                    return true
-                }
+        var maxWidth = rootViewGroup.width
+        var next = rootViewGroup as Any
+        while(next is ViewGroup) { //try {
+            if (next.width > maxWidth) {
+                maxWidth = next.width
             }
+            if (next.children.count() == 0) break
+            next.children.first().also { next = it }
         }
-
-        return false
+        return maxWidth
     }
 
-    private fun setSizeByAllChildren(viewGroup: ViewGroup, coordinates: Coordinates) {
-        for (child in viewGroup.children) {
-            if (child.isShown) {
-                if (child is ViewGroup) {
-                    val childCoordinates = Coordinates()
-                    setSizeByAllChildren(child, childCoordinates)
-                    coordinates.left = coordinates.left.coerceAtMost(childCoordinates.left)
-                    coordinates.right = coordinates.right.coerceAtLeast(childCoordinates.right)
-                    coordinates.top = coordinates.top.coerceAtMost(childCoordinates.top)
-                    coordinates.bottom = coordinates.bottom.coerceAtLeast(childCoordinates.bottom)
-                } else {
-                    val location = IntArray(2)
-                    child.getLocationOnScreen(location)
-                    val childLeft = location[0]
-                    val childRight = childLeft + child.measuredWidth
-                    val childTop = location[1]
-                    val childBottom = childTop + child.measuredHeight
-
-                    coordinates.left = coordinates.left.coerceAtMost(childLeft)
-                    coordinates.right = coordinates.right.coerceAtLeast(childRight)
-                    coordinates.top = coordinates.top.coerceAtMost(childTop)
-                    coordinates.bottom = coordinates.bottom.coerceAtLeast(childBottom)
-                }
-            }
+    private fun getLastRootViewChild(): View? {
+        if (rootViewGroup.children.count() == 0) {
+            return null
         }
-
+        var rootViewGroupLastChild: View = rootViewGroup
+        var next = rootViewGroup as Any
+        while(next is ViewGroup) { //try {
+            rootViewGroupLastChild = next
+            if (next.children.count() == 0) break
+            next.children.first().also { next = it }
+        }
+        @Suppress("UNREACHABLE_CODE")
+        return rootViewGroupLastChild
     }
-}
+}

package/lib/dist/Mock/Components/LayoutComponent.js

@@ -20,7 +20,7 @@ const LayoutComponent = class extends react_1.Component {
         return react_1.default.createElement(react_native_1.View, null);
     }
     componentDidCatch(error, errorInfo) {
-        console.error(`Error while trying to render layout ${this.props.layoutNode.nodeId} of type ${this.props.layoutNode.type}`, error, errorInfo);
+        throw new Error(`Error while trying to render layout ${this.props.layoutNode.nodeId} of type ${this.props.layoutNode.type}: ${error}\n${errorInfo?.componentStack}`);
     }
 };
 exports.LayoutComponent = LayoutComponent;

package/lib/dist/src/commands/LayoutTreeCrawler.js

@@ -14,7 +14,7 @@ class LayoutTreeCrawler {
         if (node.type === LayoutType_1.LayoutType.Component) {
             this.handleComponent(node);
         }
-        const componentProps = this.store.getPropsForId(node.id) || undefined;
+        const componentProps = this.store.getPendingProps(node.id) || undefined;
         this.optionsProcessor.processOptions(commandName, node.data.options, componentProps);
         node.children.forEach((value) => this.crawl(value, commandName));
     }

package/lib/dist/src/components/Store.d.ts

@@ -10,6 +10,7 @@ export declare class Store {
     private lazyRegistratorFn;
     updateProps(componentId: string, props: any, callback?: () => void): void;
     setPendingProps(componentId: string, newProps: any): void;
+    getPendingProps(componentId: string): any;
     getPropsForId(componentId: string): any;
     mergeNewPropsForId(componentId: string, newProps: any): void;
     clearComponent(componentId: string): void;

package/lib/dist/src/components/Store.js

@@ -18,6 +18,9 @@ class Store {
     setPendingProps(componentId, newProps) {
         this.pendingPropsById[componentId] = newProps;
     }
+    getPendingProps(componentId) {
+        return this.pendingPropsById[componentId];
+    }
     getPropsForId(componentId) {
         if (this.pendingPropsById[componentId]) {
             this.propsById[componentId] = this.pendingPropsById[componentId];

package/lib/ios/BottomTabsTogetherAttacher.m

@@ -6,7 +6,7 @@
 - (void)attach:(RNNBottomTabsController *)bottomTabsController {
     dispatch_group_t ready = dispatch_group_create();
 
-    for (UIViewController *vc in bottomTabsController.pendingChildViewControllers) {
+    for (UIViewController *vc in bottomTabsController.childViewControllers) {
         dispatch_group_enter(ready);
         [vc setReactViewReadyCallback:^{
           dispatch_group_leave(ready);

package/lib/ios/RCTConvert+Interpolation.m

@@ -27,12 +27,12 @@ RCT_CUSTOM_CONVERTER(id<Interpolator>, Interpolator, [RCTConvert interpolatorFro
     }
     NSString *interpolation = json[@"type"] ? json[@"type"] : nil;
 
-    id<Interpolator> (^interpolator)(void) = @{
-        @"decelerate" : ^{
-          CGFloat factor = [[[NumberParser parse:json key:@"factor"]
-              withDefault:[NSNumber numberWithFloat:1.0f]] floatValue];
-          return [[DecelerateInterpolator alloc] init:factor];
-        },
+    id<Interpolator> (^interpolator)(void) = @{@"decelerate" : ^{
+        CGFloat factor = [[[NumberParser parse:json key:@"factor"]
+            withDefault:[NSNumber numberWithFloat:1.0f]] floatValue];
+    return [[DecelerateInterpolator alloc] init:factor];
+}
+,
         @"accelerate" : ^{
           CGFloat factor = [[[NumberParser parse:json key:@"factor"]
               withDefault:[NSNumber numberWithFloat:1.0f]] floatValue];
@@ -72,13 +72,14 @@ RCT_CUSTOM_CONVERTER(id<Interpolator>, Interpolator, [RCTConvert interpolatorFro
                                 allowsOverdamping:allowsOverdamping
                                   initialVelocity:initialVelocity];
         },
-    }[interpolation];
+}
+[interpolation];
 
-    if (interpolator != nil) {
-        return interpolator();
-    } else {
-        return [RCTConvert defaultInterpolator];
-    }
+if (interpolator != nil) {
+    return interpolator();
+} else {
+    return [RCTConvert defaultInterpolator];
+}
 }
 
 @end

package/lib/ios/RNNBaseIconCreator.h

@@ -1,7 +1,7 @@
-#import <Foundation/Foundation.h>
 #import "RNNButtonOptions.h"
 #import "RNNIconDrawer.h"
 #import "UIImage+utils.h"
+#import <Foundation/Foundation.h>
 
 @interface RNNBaseIconCreator : NSObject
 
@@ -9,7 +9,7 @@
 
 - (UIImage *)create:(RNNButtonOptions *)buttonOptions;
 
-@property (nonatomic, retain) RNNIconDrawer* iconDrawer;
+@property(nonatomic, retain) RNNIconDrawer *iconDrawer;
 
 @end
 

package/lib/ios/RNNBaseIconCreator.m

@@ -4,62 +4,62 @@
 @implementation RNNBaseIconCreator
 
 - (instancetype)initWithIconDrawer:(RNNIconDrawer *)iconDrawer {
- self = [super init];
- self.iconDrawer = iconDrawer;
- return self;
+    self = [super init];
+    self.iconDrawer = iconDrawer;
+    return self;
 }
 
 - (UIImage *)create:(RNNButtonOptions *)buttonOptions {
- if (buttonOptions.isEnabled)
-	 return [self createEnabledIcon:buttonOptions];
- else
-	 return [self createDisabledIcon:buttonOptions];
+    if (buttonOptions.isEnabled)
+        return [self createEnabledIcon:buttonOptions];
+    else
+        return [self createDisabledIcon:buttonOptions];
 }
 
 - (UIImage *)createEnabledIcon:(RNNButtonOptions *)buttonOptions {
- UIColor *backgroundColor = [buttonOptions.iconBackground.color withDefault:UIColor.clearColor];
- UIColor *tintColor = [buttonOptions.color withDefault:nil];
+    UIColor *backgroundColor = [buttonOptions.iconBackground.color withDefault:UIColor.clearColor];
+    UIColor *tintColor = [buttonOptions.color withDefault:nil];
 
- return [self createIcon:buttonOptions tintColor:tintColor backgroundColor:backgroundColor];
+    return [self createIcon:buttonOptions tintColor:tintColor backgroundColor:backgroundColor];
 }
 
 - (UIImage *)createDisabledIcon:(RNNButtonOptions *)buttonOptions {
- UIColor *backgroundColor = [self resolveDisabledBackgroundColor:buttonOptions];
- UIColor *tintColor = [self resolveDisabledIconColor:buttonOptions];
+    UIColor *backgroundColor = [self resolveDisabledBackgroundColor:buttonOptions];
+    UIColor *tintColor = [self resolveDisabledIconColor:buttonOptions];
 
- return [self createIcon:buttonOptions tintColor:tintColor backgroundColor:backgroundColor];
+    return [self createIcon:buttonOptions tintColor:tintColor backgroundColor:backgroundColor];
 }
 
 - (UIColor *)resolveDisabledIconColor:(RNNButtonOptions *)buttonOptions {
- if (![buttonOptions.enabled withDefault:YES] && buttonOptions.disabledColor.hasValue)
-	 return buttonOptions.disabledColor.get;
- else
-	 return [buttonOptions.color withDefault:nil];
+    if (![buttonOptions.enabled withDefault:YES] && buttonOptions.disabledColor.hasValue)
+        return buttonOptions.disabledColor.get;
+    else
+        return [buttonOptions.color withDefault:nil];
 }
 
 - (UIColor *)resolveDisabledBackgroundColor:(RNNButtonOptions *)buttonOptions {
- if (![buttonOptions.enabled withDefault:YES] &&
-	 buttonOptions.iconBackground.disabledColor.hasValue)
-	 return buttonOptions.iconBackground.disabledColor.get;
- else
-	 return [buttonOptions.iconBackground.color withDefault:nil];
+    if (![buttonOptions.enabled withDefault:YES] &&
+        buttonOptions.iconBackground.disabledColor.hasValue)
+        return buttonOptions.iconBackground.disabledColor.get;
+    else
+        return [buttonOptions.iconBackground.color withDefault:nil];
 }
 
 - (UIImage *)createIcon:(RNNButtonOptions *)buttonOptions
-		   tintColor:(UIColor *)tintColor
-	 backgroundColor:(UIColor *)backgroundColor {
+              tintColor:(UIColor *)tintColor
+        backgroundColor:(UIColor *)backgroundColor {
     @throw @"createIcon should be implemented by subclass";
     return nil;
 }
 
 - (CGSize)resolveIconSize:(RNNButtonOptions *)buttonOptions {
- CGFloat width =
-	 [buttonOptions.iconBackground.width withDefault:@(buttonOptions.icon.get.size.width)]
-		 .floatValue;
- CGFloat height =
-	 [buttonOptions.iconBackground.height withDefault:@(buttonOptions.icon.get.size.height)]
-		 .floatValue;
- return CGSizeMake(width, height);
+    CGFloat width =
+        [buttonOptions.iconBackground.width withDefault:@(buttonOptions.icon.get.size.width)]
+            .floatValue;
+    CGFloat height =
+        [buttonOptions.iconBackground.height withDefault:@(buttonOptions.icon.get.size.height)]
+            .floatValue;
+    return CGSizeMake(width, height);
 }
 
 @end

package/lib/ios/RNNBottomTabsController.h

@@ -28,6 +28,4 @@
 
 - (void)handleTabBarLongPress:(CGPoint)locationInTabBar;
 
-@property(nonatomic, strong) NSArray *pendingChildViewControllers;
-
 @end

package/lib/ios/RNNBottomTabsController.m

@@ -4,7 +4,6 @@
 @interface RNNBottomTabsController ()
 @property(nonatomic, strong) BottomTabPresenter *bottomTabPresenter;
 @property(nonatomic, strong) RNNDotIndicatorPresenter *dotIndicatorPresenter;
-@property(nonatomic) BOOL viewWillAppearOnce;
 @property(nonatomic, strong) UILongPressGestureRecognizer *longPressRecognizer;
 
 @end
@@ -29,7 +28,7 @@
     _bottomTabsAttacher = bottomTabsAttacher;
     _bottomTabPresenter = bottomTabPresenter;
     _dotIndicatorPresenter = dotIndicatorPresenter;
-    _pendingChildViewControllers = childViewControllers;
+
     self = [super initWithLayoutInfo:layoutInfo
                              creator:creator
                              options:options
@@ -56,18 +55,27 @@
     return self;
 }
 
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    // This hack is needed for cases when the initialized state of the tabBar should be hidden
+    UINavigationController *firstChild = [self.childViewControllers objectAtIndex:0];
+    if ([firstChild isKindOfClass:UINavigationController.class] &&
+        firstChild.hidesBottomBarWhenPushed) {
+        [firstChild pushViewController:UIViewController.new animated:NO];
+        [firstChild popViewControllerAnimated:NO];
+    }
+}
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+}
+
 - (void)createTabBarItems:(NSArray<UIViewController *> *)childViewControllers {
     for (UIViewController *child in childViewControllers) {
         [_bottomTabPresenter applyOptions:child.resolveOptions child:child];
     }
 }
 
-- (void)viewWillAppear:(BOOL)animated {
-    [super viewWillAppear:animated];
-    _viewWillAppearOnce = YES;
-    [self loadChildren:self.pendingChildViewControllers];
-}
-
 - (void)mergeChildOptions:(RNNNavigationOptions *)options child:(UIViewController *)child {
     [super mergeChildOptions:options child:child];
     UIViewController *childViewController = [self findViewController:child];
@@ -124,23 +132,12 @@
     return self.childViewControllers.count ? self.childViewControllers[_currentTabIndex] : nil;
 }
 
-- (NSArray<__kindof UIViewController *> *)childViewControllers {
-    return self.pendingChildViewControllers ?: super.childViewControllers;
-}
-
 - (void)setSelectedViewController:(__kindof UIViewController *)selectedViewController {
     _previousTabIndex = _currentTabIndex;
     _currentTabIndex = [self.childViewControllers indexOfObject:selectedViewController];
     [super setSelectedViewController:selectedViewController];
 }
 
-- (void)loadChildren:(NSArray *)children {
-    if (self.viewWillAppearOnce) {
-        [super loadChildren:children];
-        self.pendingChildViewControllers = nil;
-    }
-}
-
 - (void)setTabBarVisible:(BOOL)visible animated:(BOOL)animated {
     _tabBarNeedsRestore = YES;
     visible ? [self showTabBar:animated] : [self hideTabBar:animated];

package/lib/ios/RNNButtonBuilder.m

@@ -1,6 +1,6 @@
 #import "RNNButtonBuilder.h"
-#import "RNNFontAttributesCreator.h"
 #import "RNNDynamicIconCreator.h"
+#import "RNNFontAttributesCreator.h"
 
 @implementation RNNButtonBuilder {
     RNNReactComponentRegistry *_componentRegistry;
@@ -15,7 +15,7 @@
     } else {
         _iconCreator = [[RNNIconCreator alloc] initWithIconDrawer:RNNIconDrawer.new];
     }
-    
+
     return self;
 }
 

package/lib/ios/RNNComponentPresenter.m

@@ -215,13 +215,15 @@
     if (mergeOptions.topBar.rightButtonColor.hasValue) {
         [_buttonsPresenter applyRightButtonsColor:mergeOptions.topBar.rightButtonColor];
     }
-    
+
     if (mergeOptions.topBar.rightButtonBackgroundColor.hasValue) {
-        [_buttonsPresenter applyRightButtonsBackgroundColor:mergeOptions.topBar.rightButtonBackgroundColor];
+        [_buttonsPresenter
+            applyRightButtonsBackgroundColor:mergeOptions.topBar.rightButtonBackgroundColor];
     }
-    
+
     if (mergeOptions.topBar.leftButtonBackgroundColor.hasValue) {
-        [_buttonsPresenter applyLeftButtonsBackgroundColor:mergeOptions.topBar.leftButtonBackgroundColor];
+        [_buttonsPresenter
+            applyLeftButtonsBackgroundColor:mergeOptions.topBar.leftButtonBackgroundColor];
     }
 
     if (mergeOptions.overlay.interceptTouchOutside.hasValue) {

package/lib/ios/RNNComponentRootView.m

@@ -12,7 +12,6 @@
                initialProperties:initialProperties
                     eventEmitter:eventEmitter
              reactViewReadyBlock:reactViewReadyBlock];
-    [bridge.uiManager setAvailableSize:UIScreen.mainScreen.bounds.size forRootView:self];
     return self;
 }
 

package/lib/ios/RNNDynamicIconCreator.h

@@ -1,5 +1,5 @@
-#import <Foundation/Foundation.h>
 #import "RNNBaseIconCreator.h"
+#import <Foundation/Foundation.h>
 
 @interface RNNDynamicIconCreator : RNNBaseIconCreator
 

package/lib/ios/RNNDynamicIconCreator.m

@@ -8,22 +8,35 @@
     UIImage *iconImage = buttonOptions.icon.get;
     CGSize iconSize = [self resolveIconSize:buttonOptions];
     CGFloat cornerRadius = [buttonOptions.iconBackground.cornerRadius withDefault:@(0)].floatValue;
-    UIColor *lightColor = [tintColor resolvedColorWithTraitCollection:[UITraitCollection traitCollectionWithUserInterfaceStyle:UIUserInterfaceStyleLight]];
-    UIColor *darkColor = [tintColor resolvedColorWithTraitCollection:[UITraitCollection traitCollectionWithUserInterfaceStyle:UIUserInterfaceStyleDark]];
-    UIColor *lightBackgroundColor = [backgroundColor resolvedColorWithTraitCollection:[UITraitCollection traitCollectionWithUserInterfaceStyle:UIUserInterfaceStyleLight]];
-    UIColor *darkBackgroundColor = [backgroundColor resolvedColorWithTraitCollection:[UITraitCollection traitCollectionWithUserInterfaceStyle:UIUserInterfaceStyleDark]];
-    UIImage *darkImage = [[self.iconDrawer draw:iconImage
-                                 imageColor:darkColor
-                            backgroundColor:darkBackgroundColor
-                                       size:iconSize
-                               cornerRadius:cornerRadius] imageWithInsets:buttonOptions.iconInsets.UIEdgeInsets];
-    UIImage *lightImage = [[self.iconDrawer draw:iconImage
-                                  imageColor:lightColor
-                             backgroundColor:lightBackgroundColor
-                                        size:iconSize
-                                cornerRadius:cornerRadius] imageWithInsets:buttonOptions.iconInsets.UIEdgeInsets];
-    [lightImage.imageAsset registerImage:darkImage withTraitCollection:[UITraitCollection traitCollectionWithUserInterfaceStyle:UIUserInterfaceStyleDark]];
-    
+    UIColor *lightColor = [tintColor
+        resolvedColorWithTraitCollection:
+            [UITraitCollection traitCollectionWithUserInterfaceStyle:UIUserInterfaceStyleLight]];
+    UIColor *darkColor = [tintColor
+        resolvedColorWithTraitCollection:
+            [UITraitCollection traitCollectionWithUserInterfaceStyle:UIUserInterfaceStyleDark]];
+    UIColor *lightBackgroundColor = [backgroundColor
+        resolvedColorWithTraitCollection:
+            [UITraitCollection traitCollectionWithUserInterfaceStyle:UIUserInterfaceStyleLight]];
+    UIColor *darkBackgroundColor = [backgroundColor
+        resolvedColorWithTraitCollection:
+            [UITraitCollection traitCollectionWithUserInterfaceStyle:UIUserInterfaceStyleDark]];
+    UIImage *darkImage =
+        [[self.iconDrawer draw:iconImage
+                    imageColor:darkColor
+               backgroundColor:darkBackgroundColor
+                          size:iconSize
+                  cornerRadius:cornerRadius] imageWithInsets:buttonOptions.iconInsets.UIEdgeInsets];
+    UIImage *lightImage =
+        [[self.iconDrawer draw:iconImage
+                    imageColor:lightColor
+               backgroundColor:lightBackgroundColor
+                          size:iconSize
+                  cornerRadius:cornerRadius] imageWithInsets:buttonOptions.iconInsets.UIEdgeInsets];
+    [lightImage.imageAsset
+              registerImage:darkImage
+        withTraitCollection:[UITraitCollection
+                                traitCollectionWithUserInterfaceStyle:UIUserInterfaceStyleDark]];
+
     return lightImage;
 }
 

package/lib/ios/RNNFontAttributesCreator.m

@@ -36,6 +36,7 @@
                                                              style:nil
                                                            variant:nil
                                                    scaleMultiplier:1.0];
+    titleTextAttributes[NSParagraphStyleAttributeName] = NSParagraphStyle.defaultParagraphStyle;
 
     return titleTextAttributes;
 }

package/lib/ios/RNNIconCreator.h

@@ -1,7 +1,7 @@
+#import "RNNBaseIconCreator.h"
 #import "RNNButtonOptions.h"
 #import "RNNIconDrawer.h"
 #import <Foundation/Foundation.h>
-#import "RNNBaseIconCreator.h"
 
 @interface RNNIconCreator : RNNBaseIconCreator
 

package/lib/ios/RNNIconCreator.m

@@ -8,11 +8,12 @@
     UIImage *iconImage = buttonOptions.icon.get;
     CGSize iconSize = [self resolveIconSize:buttonOptions];
     CGFloat cornerRadius = [buttonOptions.iconBackground.cornerRadius withDefault:@(0)].floatValue;
-    return [[self.iconDrawer draw:iconImage
-                   imageColor:tintColor
-              backgroundColor:backgroundColor
-                         size:iconSize
-                 cornerRadius:cornerRadius] imageWithInsets:buttonOptions.iconInsets.UIEdgeInsets];
+    return
+        [[self.iconDrawer draw:iconImage
+                    imageColor:tintColor
+               backgroundColor:backgroundColor
+                          size:iconSize
+                  cornerRadius:cornerRadius] imageWithInsets:buttonOptions.iconInsets.UIEdgeInsets];
 }
 
 @end

package/lib/ios/RNNLayoutManager.m

@@ -72,16 +72,6 @@
         }
     }
 
-    if ([parentViewController respondsToSelector:@selector(pendingChildViewControllers)]) {
-        NSArray *pendingChildVCs = [parentViewController pendingChildViewControllers];
-        for (UIViewController *childVC in pendingChildVCs) {
-            UIViewController *result = [self findChildComponentForParent:childVC forId:componentId];
-            if (result) {
-                return result;
-            }
-        }
-    }
-
     return nil;
 }
 

package/lib/ios/RNNLayoutProtocol.h

@@ -42,6 +42,4 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
 
 @optional
 
-- (NSArray<UIViewController *> *)pendingChildViewControllers;
-
 @end

package/lib/ios/RNNTabBarItemCreator.m

@@ -91,14 +91,6 @@
     NSNumber *fontSize = [bottomTabOptions.fontSize withDefault:@(10)];
     NSString *fontWeight = [bottomTabOptions.fontWeight withDefault:nil];
 
-    NSDictionary *selectedAttributes = [RNNFontAttributesCreator
-        createFromDictionary:[tabItem titleTextAttributesForState:UIControlStateSelected]
-                  fontFamily:fontFamily
-                    fontSize:fontSize
-                  fontWeight:fontWeight
-                       color:selectedTextColor];
-    [self setSelectedTitleAttributes:tabItem selectedTitleAttributes:selectedAttributes];
-
     NSDictionary *normalAttributes = [RNNFontAttributesCreator
         createFromDictionary:[tabItem titleTextAttributesForState:UIControlStateNormal]
                   fontFamily:fontFamily
@@ -106,6 +98,14 @@
                   fontWeight:fontWeight
                        color:textColor];
     [self setTitleAttributes:tabItem titleAttributes:normalAttributes];
+
+    NSDictionary *selectedAttributes = [RNNFontAttributesCreator
+        createFromDictionary:[tabItem titleTextAttributesForState:UIControlStateSelected]
+                  fontFamily:fontFamily
+                    fontSize:fontSize
+                  fontWeight:fontWeight
+                       color:selectedTextColor];
+    [self setSelectedTitleAttributes:tabItem selectedTitleAttributes:selectedAttributes];
 }
 
 - (void)setTitleAttributes:(UITabBarItem *)tabItem titleAttributes:(NSDictionary *)titleAttributes {

package/lib/ios/RNNUIBarButtonItem.m

@@ -12,8 +12,8 @@
 @end
 
 @implementation RNNUIBarButtonItem {
-    RNNIconCreator* _iconCreator;
-    RNNButtonOptions* _buttonOptions;
+    RNNIconCreator *_iconCreator;
+    RNNButtonOptions *_buttonOptions;
 }
 
 - (instancetype)init {
@@ -165,7 +165,7 @@
 
 - (void)redrawIcon {
     if (_buttonOptions.icon.hasValue && [self.customView isKindOfClass:UIButton.class]) {
-        UIImage* icon = [_iconCreator create:_buttonOptions];
+        UIImage *icon = [_iconCreator create:_buttonOptions];
         [(UIButton *)self.customView setImage:icon forState:_buttonOptions.state];
     }
 }

package/lib/ios/TopBarTitlePresenter.m

@@ -33,7 +33,7 @@
         [self removeTitleComponents];
         self.boundViewController.navigationItem.title = resolvedOptions.title.text.get;
     }
-    
+
     if (options.title.color.hasValue) {
         [_titleViewHelper setTitleColor:options.title.color.get];
     }

package/lib/src/commands/LayoutTreeCrawler.ts

@@ -24,7 +24,7 @@ export class LayoutTreeCrawler {
     if (node.type === LayoutType.Component) {
       this.handleComponent(node);
     }
-    const componentProps = this.store.getPropsForId(node.id) || undefined;
+    const componentProps = this.store.getPendingProps(node.id) || undefined;
     this.optionsProcessor.processOptions(commandName, node.data.options, componentProps);
     node.children.forEach((value: LayoutNode) => this.crawl(value, commandName));
   }

package/lib/src/components/Store.ts

@@ -23,6 +23,10 @@ export class Store {
     this.pendingPropsById[componentId] = newProps;
   }
 
+  getPendingProps(componentId: string) {
+    return this.pendingPropsById[componentId];
+  }
+
   getPropsForId(componentId: string) {
     if (this.pendingPropsById[componentId]) {
       this.propsById[componentId] = this.pendingPropsById[componentId];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "7.33.0-alpha.9",
+  "version": "7.33.1",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,