react-native-screens 5.0.0-alpha.3 → 5.0.0-alpha.4

package/ios/stack/header/RNSStackHeaderItemComponentView.mm

@@ -49,10 +49,14 @@ namespace react = facebook::react;
   [self setTitleProp:nil];
   [self setIconProp:nil];
   [self setMenuProp:nil];
+  [self setMenuRepresentationProp:nil];
   _placement = RNSHeaderItemPlacementTrailing;
   _didSetHeaderItemPlacement = NO;
+  _style = UIBarButtonItemStylePlain;
+  _disabled = NO;
   _respondsToOnPress = NO;
   _hidesSharedBackground = NO;
+  _visibilityPriority = RNSHeaderItemVisibilityPriorityStandard;
 }
 
 - (void)setTitleProp:(NSString *)titleProp
@@ -73,6 +77,12 @@ namespace react = facebook::react;
   _menu = menuProp;
 }
 
+- (void)setMenuRepresentationProp:(RNSStackHeaderMenuData *)menuRepresentationProp
+{
+  _menuRepresentationProp = menuRepresentationProp;
+  _menuRepresentation = menuRepresentationProp;
+}
+
 - (void)emitOnPress
 {
   [_headerItemEventEmitter emitOnPress];
@@ -81,11 +91,22 @@ namespace react = facebook::react;
 - (void)updateMenuElementWithId:(NSString *)elementId
                     withElement:(id<RNSStackHeaderMenuElement>)newElement
                      parentMenu:(nullable RNSStackHeaderMenuData *)parentMenu
+           inMenuRepresentation:(BOOL)inMenuRepresentation
 {
-  if (parentMenu == nil) {
-    _menu = (RNSStackHeaderMenuData *)newElement;
+  if (inMenuRepresentation) {
+    if (parentMenu == nil) {
+      _menuRepresentation = (RNSStackHeaderMenuData *)newElement;
+    } else {
+      _menuRepresentation = [RNSStackHeaderMenuCoordinator menu:_menuRepresentation
+                                           replacingChildWithId:elementId
+                                                    withElement:newElement];
+    }
   } else {
-    _menu = [RNSStackHeaderMenuCoordinator menu:_menu replacingChildWithId:elementId withElement:newElement];
+    if (parentMenu == nil) {
+      _menu = (RNSStackHeaderMenuData *)newElement;
+    } else {
+      _menu = [RNSStackHeaderMenuCoordinator menu:_menu replacingChildWithId:elementId withElement:newElement];
+    }
   }
   [_invalidationDelegate headerItemMenuDidUpdateFromCommandWithId:_itemId];
 }
@@ -217,6 +238,25 @@ RNS_IGNORE_SUPER_CALL_END
     menuDidChange = YES;
   }
 
+  if (oldItemProps.menuRepresentation != newItemProps.menuRepresentation) {
+    [self setMenuRepresentationProp:[RNSStackHeaderMenuMapper
+                                        menuFromDictionary:rnscreens::conversion::RNSConvertFollyDynamicToId(
+                                                               newItemProps.menuRepresentation)]];
+    // menu representation is applied together with the menu & shares its toggle state tracker,
+    // so it follows the same invalidation path
+    menuDidChange = YES;
+  }
+
+  if (oldItemProps.variant != newItemProps.variant) {
+    _style = rnscreens::conversion::UIBarButtonItemStyleFromReactRNSStackHeaderItemIOSVariant(newItemProps.variant);
+    needsUpdate = YES;
+  }
+
+  if (oldItemProps.disabled != newItemProps.disabled) {
+    _disabled = newItemProps.disabled;
+    needsUpdate = YES;
+  }
+
   if (oldItemProps.respondsToOnPress != newItemProps.respondsToOnPress) {
     _respondsToOnPress = newItemProps.respondsToOnPress;
     needsUpdate = YES;
@@ -227,6 +267,20 @@ RNS_IGNORE_SUPER_CALL_END
     needsUpdate = YES;
   }
 
+  if (oldItemProps.visibilityPriority != newItemProps.visibilityPriority) {
+    _visibilityPriority =
+        rnscreens::conversion::RNSHeaderItemVisibilityPriorityFromReactRNSStackHeaderItemIOSVisibilityPriority(
+            newItemProps.visibilityPriority);
+// tvOS and visionOS are excluded on purpose: `visibilityPriority` exists there, but the only
+// supported value is `standard`, which is already the default.
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(27_0) && !TARGET_OS_TV && !TARGET_OS_VISION
+    // The item is rebuilt only on iOS 27+, where the priority is actually applied.
+    if (@available(iOS 27.0, *)) {
+      needsUpdate = YES;
+    }
+#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(27_0) && !TARGET_OS_TV && !TARGET_OS_VISION
+  }
+
   [super updateProps:props oldProps:oldProps];
 
   if (needsUpdate) {

package/ios/stack/header/RNSStackHeaderItemDataProviding.h

@@ -3,6 +3,7 @@
 #import <UIKit/UIKit.h>
 
 #import "RNSHeaderItemPlacement.h"
+#import "RNSHeaderItemVisibilityPriority.h"
 #import "RNSStackHeaderIconData.h"
 #import "RNSStackHeaderMenuData.h"
 
@@ -16,9 +17,13 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, readonly, nullable) NSString *title;
 @property (nonatomic, readonly, nullable) RNSStackHeaderIconData *icon;
 @property (nonatomic, readonly, nullable) RNSStackHeaderMenuData *menu;
+@property (nonatomic, readonly, nullable) RNSStackHeaderMenuData *menuRepresentation;
 @property (nonatomic, readonly, nullable) UIView *customView;
+@property (nonatomic, readonly) UIBarButtonItemStyle style;
+@property (nonatomic, readonly) BOOL disabled;
 @property (nonatomic, readonly) BOOL respondsToOnPress;
 @property (nonatomic, readonly) BOOL hidesSharedBackground;
+@property (nonatomic, readonly) RNSHeaderItemVisibilityPriority visibilityPriority;
 
 @end
 

package/ios/stack/header/RNSStackHeaderMenuCoordinator.h

@@ -25,6 +25,19 @@ NS_ASSUME_NONNULL_BEGIN
              withImageLoader:(id<RNSImageLoading>)imageLoader
      menuInvalidatedCallback:(nullable void (^)(void))onMenuInvalidated;
 
+/**
+ * Applies menu representation to the item - a menu element substituting the item
+ * when it is displayed in a menu (e.g. the navigation bar overflow menu).
+ * Passing nil `data` clears the representation. Works like regular `applyMenu`.
+ * No-op below iOS 16 and on tvOS, where `UIBarButtonItem.menuRepresentation` is unavailable.
+ */
++ (void)applyMenuRepresentation:(nullable RNSStackHeaderMenuData *)data
+                toBarButtonItem:(UIBarButtonItem *)item
+       withHeaderEventsDelegate:(id<RNSStackHeaderEventsDelegate>)delegate
+                   stateTracker:(RNSStackHeaderMenuToggleStateTracker *)tracker
+                withImageLoader:(id<RNSImageLoading>)imageLoader
+        menuInvalidatedCallback:(nullable void (^)(void))onMenuInvalidated;
+
 /**
  * Collects IDs of all toggle items in a single selection hierarchy rooted at the given menu.
  */

package/ios/stack/header/RNSStackHeaderMenuCoordinator.mm

@@ -26,6 +26,30 @@
 #endif // !TARGET_OS_TV || __TV_OS_VERSION_MAX_ALLOWED >= 170000
 }
 
