diff --git a/apps/src/tests/Test3236.tsx b/apps/src/tests/Test3236.tsx index c59c584722..59019322d2 100644 --- a/apps/src/tests/Test3236.tsx +++ b/apps/src/tests/Test3236.tsx @@ -26,14 +26,14 @@ function makeTab( title={`Change mode (currently ${controllerMode})`} onPress={() => { switch (controllerMode) { - case 'automatic': + case 'auto': setControllerMode('tabBar'); break; case 'tabBar': setControllerMode('tabSidebar'); break; default: - setControllerMode('automatic'); + setControllerMode('auto'); break; } }} @@ -49,7 +49,7 @@ function App() { ); const [controllerMode, setControllerMode] = - useState('automatic'); + useState('auto'); const TAB_CONFIGS: TabConfiguration[] = [ { diff --git a/apps/src/tests/TestSafeAreaViewIOS/bottom-tabs/ConfigTab.tsx b/apps/src/tests/TestSafeAreaViewIOS/bottom-tabs/ConfigTab.tsx index 75a024162d..3db572df95 100644 --- a/apps/src/tests/TestSafeAreaViewIOS/bottom-tabs/ConfigTab.tsx +++ b/apps/src/tests/TestSafeAreaViewIOS/bottom-tabs/ConfigTab.tsx @@ -51,7 +51,7 @@ export default function ConfigTab() { tabBarMinimizeBehavior: value, }) } - items={['automatic', 'onScrollDown', 'onScrollUp', 'never']} + items={['auto', 'onScrollDown', 'onScrollUp', 'never']} /> label="tabBarItemSystemItem" diff --git a/apps/src/tests/TestSafeAreaViewIOS/bottom-tabs/index.tsx b/apps/src/tests/TestSafeAreaViewIOS/bottom-tabs/index.tsx index b2bffce5ff..3b05d06fc7 100644 --- a/apps/src/tests/TestSafeAreaViewIOS/bottom-tabs/index.tsx +++ b/apps/src/tests/TestSafeAreaViewIOS/bottom-tabs/index.tsx @@ -12,7 +12,7 @@ import { export default function BottomTabsSAVExample() { const [exampleConfig, setExampleConfig] = useState({ - tabBarMinimizeBehavior: 'automatic', + tabBarMinimizeBehavior: 'auto', tabBarItemSystemItem: 'disabled', content: 'regularView', safeAreaTopEdge: true, diff --git a/ios/RNSEnums.h b/ios/RNSEnums.h index a1ecadd017..203001b153 100644 --- a/ios/RNSEnums.h +++ b/ios/RNSEnums.h @@ -131,7 +131,7 @@ typedef NS_ENUM(NSInteger, RNSBottomTabsIconType) { #if !RCT_NEW_ARCH_ENABLED typedef NS_ENUM(NSInteger, RNSTabBarMinimizeBehavior) { - RNSTabBarMinimizeBehaviorAutomatic, + RNSTabBarMinimizeBehaviorAuto, RNSTabBarMinimizeBehaviorNever, RNSTabBarMinimizeBehaviorOnScrollDown, RNSTabBarMinimizeBehaviorOnScrollUp, @@ -140,7 +140,7 @@ typedef NS_ENUM(NSInteger, RNSTabBarMinimizeBehavior) { #if !RCT_NEW_ARCH_ENABLED typedef NS_ENUM(NSInteger, RNSTabBarControllerMode) { - RNSTabBarControllerModeAutomatic, + RNSTabBarControllerModeAuto, RNSTabBarControllerModeTabBar, RNSTabBarControllerModeTabSidebar, }; diff --git a/ios/bottom-tabs/RCTConvert+RNSBottomTabs.mm b/ios/bottom-tabs/RCTConvert+RNSBottomTabs.mm index 450ce3978c..d7c692c3c5 100644 --- a/ios/bottom-tabs/RCTConvert+RNSBottomTabs.mm +++ b/ios/bottom-tabs/RCTConvert+RNSBottomTabs.mm @@ -22,7 +22,7 @@ + (UIOffset)UIOffset:(id)json; RCT_ENUM_CONVERTER( RNSTabBarMinimizeBehavior, (@{ - @"automatic" : @(RNSTabBarMinimizeBehaviorAutomatic), + @"automatic" : @(RNSTabBarMinimizeBehaviorAuto), @"never" : @(RNSTabBarMinimizeBehaviorNever), @"onScrollDown" : @(RNSTabBarMinimizeBehaviorOnScrollDown), @"onScrollUp" : @(RNSTabBarMinimizeBehaviorOnScrollUp), @@ -33,7 +33,7 @@ + (UIOffset)UIOffset:(id)json; RCT_ENUM_CONVERTER( RNSTabBarControllerMode, (@{ - @"automatic" : @(RNSTabBarControllerModeAutomatic), + @"automatic" : @(RNSTabBarControllerModeAuto), @"tabBar" : @(RNSTabBarControllerModeTabBar), @"tabSidebar" : @(RNSTabBarControllerModeTabSidebar), }), diff --git a/ios/bottom-tabs/RNSBottomTabsHostComponentView.mm b/ios/bottom-tabs/RNSBottomTabsHostComponentView.mm index e5b111d996..09328738db 100644 --- a/ios/bottom-tabs/RNSBottomTabsHostComponentView.mm +++ b/ios/bottom-tabs/RNSBottomTabsHostComponentView.mm @@ -261,7 +261,7 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props _controller.tabBarMinimizeBehavior = _tabBarMinimizeBehavior; } else #endif // Check for iOS >= 26 - if (newComponentProps.tabBarMinimizeBehavior != react::RNSBottomTabsTabBarMinimizeBehavior::Automatic) { + if (newComponentProps.tabBarMinimizeBehavior != react::RNSBottomTabsTabBarMinimizeBehavior::Auto) { RCTLogWarn(@"[RNScreens] tabBarMinimizeBehavior is supported for iOS >= 26"); } } @@ -274,7 +274,7 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props _controller.mode = _tabBarControllerMode; } else #endif // Check for iOS >= 18 - if (newComponentProps.tabBarControllerMode != react::RNSBottomTabsTabBarControllerMode::Automatic) { + if (newComponentProps.tabBarControllerMode != react::RNSBottomTabsTabBarControllerMode::Auto) { RCTLogWarn(@"[RNScreens] tabBarControllerMode is supported for iOS >= 18"); } } @@ -440,7 +440,7 @@ - (void)setTabBarMinimizeBehaviorFromRNSTabBarMinimizeBehavior:(RNSTabBarMinimiz _controller.tabBarMinimizeBehavior = _tabBarMinimizeBehavior; } else #endif // Check for iOS >= 26 - if (tabBarMinimizeBehavior != RNSTabBarMinimizeBehaviorAutomatic) { + if (tabBarMinimizeBehavior != RNSTabBarMinimizeBehaviorAuto) { RCTLogWarn(@"[RNScreens] tabBarMinimizeBehavior is supported for iOS >= 26"); } } @@ -454,7 +454,7 @@ - (void)setTabBarControllerModeFromRNSTabBarControllerMode:(RNSTabBarControllerM _controller.mode = _tabBarControllerMode; } else #endif // Check for iOS >= 18 - if (tabBarControllerMode != RNSTabBarControllerModeAutomatic) { + if (tabBarControllerMode != RNSTabBarControllerModeAuto) { RCTLogWarn(@"[RNScreens] tabBarControllerMode is supported for iOS >= 18"); } } diff --git a/ios/conversion/RNSConversions-BottomTabs.mm b/ios/conversion/RNSConversions-BottomTabs.mm index 8647af3914..86952fab77 100644 --- a/ios/conversion/RNSConversions-BottomTabs.mm +++ b/ios/conversion/RNSConversions-BottomTabs.mm @@ -188,7 +188,7 @@ UITabBarControllerMode UITabBarControllerModeFromRNSBottomTabsTabBarControllerMo using enum facebook::react::RNSBottomTabsTabBarControllerMode; switch (tabBarControllerMode) { - case Automatic: + case Auto: return UITabBarControllerModeAutomatic; case TabBar: return UITabBarControllerModeTabBar; @@ -203,7 +203,7 @@ UITabBarControllerMode UITabBarControllerModeFromRNSBottomTabsTabBarControllerMo UITabBarControllerMode UITabBarControllerModeFromRNSTabBarControllerMode(RNSTabBarControllerMode tabBarDisplayMode) { switch (tabBarDisplayMode) { - case RNSTabBarControllerModeAutomatic: + case RNSTabBarControllerModeAuto: return UITabBarControllerModeAutomatic; case RNSTabBarControllerModeTabBar: return UITabBarControllerModeTabBar; diff --git a/src/components/bottom-tabs/BottomTabs.types.ts b/src/components/bottom-tabs/BottomTabs.types.ts index d19d438cac..b468200ba2 100644 --- a/src/components/bottom-tabs/BottomTabs.types.ts +++ b/src/components/bottom-tabs/BottomTabs.types.ts @@ -18,13 +18,13 @@ export type TabBarItemLabelVisibilityMode = // iOS-specific export type TabBarMinimizeBehavior = - | 'automatic' + | 'auto' | 'never' | 'onScrollDown' | 'onScrollUp'; // iOS-specific -export type TabBarControllerMode = 'automatic' | 'tabBar' | 'tabSidebar'; +export type TabBarControllerMode = 'auto' | 'tabBar' | 'tabSidebar'; export interface BottomTabsProps extends ViewProps { // #region Events @@ -167,7 +167,7 @@ export interface BottomTabsProps extends ViewProps { * * The following values are currently supported: * - * - `automatic` - resolves to the system default minimize behavior + * - `auto` - resolves to the system default minimize behavior * - `never` - the tab bar does not minimize * - `onScrollDown` - the tab bar minimizes when scrolling down and * expands when scrolling back up @@ -191,7 +191,7 @@ export interface BottomTabsProps extends ViewProps { * * The following values are currently supported: * - * - `automatic` - the system sets the display mode based on the tab’s content + * - `auto` - the system sets the display mode based on the tab’s content * - `tabBar` - the system displays the content only as a tab bar * - `tabSidebar` - the tab bar is displayed as a sidebar * diff --git a/src/fabric/bottom-tabs/BottomTabsNativeComponent.ts b/src/fabric/bottom-tabs/BottomTabsNativeComponent.ts index a20e74fc3f..851e1b60cc 100644 --- a/src/fabric/bottom-tabs/BottomTabsNativeComponent.ts +++ b/src/fabric/bottom-tabs/BottomTabsNativeComponent.ts @@ -26,13 +26,9 @@ type TabBarItemLabelVisibilityMode = | 'labeled' | 'unlabeled'; -type TabBarMinimizeBehavior = - | 'automatic' - | 'never' - | 'onScrollDown' - | 'onScrollUp'; +type TabBarMinimizeBehavior = 'auto' | 'never' | 'onScrollDown' | 'onScrollUp'; -type TabBarControllerMode = 'automatic' | 'tabBar' | 'tabSidebar'; +type TabBarControllerMode = 'auto' | 'tabBar' | 'tabSidebar'; export interface NativeProps extends ViewProps { // Events @@ -62,8 +58,8 @@ export interface NativeProps extends ViewProps { // iOS-specific tabBarTintColor?: ColorValue; - tabBarMinimizeBehavior?: WithDefault; - tabBarControllerMode?: WithDefault; + tabBarMinimizeBehavior?: WithDefault; + tabBarControllerMode?: WithDefault; // Control diff --git a/src/gesture-handler/fabricUtils.ts b/src/gesture-handler/fabricUtils.ts index 0a6f36a039..4f882b3ded 100644 --- a/src/gesture-handler/fabricUtils.ts +++ b/src/gesture-handler/fabricUtils.ts @@ -1,6 +1,6 @@ 'use strict'; -import { View } from "react-native"; +import { View } from 'react-native'; /* eslint-disable */ @@ -24,11 +24,11 @@ export function getShadowNodeWrapperAndTagFromRef(ref: View | null): { return { shadowNodeWrapper: null, tag: -1, - } + }; } const internalRef = ref as unknown as HostInstance; return { shadowNodeWrapper: internalRef.__internalInstanceHandle.stateNode.node, tag: internalRef.__nativeTag, - } + }; }