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

package/ios/stack/header/RNSStackHeaderConfigComponentView.mm

@@ -1,6 +1,8 @@
 #import "RNSStackHeaderConfigComponentView.h"
+#import "RNSConversions-Stack.h"
 #import "RNSConversions.h"
 #import "RNSImageLoadingHelper.h"
+#import "RNSStackHeaderAppearanceMapper.h"
 #import "RNSStackHeaderConfigEventEmitter.h"
 #import "RNSStackHeaderConfigShadowStateProxy.h"
 #import "RNSStackHeaderItemComponentView.h"
@@ -12,7 +14,6 @@
 #import "RNSStackNavigationController.h"
 #import "RNSStackScreenComponentView.h"
 #import "RNSStackScreenController.h"
-#import "RNSStackScreenHeaderCoordinator.h"
 
 #import <React/RCTConversions.h>
 #import <React/RCTConvert.h>
@@ -20,8 +21,8 @@
 #import <React/RCTLog.h>
 #import <react/renderer/components/rnscreens/Props.h>
 #import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
+#import <react/renderer/components/rnscreens/RNSStackHeaderConfigComponentDescriptor.h>
 #import <react/utils/ManagedObjectWrapper.h>
-#import <rnscreens/RNSStackHeaderConfigComponentDescriptor.h>
 
 namespace react = facebook::react;
 
@@ -67,7 +68,19 @@ static void RNSAssertIsValidHeaderChild(UIView *child)
   _largeTitle = nil;
   _largeSubtitle = nil;
   _largeTitleEnabled = NO;
+  _prompt = nil;
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(27_0)
+  if (@available(iOS 27.0, *)) {
+    _minimizationBehavior = UIBarMinimizationBehaviorAutomatic;
+    _restorationBehavior = UIBarMinimizationRestorationBehaviorAutomatic;
+  }
+#endif // Check for iOS >= 27
+  _backButtonTitle = nil;
+  _backButtonDisplayMode = UINavigationItemBackButtonDisplayModeDefault;
+  _backButtonMenuEnabled = YES;
   _titleMenu = nil;
+  _standardAppearance = nil;
+  _scrollEdgeAppearance = nil;
 }
 
 - (NSArray<id> *)children
@@ -123,18 +136,7 @@ static void RNSAssertIsValidHeaderChild(UIView *child)
 {
   if (self.window != nil) {
     [[self requireNavigationController] setNavigationBarFrameChangeDelegate:self];
-    RNSStackScreenHeaderCoordinator *coordinator = [self headerCoordinator];
-    coordinator.configDataProvider = self;
-    coordinator.frameChangeDelegate = self;
-    coordinator.eventsDelegate = self;
-    coordinator.imageLoader = self;
-    [coordinator rebuild];
-  } else {
-    RNSStackScreenHeaderCoordinator *coordinator = [self headerCoordinator];
-    coordinator.configDataProvider = nil;
-    coordinator.frameChangeDelegate = nil;
-    coordinator.eventsDelegate = nil;
-    coordinator.imageLoader = nil;
+    [self.headerCoordinator rebuild];
   }
   [super didMoveToWindow];
 }
@@ -155,7 +157,7 @@ static void RNSAssertIsValidHeaderChild(UIView *child)
     ((RNSStackHeaderItemSpacerComponentView *)childComponentView).invalidationDelegate = self;
   }
 
-  [[self headerCoordinator] rebuild];
+  [self.headerCoordinator rebuild];
 }
 
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
@@ -169,7 +171,7 @@ static void RNSAssertIsValidHeaderChild(UIView *child)
   }
 
   [_children removeObjectAtIndex:index];
-  [[self headerCoordinator] rebuild];
+  [self.headerCoordinator rebuild];
 }
 
 #pragma mark - RNSStackHeaderItemInvalidationDelegate