++ (void)applyMenuRepresentation:(nullable RNSStackHeaderMenuData *)data
+                toBarButtonItem:(UIBarButtonItem *)item
+       withHeaderEventsDelegate:(id<RNSStackHeaderEventsDelegate>)delegate
+                   stateTracker:(RNSStackHeaderMenuToggleStateTracker *)tracker
+                withImageLoader:(id<RNSImageLoading>)imageLoader
+        menuInvalidatedCallback:(nullable void (^)(void))onMenuInvalidated
+{
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(16_0) && !TARGET_OS_TV
+  if (@available(iOS 16.0, *)) {
+    if (data == nil) {
+      item.menuRepresentation = nil;
+      return;
+    }
+    item.menuRepresentation = [self buildMenuFromData:data
+                             withHeaderEventsDelegate:delegate
+                                         stateTracker:tracker
+                                  singleSelectionRoot:nil
+                   initialSingleSelectionStateClaimed:NULL
+                                      withImageLoader:imageLoader
+                              menuInvalidatedCallback:onMenuInvalidated];
+  }
+#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(16_0) && !TARGET_OS_TV
+}
+
 + (UIMenu *)buildMenuFromData:(RNSStackHeaderMenuData *)data
               withHeaderEventsDelegate:(id<RNSStackHeaderEventsDelegate>)delegate
                           stateTracker:(RNSStackHeaderMenuToggleStateTracker *)tracker

