react-native-navigation 7.23.1 → 7.24.0

package/lib/ios/RNNComponentPresenter.m

@@ -41,10 +41,6 @@
     [_buttonsPresenter componentDidDisappear];
 }
 
-- (void)applyOptionsOnWillMoveToParentViewController:(RNNNavigationOptions *)options {
-    [super applyOptionsOnWillMoveToParentViewController:options];
-}
-
 - (void)applyOptions:(RNNNavigationOptions *)options {
     [super applyOptions:options];
 

package/lib/ios/RNNComponentViewController.m

@@ -1,4 +1,5 @@
 #import "RNNComponentViewController.h"
+#import "AnimationObserver.h"
 
 @implementation RNNComponentViewController {
     NSArray *_reactViewConstraints;
@@ -36,6 +37,7 @@
 
 - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
+    [[AnimationObserver sharedObserver] endAnimation];
     [self.reactView componentDidAppear];
     [self componentDidAppear];
 }
@@ -224,10 +226,6 @@
 
 #pragma mark - UIViewController overrides
 
-- (void)willMoveToParentViewController:(UIViewController *)parent {
-    [self.presenter willMoveToParentViewController:parent];
-}
-
 - (UIStatusBarStyle)preferredStatusBarStyle {
     return [self.presenter getStatusBarStyle];
 }

package/lib/ios/RNNDotIndicatorPresenter.m

@@ -92,7 +92,8 @@
         return NO;
     UIView *currentIndicator = [self getCurrentIndicator:child];
 
-    return [[currentIndicator backgroundColor] isEqual:[options.color withDefault:[UIColor redColor]]];
+    return
+        [[currentIndicator backgroundColor] isEqual:[options.color withDefault:[UIColor redColor]]];
 }
 
 - (UIView *)getCurrentIndicator:(UIViewController *)child {

package/lib/ios/RNNExternalViewController.m

@@ -1,4 +1,5 @@
 #import "RNNExternalViewController.h"
+#import "AnimationObserver.h"
 
 @implementation RNNExternalViewController {
     UIViewController *_boundViewController;
@@ -49,6 +50,7 @@
 
 - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
+    [[AnimationObserver sharedObserver] endAnimation];
     [self.eventEmitter sendComponentDidAppear:self.layoutInfo.componentId
                                 componentName:self.layoutInfo.name
                                 componentType:ComponentTypeScreen];
@@ -63,10 +65,6 @@
 
 #pragma mark - UIViewController overrides
 
-- (void)willMoveToParentViewController:(UIViewController *)parent {
-    [self.presenter willMoveToParentViewController:parent];
-}
-
 - (UIStatusBarStyle)preferredStatusBarStyle {
     return [self.presenter getStatusBarStyle];
 }

package/lib/ios/RNNModalManager.h

@@ -22,6 +22,7 @@ typedef void (^RNNTransitionRejectionBlock)(NSString *_Nonnull code, NSString *_
             animated:(BOOL)animated
           completion:(RNNTransitionCompletionBlock _Nullable)completion;
 - (void)dismissAllModalsAnimated:(BOOL)animated completion:(void (^__nullable)(void))completion;
-- (void)dismissAllModalsSynchronosly;
+
+- (void)reset;
 
 @end

package/lib/ios/RNNModalManager.m

@@ -36,12 +36,14 @@
     modalHostViewManager.presentationBlock =
         ^(UIViewController *reactViewController, UIViewController *viewController, BOOL animated,
           dispatch_block_t completionBlock) {
-          [self showModal:viewController
-                 animated:animated
-               completion:^(NSString *_Nonnull componentId) {
-                 if (completionBlock)
-                     completionBlock();
-               }];
+          if (reactViewController.presentedViewController != viewController) {
+              [self showModal:viewController
+                     animated:animated
+                   completion:^(NSString *_Nonnull componentId) {
+                     if (completionBlock)
+                         completionBlock();
+                   }];
+          }
         };
 
     modalHostViewManager.dismissalBlock =
@@ -128,19 +130,9 @@
         completion();
 }
 
-- (void)dismissAllModalsSynchronosly {
-    if (_presentedModals.count) {
-        dispatch_semaphore_t sem = dispatch_semaphore_create(0);
-        [self dismissAllModalsAnimated:NO
-                            completion:^{
-                              dispatch_semaphore_signal(sem);
-                            }];
-
-        while (dispatch_semaphore_wait(sem, DISPATCH_TIME_NOW)) {
-            [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode
-                                     beforeDate:[NSDate dateWithTimeIntervalSinceNow:0]];
-        }
-    }
+- (void)reset {
+    [_presentedModals removeAllObjects];
+    [_pendingModalIdsToDismiss removeAllObjects];
 }
 
 #pragma mark - private
@@ -170,8 +162,7 @@
             _dismissModalTransitionDelegate;
     }
 
-    if ((modalToDismiss == topPresentedVC ||
-         [[topPresentedVC childViewControllers] containsObject:modalToDismiss])) {
+    if ((modalToDismiss == topPresentedVC || [topPresentedVC findViewController:modalToDismiss])) {
         [self dismissSearchController:modalToDismiss];
         [modalToDismiss
             dismissViewControllerAnimated:animated

package/lib/ios/RNNSegmentedControl.h

@@ -1,5 +1,5 @@
-#import <HMSegmentedControl/HMSegmentedControl.h>
 #import <Foundation/Foundation.h>
+#import <HMSegmentedControl/HMSegmentedControl.h>
 
 @interface RNNSegmentedControl : HMSegmentedControl
 

package/lib/ios/RNNSideMenuChildVC.m

@@ -64,10 +64,6 @@
 
 #pragma mark - UIViewController overrides
 
-- (void)willMoveToParentViewController:(UIViewController *)parent {
-    [self.presenter willMoveToParentViewController:parent];
-}
-
 - (UIStatusBarStyle)preferredStatusBarStyle {
     return [self.presenter getStatusBarStyle];
 }

package/lib/ios/RNNSideMenuController.m

@@ -170,10 +170,6 @@
 
 #pragma mark - UIViewController overrides
 
-- (void)willMoveToParentViewController:(UIViewController *)parent {
-    [self.presenter willMoveToParentViewController:parent];
-}
-
 - (UIStatusBarStyle)preferredStatusBarStyle {
     return [self.presenter getStatusBarStyle];
 }

package/lib/ios/RNNSplitViewController.m

@@ -15,10 +15,6 @@
 
 #pragma mark - UIViewController overrides
 
-- (void)willMoveToParentViewController:(UIViewController *)parent {
-    [self.presenter willMoveToParentViewController:parent];
-}
-
 - (UIStatusBarStyle)preferredStatusBarStyle {
     return [self.presenter getStatusBarStyle];
 }

package/lib/ios/RNNStackController.m

@@ -73,10 +73,6 @@
 
 #pragma mark - UIViewController overrides
 
-- (void)willMoveToParentViewController:(UIViewController *)parent {
-    [self.presenter willMoveToParentViewController:parent];
-}
-
 - (UIStatusBarStyle)preferredStatusBarStyle {
     return [self.presenter getStatusBarStyle];
 }

package/lib/ios/RNNStackPresenter.m

@@ -82,6 +82,9 @@
         setNavigationBarClipsToBounds:[withDefault.topBar.background.clipToBounds withDefault:NO]];
 
     [stack.view setBackgroundColor:[withDefault.layout.backgroundColor withDefault:nil]];
+    if (options.topBar.background.component.name.hasValue) {
+        [self setCustomNavigationComponentBackground:options perform:nil];
+    }
 }
 
 - (void)applyOptionsOnViewDidLayoutSubviews:(RNNNavigationOptions *)options {

package/lib/ios/RNNSwizzles.m

@@ -7,11 +7,13 @@
 //
 
 #import "RNNSwizzles.h"
+#import "AnimationObserver.h"
 @import ObjectiveC;
 @import UIKit;
 
 static id (*__SWZ_initWithEventDispatcher_orig)(id self, SEL _cmd, id eventDispatcher);
 static void (*__SWZ_setFrame_orig)(id self, SEL _cmd, CGRect frame);
+static void (*__SWZ_didMoveToWindow_orig)(id self, SEL _cmd);
 
 static void __RNN_setFrame_orig(UIScrollView *self, SEL _cmd, CGRect frame) {
     CGPoint originalOffset = self.contentOffset;
@@ -37,6 +39,16 @@ static void __RNN_setFrame_orig(UIScrollView *self, SEL _cmd, CGRect frame) {
     }
 }
 
+static void __RNN_didMoveToWindow(UIView *self, SEL _cmd) {
+    if (![[AnimationObserver sharedObserver] isAnimating] || !self.window) {
+        __SWZ_didMoveToWindow_orig(self, _cmd);
+    } else {
+        [[AnimationObserver sharedObserver] registerAnimationEndedBlock:^{
+          __SWZ_didMoveToWindow_orig(self, _cmd);
+        }];
+    }
+}
+
 @implementation RNNSwizzles
 
 - (id)__swz_initWithEventDispatcher:(id)eventDispatcher {
@@ -72,6 +84,14 @@ static void __RNN_setFrame_orig(UIScrollView *self, SEL _cmd, CGRect frame) {
     m1 = class_getInstanceMethod(cls, @selector(setFrame:));
     __SWZ_setFrame_orig = (void *)method_getImplementation(m1);
     method_setImplementation(m1, (IMP)__RNN_setFrame_orig);
+
+    cls = NSClassFromString(@"RCTBaseTextInputView");
+    if (cls == NULL) {
+        return;
+    }
+    Method m4 = class_getInstanceMethod(cls, NSSelectorFromString(@"didMoveToWindow"));
+    __SWZ_didMoveToWindow_orig = (void *)method_getImplementation(m4);
+    method_setImplementation(m4, (IMP)__RNN_didMoveToWindow);
 }
 
 @end

package/lib/ios/RNNTabBarItemCreator.m

@@ -18,11 +18,12 @@
 
     if (@available(iOS 13.0, *)) {
         if (bottomTabOptions.sfSymbol.hasValue) {
-            icon = [UIImage systemImageNamed: [bottomTabOptions.sfSymbol withDefault:nil]];
+            icon = [UIImage systemImageNamed:[bottomTabOptions.sfSymbol withDefault:nil]];
         }
 
         if (bottomTabOptions.sfSelectedSymbol.hasValue) {
-            selectedIcon = [UIImage systemImageNamed: [bottomTabOptions.sfSelectedSymbol withDefault:nil]];
+            selectedIcon =
+                [UIImage systemImageNamed:[bottomTabOptions.sfSelectedSymbol withDefault:nil]];
         }
     }
 

package/lib/ios/RNNUIBarButtonItem.h

@@ -14,6 +14,8 @@ typedef void (^RNNButtonPressCallback)(NSString *buttonId);
 - (instancetype)initCustomIcon:(RNNButtonOptions *)buttonOptions
                    iconCreator:(RNNIconCreator *)iconCreator
                        onPress:(RNNButtonPressCallback)onPress;
+- (instancetype)initWithSFSymbol:(RNNButtonOptions *)buttonOptions
+                         onPress:(RNNButtonPressCallback)onPress;
 - (instancetype)initWithIcon:(RNNButtonOptions *)buttonOptions
                      onPress:(RNNButtonPressCallback)onPress;
 - (instancetype)initWithTitle:(RNNButtonOptions *)buttonOptions

package/lib/ios/RNNUIBarButtonItem.m

@@ -20,6 +20,23 @@
     return self;
 }
 
+- (instancetype)initWithSFSymbol:(RNNButtonOptions *)buttonOptions
+                         onPress:(RNNButtonPressCallback)onPress {
+    UIImage *iconImage = [UIImage alloc];
+
+    if (@available(iOS 13.0, *)) {
+        iconImage = [UIImage systemImageNamed:[buttonOptions.sfSymbol withDefault:nil]];
+    }
+
+    self = [super initWithImage:iconImage
+                          style:UIBarButtonItemStylePlain
+                         target:self
+                         action:@selector(onButtonPressed:)];
+    [self applyOptions:buttonOptions];
+    self.onPress = onPress;
+    return self;
+}
+
 - (instancetype)initWithIcon:(RNNButtonOptions *)buttonOptions
                      onPress:(RNNButtonPressCallback)onPress {
     UIImage *iconImage = buttonOptions.icon.get;

package/lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -355,6 +355,8 @@
 		50D3A37723BB5CD900717F95 /* OptionsArrayParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 50D3A37523BB5CD900717F95 /* OptionsArrayParser.m */; };
 		50D4656D23CE2553005A84B2 /* Transition.h in Headers */ = {isa = PBXBuildFile; fileRef = 50D4656B23CE2553005A84B2 /* Transition.h */; };
 		50D4656E23CE2553005A84B2 /* Transition.m in Sources */ = {isa = PBXBuildFile; fileRef = 50D4656C23CE2553005A84B2 /* Transition.m */; };
+		50DD9154274FC6E200B4C917 /* AnimationObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 50DD9152274FC6E200B4C917 /* AnimationObserver.h */; };
+		50DD9155274FC6E200B4C917 /* AnimationObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = 50DD9153274FC6E200B4C917 /* AnimationObserver.m */; };
 		50DE2E45238EA14E005CD5F4 /* NSArray+utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50DE2E43238EA14E005CD5F4 /* NSArray+utils.h */; };
 		50DE2E46238EA14E005CD5F4 /* NSArray+utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 50DE2E44238EA14E005CD5F4 /* NSArray+utils.m */; };
 		50E02BD821A6EE0F00A43942 /* SideMenuOpenMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E02BD621A6EE0F00A43942 /* SideMenuOpenMode.h */; };
