react-native-screens 4.25.0-beta.1 → 4.25.0-beta.2

package/ios/tabs/host/RNSTabBarController.mm

@@ -3,10 +3,12 @@
 #import <React/RCTLog.h>
 #import <objc/message.h>
 #import <objc/runtime.h>
+#import <limits>
 #import "NSString+RNSUtility.h"
 #import "RNSLog.h"
 #import "RNSScreenWindowTraits.h"
 #import "RNSTabsHostComponentView.h"
+#import "RNSTabsNavigationStateObserverRegistry.h"
 
 #define RNS_MORE_NAVIGATION_CONTROLLER_AVAILABLE !TARGET_OS_TV && !TARGET_OS_VISION
 
@@ -34,16 +36,17 @@
  * (reached via UIKit's `tabBarController` property on the parent chain)
  * to check whether the push should be prevented (e.g. due to `preventNativeSelection`).
  */
-static void
-rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *viewController, BOOL animated)
+static void rns_pushViewController(__unsafe_unretained id self,
+                                   SEL _cmd,
+                                   UIViewController *viewController,
+                                   BOOL animated)
 {
   UITabBarController *rawTabBarController = static_cast<UIViewController *>(self).tabBarController;
 
-  RCTAssert(
-      [rawTabBarController isKindOfClass:RNSTabBarController.class],
-      @"[RNScreens] Expected tabBarController to be of class %@, got: %@",
-      RNSTabBarController.class,
-      rawTabBarController.class);
+  RCTAssert([rawTabBarController isKindOfClass:RNSTabBarController.class],
+            @"[RNScreens] Expected tabBarController to be of class %@, got: %@",
+            RNSTabBarController.class,
+            rawTabBarController.class);
   RNSTabBarController *tabBarController = static_cast<RNSTabBarController *>(rawTabBarController);
 
   if ([tabBarController moreNavigationController:self shouldPushViewController:viewController]) {
@@ -73,12 +76,14 @@ rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *
   /// This property is nullable until first container update. Later it MUST NOT be nil.
   RNSTabsNavigationState *_Nullable _lastUINavigationState;
 
-  RNSTabsNavigationState *_Nullable _pendingOperation;
+  RNSTabsNavigationStateUpdateRequest *_Nullable _pendingStateUpdate;
 
   /// When YES, the controller is inside an explicit selection-changing code path (container update,
   /// delegate handling). Setter overrides skip reconciliation while this flag is set.
   BOOL _isHandlingExplicitSelectionUpdate;
 
+  RNSTabsNavigationStateObserverRegistry *_observerRegistry;
+
 #if !RCT_NEW_ARCH_ENABLED
   BOOL _isControllerFlushBlockScheduled;
 #endif // !RCT_NEW_ARCH_ENABLED
@@ -91,8 +96,9 @@ rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *
     _tabBarAppearanceCoordinator = [RNSTabBarAppearanceCoordinator new];
     _tabsHostComponentView = nil;
     _navigationState = nil;
-    _pendingOperation = nil;
+    _pendingStateUpdate = nil;
     _shouldProgressStateOnMoreNavigationControllerPush = NO;
+    _observerRegistry = [RNSTabsNavigationStateObserverRegistry new];
 
     // Delegate field retains weakly, no risk of cycle.
     self.delegate = self;
@@ -104,6 +110,41 @@ rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *
   return self;
 }
 
+#pragma mark - Public API
+
+- (void)submitSelectionOfTabsScreenWithKey:(nonnull NSString *)screenKey
+{
+  RCTAssert(screenKey != nil, @"[RNScreens] Requested screenKey MUST NOT be nil");
+  int baseProvenance = _navigationState != nil ? _navigationState.provenance : std::numeric_limits<int>::min();
+  RNSTabsNavigationStateUpdateRequest *request =
+      [RNSTabsNavigationStateUpdateRequest requestWithSelectedScreenKey:screenKey
+                                                         baseProvenance:baseProvenance
+                                                           actionOrigin:RNSTabsActionOriginProgrammaticNative];
+  [self setPendingNavigationStateUpdate:request];
+}
+
+- (void)flushPendingUpdates
+{
+  [self performContainerUpdate];
+}
+
+- (BOOL)addNavigationStateObserver:(id<RNSTabsNavigationStateObserver>)observer
+{
+  return [_observerRegistry addObserver:observer];
+}
+
+- (BOOL)removeNavigationStateObserver:(id<RNSTabsNavigationStateObserver>)observer
+{
+  return [_observerRegistry removeObserver:observer];
+}
+
+- (void)tearDown
+{
+  [_observerRegistry clear];
+  _pendingStateUpdate = nil;
+  _tabsHostComponentView = nil;
+}
+
 - (instancetype)initWithTabsHostComponentView:(nullable RNSTabsHostComponentView *)tabsHostComponentView
 {
   if (self = [self init]) {
@@ -146,9 +187,9 @@ rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *
 
 #pragma mark - Signals
 
-- (void)setPendingNavigationStateUpdate:(nullable RNSTabsNavigationState *)navState
+- (void)setPendingNavigationStateUpdate:(nullable RNSTabsNavigationStateUpdateRequest *)stateUpdate
 {
-  _pendingOperation = navState;
+  _pendingStateUpdate = stateUpdate;
 }
 
 - (void)childViewControllersHaveChangedTo:(NSArray<RNSTabsScreenViewController *> *)reactChildControllers
@@ -232,11 +273,10 @@ rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *
 
   UIViewController *currSelectedViewController = self.selectedViewController;
 
-  RCTAssert(
-      ![NSString rnscreens_isBlankOrNull:screenKey],
-      @"[RNScreens] The screenKey MUST NOT be null if the view controller is not null");
+  RCTAssert(![NSString rnscreens_isBlankOrNull:screenKey],
+            @"[RNScreens] The screenKey MUST NOT be null if the view controller is not null");
 
-  [self progressNavigationState:screenKey withSource:RNSTabsNavigationStateUpdateSourceExternal];
+  [self progressNavigationState:screenKey withOrigin:RNSTabsActionOriginProgrammaticJs];
 
   if (currSelectedViewController == nextSelectedViewController) {
     return YES;
@@ -254,14 +294,13 @@ rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *
  */
 - (void)updateNavigationStateOnModelUpdate
 {
-  [self progressNavigationState:[self screenKeyForSelectedViewController]
-                     withSource:RNSTabsNavigationStateUpdateSourceUser];
+  [self progressNavigationState:[self screenKeyForSelectedViewController] withOrigin:RNSTabsActionOriginUser];
 }
 
 - (void)userDidRepeatViewControllerSelection:(nonnull UIViewController *)viewController
 {
-  RCTAssert(
-      self.selectedViewController == viewController, @"[RNScreens] Expected UIKit to update selectedViewController");
+  RCTAssert(self.selectedViewController == viewController,
+            @"[RNScreens] Expected UIKit to update selectedViewController");
 
   if ([self isSelectedViewControllerTheMoreNavigationController]) {
     // We don't want to run neither state update nor side effects.
@@ -277,15 +316,15 @@ rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *
       [[RNSTabsNavigationStateUpdateContext alloc] initWithNavState:_navigationState
                                                          isRepeated:YES
                                           hasTriggeredSpecialEffect:repeatedSelectionHandledBySpecialEffect
-                                                     isNativeAction:YES];
-  [self.tabsHostComponentView tabBarController:self didUpdateStateTo:_navigationState withContext:updateContext];
+                                                       actionOrigin:RNSTabsActionOriginUser];
+  [_observerRegistry emitDidUpdateStateTo:_navigationState withContext:updateContext sender:self];
 }
 
 - (void)userDidSelectViewController:(nonnull UIViewController *)viewController
 {
   // At this moment the `UITabBarController` model is already updated.
-  RCTAssert(
-      self.selectedViewController == viewController, @"[RNScreens] Expected UIKit to update selectedViewController");
+  RCTAssert(self.selectedViewController == viewController,
+            @"[RNScreens] Expected UIKit to update selectedViewController");
 
   if ([self isSelectedViewControllerTheMoreNavigationController]) {
     [self disableNavigationBarInMoreNavigationController];
@@ -293,20 +332,20 @@ rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *
 
     // We don't want to progress state in case a user selected the more navigation controller.
     // Instead, we emit a dedicated event so JS knows the More tab was tapped.
-    [self.tabsHostComponentView tabBarController:self didSelectMoreTabWithCurrentState:_navigationState];
+    [_observerRegistry emitDidSelectMoreTabWithCurrentState:_navigationState sender:self];
   } else {
     [self updateNavigationStateOnModelUpdate];
     auto *updateContext = [[RNSTabsNavigationStateUpdateContext alloc] initWithNavState:_navigationState
                                                                              isRepeated:NO
                                                               hasTriggeredSpecialEffect:NO
-                                                                         isNativeAction:YES];
-    [self.tabsHostComponentView tabBarController:self didUpdateStateTo:_navigationState withContext:updateContext];
+                                                                           actionOrigin:RNSTabsActionOriginUser];
+    [_observerRegistry emitDidUpdateStateTo:_navigationState withContext:updateContext sender:self];
   }
 }
 
 - (void)onDidPreventUserFromSelectingViewControllerWithKey:(nonnull NSString *)screenKey
 {
-  [self.tabsHostComponentView tabBarController:self preventedSelectionOf:screenKey currentState:_navigationState];
+  [_observerRegistry emitPreventedSelectionOf:screenKey currentState:_navigationState sender:self];
 }
 
 - (BOOL)shouldPreventNativeTabSelection:(nonnull UIViewController *)nextViewController
@@ -331,11 +370,10 @@ rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *
   RCTAssert(tabBarController == self, @"[RNScreens] Unexpected type of controller: %@", tabBarController.class);
 
   // Can be UINavigationController in case of MoreNavigationController
-  RCTAssert(
-      [viewController isKindOfClass:RNSTabsScreenViewController.class] ||
-          [viewController isKindOfClass:UINavigationController.class],
-      @"[RNScreens] Unexpected type of controller: %@",
-      viewController.class);
+  RCTAssert([viewController isKindOfClass:RNSTabsScreenViewController.class] ||
+                [viewController isKindOfClass:UINavigationController.class],
+            @"[RNScreens] Unexpected type of controller: %@",
+            viewController.class);
 
   // TODO: handle enforcing orientation with natively-driven tabs
 
@@ -384,11 +422,10 @@ rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *
   RCTAssert(self == tabBarController, @"[RNScreens] Unexpected type of controller: %@", tabBarController.class);
 
   // Can be UINavigationController in case of MoreNavigationController
-  RCTAssert(
-      [viewController isKindOfClass:RNSTabsScreenViewController.class] ||
-          [viewController isKindOfClass:UINavigationController.class],
-      @"[RNScreens] Unexpected type of controller: %@",
-      viewController.class);
+  RCTAssert([viewController isKindOfClass:RNSTabsScreenViewController.class] ||
+                [viewController isKindOfClass:UINavigationController.class],
+            @"[RNScreens] Unexpected type of controller: %@",
+            viewController.class);
 
   [self userDidSelectViewController:viewController];
   _isHandlingExplicitSelectionUpdate = NO;
@@ -401,10 +438,9 @@ rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *
                     animated:(BOOL)animated
 {
 #if RNS_MORE_NAVIGATION_CONTROLLER_AVAILABLE
-  RCTAssert(
-      self.moreNavigationController == navigationController,
-      @"[RNScreens] Unexpected view controller called delegate method: %@",
-      navigationController);
+  RCTAssert(self.moreNavigationController == navigationController,
+            @"[RNScreens] Unexpected view controller called delegate method: %@",
+            navigationController);
 
   // The root view controller is of different type.
   if ([viewController isKindOfClass:RNSTabsScreenViewController.class] &&
@@ -439,60 +475,58 @@ rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *
 
 - (void)updateSelectedViewControllerIfNeeded
 {
-  if (_pendingOperation != nil) {
+  if (_pendingStateUpdate != nil) {
     [self updateSelectedViewController];
   }
 }
 
 - (void)updateSelectedViewController
 {
-  if (_pendingOperation == nil || self.viewControllers.count == 0) {
+  if (_pendingStateUpdate == nil || self.viewControllers.count == 0) {
     return;
   }
 
   RNSLog(@"TabBarCtrl updateSelectedViewController");
   [self updateSelectedViewControllerInner];
-  _pendingOperation = nil;
+  _pendingStateUpdate = nil;
 }
 
 /**
  * NEVER call this method directly. Call the proper function `updateSelectedViewController`
  *
- * The logic is extracted to an inner method to correctly manage _pendingOperation cleanup.
+ * The logic is extracted to an inner method to correctly manage `_pendingStateUpdate` cleanup.
  */
 - (void)updateSelectedViewControllerInner
 {
   UIViewController *_Nonnull currSelectedViewController = self.selectedViewController;
 
-  NSString *_Nonnull nextSelectedViewControllerKey = _pendingOperation.selectedScreenKey;
+  NSString *_Nonnull nextSelectedViewControllerKey = _pendingStateUpdate.selectedScreenKey;
   UIViewController *nextSelectedViewController = [self findChildViewControllerForKey:nextSelectedViewControllerKey];
 
-  RCTAssert(
-      nextSelectedViewController != nil,
-      @"[RNScreens] Failed to determine next selected view controller for key: %@",
-      nextSelectedViewControllerKey);
-
-  RCTAssert(
-      [nextSelectedViewController isKindOfClass:RNSTabsScreenViewController.class],
-      @"[RNScreens] nextSelectedViewController MUST be %@, got: %@",
-      RNSTabsScreenViewController.class,
-      nextSelectedViewController.class);
-
-  if (self.rejectStaleNavigationStateUpdates && [self isNavigationStateUpdateStale:_pendingOperation]) {
-    [self.tabsHostComponentView tabBarController:self
-                           rejectedStateUpdateTo:_pendingOperation
-                                    currentState:_navigationState
-                                      withReason:RNSTabsNavigationStateRejectionReasonStale];
+  RCTAssert(nextSelectedViewController != nil,
+            @"[RNScreens] Failed to determine next selected view controller for key: %@",
+            nextSelectedViewControllerKey);
+
+  RCTAssert([nextSelectedViewController isKindOfClass:RNSTabsScreenViewController.class],
+            @"[RNScreens] nextSelectedViewController MUST be %@, got: %@",
+            RNSTabsScreenViewController.class,
+            nextSelectedViewController.class);
+
+  if (self.rejectStaleNavigationStateUpdates && [self isNavigationStateUpdateStale:_pendingStateUpdate]) {
+    [_observerRegistry emitRejectedStateUpdate:_pendingStateUpdate
+                                  currentState:_navigationState
+                                    withReason:RNSTabsNavigationStateRejectionReasonStale
+                                        sender:self];
     return;
   }
 
   if (currSelectedViewController == nextSelectedViewController && _navigationState != nil) {
     // Nothing to do, we don't allow for programmatic repeat selection, unless
     // we're during first render.
-    [self.tabsHostComponentView tabBarController:self
-                           rejectedStateUpdateTo:_pendingOperation
-                                    currentState:_navigationState
-                                      withReason:RNSTabsNavigationStateRejectionReasonRepeated];
+    [_observerRegistry emitRejectedStateUpdate:_pendingStateUpdate
+                                  currentState:_navigationState
+                                    withReason:RNSTabsNavigationStateRejectionReasonRepeated
+                                        sender:self];
     return;
   }
 
@@ -517,8 +551,8 @@ rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *
         [[RNSTabsNavigationStateUpdateContext alloc] initWithNavState:_navigationState
                                                            isRepeated:NO
                                             hasTriggeredSpecialEffect:NO
-                                                       isNativeAction:NO];
-    [self.tabsHostComponentView tabBarController:self didUpdateStateTo:_navigationState withContext:context];
+                                                         actionOrigin:_pendingStateUpdate.actionOrigin];
+    [_observerRegistry emitDidUpdateStateTo:_navigationState withContext:context sender:self];
   }
 }
 
@@ -562,10 +596,9 @@ rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *
     return nil;
   }
   for (UIViewController *viewController in self.viewControllers) {
-    RCTAssert(
-        [viewController isKindOfClass:RNSTabsScreenViewController.class],
-        @"[RNScreens] Unexpected type of controller: %@",
-        viewController.class);
+    RCTAssert([viewController isKindOfClass:RNSTabsScreenViewController.class],
+              @"[RNScreens] Unexpected type of controller: %@",
+              viewController.class);
     auto *screenViewController = static_cast<RNSTabsScreenViewController *>(viewController);
     if ([screenViewController.getScreenKeyOrNull isEqualToString:screenKey]) {
       return screenViewController;
@@ -574,8 +607,7 @@ rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *
   return nil;
 }
 
-- (void)progressNavigationState:(nonnull NSString *)newSelectedScreenKey
-                     withSource:(RNSTabsNavigationStateUpdateSource)updateSource
+- (void)progressNavigationState:(nonnull NSString *)newSelectedScreenKey withOrigin:(RNSTabsActionOrigin)origin
 {
   RCTAssert(newSelectedScreenKey != nil, @"[RNScreens] newSelectedScreenKey MUST NOT be nil");
 
@@ -587,7 +619,7 @@ rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *
   _navigationState = [RNSTabsNavigationState stateWithSelectedScreenKey:newSelectedScreenKey
                                                              provenance:_navigationState.provenance + 1];
 
-  if (updateSource != RNSTabsNavigationStateUpdateSourceExternal) {
+  if (origin != RNSTabsActionOriginProgrammaticJs) {
     _lastUINavigationState = [_navigationState cloneState];
   }
 }
@@ -598,20 +630,18 @@ rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *
  */
 - (RNSTabsScreenViewController *)selectedScreenViewController
 {
-  RCTAssert(
-      [self.selectedViewController isKindOfClass:RNSTabsScreenViewController.class],
-      @"[RNScreens] Unexpected type of selectedViewController: %@",
-      self.selectedViewController.class);
+  RCTAssert([self.selectedViewController isKindOfClass:RNSTabsScreenViewController.class],
+            @"[RNScreens] Unexpected type of selectedViewController: %@",
+            self.selectedViewController.class);
   return static_cast<RNSTabsScreenViewController *>(self.selectedViewController);
 }
 
 - (nonnull NSString *)screenKeyForViewController:(nonnull UIViewController *)viewController
 {
-  RCTAssert(
-      [viewController isKindOfClass:RNSTabsScreenViewController.class],
-      @"[RNScreens] Expected selected view controller to be of class %@, got: %@",
-      RNSTabsScreenViewController.class,
-      viewController.class);
+  RCTAssert([viewController isKindOfClass:RNSTabsScreenViewController.class],
+            @"[RNScreens] Expected selected view controller to be of class %@, got: %@",
+            RNSTabsScreenViewController.class,
+            viewController.class);
 
   auto *screenKey = static_cast<RNSTabsScreenViewController *>(viewController).getScreenKeyOrNull;
   RCTAssert(screenKey != nil, @"[RNScreens] screenKey MUST NOT be nil");
@@ -650,10 +680,9 @@ rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *
   }
 
   if (![self.selectedViewController isKindOfClass:RNSTabsScreenViewController.class]) {
-    RCTAssert(
-        NO,
-        @"[RNScreens] Unexpected controller type during state reconciliation: %@",
-        self.selectedViewController.class);
+    RCTAssert(NO,
+              @"[RNScreens] Unexpected controller type during state reconciliation: %@",
+              self.selectedViewController.class);
     return;
   }
 
@@ -662,25 +691,24 @@ rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *
     return;
   }
 
-  RNSLog(
-      @"TabBarCtrl reconcileNavigationStateWithUIKitState: %@ -> %@",
-      _navigationState.selectedScreenKey,
-      selectedScreenKey);
-  [self progressNavigationState:selectedScreenKey withSource:RNSTabsNavigationStateUpdateSourceImplicit];
+  RNSLog(@"TabBarCtrl reconcileNavigationStateWithUIKitState: %@ -> %@",
+         _navigationState.selectedScreenKey,
+         selectedScreenKey);
+  [self progressNavigationState:selectedScreenKey withOrigin:RNSTabsActionOriginImplicit];
 
   auto *context = [[RNSTabsNavigationStateUpdateContext alloc] initWithNavState:_navigationState
                                                                      isRepeated:NO
                                                       hasTriggeredSpecialEffect:NO
-                                                                 isNativeAction:YES];
-  [self.tabsHostComponentView tabBarController:self didUpdateStateTo:_navigationState withContext:context];
+                                                                   actionOrigin:RNSTabsActionOriginImplicit];
+  [_observerRegistry emitDidUpdateStateTo:_navigationState withContext:context sender:self];
 }
 
 /**
  * This function assumes that the source of the state is NOT user. In current model, user update is never stale.
  */
-- (BOOL)isNavigationStateUpdateStale:(nullable RNSTabsNavigationState *)newState
+- (BOOL)isNavigationStateUpdateStale:(nullable RNSTabsNavigationStateUpdateRequest *)stateUpdate
 {
-  if (newState == nil) {
+  if (stateUpdate == nil) {
     return YES;
   }
 
@@ -688,7 +716,7 @@ rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *
     return NO;
   }
 
-  return newState.provenance < _lastUINavigationState.provenance;
+  return stateUpdate.baseProvenance < _lastUINavigationState.provenance;
 }
 
 #pragma mark-- More Navigation Controller
@@ -754,10 +782,9 @@ rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *
     // We quietly assume here, that the root view controller is the `UIMoreListViewController`.
     if (shouldRespectSelectionPrevention) {
       UIViewController *topViewController = self.moreNavigationController.topViewController;
-      RCTAssert(
-          [topViewController isKindOfClass:RNSTabsScreenViewController.class],
-          @"[RNScreens] Unexpected type of view controller on moreNavigationControllerStack: %@",
-          topViewController.class);
+      RCTAssert([topViewController isKindOfClass:RNSTabsScreenViewController.class],
+                @"[RNScreens] Unexpected type of view controller on moreNavigationControllerStack: %@",
+                topViewController.class);
       RNSTabsScreenViewController *screenController = static_cast<RNSTabsScreenViewController *>(topViewController);
       if (screenController.isPreventNativeSelectionEnabled) {
         return [self popToRootMoreNavigationController:self.moreNavigationController animated:shouldAnimate];
@@ -785,9 +812,8 @@ rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *
   }
 
   auto *poppedViewControllers = [moreNavigationController popToRootViewControllerAnimated:animated];
-  RCTAssert(
-      poppedViewControllers != nil && poppedViewControllers.count == 1,
-      @"[RNScreens] Expected exactly one view controller to be popped");
+  RCTAssert(poppedViewControllers != nil && poppedViewControllers.count == 1,
+            @"[RNScreens] Expected exactly one view controller to be popped");
   return [poppedViewControllers firstObject];
 }
 
@@ -842,11 +868,10 @@ rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *
     RCTAssert(dynamicSubclass != nil, @"[RNScreens] Failed to allocate dynamic subclass of %s", currentClassName);
 
     Method pushMethod = class_getInstanceMethod(currentClass, @selector(pushViewController:animated:));
-    class_addMethod(
-        dynamicSubclass,
-        @selector(pushViewController:animated:),
-        (IMP)rns_pushViewController,
-        method_getTypeEncoding(pushMethod));
+    class_addMethod(dynamicSubclass,
+                    @selector(pushViewController:animated:),
+                    (IMP)rns_pushViewController,
+                    method_getTypeEncoding(pushMethod));
 
     objc_registerClassPair(dynamicSubclass);
   }
@@ -982,9 +1007,8 @@ rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *
   }
 #endif // RNS_IPHONE_OS_VERSION_AVAILABLE(17_0)
 
-  RCTAssert(
-      self.parentViewController != nil,
-      @"[RNScreens] Expected non-null parent view controller for layout direction update.");
+  RCTAssert(self.parentViewController != nil,
+            @"[RNScreens] Expected non-null parent view controller for layout direction update.");
   [self.parentViewController
       setOverrideTraitCollection:[UITraitCollection
                                      traitCollectionWithLayoutDirection:self.tabsHostComponentView.layoutDirection]

package/ios/tabs/host/RNSTabsHostComponentView.h

@@ -26,14 +26,13 @@ NS_ASSUME_NONNULL_BEGIN
  * 2. provider of React state & props for the tab bar controller
  * 3. two way communication channel with React (commands & events)
  */
-@interface RNSTabsHostComponentView : RNSReactBaseView <
-                                          RNSScreenContainerDelegate,
-                                          RNSTabBarControllerDelegate
+@interface RNSTabsHostComponentView : RNSReactBaseView <RNSScreenContainerDelegate,
+                                                        RNSTabsNavigationStateObserver
 #if !RCT_NEW_ARCH_ENABLED
-                                          ,
-                                          RCTInvalidating
+                                                        ,
+                                                        RCTInvalidating
 #endif
-                                          >
+                                                        >
 
 #if !RCT_NEW_ARCH_ENABLED
 - (instancetype)initWithFrame:(CGRect)frame reactImageLoader:(RCTImageLoader *)imageLoader;
@@ -48,9 +47,9 @@ NS_ASSUME_NONNULL_BEGIN
 @interface RNSTabsHostComponentView ()
 
 /**
- * Last navigation state requested by JS. Will be nonnull after first prop update.
+ * Last navigation state update requested by JS. Will be nonnull after first prop update.
  */
-@property (nonatomic, strong, readonly, nullable) RNSTabsNavigationState *navState;
+@property (nonatomic, strong, readonly, nullable) RNSTabsNavigationStateUpdateRequest *navStateRequest;
 
 @property (nonatomic, readonly) BOOL rejectStaleNavStateUpdates;