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

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;
 

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"
 

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/bottom-accessory/RNSTabsBottomAccessoryWrapperView.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#import <UIKit/UIKit.h>
+#import "RNSDefines.h"
+
+#if RNS_TABS_BOTTOM_ACCESSORY_AVAILABLE
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ * @class RNSTabsBottomAccessoryWrapperView
+ * @brief Content view of UITabAccessory, wraps RNSTabsBottomAccessoryComponentView.
+ *
+ * It is a plain UIView (not RCTViewComponentView) to maintain native corner radius
+ * and it answers UIKit's size queries so that the accessory takes full available width.
+ */
+API_AVAILABLE(ios(26.0))
+@interface RNSTabsBottomAccessoryWrapperView : UIView
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif // RNS_TABS_BOTTOM_ACCESSORY_AVAILABLE

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

@@ -0,0 +1,22 @@
+#import "RNSTabsBottomAccessoryWrapperView.h"
+
+#if RNS_TABS_BOTTOM_ACCESSORY_AVAILABLE
+
+@implementation RNSTabsBottomAccessoryWrapperView
+
+- (CGSize)sizeThatFits:(CGSize)size
+{
+  // In regular width (e.g. iPad), UIKit asks the content view for its size and uses
+  // the answer if it is smaller than the proposed size (unless Auto Layout is used).
+  //
+  // Default implementation returns current bounds, therefore the accessory keeps stale
+  // width when available space grows (e.g. after hiding the sidebar or rotating the
+  // device). By returning the proposed size, we make sure that the accessory always
+  // takes full available width.
+  // See https://github.com/software-mansion/react-native-screens/issues/4728.
+  return size;
+}
+
+@end
+
+#endif // RNS_TABS_BOTTOM_ACCESSORY_AVAILABLE

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

@@ -0,0 +1,100 @@
+#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
+
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(27_0) && !TARGET_OS_TV
+
+API_AVAILABLE(ios(27.0))
+UITabBarControllerSidebarPlacement UITabBarControllerSidebarPlacementFromRNSTabsHostTabBarSidebarPreferredPlacement(
+    react::RNSTabsHostIOSTabBarSidebarPreferredPlacement tabBarSidebarPreferredPlacement);
+
+#endif // Check for iOS >= 27 && !TARGET_OS_TV
+
+react::RNSTabsHostIOSEventEmitter::OnTabSelectionRejectedRejectionReason
+RNSOnTabSelectionRejectedRejectionReasonFromRNSTabsNavigationStateRejectionReason(
+    RNSTabsNavigationStateRejectionReason reason);
+
+react::RNSTabsHostIOSEventEmitter::OnTabSelectedActionOrigin RNSOnTabSelectedActionOriginFromRNSTabsActionOrigin(
+    RNSTabsActionOrigin actionOrigin);
+
+RNSTabsIconType RNSTabsIconTypeFromIcon(react::RNSTabsScreenIOSIconType iconType);
+
+RNSTabsIconImageRenderingMode RNSTabsIconImageRenderingModeFromIconImageRenderingMode(
+    react::RNSTabsScreenIOSIconImageRenderingMode renderingMode);
+
+RNSTabsIconImageRenderingMode RNSTabsIconImageRenderingModeFromSelectedIconImageRenderingMode(
+    react::RNSTabsScreenIOSSelectedIconImageRenderingMode renderingMode);
+
+RNSTabsIconSymbolRenderingMode RNSTabsIconSymbolRenderingModeFromIconSymbolRenderingMode(
+    react::RNSTabsScreenIOSIconSymbolRenderingMode renderingMode);
+
+RNSTabsIconSymbolRenderingMode RNSTabsIconSymbolRenderingModeFromSelectedIconSymbolRenderingMode(
+    react::RNSTabsScreenIOSSelectedIconSymbolRenderingMode renderingMode);
+
+RNSTabsScreenSystemItem RNSTabsScreenSystemItemFromReactRNSTabsScreenSystemItem(
+    react::RNSTabsScreenIOSSystemItem systemItem);
+
+std::optional<UITabBarSystemItem> RNSTabsScreenSystemItemToUITabBarSystemItem(RNSTabsScreenSystemItem systemItem);
+
+RNSTabsScreenTabRole RNSTabsScreenTabRoleFromReactRNSTabsScreenTabRole(react::RNSTabsScreenIOSTabRole tabRole);
+
+#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))
@@ -182,6 +120,28 @@ UITabBarControllerMode UITabBarControllerModeFromRNSTabsHostTabBarControllerMode
 
 #endif // Check for iOS >= 18
 
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(27_0) && !TARGET_OS_TV
+
+API_AVAILABLE(ios(27.0))
+UITabBarControllerSidebarPlacement UITabBarControllerSidebarPlacementFromRNSTabsHostTabBarSidebarPreferredPlacement(
+    react::RNSTabsHostIOSTabBarSidebarPreferredPlacement tabBarSidebarPreferredPlacement)
+{
+  using enum facebook::react::RNSTabsHostIOSTabBarSidebarPreferredPlacement;
+
+  switch (tabBarSidebarPreferredPlacement) {
+    case Automatic:
+      return UITabBarControllerSidebarPlacementAutomatic;
+    case Sidebar:
+      return UITabBarControllerSidebarPlacementSidebar;
+    case TabBar:
+      return UITabBarControllerSidebarPlacementTabBar;
+    default:
+      return UITabBarControllerSidebarPlacementAutomatic;
+  }
+}
+
+#endif // Check for iOS >= 27 && !TARGET_OS_TV
+
 react::RNSTabsHostIOSEventEmitter::OnTabSelectionRejectedRejectionReason
 RNSOnTabSelectionRejectedRejectionReasonFromRNSTabsNavigationStateRejectionReason(
     RNSTabsNavigationStateRejectionReason reason)
