rename prop in fabric spec/native platform

kligarski · kligarski · commit cffb3735e74b · 2025-11-06T09:34:15.000+01:00
diff --git a/android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderConfigViewManager.kt b/android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderConfigViewManager.kt
@@ -341,10 +341,10 @@ class ScreenStackHeaderConfigViewManager :
         logNotAvailable("headerRightBarButtonItems")
     }
 
-    override fun setExperimental_overrideUserInterfaceStyle(
+    override fun setUserInterfaceStyle(
         view: ScreenStackHeaderConfig?,
         value: String?,
     ) {
-        logNotAvailable("experimental_overrideUserInterfaceStyle")
+        logNotAvailable("userInterfaceStyle")
     }
 }
diff --git a/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/TabScreenViewManager.kt b/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/TabScreenViewManager.kt
@@ -190,7 +190,7 @@ class TabScreenViewManager :
         value: String?,
     ) = Unit
 
-    override fun setExperimental_overrideUserInterfaceStyle(
+    override fun setUserInterfaceStyle(
         view: TabScreen,
         value: String?,
     ) = Unit
diff --git a/android/src/paper/java/com/facebook/react/viewmanagers/RNSBottomTabsScreenManagerDelegate.java b/android/src/paper/java/com/facebook/react/viewmanagers/RNSBottomTabsScreenManagerDelegate.java
@@ -98,8 +98,8 @@ public void setProperty(T view, String propName, @Nullable Object value) {
       case "topScrollEdgeEffect":
         mViewManager.setTopScrollEdgeEffect(view, (String) value);
         break;
-      case "experimental_overrideUserInterfaceStyle":
-        mViewManager.setExperimental_overrideUserInterfaceStyle(view, (String) value);
+      case "userInterfaceStyle":
+        mViewManager.setUserInterfaceStyle(view, (String) value);
         break;
       default:
         super.setProperty(view, propName, value);
diff --git a/android/src/paper/java/com/facebook/react/viewmanagers/RNSBottomTabsScreenManagerInterface.java b/android/src/paper/java/com/facebook/react/viewmanagers/RNSBottomTabsScreenManagerInterface.java
@@ -40,5 +40,5 @@ public interface RNSBottomTabsScreenManagerInterface<T extends View>  {
   void setLeftScrollEdgeEffect(T view, @Nullable String value);
   void setRightScrollEdgeEffect(T view, @Nullable String value);
   void setTopScrollEdgeEffect(T view, @Nullable String value);
-  void setExperimental_overrideUserInterfaceStyle(T view, @Nullable String value);
+  void setUserInterfaceStyle(T view, @Nullable String value);
 }
diff --git a/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenStackHeaderConfigManagerDelegate.java b/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenStackHeaderConfigManagerDelegate.java
@@ -118,8 +118,8 @@ public void setProperty(T view, String propName, @Nullable Object value) {
       case "synchronousShadowStateUpdatesEnabled":
         mViewManager.setSynchronousShadowStateUpdatesEnabled(view, value == null ? false : (boolean) value);
         break;
-      case "experimental_overrideUserInterfaceStyle":
-        mViewManager.setExperimental_overrideUserInterfaceStyle(view, (String) value);
+      case "userInterfaceStyle":
+        mViewManager.setUserInterfaceStyle(view, (String) value);
         break;
       default:
         super.setProperty(view, propName, value);
diff --git a/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenStackHeaderConfigManagerInterface.java b/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenStackHeaderConfigManagerInterface.java
@@ -46,5 +46,5 @@ public interface RNSScreenStackHeaderConfigManagerInterface<T extends View>  {
   void setHeaderLeftBarButtonItems(T view, @Nullable ReadableArray value);
   void setHeaderRightBarButtonItems(T view, @Nullable ReadableArray value);
   void setSynchronousShadowStateUpdatesEnabled(T view, boolean value);
-  void setExperimental_overrideUserInterfaceStyle(T view, @Nullable String value);
+  void setUserInterfaceStyle(T view, @Nullable String value);
 }
diff --git a/ios/RNSConvert.h b/ios/RNSConvert.h
@@ -53,7 +53,7 @@ namespace react = facebook::react;
     (react::RNSSearchBarHideNavigationBar)hideNavigationBar;
 
 + (UIUserInterfaceStyle)UIUserInterfaceStyleFromCppEquivalent:
-    (react::RNSScreenStackHeaderConfigExperimental_overrideUserInterfaceStyle)userInterfaceStyle;
+    (react::RNSScreenStackHeaderConfigUserInterfaceStyle)userInterfaceStyle;
 
 + (NSMutableArray<NSNumber *> *)arrayFromVector:(const std::vector<CGFloat> &)vector;
 
diff --git a/ios/RNSConvert.mm b/ios/RNSConvert.mm
@@ -276,10 +276,10 @@ + (RNSOptionalBoolean)RNSOptionalBooleanFromRNSSearchBarHideNavigationBar:
 }
 
 + (UIUserInterfaceStyle)UIUserInterfaceStyleFromCppEquivalent:
-    (react::RNSScreenStackHeaderConfigExperimental_overrideUserInterfaceStyle)userInterfaceStyle
+    (react::RNSScreenStackHeaderConfigUserInterfaceStyle)userInterfaceStyle
 {
   switch (userInterfaceStyle) {
-    using enum react::RNSScreenStackHeaderConfigExperimental_overrideUserInterfaceStyle;
+    using enum react::RNSScreenStackHeaderConfigUserInterfaceStyle;
 
     case Unspecified:
       return UIUserInterfaceStyleUnspecified;
diff --git a/ios/RNSScreenStackHeaderConfig.mm b/ios/RNSScreenStackHeaderConfig.mm
@@ -1141,10 +1141,8 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
   _backButtonDisplayMode =
       [RNSConvert UINavigationItemBackButtonDisplayModeFromCppEquivalent:newScreenProps.backButtonDisplayMode];
 
-  if (newScreenProps.experimental_overrideUserInterfaceStyle !=
-      oldScreenProps.experimental_overrideUserInterfaceStyle) {
-    _userInterfaceStyle =
-        [RNSConvert UIUserInterfaceStyleFromCppEquivalent:newScreenProps.experimental_overrideUserInterfaceStyle];
+  if (newScreenProps.userInterfaceStyle != oldScreenProps.userInterfaceStyle) {
+    _userInterfaceStyle = [RNSConvert UIUserInterfaceStyleFromCppEquivalent:newScreenProps.userInterfaceStyle];
   }
 
   if (newScreenProps.direction != oldScreenProps.direction) {
@@ -1295,11 +1293,7 @@ - (RCTShadowView *)shadowView
 RCT_EXPORT_VIEW_PROPERTY(backButtonInCustomView, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(disableBackButtonMenu, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(backButtonDisplayMode, UINavigationItemBackButtonDisplayMode)
-RCT_REMAP_VIEW_PROPERTY(
-    experimental_overrideUserInterfaceStyle,
-    userInterfaceStyle,
-    UIUserInterfaceStyle) // `overrideUserInterfaceStyle` is an UIView property, we need to use different name
-                          // internally
+RCT_EXPORT_VIEW_PROPERTY(userInterfaceStyle, UIUserInterfaceStyle)
 RCT_REMAP_VIEW_PROPERTY(hidden, hide, BOOL) // `hidden` is an UIView property, we need to use different name internally
 RCT_EXPORT_VIEW_PROPERTY(translucent, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(headerLeftBarButtonItems, NSArray)
diff --git a/ios/bottom-tabs/RNSBottomTabsScreenComponentView.mm b/ios/bottom-tabs/RNSBottomTabsScreenComponentView.mm
@@ -404,10 +404,9 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props
     scrollEdgeEffectsNeedUpdate = YES;
   }
 
-  if (newComponentProps.experimental_overrideUserInterfaceStyle !=
-      oldComponentProps.experimental_overrideUserInterfaceStyle) {
+  if (newComponentProps.userInterfaceStyle != oldComponentProps.userInterfaceStyle) {
     _userInterfaceStyle = rnscreens::conversion::UIUserInterfaceStyleFromBottomTabsScreenCppEquivalent(
-        newComponentProps.experimental_overrideUserInterfaceStyle);
+        newComponentProps.userInterfaceStyle);
   }
 
   if (tabBarItemNeedsRecreation) {
diff --git a/ios/bottom-tabs/RNSBottomTabsScreenComponentViewManager.mm b/ios/bottom-tabs/RNSBottomTabsScreenComponentViewManager.mm
@@ -43,11 +43,7 @@ - (UIView *)view
 RCT_EXPORT_VIEW_PROPERTY(rightScrollEdgeEffect, RNSScrollEdgeEffect);
 RCT_EXPORT_VIEW_PROPERTY(topScrollEdgeEffect, RNSScrollEdgeEffect);
 
-RCT_REMAP_VIEW_PROPERTY(
-    experimental_overrideUserInterfaceStyle,
-    userInterfaceStyle,
-    UIUserInterfaceStyle) // `overrideUserInterfaceStyle` is an UIView property, we need to use different name
-                          // internally
+RCT_EXPORT_VIEW_PROPERTY(userInterfaceStyle, UIUserInterfaceStyle);
 
 RCT_EXPORT_VIEW_PROPERTY(systemItem, RNSBottomTabsScreenSystemItem);
 
diff --git a/ios/conversion/RNSConversions-BottomTabs.mm b/ios/conversion/RNSConversions-BottomTabs.mm
@@ -401,9 +401,9 @@ RNSScrollEdgeEffect RNSBottomTabsScrollEdgeEffectFromBottomTabsScreenTopScrollEd
 #undef SWITCH_EDGE_EFFECT
 
 UIUserInterfaceStyle UIUserInterfaceStyleFromBottomTabsScreenCppEquivalent(
-    react::RNSBottomTabsScreenExperimental_overrideUserInterfaceStyle userInterfaceStyle)
+    react::RNSBottomTabsScreenUserInterfaceStyle userInterfaceStyle)
 {
-  using enum facebook::react::RNSBottomTabsScreenExperimental_overrideUserInterfaceStyle;
+  using enum facebook::react::RNSBottomTabsScreenUserInterfaceStyle;
   switch (userInterfaceStyle) {
     case Unspecified:
       return UIUserInterfaceStyleUnspecified;
diff --git a/ios/conversion/RNSConversions.h b/ios/conversion/RNSConversions.h
@@ -73,7 +73,7 @@ RNSScrollEdgeEffect RNSBottomTabsScrollEdgeEffectFromBottomTabsScreenTopScrollEd
     react::RNSBottomTabsScreenTopScrollEdgeEffect edgeEffect);
 
 UIUserInterfaceStyle UIUserInterfaceStyleFromBottomTabsScreenCppEquivalent(
-    react::RNSBottomTabsScreenExperimental_overrideUserInterfaceStyle userInterfaceStyle);
+    react::RNSBottomTabsScreenUserInterfaceStyle userInterfaceStyle);
 
 RCTImageSource *RCTImageSourceFromImageSourceAndIconType(
     const facebook::react::ImageSource *imageSource,
diff --git a/src/components/ScreenStackHeaderConfig.tsx b/src/components/ScreenStackHeaderConfig.tsx
@@ -112,6 +112,7 @@ export const ScreenStackHeaderConfig = React.forwardRef<
   return (
     <ScreenStackHeaderConfigNativeComponent
       {...props}
+      userInterfaceStyle={props.experimental_overrideUserInterfaceStyle}
       headerLeftBarButtonItems={preparedHeaderLeftBarButtonItems}
       headerRightBarButtonItems={preparedHeaderRightBarButtonItems}
       onPressHeaderBarButtonItem={onPressHeaderBarButtonItem}
diff --git a/src/components/bottom-tabs/BottomTabsScreen.tsx b/src/components/bottom-tabs/BottomTabsScreen.tsx
@@ -65,6 +65,8 @@ function BottomTabsScreen(props: BottomTabsScreenProps) {
     standardAppearance,
     scrollEdgeAppearance,
     scrollEdgeEffects,
+    // eslint-disable-next-line camelcase -- we use sneak case experimental prefix
+    experimental_overrideUserInterfaceStyle,
     ...rest
   } = props;
 
@@ -143,6 +145,8 @@ function BottomTabsScreen(props: BottomTabsScreenProps) {
       rightScrollEdgeEffect={scrollEdgeEffects?.right}
       topScrollEdgeEffect={scrollEdgeEffects?.top}
       isTitleUndefined={rest.title === null || rest.title === undefined}
+      // eslint-disable-next-line camelcase -- we use sneak case experimental prefix
+      userInterfaceStyle={experimental_overrideUserInterfaceStyle}
       {...rest}>
       <Freeze freeze={shouldFreeze} placeholder={rest.placeholder}>
         {rest.children}
diff --git a/src/fabric/ScreenStackHeaderConfigNativeComponent.ts b/src/fabric/ScreenStackHeaderConfigNativeComponent.ts
@@ -84,10 +84,7 @@ export interface NativeProps extends ViewProps {
   onPressHeaderBarButtonItem?: DirectEventHandler<OnPressHeaderBarButtonItemEvent>;
   onPressHeaderBarButtonMenuItem?: DirectEventHandler<OnPressHeaderBarButtonMenuItemEvent>;
   synchronousShadowStateUpdatesEnabled?: WithDefault<boolean, false>;
-  experimental_overrideUserInterfaceStyle?: WithDefault<
-    UserInterfaceStyle,
-    'unspecified'
-  >;
+  userInterfaceStyle?: WithDefault<UserInterfaceStyle, 'unspecified'>;
 }
 
 export default codegenNativeComponent<NativeProps>(
diff --git a/src/fabric/bottom-tabs/BottomTabsScreenNativeComponent.ts b/src/fabric/bottom-tabs/BottomTabsScreenNativeComponent.ts
@@ -167,10 +167,7 @@ export interface NativeProps extends ViewProps {
   rightScrollEdgeEffect?: WithDefault<ScrollEdgeEffect, 'automatic'>;
   topScrollEdgeEffect?: WithDefault<ScrollEdgeEffect, 'automatic'>;
 
-  experimental_overrideUserInterfaceStyle?: WithDefault<
-    UserInterfaceStyle,
-    'unspecified'
-  >;
+  userInterfaceStyle?: WithDefault<UserInterfaceStyle, 'unspecified'>;
 }
 
 export default codegenNativeComponent<NativeProps>('RNSBottomTabsScreen', {});

Original file line number	Diff line number	Diff line change
`@@ -341,10 +341,10 @@ class ScreenStackHeaderConfigViewManager :`
`341`	`341`	`logNotAvailable("headerRightBarButtonItems")`
`342`	`342`	`}`
`343`	`343`
`344`		`- override fun setExperimental_overrideUserInterfaceStyle(`
	`344`	`+ override fun setUserInterfaceStyle(`
`345`	`345`	`view: ScreenStackHeaderConfig?,`
`346`	`346`	`value: String?,`
`347`	`347`	`) {`
`348`		`- logNotAvailable("experimental_overrideUserInterfaceStyle")`
	`348`	`+ logNotAvailable("userInterfaceStyle")`
`349`	`349`	`}`
`350`	`350`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,5 +40,5 @@ public interface RNSBottomTabsScreenManagerInterface<T extends View> {`
`40`	`40`	`void setLeftScrollEdgeEffect(T view, @Nullable String value);`
`41`	`41`	`void setRightScrollEdgeEffect(T view, @Nullable String value);`
`42`	`42`	`void setTopScrollEdgeEffect(T view, @Nullable String value);`
`43`		`- void setExperimental_overrideUserInterfaceStyle(T view, @Nullable String value);`
	`43`	`+ void setUserInterfaceStyle(T view, @Nullable String value);`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,5 +46,5 @@ public interface RNSScreenStackHeaderConfigManagerInterface<T extends View> {`
`46`	`46`	`void setHeaderLeftBarButtonItems(T view, @Nullable ReadableArray value);`
`47`	`47`	`void setHeaderRightBarButtonItems(T view, @Nullable ReadableArray value);`
`48`	`48`	`void setSynchronousShadowStateUpdatesEnabled(T view, boolean value);`
`49`		`- void setExperimental_overrideUserInterfaceStyle(T view, @Nullable String value);`
	`49`	`+ void setUserInterfaceStyle(T view, @Nullable String value);`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -276,10 +276,10 @@ + (RNSOptionalBoolean)RNSOptionalBooleanFromRNSSearchBarHideNavigationBar:`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`+ (UIUserInterfaceStyle)UIUserInterfaceStyleFromCppEquivalent:`
`279`		`- (react::RNSScreenStackHeaderConfigExperimental_overrideUserInterfaceStyle)userInterfaceStyle`
	`279`	`+ (react::RNSScreenStackHeaderConfigUserInterfaceStyle)userInterfaceStyle`
`280`	`280`	`{`
`281`	`281`	`switch (userInterfaceStyle) {`
`282`		`- using enum react::RNSScreenStackHeaderConfigExperimental_overrideUserInterfaceStyle;`
	`282`	`+ using enum react::RNSScreenStackHeaderConfigUserInterfaceStyle;`
`283`	`283`
`284`	`284`	`case Unspecified:`
`285`	`285`	`return UIUserInterfaceStyleUnspecified;`
Original file line number	Diff line number	Diff line change
`@@ -404,10 +404,9 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props`
`404`	`404`	`scrollEdgeEffectsNeedUpdate = YES;`
`405`	`405`	`}`
`406`	`406`
`407`		`- if (newComponentProps.experimental_overrideUserInterfaceStyle !=`
`408`		`- oldComponentProps.experimental_overrideUserInterfaceStyle) {`
	`407`	`+ if (newComponentProps.userInterfaceStyle != oldComponentProps.userInterfaceStyle) {`
`409`	`408`	`_userInterfaceStyle = rnscreens::conversion::UIUserInterfaceStyleFromBottomTabsScreenCppEquivalent(`
`410`		`- newComponentProps.experimental_overrideUserInterfaceStyle);`
	`409`	`+ newComponentProps.userInterfaceStyle);`
`411`	`410`	`}`
`412`	`411`
`413`	`412`	`if (tabBarItemNeedsRecreation) {`