package/ios/stack/header/RNSStackHeaderMenuFinder.h

@@ -41,11 +41,18 @@ typedef NS_ENUM(NSInteger, RNSMenuElementPosition) {
  */
 @property (nonatomic, copy, readonly, nullable) NSString *trackerItemId;
 
+/**
+ * Whether the element was found in the header item's menuRepresentation tree
+ * rather than its menu tree.
+ */
+@property (nonatomic, readonly) BOOL inMenuRepresentation;
+
 - (instancetype)initWithSearchResult:(RNSStackHeaderMenuElementSearchResult *)searchResult
                             position:(RNSMenuElementPosition)position
                           headerItem:(nullable id<RNSStackHeaderItemDataProviding>)headerItem
                             rootMenu:(nullable RNSStackHeaderMenuData *)rootMenu
-                       trackerItemId:(nullable NSString *)trackerItemId;
+                       trackerItemId:(nullable NSString *)trackerItemId
+                inMenuRepresentation:(BOOL)inMenuRepresentation;
 
 @end
 

package/ios/stack/header/RNSStackHeaderMenuFinder.mm

@@ -25,6 +25,7 @@
                           headerItem:(nullable id<RNSStackHeaderItemDataProviding>)headerItem
                             rootMenu:(nullable RNSStackHeaderMenuData *)rootMenu
                        trackerItemId:(nullable NSString *)trackerItemId
+                inMenuRepresentation:(BOOL)inMenuRepresentation
 {
   if (self = [super init]) {
     _searchResult = searchResult;
@@ -32,6 +33,7 @@
     _headerItem = headerItem;
     _rootMenu = rootMenu;
     _trackerItemId = [trackerItemId copy];
+    _inMenuRepresentation = inMenuRepresentation;
   }
   return self;
 }
@@ -47,16 +49,30 @@
                                                 titleMenu:(nullable RNSStackHeaderMenuData *)titleMenu
 {
   for (id<RNSStackHeaderItemDataProviding> item in items) {
-    if (item.menu == nil || item.itemId == nil) {
+    if (item.itemId == nil) {
       continue;
     }
-    RNSStackHeaderMenuElementSearchResult *result = [self findElementWithId:elementId inMenu:item.menu];
-    if (result != nil) {
-      return [[RNSMenuElementLocator alloc] initWithSearchResult:result
-                                                        position:RNSMenuElementPositionItem
-                                                      headerItem:item
-                                                        rootMenu:item.menu
-                                                   trackerItemId:item.itemId];
+    if (item.menu != nil) {
+      RNSStackHeaderMenuElementSearchResult *result = [self findElementWithId:elementId inMenu:item.menu];
+      if (result != nil) {
+        return [[RNSMenuElementLocator alloc] initWithSearchResult:result
+                                                          position:RNSMenuElementPositionItem
+                                                        headerItem:item
+                                                          rootMenu:item.menu
+                                                     trackerItemId:item.itemId
+                                              inMenuRepresentation:NO];
+      }
+    }
+    if (item.menuRepresentation != nil) {
+      RNSStackHeaderMenuElementSearchResult *result = [self findElementWithId:elementId inMenu:item.menuRepresentation];
+      if (result != nil) {
+        return [[RNSMenuElementLocator alloc] initWithSearchResult:result
+                                                          position:RNSMenuElementPositionItem
+                                                        headerItem:item
+                                                          rootMenu:item.menuRepresentation
+                                                     trackerItemId:item.itemId
+                                              inMenuRepresentation:YES];
+      }
     }
   }
 
@@ -67,7 +83,8 @@
                                                         position:RNSMenuElementPositionTitle
                                                       headerItem:nil
                                                         rootMenu:titleMenu
-                                                   trackerItemId:RNSTitleMenuTrackerItemId];
+                                                   trackerItemId:RNSTitleMenuTrackerItemId
+                                            inMenuRepresentation:NO];
     }
   }
 

package/ios/stack/screen/RNSStackScreenComponentView.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #import "RNSReactBaseView.h"
+#import "RNSSafeAreaProviding.h"
 #import "RNSStackScreenComponentEventEmitter.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -14,7 +15,7 @@ typedef NS_ENUM(int, RNSStackScreenActivityMode) {
   RNSStackScreenActivityModeAttached = 1,
 };
 
