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

package/ios/stack/screen/RNSStackScreenHeaderCoordinator.mm

@@ -1,5 +1,6 @@
 #import "RNSStackScreenHeaderCoordinator.h"
-#import "RCTAssert.h"
+#import <React/RCTAssert.h>
+#import <React/RCTLog.h>
 #import "RNSDefines.h"
 #import "RNSStackHeaderContentFactory.h"
 #import "RNSStackHeaderItemDataProviding.h"
@@ -10,11 +11,17 @@
 #import "RNSStackNavigationBarCoordinator.h"
 #import "RNSStackNavigationController.h"
 #import "RNSStackScreenController.h"
-#import "React/RCTLog.h"
 
 @implementation RNSStackScreenHeaderCoordinator {
   __weak RNSStackScreenController *_Nullable _screenController;
 
+#if !TARGET_OS_TV
+  // Navigation item of the screen below, onto which the back button
+  // configuration has been applied. Kept so that the configuration can be
+  // cleared when the owning screen is popped from the stack.
+  __weak UINavigationItem *_Nullable _backButtonConfigTargetItem;
+#endif // !TARGET_OS_TV
+
   RNSStackHeaderMenuTrackerRegistry *_Nonnull _trackerRegistry;
 
   NSMutableArray<UIBarButtonItem *> *_Nonnull _leadingBarButtonItems;
@@ -36,6 +43,17 @@
 
 #pragma mark - Public
 
+- (void)updateNavigationBarVisibilityAnimated:(BOOL)animated
+{
+  RNSStackNavigationController *navController = [self getNavigationController];
+  if (navController == nil || navController.topViewController != _screenController) {
+    return;
+  }
+
+  BOOL hidden = _configDataProvider == nil || _configDataProvider.hidden;
+  [navController.navigationBarCoordinator setHidden:hidden forNavigationController:navController animated:animated];
+}
+
 - (void)rebuild
 {
   if (_configDataProvider == nil) {
@@ -103,7 +121,11 @@
               largeSubtitleView:largeSubtitleView
                   forController:controller];
 
-  [self applyNavigationBarProperties];
+  [self applyTitleMenuForController:controller];
+  [self updateNavigationBarVisibilityAnimated:YES];
+#if !TARGET_OS_TV
+  [self updateBackButtonMenuEnabled];
+#endif // !TARGET_OS_TV
 }
 
 - (void)applyConfigProperties
@@ -113,8 +135,24 @@
   }
 
   [self applyConfigPropertiesForController:[self requireScreenController]];
-  [self applyNavigationBarProperties];
+  [self updateNavigationBarVisibilityAnimated:YES];
+#if !TARGET_OS_TV
+  [self updateBackButtonMenuEnabled];
+#endif // !TARGET_OS_TV
+}
+
+#if !TARGET_OS_TV
+- (void)updateBackButtonMenuEnabled
+{
+  RNSStackNavigationController *navController = [self getNavigationController];
+  if (navController == nil || navController.topViewController != _screenController) {
+    return;
+  }
+
+  BOOL enabled = _configDataProvider == nil || _configDataProvider.backButtonMenuEnabled;
+  [navController.navigationBarCoordinator setBackButtonMenuEnabled:enabled forNavigationController:navController];
 }