@@ -178,22 +180,21 @@ static void RNSAssertIsValidHeaderChild(UIView *child)
 {
   if (itemId == nil) {
     RCTLogWarn(@"[RNScreens] headerItemDidInvalidateWithId called with nil id, will run full header rebuild");
-    [[self headerCoordinator] rebuild];
+    [self.headerCoordinator rebuild];
     return;
   }
-  [[self headerCoordinator] rebuildItemWithId:itemId];
+  [self.headerCoordinator rebuildItemWithId:itemId];
 }
 
 - (void)headerItemMenuDidChangeWithId:(NSString *)itemId
 {
   if (itemId == nil) {
     RCTLogWarn(@"[RNScreens] headerItemMenuDidChangeWithId called with nil id, will run full header rebuild");
-    [[self headerCoordinator] rebuild];
+    [self.headerCoordinator rebuild];
     return;
   }
-  RNSStackScreenHeaderCoordinator *coordinator = [self headerCoordinator];
-  [coordinator resetTrackerForItemWithId:itemId];
-  [coordinator reapplyMenuForItemWithId:itemId];
+  [self.headerCoordinator resetTrackerForItemWithId:itemId];
+  [self.headerCoordinator reapplyMenuForItemWithId:itemId];
 }
 
 /**
@@ -204,15 +205,15 @@ static void RNSAssertIsValidHeaderChild(UIView *child)
   if (itemId == nil) {
     RCTLogWarn(
         @"[RNScreens] headerItemMenuDidUpdateFromCommandWithId called with nil id, will run full header rebuild");
-    [[self headerCoordinator] rebuild];
+    [self.headerCoordinator rebuild];
     return;
   }
-  [[self headerCoordinator] reapplyMenuForItemWithId:itemId];
+  [self.headerCoordinator reapplyMenuForItemWithId:itemId];
 }
 
 - (void)headerItemSpacerDidInvalidate
 {
-  [[self headerCoordinator] rebuild];
+  [self.headerCoordinator rebuild];
 }
 
 #pragma mark - RNSStackHeaderEventsDelegate
@@ -295,11 +296,11 @@ static void RNSAssertIsValidHeaderChild(UIView *child)
         (oldItemData.itemType == RNSMenuItemTypeAutomatic &&
          [RNSStackHeaderMenuFinder singleSelectionRootForElementWithId:menuItemId inMenu:locator.rootMenu] != nil);
     if (isToggle) {
-      [[self headerCoordinator] setToggleState:updateOptions.toggleState
-                              forMenuElementId:menuItemId
-                                 trackerItemId:locator.trackerItemId
-                                      rootMenu:locator.rootMenu
-                                    parentMenu:locator.searchResult.parentMenu];
+      [self.headerCoordinator setToggleState:updateOptions.toggleState
+                            forMenuElementId:menuItemId
+                               trackerItemId:locator.trackerItemId
+                                    rootMenu:locator.rootMenu
+                                  parentMenu:locator.searchResult.parentMenu];
     }
   }
 
@@ -310,7 +311,8 @@ static void RNSAssertIsValidHeaderChild(UIView *child)
       [static_cast<RNSStackHeaderItemComponentView *>(locator.headerItem)
           updateMenuElementWithId:menuItemId
                       withElement:newItemData
-                       parentMenu:locator.searchResult.parentMenu];
+                       parentMenu:locator.searchResult.parentMenu
+             inMenuRepresentation:locator.inMenuRepresentation];
       break;
     case RNSMenuElementPositionTitle:
       if (locator.searchResult.parentMenu != nil) {
@@ -318,7 +320,7 @@ static void RNSAssertIsValidHeaderChild(UIView *child)
                                     replacingChildWithId:menuItemId
                                              withElement:newItemData];
       }
-      [[self headerCoordinator] reapplyTitleMenu];
+      [self.headerCoordinator reapplyTitleMenu];
       break;
     case RNSMenuElementPositionOverflow:
       // TODO: handle overflow menu
@@ -356,7 +358,8 @@ static void RNSAssertIsValidHeaderChild(UIView *child)
       [static_cast<RNSStackHeaderItemComponentView *>(locator.headerItem)
           updateMenuElementWithId:menuElementId
                       withElement:newMenuItem
-                       parentMenu:locator.searchResult.parentMenu];
+                       parentMenu:locator.searchResult.parentMenu
+             inMenuRepresentation:locator.inMenuRepresentation];
       break;
     case RNSMenuElementPositionTitle:
       if (locator.searchResult.parentMenu == nil) {
@@ -366,7 +369,7 @@ static void RNSAssertIsValidHeaderChild(UIView *child)
                                     replacingChildWithId:menuElementId
                                              withElement:newMenuItem];
       }
-      [[self headerCoordinator] reapplyTitleMenu];
+      [self.headerCoordinator reapplyTitleMenu];
       break;
     case RNSMenuElementPositionOverflow:
       // TODO: handle overflow menu
@@ -444,6 +447,60 @@ static void RNSAssertIsValidHeaderChild(UIView *child)
     _largeTitleEnabled = newHeaderProps.largeTitleEnabled;
   }
 
+  if (oldHeaderProps.prompt != newHeaderProps.prompt) {
+    _prompt = RCTNSStringFromStringNilIfEmpty(newHeaderProps.prompt);
+  }
+
+  if (oldHeaderProps.minimizationBehavior != newHeaderProps.minimizationBehavior) {
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(27_0)
+    if (@available(iOS 27.0, *)) {
+      _minimizationBehavior =
+          rnscreens::conversion::UIBarMinimizationBehaviorFromReactRNSStackHeaderConfigIOSMinimizationBehavior(
+              newHeaderProps.minimizationBehavior);
+    } else
+#endif // Check for iOS >= 27
+      if (newHeaderProps.minimizationBehavior != react::RNSStackHeaderConfigIOSMinimizationBehavior::Automatic) {
+        RCTLogWarn(@"[RNScreens] minimizationBehavior is supported for iOS >= 27");
+      }
+  }
+
+  if (oldHeaderProps.restorationBehavior != newHeaderProps.restorationBehavior) {
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(27_0)
+    if (@available(iOS 27.0, *)) {
+      _restorationBehavior = rnscreens::conversion::
+          UIBarMinimizationRestorationBehaviorFromReactRNSStackHeaderConfigIOSRestorationBehavior(
+              newHeaderProps.restorationBehavior);
+    } else
+#endif // Check for iOS >= 27
+      if (newHeaderProps.restorationBehavior != react::RNSStackHeaderConfigIOSRestorationBehavior::Automatic) {
+        RCTLogWarn(@"[RNScreens] restorationBehavior is supported for iOS >= 27");
+      }
+  }
+
+  if (oldHeaderProps.backButtonTitle != newHeaderProps.backButtonTitle) {
+    _backButtonTitle = RCTNSStringFromStringNilIfEmpty(newHeaderProps.backButtonTitle);
+  }
+
+  if (oldHeaderProps.backButtonDisplayMode != newHeaderProps.backButtonDisplayMode) {
+    _backButtonDisplayMode = rnscreens::conversion::
+        UINavigationItemBackButtonDisplayModeFromReactRNSStackHeaderConfigIOSBackButtonDisplayMode(
+            newHeaderProps.backButtonDisplayMode);
+  }
+
+  if (oldHeaderProps.backButtonMenuEnabled != newHeaderProps.backButtonMenuEnabled) {
+    _backButtonMenuEnabled = newHeaderProps.backButtonMenuEnabled;
+  }
+
+  if (oldHeaderProps.standardAppearance != newHeaderProps.standardAppearance) {
+    _standardAppearance = [RNSStackHeaderAppearanceMapper
+        appearanceFromDictionary:[self dictionaryFromAppearanceProp:newHeaderProps.standardAppearance]];
+  }
+
+  if (oldHeaderProps.scrollEdgeAppearance != newHeaderProps.scrollEdgeAppearance) {
+    _scrollEdgeAppearance = [RNSStackHeaderAppearanceMapper
+        scrollEdgeAppearanceFromDictionary:[self dictionaryFromAppearanceProp:newHeaderProps.scrollEdgeAppearance]];
+  }
+
   if (oldHeaderProps.titleMenu != newHeaderProps.titleMenu) {
     _titleMenu = [RNSStackHeaderMenuMapper
         menuFromDictionary:rnscreens::conversion::RNSConvertFollyDynamicToId(newHeaderProps.titleMenu)];
@@ -452,14 +509,14 @@ static void RNSAssertIsValidHeaderChild(UIView *child)
 
   [super updateProps:props oldProps:oldProps];
 
-  [[self headerCoordinator] applyConfigProperties];
+  [self.headerCoordinator applyConfigProperties];
 
   if (titleMenuDidChange) {
     // title menu is a prop on the navigation item, not on one of the bar button items
     // thus it is not configured with matching RNSStackHeaderItemComponentView
     // but here directly
-    [[self headerCoordinator] resetTitleMenuTracker];
-    [[self headerCoordinator] reapplyTitleMenu];
+    [self.headerCoordinator resetTitleMenuTracker];
+    [self.headerCoordinator reapplyTitleMenu];
   }
 }
 
@@ -482,6 +539,15 @@ static void RNSAssertIsValidHeaderChild(UIView *child)
 
 #pragma mark - Private
 
+- (nullable NSDictionary *)dictionaryFromAppearanceProp:(const folly::dynamic &)appearanceProp
+{
+  if (appearanceProp.type() != folly::dynamic::OBJECT) {
+    return nil;
+  }
+
+  return rnscreens::conversion::RNSConvertFollyDynamicToId(appearanceProp);
+}
+
 - (nullable RNSStackScreenHeaderCoordinator *)headerCoordinator
 {
   if (self.superview == nil) {

package/ios/stack/header/RNSStackHeaderConfigDataProviding.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #import <UIKit/UIKit.h>
+#import "RNSDefines.h"
 
 @class RNSStackHeaderMenuData;
 
@@ -14,7 +15,17 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, readonly, nullable) NSString *largeTitle;
 @property (nonatomic, readonly, nullable) NSString *largeSubtitle;
 @property (nonatomic, readonly) BOOL largeTitleEnabled;
+@property (nonatomic, readonly, nullable) NSString *prompt;
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(27_0)
+@property (nonatomic, readonly) UIBarMinimizationBehavior minimizationBehavior API_AVAILABLE(ios(27.0));
+@property (nonatomic, readonly) UIBarMinimizationRestorationBehavior restorationBehavior API_AVAILABLE(ios(27.0));
+#endif // Check for iOS >= 27
+@property (nonatomic, readonly, nullable) NSString *backButtonTitle;
+@property (nonatomic, readonly) UINavigationItemBackButtonDisplayMode backButtonDisplayMode;
+@property (nonatomic, readonly) BOOL backButtonMenuEnabled;
 @property (nonatomic, readonly, nullable) RNSStackHeaderMenuData *titleMenu;
+@property (nonatomic, readonly, nullable) UINavigationBarAppearance *standardAppearance;
+@property (nonatomic, readonly, nullable) UINavigationBarAppearance *scrollEdgeAppearance;
 
 /**
  Children are expected to conform to either RNSStackHeaderItemDataProviding

package/ios/stack/header/RNSStackHeaderConfigShadowStateProxy.mm

@@ -2,7 +2,7 @@
 #import "RNSStackHeaderConfigComponentView.h"
 
 #import <React/RCTConversions.h>
-#import <rnscreens/RNSStackHeaderConfigComponentDescriptor.h>
+#import <react/renderer/components/rnscreens/RNSStackHeaderConfigComponentDescriptor.h>
 
 namespace react = facebook::react;
 

package/ios/stack/header/RNSStackHeaderContentFactory.mm

@@ -51,6 +51,9 @@
                                                     action:nil];
   }
 
+  barButtonItem.style = item.style;
+  barButtonItem.enabled = !item.disabled;
+
   if (item.icon != nil) {
     __weak UIBarButtonItem *weakBarButtonItem = barButtonItem;
     UIImage *syncImage = [RNSStackHeaderIconResolver resolveIcon:item.icon

package/ios/stack/header/RNSStackHeaderIconResolver.mm

@@ -1,4 +1,5 @@
 #import "RNSStackHeaderIconResolver.h"
+#import <React/RCTLog.h>
 
 @implementation RNSStackHeaderIconResolver
 
@@ -18,11 +19,17 @@
   switch (iconData.iconType) {
     case RNSStackHeaderIconTypeSfSymbol: {
       UIImage *image = [UIImage systemImageNamed:iconData.resourceName];
+      if (image == nil && iconData.resourceName != nil) {
+        RCTLogWarn(@"[RNScreens] Failed to load SF Symbol \"%@\" for header icon", iconData.resourceName);
+      }
       iconData.resolvedImage = image;
       return image;
     }
     case RNSStackHeaderIconTypeXcasset: {
       UIImage *image = [UIImage imageNamed:iconData.resourceName];
+      if (image == nil && iconData.resourceName != nil) {
+        RCTLogWarn(@"[RNScreens] Failed to load xcasset \"%@\" for header icon", iconData.resourceName);
+      }
       iconData.resolvedImage = image;
       return image;
     }

package/ios/stack/header/RNSStackHeaderItemComponentView.h

@@ -12,27 +12,36 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, readonly) RNSHeaderItemPlacement placement;
 @property (nonatomic, readonly, nullable) NSString *itemId;
+@property (nonatomic, readonly, nullable) NSString *identifier;
 @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;
 
 @property (nonatomic, nullable) NSString *titleProp;
 @property (nonatomic, nullable) RNSStackHeaderIconData *iconProp;
 @property (nonatomic, nullable) RNSStackHeaderMenuData *menuProp;
+@property (nonatomic, nullable) RNSStackHeaderMenuData *menuRepresentationProp;
 
 @property (nonatomic, weak, nullable) id<RNSStackHeaderItemInvalidationDelegate> invalidationDelegate;
 
 - (void)emitOnPress;
 
 /**
- * Replaces a menu element in the item's menu tree with a new element constructed from command options.
+ * Replaces a menu element in the item's menu or menuRepresentation tree with a new element
+ * constructed from command options.
  * If parentMenu is nil, the element is the root menu and is replaced directly.
  */
 - (void)updateMenuElementWithId:(NSString *)elementId
                     withElement:(id<RNSStackHeaderMenuElement>)newElement