-@interface RNSStackScreenComponentView : RNSReactBaseView
+@interface RNSStackScreenComponentView : RNSReactBaseView <RNSSafeAreaProviding>
 
 @property (nonatomic, weak, readwrite, nullable) RNSStackHostComponentView *stackHost;
 @property (nonatomic, weak, readonly, nullable) RNSStackHeaderConfigComponentView *headerConfig;

package/ios/stack/screen/RNSStackScreenComponentView.mm

@@ -8,6 +8,7 @@
 #import <react/renderer/components/rnscreens/RNSStackScreenComponentDescriptor.h>
 
 #import "RNSConversions-Stack.h"
+#import "RNSSafeAreaViewNotifications.h"
 #import "RNSScrollViewMarkerComponentView.h"
 #import "RNSScrollViewSeeking.h"
 #import "RNSStackHeaderConfigComponentView.h"
@@ -107,6 +108,28 @@ namespace react = facebook::react;
   return _reactEventEmitter;
 }
 
+#pragma mark - RNSSafeAreaProviding
+
+- (UIEdgeInsets)providerSafeAreaInsets
+{
+  return self.safeAreaInsets;
+}
+
+- (void)dispatchSafeAreaDidChangeNotification
+{
+  [NSNotificationCenter.defaultCenter postNotificationName:RNSSafeAreaDidChange object:self userInfo:nil];
+}
+
+#pragma mark - RNSSafeAreaProviding related methods
+
+// TODO: register for UIKeyboard notifications
+
+- (void)safeAreaInsetsDidChange
+{
+  [super safeAreaInsetsDidChange];
+  [self dispatchSafeAreaDidChangeNotification];
+}
+
 #pragma mark - RCTComponentViewProtocol
 
 - (void)updateProps:(const facebook::react::Props::Shared &)props

package/ios/stack/screen/RNSStackScreenHeaderCoordinator.mm

@@ -1,6 +1,7 @@
 #import "RNSStackScreenHeaderCoordinator.h"
 #import <React/RCTAssert.h>
 #import <React/RCTLog.h>
+#import "RNSConversions-Stack.h"
 #import "RNSDefines.h"
 #import "RNSStackHeaderContentFactory.h"
 #import "RNSStackHeaderItemDataProviding.h"
@@ -336,6 +337,12 @@
   }
 #endif // RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
 
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(27_0)
+  if (@available(iOS 27.0, *)) {
+    navItem.navigationBarMinimization = [UIBarMinimization new];
+  }
+#endif // Check for iOS >= 27
+
 #if !TARGET_OS_TV
   navItem.prompt = nil;
   navItem.largeTitleDisplayMode = UINavigationItemLargeTitleDisplayModeNever;
@@ -371,19 +378,52 @@
 
   if (item.menu == nil) {
     barButtonItem.menu = nil;
+  } else {
+    RNSStackHeaderMenuToggleStateTracker *tracker = [_trackerRegistry trackerForItemId:itemId];
+    __weak auto weakSelf = self;
+    [RNSStackHeaderMenuCoordinator applyMenu:item.menu
+                             toBarButtonItem:barButtonItem
+                    withHeaderEventsDelegate:_eventsDelegate
+                                stateTracker:tracker
+                             withImageLoader:_imageLoader
+                     menuInvalidatedCallback:^{
+                       [weakSelf reapplyMenuForItemWithId:itemId];
+                     }];
+  }
+
+  [self reapplyMenuRepresentationForItemWithId:itemId];
+}
+
+/**
+ Finds an existing barButtonItem and its corresponding config, then applies the menu
+ representation again. If the config is missing, it clears the representation.
+ */
+- (void)reapplyMenuRepresentationForItemWithId:(NSString *)itemId
+{
+  if (_configDataProvider == nil || itemId == nil) {
+    return;
+  }
+
+  UIBarButtonItem *barButtonItem = _barButtonItemsByItemId[itemId];
+  if (barButtonItem == nil) {
+    return;
+  }
+
+  id<RNSStackHeaderItemDataProviding> item = [self findItemWithId:itemId];
+  if (item == nil) {
     return;
   }
 
   RNSStackHeaderMenuToggleStateTracker *tracker = [_trackerRegistry trackerForItemId:itemId];
   __weak auto weakSelf = self;
-  [RNSStackHeaderMenuCoordinator applyMenu:item.menu
-                           toBarButtonItem:barButtonItem
-                  withHeaderEventsDelegate:_eventsDelegate
-                              stateTracker:tracker
-                           withImageLoader:_imageLoader
-                   menuInvalidatedCallback:^{
-                     [weakSelf reapplyMenuForItemWithId:itemId];
-                   }];
+  [RNSStackHeaderMenuCoordinator applyMenuRepresentation:item.menuRepresentation
+                                         toBarButtonItem:barButtonItem
+                                withHeaderEventsDelegate:_eventsDelegate
+                                            stateTracker:tracker
+                                         withImageLoader:_imageLoader
+                                 menuInvalidatedCallback:^{
+                                   [weakSelf reapplyMenuRepresentationForItemWithId:itemId];
+                                 }];
 }
 
 - (nullable id<RNSStackHeaderItemDataProviding>)findItemWithId:(NSString *)itemId