+#endif // !TARGET_OS_TV
 
 /**
  Rebuilds an existing item: sets all props and applies the menu config.
@@ -200,28 +238,37 @@
   }
 }
 
+- (void)reapplyTitleMenu
+{
+  if (_configDataProvider == nil) {
+    return;
+  }
+  [self applyTitleMenuForController:[self requireScreenController]];
+}
+
+- (void)resetTitleMenuTracker
+{
+  [_trackerRegistry resetTrackerForItemId:RNSTitleMenuTrackerItemId];
+}
+
 - (void)setToggleState:(BOOL)state
       forMenuElementId:(NSString *)elementId
-            withItemId:(NSString *)itemId
+         trackerItemId:(NSString *)trackerItemId
+              rootMenu:(RNSStackHeaderMenuData *)rootMenu
             parentMenu:(nullable RNSStackHeaderMenuData *)parentMenu
 {
-  if (_configDataProvider == nil || elementId == nil || itemId == nil) {
+  if (_configDataProvider == nil || elementId == nil || trackerItemId == nil || rootMenu == nil) {
     return;
   }
 
-  RNSStackHeaderMenuToggleStateTracker *tracker = [_trackerRegistry trackerForItemId:itemId];
+  RNSStackHeaderMenuToggleStateTracker *tracker = [_trackerRegistry trackerForItemId:trackerItemId];
 
   if ([tracker toggleStateEquals:state forItemWithId:elementId]) {
     return;
   }
 
-  id<RNSStackHeaderItemDataProviding> item = [self findItemWithId:itemId];
-  if (item == nil || item.menu == nil) {
-    return;
-  }
-
-  RNSStackHeaderMenuData *singleSelectionRoot =
-      [RNSStackHeaderMenuFinder singleSelectionRootForElementWithId:elementId inMenu:item.menu];
+  RNSStackHeaderMenuData *singleSelectionRoot = [RNSStackHeaderMenuFinder singleSelectionRootForElementWithId:elementId
+                                                                                                       inMenu:rootMenu];
 
   NSString *eventMenuId = nil;
   NSArray<NSString *> *toggleIds = nil;
@@ -256,6 +303,7 @@
   _configDataProvider = nil;
   _frameChangeDelegate = nil;
   _eventsDelegate = nil;
+  _imageLoader = nil;
 
   [_leadingBarButtonItems removeAllObjects];
   [_trailingBarButtonItems removeAllObjects];
@@ -267,9 +315,17 @@
 
   navItem.title = nil;
   navItem.titleView = nil;
+  navItem.standardAppearance = nil;
+  navItem.scrollEdgeAppearance = nil;
   [navItem setLeftBarButtonItems:@[] animated:YES];
   [navItem setRightBarButtonItems:@[] animated:YES];
 
+#if !TARGET_OS_TV
+  if (@available(iOS 16.0, *)) {
+    navItem.titleMenuProvider = nil;
+  }
+#endif // !TARGET_OS_TV
+
 #if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
   if (@available(iOS 26.0, *)) {
     navItem.subtitle = nil;
@@ -281,13 +337,16 @@
 #endif // RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
 
 #if !TARGET_OS_TV
+  navItem.prompt = nil;
   navItem.largeTitleDisplayMode = UINavigationItemLargeTitleDisplayModeNever;
+
+  [self clearAppliedBackButtonConfig];
 #endif // !TARGET_OS_TV
 
-  RNSStackNavigationController *navController = [self getNavigationController];
-  if (navController != nil) {
-    [navController.navigationBarCoordinator setHidden:NO forNavigationController:navController animated:YES];
-  }
+  [self updateNavigationBarVisibilityAnimated:YES];
+#if !TARGET_OS_TV
+  [self updateBackButtonMenuEnabled];
+#endif // !TARGET_OS_TV
 }
 
 /**
@@ -361,21 +420,25 @@
   return (RNSStackNavigationController *)navController;
 }
 
-- (void)applyNavigationBarProperties
-{
-  RNSStackNavigationController *navController = [self getNavigationController];
-  if (navController != nil) {
-    [navController.navigationBarCoordinator setHidden:_configDataProvider.hidden
-                              forNavigationController:navController
-                                             animated:YES];
-  }
-}
-
 - (void)applyConfigPropertiesForController:(RNSStackScreenController *)controller
 {
   UINavigationItem *navItem = controller.navigationItem;
 
   navItem.title = _configDataProvider.title;
+  navItem.standardAppearance = _configDataProvider.standardAppearance;
+  navItem.scrollEdgeAppearance = _configDataProvider.scrollEdgeAppearance;
+
+#if !TARGET_OS_TV
+  NSString *prompt = _configDataProvider.prompt;
+  if (navItem.prompt != prompt && ![navItem.prompt isEqualToString:prompt]) {
+    navItem.prompt = prompt;
+    // UIKit does not resize an already visible navigation bar when the prompt
+    // of its navigation item changes - request layout explicitly.
+    [controller.navigationController.view setNeedsLayout];
+  }
+
+  [self applyBackButtonConfigForController:controller];
+#endif // !TARGET_OS_TV
 
 #if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
   if (@available(iOS 26.0, *)) {
@@ -391,6 +454,32 @@
 #endif // !TARGET_OS_TV
 }
 
+#if !TARGET_OS_TV
+- (void)applyBackButtonConfigForController:(RNSStackScreenController *)controller
+{
+  NSArray<UIViewController *> *viewControllers = controller.navigationController.viewControllers;
+  NSUInteger index = [viewControllers indexOfObject:controller];
+  if (index == NSNotFound || index == 0) {
+    return;
+  }
+
+  UINavigationItem *prevItem = viewControllers[index - 1].navigationItem;
+  _backButtonConfigTargetItem = prevItem;
+  prevItem.backButtonTitle = _configDataProvider.backButtonTitle;
+  prevItem.backButtonDisplayMode = _configDataProvider.backButtonDisplayMode;
+}
+#endif // !TARGET_OS_TV
+
+#if !TARGET_OS_TV
+- (void)clearAppliedBackButtonConfig
+{
+  UINavigationItem *targetItem = _backButtonConfigTargetItem;
+  _backButtonConfigTargetItem = nil;
+  targetItem.backButtonTitle = nil;
+  targetItem.backButtonDisplayMode = UINavigationItemBackButtonDisplayModeDefault;
+}
+#endif // !TARGET_OS_TV
+
 - (void)applyItemsWithTitleView:(nullable UIView *)titleView
                    subtitleView:(nullable UIView *)subtitleView
               largeSubtitleView:(nullable UIView *)largeSubtitleView
@@ -415,6 +504,39 @@
 #endif // RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
 }
 
+- (void)applyTitleMenuForController:(RNSStackScreenController *)controller
+{
+#if !TARGET_OS_TV
+  if (@available(iOS 16.0, *)) {
+    RNSStackHeaderMenuData *titleMenuData = _configDataProvider.titleMenu;
+    UINavigationItem *navItem = controller.navigationItem;
+
+    if (titleMenuData == nil) {
+      navItem.titleMenuProvider = nil;
+      return;
+    }
+
+    RNSStackHeaderMenuToggleStateTracker *tracker = [_trackerRegistry trackerForItemId:RNSTitleMenuTrackerItemId];
+    __weak auto weakSelf = self;
+    __weak auto weakEventsDelegate = _eventsDelegate;
+    __weak auto weakImageLoader = _imageLoader;
+
+    navItem.titleMenuProvider = ^UIMenu *(NSArray<UIMenuElement *> *suggestedActions) {
+      if (weakEventsDelegate == nil || weakImageLoader == nil) {
+        return nil;
+      }
+      return [RNSStackHeaderMenuCoordinator buildUIMenuFromData:titleMenuData
+                                       withHeaderEventsDelegate:weakEventsDelegate
+                                                   stateTracker:tracker
+                                                withImageLoader:weakImageLoader
+                                        menuInvalidatedCallback:^{
+                                          [weakSelf reapplyTitleMenu];
+                                        }];
+    };
+  }
+#endif // !TARGET_OS_TV
+}
+
 - (UIBarButtonItem *)buildBarButtonItemForItem:(id<RNSStackHeaderItemDataProviding>)item
 {
   UIBarButtonItem *barButtonItem = [RNSStackHeaderContentFactory barButtonItemForHeaderItem:item
@@ -422,6 +544,15 @@
                                                                    withHeaderEventsDelegate:_eventsDelegate
                                                                             withImageLoader:_imageLoader];
 
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
+  if (@available(iOS 26.0, *)) {
+    if (item.identifier != nil) {
+      barButtonItem.identifier = item.identifier;
+    }
+    barButtonItem.hidesSharedBackground = item.hidesSharedBackground;
+  }
+#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
+
   if (item.menu != nil && item.itemId != nil) {
     RNSStackHeaderMenuToggleStateTracker *tracker = [_trackerRegistry trackerForItemId:item.itemId];
     __weak auto weakSelf = self;

package/ios/tabs/RNSTabBarAppearanceCoordinator.mm

@@ -1,8 +1,9 @@
 #import "RNSTabBarAppearanceCoordinator.h"
 #import <React/RCTFont.h>
 #import <React/RCTImageLoader.h>
+#import <React/RCTLog.h>
 #import "RCTConvert+RNSTabs.h"
-#import "RNSConversions.h"
+#import "RNSConversions-Tabs.h"
 #import "RNSImageLoadingHelper.h"
 #import "RNSTabBarController.h"
 #import "RNSTabsHostComponentView.h"
@@ -62,30 +63,60 @@
   if (screenView.iconType == RNSTabsIconTypeSfSymbol || screenView.iconType == RNSTabsIconTypeXcasset) {
     if (screenView.iconResourceName != nil) {
       if (screenView.iconType == RNSTabsIconTypeSfSymbol) {
-        tabBarItem.image = [UIImage systemImageNamed:screenView.iconResourceName];
+        UIImage *image = [UIImage systemImageNamed:screenView.iconResourceName];
+        if (image == nil) {
+          RCTLogWarn(@"[RNScreens] Failed to load SF Symbol \"%@\" for tab bar item", screenView.iconResourceName);
+        }
+        tabBarItem.image = image;
       } else {
-        tabBarItem.image = [UIImage imageNamed:screenView.iconResourceName];
+        UIImage *image = [UIImage imageNamed:screenView.iconResourceName];
+        if (image == nil) {
+          RCTLogWarn(@"[RNScreens] Failed to load xcasset \"%@\" for tab bar item", screenView.iconResourceName);
+        }
+        tabBarItem.image = image;
       }
     } else if (screenView.systemItem != RNSTabsScreenSystemItemNone) {
       // Restore default system item icon
-      UITabBarSystemItem systemItem =
+      std::optional<UITabBarSystemItem> systemItem =
           rnscreens::conversion::RNSTabsScreenSystemItemToUITabBarSystemItem(screenView.systemItem);
-      tabBarItem.image = [[UITabBarItem alloc] initWithTabBarSystemItem:systemItem tag:0].image;
+      if (!systemItem) {
+        RCTLogError(
+            @"[RNScreens] Conversion from tabs screen systemItem to UITabBarSystemItem failed for systemItem [%ld]",
+            (long)screenView.systemItem);
+        return;
+      }
+      tabBarItem.image = [[UITabBarItem alloc] initWithTabBarSystemItem:systemItem.value() tag:0].image;
     } else {
       tabBarItem.image = nil;
     }
 
     if (screenView.selectedIconResourceName != nil) {
       if (screenView.iconType == RNSTabsIconTypeSfSymbol) {
-        tabBarItem.selectedImage = [UIImage systemImageNamed:screenView.selectedIconResourceName];
+        UIImage *selectedImage = [UIImage systemImageNamed:screenView.selectedIconResourceName];
+        if (selectedImage == nil) {
+          RCTLogWarn(@"[RNScreens] Failed to load SF Symbol \"%@\" for selected tab bar item",
+                     screenView.selectedIconResourceName);
+        }
+        tabBarItem.selectedImage = selectedImage;
       } else {
-        tabBarItem.selectedImage = [UIImage imageNamed:screenView.selectedIconResourceName];
+        UIImage *selectedImage = [UIImage imageNamed:screenView.selectedIconResourceName];
+        if (selectedImage == nil) {
+          RCTLogWarn(@"[RNScreens] Failed to load xcasset \"%@\" for selected tab bar item",
+                     screenView.selectedIconResourceName);
+        }
+        tabBarItem.selectedImage = selectedImage;
       }
     } else if (screenView.systemItem != RNSTabsScreenSystemItemNone) {
       // Restore default system item icon
-      UITabBarSystemItem systemItem =
+      std::optional<UITabBarSystemItem> systemItem =
           rnscreens::conversion::RNSTabsScreenSystemItemToUITabBarSystemItem(screenView.systemItem);
-      tabBarItem.selectedImage = [[UITabBarItem alloc] initWithTabBarSystemItem:systemItem tag:0].selectedImage;
+      if (!systemItem) {
+        RCTLogError(
+            @"[RNScreens] Conversion from tabs screen systemItem to UITabBarSystemItem failed for systemItem [%ld]",
+            (long)screenView.systemItem);
+        return;
+      }
+      tabBarItem.selectedImage = [[UITabBarItem alloc] initWithTabBarSystemItem:systemItem.value() tag:0].selectedImage;
     } else {
       tabBarItem.selectedImage = nil;
     }

package/ios/tabs/bottom-accessory/RNSTabsBottomAccessoryComponentView.h

@@ -5,7 +5,7 @@
 #import "RNSTabsHostComponentView.h"
 
 #if defined(__cplusplus)
-#import <rnscreens/RNSTabsBottomAccessoryComponentDescriptor.h>
+#import <react/renderer/components/rnscreens/RNSTabsBottomAccessoryComponentDescriptor.h>
 #endif // defined(__cplusplus)
 
 NS_ASSUME_NONNULL_BEGIN

package/ios/tabs/bottom-accessory/RNSTabsBottomAccessoryComponentView.mm

@@ -4,7 +4,7 @@
 
 #if RNS_TABS_BOTTOM_ACCESSORY_AVAILABLE
 
-#import <rnscreens/RNSTabsBottomAccessoryComponentDescriptor.h>
+#import <react/renderer/components/rnscreens/RNSTabsBottomAccessoryComponentDescriptor.h>
 
 namespace react = facebook::react;
 
@@ -32,6 +32,9 @@ namespace react = facebook::react;
 
 - (void)initState
 {
+  static const auto defaultProps = std::make_shared<const react::RNSTabsBottomAccessoryProps>();
+  _props = defaultProps;
+
 #if RNS_TABS_BOTTOM_ACCESSORY_AVAILABLE
   if (@available(iOS 26, *)) {
     _helper = [[RNSTabsBottomAccessoryHelper alloc] initWithBottomAccessoryView:self];

package/ios/tabs/bottom-accessory/RNSTabsBottomAccessoryContentComponentView.mm

@@ -1,5 +1,5 @@
 #import "RNSTabsBottomAccessoryContentComponentView.h"
-#import "RNSConversions.h"
+#import "RNSConversions-Tabs.h"
 #import "RNSTabsBottomAccessoryComponentView.h"
 #import "RNSTabsBottomAccessoryHelper.h"
 
@@ -17,7 +17,10 @@ namespace react = facebook::react;
 
 - (instancetype)initWithFrame:(CGRect)frame
 {
-  self = [super initWithFrame:frame];
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const react::RNSTabsBottomAccessoryContentProps>();
+    _props = defaultProps;
+  }
   return self;
 }
 

package/ios/tabs/bottom-accessory/RNSTabsBottomAccessoryEventEmitter.mm

@@ -5,7 +5,7 @@
 #import <React/RCTConversions.h>
 #import <React/RCTLog.h>
 #import <react/renderer/components/rnscreens/EventEmitters.h>
-#import "RNSConversions.h"
+#import "RNSConversions-Tabs.h"
 
 namespace react = facebook::react;
 

package/ios/tabs/bottom-accessory/RNSTabsBottomAccessoryShadowStateProxy.mm

@@ -3,7 +3,7 @@
 #if RNS_TABS_BOTTOM_ACCESSORY_AVAILABLE
 
 #import <React/RCTConversions.h>
-#import <rnscreens/RNSTabsBottomAccessoryShadowNode.h>
+#import <react/renderer/components/rnscreens/RNSTabsBottomAccessoryShadowNode.h>
 
 @implementation RNSTabsBottomAccessoryShadowStateProxy {
   RNSTabsBottomAccessoryComponentView *__weak _bottomAccessoryView;

package/ios/tabs/conversion/RNSConversions-Tabs.h

@@ -0,0 +1,78 @@
+#pragma once
+
+#if defined(__cplusplus)
+
+#import <React/RCTImageSource.h>
+#import <UIKit/UIKit.h>
+#import <react/renderer/components/rnscreens/EventEmitters.h>
+#import <react/renderer/components/rnscreens/Props.h>
+#import <optional>
+#import "RNSDefines.h"
+#import "RNSEnums.h"
+#import "RNSTabsNavigationState.h"
+
+namespace rnscreens::conversion {
+
+namespace react = facebook::react;
+
+std::optional<UIBlurEffectStyle> RNSMaybeUIBlurEffectStyleFromString(NSString *blurEffectString);
+
+UIBlurEffect *RNSUIBlurEffectFromString(NSString *blurEffectString);
+
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
+
+API_AVAILABLE(ios(26.0))
+UITabBarMinimizeBehavior UITabBarMinimizeBehaviorFromRNSTabsHostTabBarMinimizeBehavior(
+    react::RNSTabsHostIOSTabBarMinimizeBehavior tabBarMinimizeBehavior);
+
+#endif // Check for iOS >= 26
+
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(18_0)
+
+API_AVAILABLE(ios(18.0))
+UITabBarControllerMode UITabBarControllerModeFromRNSTabsHostTabBarControllerMode(
+    react::RNSTabsHostIOSTabBarControllerMode tabBarControllerMode);
+
+#endif // Check for iOS >= 18
+
+react::RNSTabsHostIOSEventEmitter::OnTabSelectionRejectedRejectionReason
+RNSOnTabSelectionRejectedRejectionReasonFromRNSTabsNavigationStateRejectionReason(
+    RNSTabsNavigationStateRejectionReason reason);
+
+react::RNSTabsHostIOSEventEmitter::OnTabSelectedActionOrigin RNSOnTabSelectedActionOriginFromRNSTabsActionOrigin(
+    RNSTabsActionOrigin actionOrigin);
+
+RNSTabsIconType RNSTabsIconTypeFromIcon(react::RNSTabsScreenIOSIconType iconType);
+
+RNSTabsScreenSystemItem RNSTabsScreenSystemItemFromReactRNSTabsScreenSystemItem(
+    react::RNSTabsScreenIOSSystemItem systemItem);
+
+std::optional<UITabBarSystemItem> RNSTabsScreenSystemItemToUITabBarSystemItem(RNSTabsScreenSystemItem systemItem);
+
+#if RNS_TABS_BOTTOM_ACCESSORY_AVAILABLE
+
+API_AVAILABLE(ios(26.0))
+std::optional<react::RNSTabsBottomAccessoryEventEmitter::OnEnvironmentChangeEnvironment>
+RNSTabsBottomAccessoryOnEnvironmentChangePayloadFromUITabAccessoryEnvironment(UITabAccessoryEnvironment environment);
+
+RNSTabsBottomAccessoryEnvironment RNSTabsBottomAccessoryEnvironmentFromCppEquivalent(
+    react::RNSTabsBottomAccessoryContentEnvironment environment);
+
+#endif // RNS_TABS_BOTTOM_ACCESSORY_AVAILABLE
+
+UIUserInterfaceStyle UIUserInterfaceStyleFromTabsScreenCppEquivalent(
+    react::RNSTabsScreenIOSUserInterfaceStyle userInterfaceStyle);
+
+RCTImageSource *RCTImageSourceFromImageSourceAndIconType(const facebook::react::ImageSource *imageSource,
+                                                         RNSTabsIconType iconType);
+
+RNSOrientation RNSOrientationFromRNSTabsScreenOrientation(react::RNSTabsScreenIOSOrientation orientation);
+
+UITraitEnvironmentLayoutDirection UITraitEnvironmentLayoutDirectionFromTabsHostCppEquivalent(
+    react::RNSTabsHostIOSLayoutDirection layoutDirection);
+
+UIUserInterfaceStyle UIUserInterfaceStyleFromHostProp(react::RNSTabsHostIOSColorScheme colorScheme);
+
+}; // namespace rnscreens::conversion
+
+#endif // defined(__cplusplus)

package/ios/{conversion → tabs/conversion}/RNSConversions-Tabs.mm

@@ -1,10 +1,11 @@
-#import <React/RCTConversions.h>
+#import "RNSConversions-Tabs.h"
+#import <React/RCTLog.h>
 #import <react/renderer/imagemanager/RCTImagePrimitivesConversions.h>
-#import "RNSConversions.h"
-#import "RNSDefines.h"
 
 namespace rnscreens::conversion {
 
+namespace react = facebook::react;
+
 UIBlurEffect *RNSUIBlurEffectFromOptionalUIBlurEffectStyle(std::optional<UIBlurEffectStyle> &maybeStyle)
 {
   if (maybeStyle) {
@@ -75,69 +76,6 @@ UIBlurEffect *RNSUIBlurEffectFromString(NSString *blurEffectString)
   return RNSUIBlurEffectFromOptionalUIBlurEffectStyle(maybeStyle);
 }
 
-std::optional<UIBlurEffectStyle> RNSMaybeUIBlurEffectStyleFromRNSBlurEffectStyle(RNSBlurEffectStyle blurEffect)
-{
-  switch (blurEffect) {
-    case RNSBlurEffectStyleNone:
-    case RNSBlurEffectStyleSystemDefault:
-      return std::nullopt;
-    case RNSBlurEffectStyleExtraLight:
-      return {UIBlurEffectStyleExtraLight};
-    case RNSBlurEffectStyleLight:
-      return {UIBlurEffectStyleLight};
-    case RNSBlurEffectStyleDark:
-      return {UIBlurEffectStyleDark};
-    case RNSBlurEffectStyleRegular:
-      return {UIBlurEffectStyleRegular};
-    case RNSBlurEffectStyleProminent:
-      return {UIBlurEffectStyleProminent};
-#if !TARGET_OS_TV
-    case RNSBlurEffectStyleSystemUltraThinMaterial:
-      return {UIBlurEffectStyleSystemUltraThinMaterial};
-    case RNSBlurEffectStyleSystemThinMaterial:
-      return {UIBlurEffectStyleSystemThinMaterial};
-    case RNSBlurEffectStyleSystemMaterial:
-      return {UIBlurEffectStyleSystemMaterial};
-    case RNSBlurEffectStyleSystemThickMaterial:
-      return {UIBlurEffectStyleSystemThickMaterial};
-    case RNSBlurEffectStyleSystemChromeMaterial:
-      return {UIBlurEffectStyleSystemChromeMaterial};
-    case RNSBlurEffectStyleSystemUltraThinMaterialLight:
-      return {UIBlurEffectStyleSystemUltraThinMaterialLight};
-    case RNSBlurEffectStyleSystemThinMaterialLight:
-      return {UIBlurEffectStyleSystemThinMaterialLight};
-    case RNSBlurEffectStyleSystemMaterialLight:
-      return {UIBlurEffectStyleSystemMaterialLight};
-    case RNSBlurEffectStyleSystemThickMaterialLight:
-      return {UIBlurEffectStyleSystemThickMaterialLight};
-    case RNSBlurEffectStyleSystemChromeMaterialLight:
-      return {UIBlurEffectStyleSystemChromeMaterialLight};
-    case RNSBlurEffectStyleSystemUltraThinMaterialDark:
-      return {UIBlurEffectStyleSystemUltraThinMaterialDark};
-    case RNSBlurEffectStyleSystemThinMaterialDark:
-      return {UIBlurEffectStyleSystemThinMaterialDark};
-    case RNSBlurEffectStyleSystemMaterialDark:
-      return {UIBlurEffectStyleSystemMaterialDark};
-    case RNSBlurEffectStyleSystemThickMaterialDark:
-      return {UIBlurEffectStyleSystemThickMaterialDark};
-    case RNSBlurEffectStyleSystemChromeMaterialDark:
-      return {UIBlurEffectStyleSystemChromeMaterialDark};
-    default:
-      RCTLogError(@"[RNScreens] unsupported blur effect style");
-      return std::nullopt;
-#else // !TARGET_OS_TV
-    default:
-      return std::nullopt;
-#endif // !TARGET_OS_TV
-  }
-}
-
-UIBlurEffect *RNSUIBlurEffectFromRNSBlurEffectStyle(RNSBlurEffectStyle blurEffect)
-{
-  std::optional<UIBlurEffectStyle> maybeStyle = RNSMaybeUIBlurEffectStyleFromRNSBlurEffectStyle(blurEffect);
-  return RNSUIBlurEffectFromOptionalUIBlurEffectStyle(maybeStyle);
-}
-
 #if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
 
 API_AVAILABLE(ios(26.0))
@@ -323,11 +261,11 @@ RNSTabsScreenSystemItem RNSTabsScreenSystemItemFromReactRNSTabsScreenSystemItem(
   }
 }
 
-UITabBarSystemItem RNSTabsScreenSystemItemToUITabBarSystemItem(RNSTabsScreenSystemItem systemItem)
+std::optional<UITabBarSystemItem> RNSTabsScreenSystemItemToUITabBarSystemItem(RNSTabsScreenSystemItem systemItem)
 {
-  RCTAssert(systemItem != RNSTabsScreenSystemItemNone,
-            @"Attempt to convert tabs systemItem none to UITabBarSystemItem");
   switch (systemItem) {
+    case RNSTabsScreenSystemItemNone:
+      return std::nullopt;
     case RNSTabsScreenSystemItemBookmarks:
       return UITabBarSystemItemBookmarks;
     case RNSTabsScreenSystemItemContacts:
@@ -353,8 +291,7 @@ UITabBarSystemItem RNSTabsScreenSystemItemToUITabBarSystemItem(RNSTabsScreenSyst
     case RNSTabsScreenSystemItemTopRated:
       return UITabBarSystemItemTopRated;
   }
-  RCTAssert(true, @"Attempt to convert unknown tabs screen systemItem to UITabBarSystemItem [%d]", systemItem);
-  return UITabBarSystemItemSearch;
+  return std::nullopt;
 }
 
 #if RNS_TABS_BOTTOM_ACCESSORY_AVAILABLE

package/ios/tabs/extensions/RNSTabsHostComponentView+RNSImageLoader.h

@@ -3,7 +3,7 @@
 #import "RNSTabsHostComponentView.h"
 
 #if defined(__cplusplus)
-#import "RNSTabsHostShadowNode.h"
+#import <react/renderer/components/rnscreens/RNSTabsHostShadowNode.h>
 #endif // defined(__cplusplus)
 
 NS_ASSUME_NONNULL_BEGIN