@@ -885,6 +887,8 @@
 		50D4656B23CE2553005A84B2 /* Transition.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Transition.h; sourceTree = "<group>"; };
 		50D4656C23CE2553005A84B2 /* Transition.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Transition.m; sourceTree = "<group>"; };
 		50DA74CF232F80FE004A00C1 /* RCTConvert+UIFontWeight.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RCTConvert+UIFontWeight.h"; sourceTree = "<group>"; };
+		50DD9152274FC6E200B4C917 /* AnimationObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnimationObserver.h; sourceTree = "<group>"; };
+		50DD9153274FC6E200B4C917 /* AnimationObserver.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AnimationObserver.m; sourceTree = "<group>"; };
 		50DE2E43238EA14E005CD5F4 /* NSArray+utils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSArray+utils.h"; sourceTree = "<group>"; };
 		50DE2E44238EA14E005CD5F4 /* NSArray+utils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSArray+utils.m"; sourceTree = "<group>"; };
 		50E02BD521A6E54B00A43942 /* RCTConvert+SideMenuOpenGestureMode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RCTConvert+SideMenuOpenGestureMode.h"; sourceTree = "<group>"; };
@@ -1120,6 +1124,8 @@
 				5053CE7E2175FB1900D0386B /* RNNDefaultOptionsHelper.m */,
 				C2A57A1A21E815F80066711C /* InteractivePopGestureDelegate.h */,
 				C2A57A1B21E815F80066711C /* InteractivePopGestureDelegate.m */,