@@ -448,6 +488,15 @@
   }
 #endif // RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
 
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(27_0)
+  if (@available(iOS 27.0, *)) {
+    UIBarMinimization *minimization = [UIBarMinimization new];
+    minimization.minimizationBehavior = _configDataProvider.minimizationBehavior;
+    minimization.restorationBehavior = _configDataProvider.restorationBehavior;
+    navItem.navigationBarMinimization = minimization;
+  }
+#endif // Check for iOS >= 27
+
 #if !TARGET_OS_TV
   navItem.largeTitleDisplayMode = _configDataProvider.largeTitleEnabled ? UINavigationItemLargeTitleDisplayModeAlways
                                                                         : UINavigationItemLargeTitleDisplayModeNever;
@@ -553,6 +602,16 @@
   }
 #endif // RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
 
+// tvOS and visionOS are excluded on purpose: `visibilityPriority` exists there, but the only
+// supported value is `standard`, which is already the default.
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(27_0) && !TARGET_OS_TV && !TARGET_OS_VISION
+  if (@available(iOS 27.0, *)) {
+    barButtonItem.visibilityPriority =
+        rnscreens::conversion::UIBarButtonItemVisibilityPriorityFromRNSHeaderItemVisibilityPriority(
+            item.visibilityPriority);
+  }
+#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(27_0) && !TARGET_OS_TV && !TARGET_OS_VISION
+
   if (item.menu != nil && item.itemId != nil) {
     RNSStackHeaderMenuToggleStateTracker *tracker = [_trackerRegistry trackerForItemId:item.itemId];
     __weak auto weakSelf = self;
@@ -567,6 +626,20 @@
                      }];
   }
 
+  if (item.menuRepresentation != nil && item.itemId != nil) {
+    RNSStackHeaderMenuToggleStateTracker *tracker = [_trackerRegistry trackerForItemId:item.itemId];
+    __weak auto weakSelf = self;
+    NSString *capturedItemId = item.itemId;
+    [RNSStackHeaderMenuCoordinator applyMenuRepresentation:item.menuRepresentation
+                                           toBarButtonItem:barButtonItem
+                                  withHeaderEventsDelegate:_eventsDelegate
+                                              stateTracker:tracker
+                                           withImageLoader:_imageLoader
+                                   menuInvalidatedCallback:^{
+                                     [weakSelf reapplyMenuRepresentationForItemWithId:capturedItemId];
+                                   }];
+  }
+
   if (item.itemId != nil) {
     _barButtonItemsByItemId[item.itemId] = barButtonItem;
   }

package/ios/tabs/RNSTabBarAppearanceCoordinator.mm

@@ -4,11 +4,26 @@
 #import <React/RCTLog.h>
 #import "RCTConvert+RNSTabs.h"
 #import "RNSConversions-Tabs.h"
+#import "RNSDefines.h"
 #import "RNSImageLoadingHelper.h"
 #import "RNSTabBarController.h"
 #import "RNSTabsHostComponentView.h"
 #import "RNSTabsScreenViewController.h"
 
+static UIImage *_Nullable RNSImageWithSymbolRenderingMode(UIImage *_Nullable image,
+                                                          RNSTabsIconSymbolRenderingMode renderingMode)
+{
+  switch (renderingMode) {
+    case RNSTabsIconSymbolRenderingModeMonochrome:
+      return [image imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+    case RNSTabsIconSymbolRenderingModeOriginal:
+      return [image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+    case RNSTabsIconSymbolRenderingModeDefault:
+    default:
+      return image;
+  }
+}
+
 @implementation RNSTabBarAppearanceCoordinator
 
 - (void)updateAppearanceOfTabBar:(nullable UITabBar *)tabBar
@@ -56,25 +71,43 @@
               withImageLoader:imageLoader];
 }
 