-                     parentMenu:(nullable RNSStackHeaderMenuData *)parentMenu;
+                     parentMenu:(nullable RNSStackHeaderMenuData *)parentMenu
+           inMenuRepresentation:(BOOL)inMenuRepresentation;
 
 @end
 
@@ -42,7 +51,7 @@ NS_ASSUME_NONNULL_END
 
 #if defined(__cplusplus)
 
-#import <rnscreens/RNSStackHeaderItemComponentDescriptor.h>
+#import <react/renderer/components/rnscreens/RNSStackHeaderItemComponentDescriptor.h>
 
 @interface RNSStackHeaderItemComponentView ()
 

package/ios/stack/header/RNSStackHeaderItemComponentView.mm

@@ -13,7 +13,7 @@
 #import <React/RCTLog.h>
 #import <react/renderer/components/rnscreens/Props.h>
 #import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
-#import <rnscreens/RNSStackHeaderItemComponentDescriptor.h>
+#import <react/renderer/components/rnscreens/RNSStackHeaderItemComponentDescriptor.h>
 
 namespace react = facebook::react;
 
@@ -45,12 +45,18 @@ namespace react = facebook::react;
 - (void)resetProps
 {
   _itemId = nil;
+  _identifier = nil;
   [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
@@ -71,6 +77,12 @@ namespace react = facebook::react;
   _menu = menuProp;
 }
 
+- (void)setMenuRepresentationProp:(RNSStackHeaderMenuData *)menuRepresentationProp
+{
+  _menuRepresentationProp = menuRepresentationProp;
+  _menuRepresentation = menuRepresentationProp;
+}
+
 - (void)emitOnPress
 {
   [_headerItemEventEmitter emitOnPress];
@@ -79,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];
 }