+				50DD9152274FC6E200B4C917 /* AnimationObserver.h */,
+				50DD9153274FC6E200B4C917 /* AnimationObserver.m */,
 			);
 			name = Helpers;
 			sourceTree = "<group>";
@@ -1931,6 +1937,7 @@
 				50CED44D239EA78700C42EE2 /* TopBarAppearancePresenter.h in Headers */,
 				50D3A37223B8D77C00717F95 /* SharedElementTransitionOptions.h in Headers */,
 				50C085F325939F6200B0502C /* RNNButtonBuilder.h in Headers */,
+				50DD9154274FC6E200B4C917 /* AnimationObserver.h in Headers */,
 				50887C1520ECC5C200D06111 /* RNNButtonOptions.h in Headers */,
 				5049593E216F5D73006D2B81 /* BoolParser.h in Headers */,
 				E5F6C3A522DB4D0F0093C2CE /* UIViewController+Utils.h in Headers */,
@@ -2219,6 +2226,7 @@
 				509416AC23A11CB20036092C /* NullEnum.m in Sources */,
 				503A8A1A23BCB2ED0094D1C4 /* RNNReactButtonView.m in Sources */,
 				50570BEB2063E09B006A1B5C /* RNNTitleViewHelper.m in Sources */,
+				50DD9155274FC6E200B4C917 /* AnimationObserver.m in Sources */,
 				263905E71E4CAC950023D7D3 /* RNNSideMenuChildVC.m in Sources */,
 				5082CC3423CDC3B800FD2B6A /* HorizontalTranslationTransition.m in Sources */,
 				50495957216F6B3D006D2B81 /* DictionaryParser.m in Sources */,