+/// Sets the normal icon on both the item (renders the iPhone bar) and the UITab (renders the
+/// iPad floating bar / sidebar, which never reads the item).
+- (void)setTabImage:(nullable UIImage *)image
+      forTabBarItem:(nonnull UITabBarItem *)tabBarItem
+         screenView:(nullable RNSTabsScreenComponentView *)screenView
+{
+#if RNS_UITAB_API_SDK_AVAILABLE
+  if (RNS_UITAB_API_ENABLED) {
+    screenView.controller.tab.image = image;
+  }
+#endif // RNS_UITAB_API_SDK_AVAILABLE
+  // This needs to be called after tab.image assignment
+  // (see https://github.com/software-mansion/react-native-screens/pull/4813)
+  tabBarItem.image = image;
+}
+
 - (void)setIconsForTabBarItem:(UITabBarItem *)tabBarItem
                fromScreenView:(RNSTabsScreenComponentView *)screenView
               withImageLoader:(RCTImageLoader *_Nullable)imageLoader
 {
   if (screenView.iconType == RNSTabsIconTypeSfSymbol || screenView.iconType == RNSTabsIconTypeXcasset) {
     if (screenView.iconResourceName != nil) {
+      UIImage *image;
       if (screenView.iconType == RNSTabsIconTypeSfSymbol) {
-        UIImage *image = [UIImage systemImageNamed:screenView.iconResourceName];
+        image = [RNSImageLoadingHelper symbolImageNamed:screenView.iconResourceName];
         if (image == nil) {
           RCTLogWarn(@"[RNScreens] Failed to load SF Symbol \"%@\" for tab bar item", screenView.iconResourceName);
         }
-        tabBarItem.image = image;
       } else {
-        UIImage *image = [UIImage imageNamed:screenView.iconResourceName];
+        image = [UIImage imageNamed:screenView.iconResourceName];
         if (image == nil) {
           RCTLogWarn(@"[RNScreens] Failed to load xcasset \"%@\" for tab bar item", screenView.iconResourceName);
         }
-        tabBarItem.image = image;
       }
+      [self setTabImage:RNSImageWithSymbolRenderingMode(image, screenView.iconSymbolRenderingMode)
+          forTabBarItem:tabBarItem
+             screenView:screenView];
     } else if (screenView.systemItem != RNSTabsScreenSystemItemNone) {
       // Restore default system item icon
       std::optional<UITabBarSystemItem> systemItem =
@@ -85,27 +118,30 @@
             (long)screenView.systemItem);
         return;
       }
-      tabBarItem.image = [[UITabBarItem alloc] initWithTabBarSystemItem:systemItem.value() tag:0].image;
+      UIImage *_Nullable systemItemImage =
+          [[UITabBarItem alloc] initWithTabBarSystemItem:systemItem.value() tag:0].image;
+      [self setTabImage:systemItemImage forTabBarItem:tabBarItem screenView:screenView];
     } else {
-      tabBarItem.image = nil;
+      [self setTabImage:nil forTabBarItem:tabBarItem screenView:screenView];
     }
 
     if (screenView.selectedIconResourceName != nil) {
+      UIImage *selectedImage;
       if (screenView.iconType == RNSTabsIconTypeSfSymbol) {
-        UIImage *selectedImage = [UIImage systemImageNamed:screenView.selectedIconResourceName];
+        selectedImage = [RNSImageLoadingHelper symbolImageNamed:screenView.selectedIconResourceName];
         if (selectedImage == nil) {
           RCTLogWarn(@"[RNScreens] Failed to load SF Symbol \"%@\" for selected tab bar item",
                      screenView.selectedIconResourceName);
         }
-        tabBarItem.selectedImage = selectedImage;
       } else {
-        UIImage *selectedImage = [UIImage imageNamed:screenView.selectedIconResourceName];
+        selectedImage = [UIImage imageNamed:screenView.selectedIconResourceName];
         if (selectedImage == nil) {
           RCTLogWarn(@"[RNScreens] Failed to load xcasset \"%@\" for selected tab bar item",
                      screenView.selectedIconResourceName);
         }
-        tabBarItem.selectedImage = selectedImage;
       }
+      tabBarItem.selectedImage =
+          RNSImageWithSymbolRenderingMode(selectedImage, screenView.selectedIconSymbolRenderingMode);
     } else if (screenView.systemItem != RNSTabsScreenSystemItemNone) {
       // Restore default system item icon
       std::optional<UITabBarSystemItem> systemItem =
@@ -121,7 +157,8 @@
       tabBarItem.selectedImage = nil;
     }
   } else if (imageLoader != nil) {
-    bool isTemplate = screenView.iconType == RNSTabsIconTypeTemplate;
+    bool isTemplate = screenView.iconImageRenderingMode == RNSTabsIconImageRenderingModeTemplate;
+    bool isSelectedTemplate = screenView.selectedIconImageRenderingMode == RNSTabsIconImageRenderingModeTemplate;
 
     // Weak-capture to avoid updating a tab bar item whose internal
     // view hierarchy has been torn down (iOS 26 UIKit regression:
@@ -141,14 +178,14 @@
                                             forScreenView:weakScreenView];
                                  }];
     } else {
-      tabBarItem.image = nil;
+      [self setTabImage:nil forTabBarItem:tabBarItem screenView:screenView];
     }
 
     // Selected icon
     if (screenView.selectedIconImageSource != nil) {
       [RNSImageLoadingHelper loadImageFromSource:screenView.selectedIconImageSource
                                  withImageLoader:imageLoader
-                                      asTemplate:isTemplate
+                                      asTemplate:isSelectedTemplate
                                  completionBlock:^(UIImage *image) {
                                    [self updateTabBarItem:weakTabBarItem
                                                 withImage:image
@@ -163,6 +200,22 @@
   }
 }
 
+/// Whether the screen is still managed by a tab bar controller. On the UITab path the controller of
+/// a tab that overflows into More has no parent until the tab is first shown (UIKit parents it
+/// lazily), but its `UITab` is installed - the tab is the liveness check there, not the parent.
+- (BOOL)isScreenControllerAttachedToTabBarController:(nullable RNSTabsScreenViewController *)screenController
+{
+  if (screenController == nil) {
+    return NO;
+  }
+#if RNS_UITAB_API_SDK_AVAILABLE
+  if (RNS_UITAB_API_ENABLED) {
+    return screenController.tab.tabBarController != nil;
+  }
+#endif // RNS_UITAB_API_SDK_AVAILABLE
+  return screenController.parentViewController != nil;
+}
+
 - (void)updateTabBarItem:(nullable UITabBarItem *)tabBarItem
                withImage:(nullable UIImage *)image
               isSelected:(BOOL)isSelected
@@ -175,16 +228,26 @@
     return;
   }
 
-  UIViewController *screenParentViewController = [screenView.controller parentViewController];
-  if (screenParentViewController == nil) {
+  if (![self isScreenControllerAttachedToTabBarController:screenView.controller]) {
     return;
   }
 
   if (isSelected) {
     tabBarItem.selectedImage = image;
   } else {
-    tabBarItem.image = image;
+    [self setTabImage:image forTabBarItem:tabBarItem screenView:screenView];
+  }
+
+  UIViewController *screenParentViewController = [screenView.controller parentViewController];
+#if RNS_UITAB_API_SDK_AVAILABLE
+  if (RNS_UITAB_API_ENABLED) {
+    if (screenParentViewController == nil) {
+      // A tab that overflows into More and has not been shown yet - UIKit parents it lazily. Its
+      // icon lives in the More list, not in the bar, so there is nothing to lay out.
+      return;
+    }
   }
+#endif // RNS_UITAB_API_SDK_AVAILABLE
 
   // A layout pass is required because the image might be loaded asynchronously,
   // after the tab bar has already been attached to the window.

package/ios/tabs/RNSTabBarItemCoordinator.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#import <Foundation/Foundation.h>
+#import "RNSTabsScreenViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNSTabBarItemCoordinator : NSObject
+
+- (void)createTabBarItemsForTabScreenControllers:(nullable NSArray<RNSTabsScreenViewController *> *)tabScreenCtrls;
+
+- (void)updateTabBarItemsForTabScreenControllers:(nullable NSArray<RNSTabsScreenViewController *> *)tabScreenCtrls;
+
+@end
+
+NS_ASSUME_NONNULL_END