@@ -183,11 +206,17 @@ RNS_IGNORE_SUPER_CALL_END
     _itemId = RCTNSStringFromStringNilIfEmpty(newItemProps.itemId);
   }
 
+  if (oldItemProps.identifier != newItemProps.identifier) {
+    _identifier = RCTNSStringFromStringNilIfEmpty(newItemProps.identifier);
+    needsUpdate = YES;
+  }
+
   if (oldItemProps.placement != newItemProps.placement) {
     if (_didSetHeaderItemPlacement) {
       RCTLogWarn(@"[RNScreens] Changing header item placement at runtime is not supported");
     } else {
-      _placement = rnscreens::conversion::convert<RNSHeaderItemPlacement>(newItemProps.placement);
+      _placement =
+          rnscreens::conversion::RNSHeaderItemPlacementFromReactRNSStackHeaderItemIOSPlacement(newItemProps.placement);
     }
   }
   _didSetHeaderItemPlacement = YES;
@@ -209,11 +238,49 @@ 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;
   }
 
+  if (oldItemProps.hidesSharedBackground != newItemProps.hidesSharedBackground) {
+    _hidesSharedBackground = newItemProps.hidesSharedBackground;
+    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"
 
@@ -12,11 +13,17 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, readonly) RNSHeaderItemPlacement placement;
 @property (nonatomic, readonly, nullable) NSString *itemId;
+@property (nonatomic, readonly, nullable) NSString *identifier;
 @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/RNSStackHeaderItemShadowStateProxy.mm

@@ -2,7 +2,7 @@
 #import "RNSStackHeaderItemComponentView.h"
 
 #import <React/RCTConversions.h>
-#import <rnscreens/RNSStackHeaderItemComponentDescriptor.h>
+#import <react/renderer/components/rnscreens/RNSStackHeaderItemComponentDescriptor.h>
 
 namespace react = facebook::react;
 

package/ios/stack/header/RNSStackHeaderItemSpacerComponentView.mm

@@ -43,7 +43,8 @@ namespace react = facebook::react;
     if (_didSetHeaderItemSpacerPlacement) {
       RCTLogWarn(@"[RNScreens] Changing header item spacer placement at runtime is not supported");
     } else {
-      _placement = rnscreens::conversion::convert<RNSHeaderItemSpacerPlacement>(newSpacerProps.placement);
+      _placement = rnscreens::conversion::RNSHeaderItemSpacerPlacementFromReactRNSStackHeaderItemSpacerIOSPlacement(
+          newSpacerProps.placement);
     }
   }
   _didSetHeaderItemSpacerPlacement = YES;

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