diff --git a/ios/RNSEnums.h b/ios/RNSEnums.h index 02d7cc227d..b7a66ef449 100644 --- a/ios/RNSEnums.h +++ b/ios/RNSEnums.h @@ -184,5 +184,6 @@ typedef NS_ENUM(NSInteger, RNSOptionalBoolean) { typedef NS_ENUM(NSInteger, RNSBottomTabsAccessoryEnvironment) { RNSBottomTabsAccessoryEnvironmentRegular, - RNSBottomTabsAccessoryEnvironmentInline + RNSBottomTabsAccessoryEnvironmentInline, + RNSBottomTabsAccessoryEnvironmentNone }; diff --git a/ios/conversion/RNSConversions-BottomTabs.mm b/ios/conversion/RNSConversions-BottomTabs.mm index 063b01cd7c..4663d991d5 100644 --- a/ios/conversion/RNSConversions-BottomTabs.mm +++ b/ios/conversion/RNSConversions-BottomTabs.mm @@ -413,6 +413,8 @@ RNSScrollEdgeEffect RNSBottomTabsScrollEdgeEffectFromBottomTabsScreenTopScrollEd return react::RNSBottomTabsAccessoryEventEmitter::OnEnvironmentChangeEnvironment::Regular; case UITabAccessoryEnvironmentInline: return react::RNSBottomTabsAccessoryEventEmitter::OnEnvironmentChangeEnvironment::Inline; + case UITabAccessoryEnvironmentNone: + return react::RNSBottomTabsAccessoryEventEmitter::OnEnvironmentChangeEnvironment::None; default: RCTLogError(@"[RNScreens] Unsupported environment for onEnvironmentChange event"); return react::RNSBottomTabsAccessoryEventEmitter::OnEnvironmentChangeEnvironment::Regular; @@ -432,6 +434,9 @@ RNSBottomTabsAccessoryEnvironment RNSBottomTabsAccessoryEnvironmentFromCppEquiva case Inline: return RNSBottomTabsAccessoryEnvironmentInline; + case None: + return RNSBottomTabsAccessoryEnvironmentNone; + default: RCTLogError(@"[RNScreens] Unsupported BottomTabsAccessory environment"); } diff --git a/src/components/bottom-tabs/BottomTabsAccessory.types.ts b/src/components/bottom-tabs/BottomTabsAccessory.types.ts index c05dfdfa20..a8ce58a930 100644 --- a/src/components/bottom-tabs/BottomTabsAccessory.types.ts +++ b/src/components/bottom-tabs/BottomTabsAccessory.types.ts @@ -1,6 +1,6 @@ import { NativeSyntheticEvent, ViewProps } from 'react-native'; -export type BottomTabsAccessoryEnvironment = 'regular' | 'inline'; +export type BottomTabsAccessoryEnvironment = 'regular' | 'inline' | 'none'; export type EnvironmentChangeEvent = { environment: BottomTabsAccessoryEnvironment; diff --git a/src/fabric/bottom-tabs/BottomTabsAccessoryContentNativeComponent.ts b/src/fabric/bottom-tabs/BottomTabsAccessoryContentNativeComponent.ts index 1952661b7d..2201618152 100644 --- a/src/fabric/bottom-tabs/BottomTabsAccessoryContentNativeComponent.ts +++ b/src/fabric/bottom-tabs/BottomTabsAccessoryContentNativeComponent.ts @@ -5,7 +5,7 @@ import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNati import type { ViewProps } from 'react-native'; import { WithDefault } from 'react-native/Libraries/Types/CodegenTypes'; -type BottomAccessoryEnvironment = 'regular' | 'inline'; +type BottomAccessoryEnvironment = 'regular' | 'inline' | 'none'; export interface NativeProps extends ViewProps { environment?: WithDefault; diff --git a/src/fabric/bottom-tabs/BottomTabsAccessoryNativeComponent.ts b/src/fabric/bottom-tabs/BottomTabsAccessoryNativeComponent.ts index 3088542e7d..a516602224 100644 --- a/src/fabric/bottom-tabs/BottomTabsAccessoryNativeComponent.ts +++ b/src/fabric/bottom-tabs/BottomTabsAccessoryNativeComponent.ts @@ -6,7 +6,7 @@ import type { ViewProps } from 'react-native'; import { DirectEventHandler } from 'react-native/Libraries/Types/CodegenTypes'; type EnvironmentChangeEvent = { - environment: 'regular' | 'inline'; + environment: 'regular' | 'inline' | 'none'; }; export interface NativeProps extends ViewProps {