package/lib/ios/TopBarPresenter.m

@@ -160,17 +160,21 @@
     UIBarButtonItem *backItem = [[RNNUIBarBackButtonItem alloc] initWithOptions:backButtonOptions];
     UINavigationItem *previousNavigationItem = previousViewControllerInStack.navigationItem;
 
-
     if (@available(iOS 13.0, *)) {
         UIImage *sfSymbol = [UIImage systemImageNamed:[backButtonOptions.sfSymbol withDefault:nil]];
         if (backButtonOptions.sfSymbol.hasValue) {
-            icon = color ? [sfSymbol imageWithTintColor:color renderingMode:UIImageRenderingModeAlwaysOriginal]
+            icon = color ? [sfSymbol imageWithTintColor:color
+                                          renderingMode:UIImageRenderingModeAlwaysOriginal]
                          : [sfSymbol imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
         } else {
-            icon = color ? [[icon withTintColor:color] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] : icon;
+            icon = color ? [[icon withTintColor:color]
+                               imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]
+                         : icon;
         }
     } else {
-        icon = color ? [[icon withTintColor:color] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] : icon;
+        icon = color ? [[icon withTintColor:color]
+                           imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]
+                     : icon;
     }
 
     [self setBackIndicatorImage:icon withColor:color];

package/lib/ios/UIViewController+RNNOptions.m

@@ -134,7 +134,7 @@ const NSInteger BLUR_STATUS_TAG = 78264801;
     if (blur) {
         if (!curBlurView) {
             UIVisualEffectView *blur = [[UIVisualEffectView alloc]
-                initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
+                initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleRegular]];
             blur.frame = [[UIApplication sharedApplication] statusBarFrame];
             blur.tag = BLUR_STATUS_TAG;
             [self.view addSubview:blur];

package/lib/src/commands/Commands.ts

@@ -73,7 +73,7 @@ export class Commands {
 
   public mergeOptions(componentId: string, options: Options) {
     const input = cloneDeep(options);
-    this.optionsProcessor.processOptions(input, CommandName.MergeOptions);
+    this.optionsProcessor.processOptions(CommandName.MergeOptions, input);
 
     const component = this.store.getComponentInstance(componentId);
     if (component && !component.isMounted)
@@ -106,6 +106,7 @@ export class Commands {
 
   public dismissModal(componentId: string, mergeOptions?: Options) {
     const commandId = this.uniqueIdProvider.generate(CommandName.DismissModal);
+    this.optionsProcessor.processOptions(CommandName.DismissModal, mergeOptions);
     const result = this.nativeCommandsSender.dismissModal(commandId, componentId, mergeOptions);
     this.commandsObserver.notify(CommandName.DismissModal, {
       commandId,
@@ -117,6 +118,7 @@ export class Commands {
 
   public dismissAllModals(mergeOptions?: Options) {
     const commandId = this.uniqueIdProvider.generate(CommandName.DismissAllModals);
+    this.optionsProcessor.processOptions(CommandName.DismissAllModals, mergeOptions);
     const result = this.nativeCommandsSender.dismissAllModals(commandId, mergeOptions);
     this.commandsObserver.notify(CommandName.DismissAllModals, { commandId, mergeOptions });
     return result;
@@ -138,6 +140,7 @@ export class Commands {
 
   public pop(componentId: string, mergeOptions?: Options) {
     const commandId = this.uniqueIdProvider.generate(CommandName.Pop);
+    this.optionsProcessor.processOptions(CommandName.Pop, mergeOptions);
     const result = this.nativeCommandsSender.pop(commandId, componentId, mergeOptions);
     this.commandsObserver.notify(CommandName.Pop, { commandId, componentId, mergeOptions });
     return result;
@@ -145,6 +148,7 @@ export class Commands {
 
   public popTo(componentId: string, mergeOptions?: Options) {
     const commandId = this.uniqueIdProvider.generate(CommandName.PopTo);
+    this.optionsProcessor.processOptions(CommandName.PopTo, mergeOptions);
     const result = this.nativeCommandsSender.popTo(commandId, componentId, mergeOptions);
     this.commandsObserver.notify(CommandName.PopTo, { commandId, componentId, mergeOptions });
     return result;
@@ -152,6 +156,7 @@ export class Commands {
 
   public popToRoot(componentId: string, mergeOptions?: Options) {
     const commandId = this.uniqueIdProvider.generate(CommandName.PopToRoot);
+    this.optionsProcessor.processOptions(CommandName.PopToRoot, mergeOptions);
     const result = this.nativeCommandsSender.popToRoot(commandId, componentId, mergeOptions);
     this.commandsObserver.notify(CommandName.PopToRoot, { commandId, componentId, mergeOptions });
     return result;

package/lib/src/commands/LayoutTreeCrawler.ts

@@ -24,7 +24,7 @@ export class LayoutTreeCrawler {
     if (node.type === LayoutType.Component) {
       this.handleComponent(node);
     }
-    this.optionsProcessor.processOptions(node.data.options, commandName);
+    this.optionsProcessor.processOptions(commandName, node.data.options);
     node.children.forEach((value: LayoutNode) => this.crawl(value, commandName));
   }
 
@@ -35,7 +35,7 @@ export class LayoutTreeCrawler {
   }
 
   private savePropsToStore(node: LayoutNode) {
-    this.store.updateProps(node.id, node.data.passProps);
+    this.store.setPendingProps(node.id, node.data.passProps);
   }
 
   private assertComponentDataName(component: LayoutNode) {

package/lib/src/commands/OptionsCrawler.ts

@@ -1,3 +1,4 @@
+import type { ComponentType } from 'react';
 import merge from 'lodash/merge';
 import isFunction from 'lodash/isFunction';
 import { Store } from '../components/Store';
@@ -14,7 +15,7 @@ import {
 import { UniqueIdProvider } from 'react-native-navigation/adapters/UniqueIdProvider';
 import { LayoutType } from './LayoutType';
 
-type ComponentWithOptions = React.ComponentType<any> & { options(passProps: any): Options };
+type ComponentWithOptions = ComponentType<any> & { options(passProps: any): Options };
 
 export class OptionsCrawler {
   constructor(public readonly store: Store, public readonly uniqueIdProvider: UniqueIdProvider) {

package/lib/src/commands/OptionsProcessor.ts

@@ -37,17 +37,19 @@ export class OptionsProcessor {
     private deprecations: Deprecations
   ) {}
 
-  public processOptions(options: Options, commandName: CommandName, props?: any) {
-    this.processObject(
-      options,
-      clone(options),
-      (key, parentOptions) => {
-        this.deprecations.onProcessOptions(key, parentOptions, commandName);
-        this.deprecations.checkForDeprecatedOptions(parentOptions);
-      },
-      commandName,
-      props
-    );
+  public processOptions(commandName: CommandName, options?: Options, props?: any) {
+    if (options) {
+      this.processObject(
+        options,
+        clone(options),
+        (key, parentOptions) => {
+          this.deprecations.onProcessOptions(key, parentOptions, commandName);
+          this.deprecations.checkForDeprecatedOptions(parentOptions);
+        },
+        commandName,
+        props
+      );
+    }
   }
 
   public processDefaultOptions(options: Options, commandName: CommandName) {
@@ -200,7 +202,7 @@ export class OptionsProcessor {
     if (endsWith(key, 'Buttons')) {
       forEach(value, (button) => {
         if (button.passProps && button.id) {
-          this.store.updateProps(button.id, button.passProps);
+          this.store.setPendingProps(button.id, button.passProps);
           button.passProps = undefined;
         }
       });
@@ -212,7 +214,7 @@ export class OptionsProcessor {
       value.componentId = value.id ? value.id : this.uniqueIdProvider.generate('CustomComponent');
       this.store.ensureClassForName(value.name);
       if (value.passProps) {
-        this.store.updateProps(value.componentId, value.passProps);
+        this.store.setPendingProps(value.componentId, value.passProps);
       }
       options[key].passProps = undefined;
     }

package/lib/src/components/Store.ts

@@ -5,6 +5,7 @@ import { IWrappedComponent } from './ComponentWrapper';
 export class Store {
   private componentsByName: Record<string, ComponentProvider> = {};
   private propsById: Record<string, any> = {};
+  private pendingPropsById: Record<string, any> = {};
   private componentsInstancesById: Record<string, IWrappedComponent> = {};
   private wrappedComponents: Record<string, React.ComponentClass<any>> = {};
   private lazyRegistratorFn: ((lazyComponentRequest: string | number) => void) | undefined;
@@ -18,7 +19,15 @@ export class Store {
     }
   }
 
+  setPendingProps(componentId: string, newProps: any) {
+    this.pendingPropsById[componentId] = newProps;
+  }
+
   getPropsForId(componentId: string) {
+    if (this.pendingPropsById[componentId]) {
+      this.propsById[componentId] = this.pendingPropsById[componentId];
+      delete this.pendingPropsById[componentId];
+    }
     return this.propsById[componentId] || {};
   }
 

package/lib/src/events/ComponentEventsObserver.ts

@@ -1,3 +1,4 @@
+import type { Component } from 'react';
 import isString from 'lodash/isString';
 import isNil from 'lodash/isNil';
 import uniqueId from 'lodash/uniqueId';
@@ -60,7 +61,10 @@ export class ComponentEventsObserver {
     this.nativeEventsReceiver.registerScreenPoppedListener(this.notifyPreviewCompleted);
   }
 
-  public bindComponent(component: React.Component<any>, componentId?: string): EventSubscription {
+  public bindComponent(
+    component: Component<{ componentId?: string }>,
+    componentId?: string
+  ): EventSubscription {
     const computedComponentId = componentId || component.props.componentId;
 
     if (!isString(computedComponentId)) {

package/lib/src/events/EventsRegistry.ts

@@ -1,3 +1,4 @@
+import type { Component } from 'react';
 import { EmitterSubscription } from 'react-native';
 
 import { NativeEventsReceiver } from '../adapters/NativeEventsReceiver';
@@ -117,7 +118,7 @@ export class EventsRegistry {
     return this.commandsObserver.register(callback);
   }
 
-  public bindComponent(component: React.Component<any>, componentId?: string): EventSubscription {
+  public bindComponent(component: Component<any>, componentId?: string): EventSubscription {
     return this.componentEventsObserver.bindComponent(component, componentId);
   }
 

package/lib/src/interfaces/Options.ts

@@ -414,6 +414,11 @@ export interface HardwareBackButtonOptions {
    * @default true
    */
   popStackOnPress?: boolean;
+
+  /**
+   * Controls hardware back button bottom tab selection behaviour
+   */
+  bottomTabsOnPress?: 'exit' | 'first' | 'previous';
 }
 
 export interface OptionsTopBarScrollEdgeAppearanceBackground {
@@ -488,6 +493,11 @@ export interface OptionsTopBarButton {
    * Set the button icon
    */
   icon?: ImageResource;
+  /**
+   * Set the SF symbol as icon (will be used primarily)
+   * #### (iOS 13+ specific)
+   */
+  sfSymbol?: string;
   /**
    * Set the button icon insets
    */