@@ -222,8 +182,6 @@ RNSTabsIconType RNSTabsIconTypeFromIcon(react::RNSTabsScreenIOSIconType iconType
   switch (iconType) {
     case Image:
       return RNSTabsIconTypeImage;
-    case Template:
-      return RNSTabsIconTypeTemplate;
     case SfSymbol:
       return RNSTabsIconTypeSfSymbol;
     case Xcasset:
@@ -231,6 +189,66 @@ RNSTabsIconType RNSTabsIconTypeFromIcon(react::RNSTabsScreenIOSIconType iconType
   }
 }
 
+RNSTabsIconImageRenderingMode RNSTabsIconImageRenderingModeFromIconImageRenderingMode(
+    react::RNSTabsScreenIOSIconImageRenderingMode renderingMode)
+{
+  using enum facebook::react::RNSTabsScreenIOSIconImageRenderingMode;
+  switch (renderingMode) {
+    case Template:
+      return RNSTabsIconImageRenderingModeTemplate;
+    case Original:
+      return RNSTabsIconImageRenderingModeOriginal;
+    case Default:
+    default:
+      return RNSTabsIconImageRenderingModeDefault;
+  }
+}
+
+RNSTabsIconImageRenderingMode RNSTabsIconImageRenderingModeFromSelectedIconImageRenderingMode(
+    react::RNSTabsScreenIOSSelectedIconImageRenderingMode renderingMode)
+{
+  using enum facebook::react::RNSTabsScreenIOSSelectedIconImageRenderingMode;
+  switch (renderingMode) {
+    case Template:
+      return RNSTabsIconImageRenderingModeTemplate;
+    case Original:
+      return RNSTabsIconImageRenderingModeOriginal;
+    case Default:
+    default:
+      return RNSTabsIconImageRenderingModeDefault;
+  }
+}
+
+RNSTabsIconSymbolRenderingMode RNSTabsIconSymbolRenderingModeFromIconSymbolRenderingMode(
+    react::RNSTabsScreenIOSIconSymbolRenderingMode renderingMode)
+{
+  using enum facebook::react::RNSTabsScreenIOSIconSymbolRenderingMode;
+  switch (renderingMode) {
+    case Monochrome:
+      return RNSTabsIconSymbolRenderingModeMonochrome;
+    case Original:
+      return RNSTabsIconSymbolRenderingModeOriginal;
+    case Default:
+    default:
+      return RNSTabsIconSymbolRenderingModeDefault;
+  }
+}
+
+RNSTabsIconSymbolRenderingMode RNSTabsIconSymbolRenderingModeFromSelectedIconSymbolRenderingMode(
+    react::RNSTabsScreenIOSSelectedIconSymbolRenderingMode renderingMode)
+{
+  using enum facebook::react::RNSTabsScreenIOSSelectedIconSymbolRenderingMode;
+  switch (renderingMode) {
+    case Monochrome:
+      return RNSTabsIconSymbolRenderingModeMonochrome;
+    case Original:
+      return RNSTabsIconSymbolRenderingModeOriginal;
+    case Default:
+    default:
+      return RNSTabsIconSymbolRenderingModeDefault;
+  }
+}
+
 RCTImageSource *RCTImageSourceFromImageSourceAndIconType(const facebook::react::ImageSource *imageSource,
                                                          RNSTabsIconType iconType)
 {
@@ -242,7 +260,6 @@ RCTImageSource *RCTImageSourceFromImageSourceAndIconType(const facebook::react::
       break;
 
     case RNSTabsIconTypeImage:
-    case RNSTabsIconTypeTemplate:
       iconImageSource =
           [[RCTImageSource alloc] initWithURLRequest:NSURLRequestFromImageSource(*imageSource)
                                                 size:CGSizeMake(imageSource->size.width, imageSource->size.height)
@@ -323,11 +340,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 +370,22 @@ 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;
+}
+
+RNSTabsScreenTabRole RNSTabsScreenTabRoleFromReactRNSTabsScreenTabRole(react::RNSTabsScreenIOSTabRole tabRole)
+{
+  using enum facebook::react::RNSTabsScreenIOSTabRole;
+
+  switch (tabRole) {
+    case None:
+      return RNSTabsScreenTabRoleNone;
+    case Search:
+      return RNSTabsScreenTabRoleSearch;
+    default:
+      RCTLogError(@"[RNScreens] unsupported tabs screen tabRole");
+      return RNSTabsScreenTabRoleNone;
+  }
 }
 
 #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

package/ios/tabs/host/RNSTabBarController.h

@@ -4,6 +4,7 @@
 #import "RNSContainer.h"
 #import "RNSReactMountingTransactionObserving.h"
 #import "RNSTabBarAppearanceCoordinator.h"
+#import "RNSTabBarItemCoordinator.h"
 #import "RNSTabsNavigationState.h"
 #import "RNSTabsScreenViewController.h"
 
@@ -117,6 +118,8 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, readonly, strong, nonnull) RNSTabBarAppearanceCoordinator *tabBarAppearanceCoordinator;
 
+@property (nonatomic, readonly, strong, nonnull) RNSTabBarItemCoordinator *tabBarItemCoordinator;
+
 /**
  * If true, the controller will reject any navigation state updates if the provenance of the
  * update is stale.
@@ -157,6 +160,19 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)setPendingNavigationStateUpdate:(nullable RNSTabsNavigationStateUpdateRequest *)stateUpdate;
 
+/**
+ * Set the React `screenKey` of the tab screen that should receive the prominent treatment
+ * (`UITabBarController.prominentTabIdentifier`, iOS 27+). Pass nil or an empty string to
+ * unset it, letting UIKit decide which tab (if any) is prominent.
+ *
+ * The key is resolved to the backing `UITab` identifier lazily & re-applied after every child
+ * installation, so the call is valid before the children are installed. A key not matching any
+ * tab screen is warned about on the next update flush and behaves like an unset key.
+ *
+ * No-op below iOS 27.
+ */
+- (void)setProminentScreenKey:(nullable NSString *)screenKey;
+
 /**
  * Idempotent teardown. Releases observer references and any retained host references.
  * Called by the host on view lifecycle end.