feat(iOS, Tabs, ScreenStack): orientation for Tabs and ScreenStack

android/src/main/java/com/swmansion/rnscreens/gamma/tabs/TabScreenViewManager.kt

@@ -187,6 +187,11 @@ class TabScreenViewManager :
         view.iconResourceName = value
     }
 
+    override fun setOrientation(
+        view: TabScreen,
+        value: String?,
+    ) = Unit
+
     companion object {
         const val REACT_CLASS = "RNSBottomTabsScreen"
     }

android/src/paper/java/com/facebook/react/viewmanagers/RNSBottomTabsScreenManagerDelegate.java

@@ -63,6 +63,9 @@ public void setProperty(T view, String propName, @Nullable Object value) {
       case "title":
         mViewManager.setTitle(view, value == null ? null : (String) value);
         break;
+      case "orientation":
+        mViewManager.setOrientation(view, (String) value);
+        break;
       case "iconResourceName":
         mViewManager.setIconResourceName(view, value == null ? null : (String) value);
         break;

android/src/paper/java/com/facebook/react/viewmanagers/RNSBottomTabsScreenManagerInterface.java

@@ -28,6 +28,7 @@ public interface RNSBottomTabsScreenManagerInterface<T extends View>  {
   void setTabBarItemIconColor(T view, @Nullable Integer value);
   void setTabBarItemBadgeBackgroundColor(T view, @Nullable Integer value);
   void setTitle(T view, @Nullable String value);
+  void setOrientation(T view, @Nullable String value);
   void setIconResourceName(T view, @Nullable String value);
   void setTabBarItemBadgeTextColor(T view, @Nullable Integer value);
   void setIconType(T view, @Nullable String value);

apps/src/tests/TestBottomTabs/index.tsx

@@ -11,6 +11,12 @@ import {
 } from '../../shared/gamma/containers/bottom-tabs/BottomTabsContainer';
 import { Tab1, Tab2, Tab3, Tab4 } from './tabs';
 import Colors from '../../shared/styling/Colors';
+// import { NavigationContainer, ParamListBase } from '@react-navigation/native';
+// import {
+//   NativeStackNavigationProp,
+//   createNativeStackNavigator,
+// } from '@react-navigation/native-stack';
+// import { Button, View } from 'react-native';
 
 enableFreeze(true);
 
@@ -53,6 +59,7 @@ const TAB_CONFIGS: TabConfiguration[] = [
       tabBarItemIconColor: Colors.RedDark120,
       iconResourceName: 'sym_call_missed', // Android specific
       title: 'Tab2',
+      orientation: 'landscape',
     },
     contentViewRenderFn: Tab2,
   },
@@ -70,6 +77,7 @@ const TAB_CONFIGS: TabConfiguration[] = [
       },
       iconResourceName: 'sym_action_email', // Android specific
       title: 'Tab3',
+      orientation: 'portrait',
     },
     contentViewRenderFn: Tab3,
   },
@@ -85,6 +93,7 @@ const TAB_CONFIGS: TabConfiguration[] = [
       iconResourceName: 'sym_action_chat', // Android specific
       title: 'Tab4',
       badgeValue: '',
+      orientation: 'portrait',
     },
     contentViewRenderFn: Tab4,
   },
@@ -107,3 +116,52 @@ function App() {
 }
 
 export default App;
+
+// type RouteParamList = {
+//   Auth: undefined;
+//   Tabs: undefined;
+// };
+
+// type NavigationProp<ParamList extends ParamListBase> = {
+//   navigation: NativeStackNavigationProp<ParamList>;
+// };
+
+// type StackNavigationProp = NavigationProp<RouteParamList>;
+
+// const Stack = createNativeStackNavigator<RouteParamList>();
+
+// function AuthScreen({ navigation }: StackNavigationProp) {
+//   return (
+//     <View
+//       style={{
+//         flex: 1,
+//         alignItems: 'center',
+//         justifyContent: 'center',
+//       }}>
+//       <Button title="Log in" onPress={() => navigation.push('Tabs')} />
+//     </View>
+//   );
+// }
+
+// function WrappedApp() {
+//   return (
+//     <NavigationContainer>
+//       <Stack.Navigator>
+//         <Stack.Screen
+//           name="Auth"
+//           component={AuthScreen}
+//           // options={{
+//           // orientation: 'landscape',
+//           // }}
+//         />
+//         <Stack.Screen
+//           name="Tabs"
+//           component={App}
+//           options={{ orientation: 'landscape' }}
+//         />
+//       </Stack.Navigator>
+//     </NavigationContainer>
+//   );
+// }
+
+// export default WrappedApp;

apps/src/tests/TestBottomTabs/tabs/Tab4.tsx

@@ -113,13 +113,14 @@ export function Tab4() {
         <Stack.Screen
           name="Screen1"
           component={Screen1}
-          options={{ headerTransparent: true }}
+          options={{ headerTransparent: true, orientation: 'landscape' }}
         />
         <Stack.Screen
           name="Screen2"
           component={Screen2}
           options={{
             headerLargeTitle: true,
+            orientation: 'default',
           }}
         />
         <Stack.Screen

ios/RNSEnums.h

@@ -140,3 +140,15 @@ typedef NS_ENUM(NSInteger, RNSTabBarMinimizeBehavior) {
   RNSTabBarMinimizeBehaviorOnScrollUp,
 };
 #endif
+
+typedef NS_ENUM(NSInteger, RNSOrientation) {
+  RNSOrientationInherit,
+  RNSOrientationAll,
+  RNSOrientationAllButUpsideDown,
+  RNSOrientationPortrait,
+  RNSOrientationPortraitUp,
+  RNSOrientationPortraitDown,
+  RNSOrientationLandscape,
+  RNSOrientationLandscapeLeft,
+  RNSOrientationLandscapeRight,
+};

ios/RNSOrientationProviding.h

@@ -0,0 +1,11 @@
+#import "RNSEnums.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol RNSOrientationProviding
+
+- (RNSOrientation)evaluateOrientation;
+
+@end
+
+NS_ASSUME_NONNULL_END

ios/RNSScreen.h

@@ -6,6 +6,10 @@
 #import "RNSScreenContentWrapper.h"
 #import "RNSScrollViewBehaviorOverriding.h"
 
+#if !TARGET_OS_TV
+#import "RNSOrientationProviding.h"
+#endif // !TARGET_OS_TV
+
 #if RCT_NEW_ARCH_ENABLED
 #import <React/RCTViewComponentView.h>
 #else
@@ -33,8 +37,13 @@ namespace react = facebook::react;
 
 @class RNSScreenView;
 
-@interface RNSScreen : UIViewController <RNSViewControllerDelegate>
-
+@interface RNSScreen : UIViewController <
+                           RNSViewControllerDelegate
+#if !TARGET_OS_TV
+                           ,
+                           RNSOrientationProviding
+#endif // !TARGET_OS_TV
+                           >
 - (instancetype)initWithView:(UIView *)view;
 - (UIViewController *)findChildVCForConfigAndTrait:(RNSWindowTrait)trait includingModals:(BOOL)includingModals;
 - (BOOL)hasNestedStack;

ios/RNSScreen.mm

@@ -33,6 +33,7 @@
 #import "RNSScreenStackHeaderConfig.h"
 #import "RNSTabBarController.h"
 #import "RNSScrollViewHelper.h"
+#import "RNSConversions.h"
 
 #import "RNSDefines.h"
 #import "UIView+RNSUtility.h"
@@ -1173,19 +1174,19 @@ - (BOOL)shouldOverrideScrollViewContentInsetAdjustmentBehavior
   // RNSScreenView does not have a property to control this behavior.
   // It looks for parent that conforms to RNSScrollViewBehaviorOverriding to determine
   // if it should override ScrollView's behavior.
-  
+
   // As this method is called when RNSScreen willMoveToParentViewController
   // and view does not have superView yet, we need to use reactSuperViews.
   UIView *parent = [self reactSuperview];
-  
+
   while (parent != nil) {
     if ([parent respondsToSelector:@selector(shouldOverrideScrollViewContentInsetAdjustmentBehavior)]) {
       id<RNSScrollViewBehaviorOverriding> overrideProvider = static_cast<id<RNSScrollViewBehaviorOverriding>>(parent);
       return [overrideProvider shouldOverrideScrollViewContentInsetAdjustmentBehavior];
     }
     parent = [parent reactSuperview];
   }
-  
+
   return NO;
 }
 
@@ -1981,6 +1982,26 @@ - (void)presentViewController:(UIViewController *)viewControllerToPresent
   [super presentViewController:viewControllerToPresent animated:flag completion:completion];
 }
 
+#pragma mark - RNSOrientationProviding
+
+#if !TARGET_OS_TV
+
+- (RNSOrientation)evaluateOrientation
+{
+  if ([self.childViewControllers.lastObject respondsToSelector:@selector(evaluateOrientation)]) {
+    id<RNSOrientationProviding> child = static_cast<id<RNSOrientationProviding>>(self.childViewControllers.lastObject);
+    RNSOrientation childOrientation = [child evaluateOrientation];
+
+    if (childOrientation != RNSOrientationInherit) {
+      return childOrientation;
+    }
+  }
+
+  return rnscreens::conversion::RNSOrientationFromUIInterfaceOrientationMask([self supportedInterfaceOrientations]);
+}
+
+#endif // !TARGET_OS_TV
+
 #ifdef RCT_NEW_ARCH_ENABLED
 #pragma mark - Fabric specific
 

ios/RNSScreenStack.h

@@ -8,10 +8,20 @@
 #import "RNSBottomTabsSpecialEffectsSupporting.h"
 #import "RNSScreenContainer.h"
 
+#if !TARGET_OS_TV
+#import "RNSOrientationProviding.h"
+#endif // !TARGET_OS_TV
+
 NS_ASSUME_NONNULL_BEGIN
 
-@interface RNSNavigationController
-    : UINavigationController <RNSViewControllerDelegate, RNSBottomTabsSpecialEffectsSupporting>
+@interface RNSNavigationController : UINavigationController <
+                                         RNSViewControllerDelegate,
+                                         RNSBottomTabsSpecialEffectsSupporting
+#if !TARGET_OS_TV
+                                         ,
+                                         RNSOrientationProviding
+#endif // !TARGET_OS_TV
+                                         >
 
 @end
 

ios/RNSScreenStack.mm

@@ -100,6 +100,20 @@ - (UIInterfaceOrientationMask)supportedInterfaceOrientations
   return [self topViewController].supportedInterfaceOrientations;
 }
 
+#if !TARGET_OS_TV
+
+- (RNSOrientation)evaluateOrientation
+{
+  if ([self.topViewController respondsToSelector:@selector(evaluateOrientation)]) {
+    id<RNSOrientationProviding> top = static_cast<id<RNSOrientationProviding>>(self.topViewController);
+    return [top evaluateOrientation];
+  }
+
+  return RNSOrientationInherit;
+}
+
+#endif // !TARGET_OS_TV
+
 - (UIViewController *)childViewControllerForHomeIndicatorAutoHidden
 {
   return [self topViewController];

ios/UIViewController+RNScreens.mm

@@ -1,5 +1,8 @@
 #import "RNSScreenContainer.h"
 #import "UIViewController+RNScreens.h"
+#import "RNSOrientationProviding.h"
+#import "RNSEnums.h"
+#import "RNSConversions.h"
 
 #import <objc/runtime.h>
 
@@ -27,8 +30,18 @@ - (UIStatusBarAnimation)reactNativeScreensPreferredStatusBarUpdateAnimation
 
 - (UIInterfaceOrientationMask)reactNativeScreensSupportedInterfaceOrientations
 {
-  UIViewController *childVC = [self findChildRNSScreensViewController];
-  return childVC ? childVC.supportedInterfaceOrientations : [self reactNativeScreensSupportedInterfaceOrientations];
+  id<RNSOrientationProviding> childOrientationProvidingVC = [self findChildRNSOrientationProvidingViewController];
+
+  if (childOrientationProvidingVC != nil) {
+    RNSOrientation orientation = [childOrientationProvidingVC evaluateOrientation];
+    if (orientation == RNSOrientationInherit) {
+      return [[UIApplication sharedApplication] supportedInterfaceOrientationsForWindow:self.view.window];
+    }
+
+    return rnscreens::conversion::UIInterfaceOrientationMaskFromRNSOrientation(orientation);
+  }
+
+  return [self reactNativeScreensSupportedInterfaceOrientations];
 }
 
 - (UIViewController *)reactNativeScreensChildViewControllerForHomeIndicatorAutoHidden
@@ -37,6 +50,15 @@ - (UIViewController *)reactNativeScreensChildViewControllerForHomeIndicatorAutoH
   return childVC ?: [self reactNativeScreensChildViewControllerForHomeIndicatorAutoHidden];
 }
 
+- (id<RNSOrientationProviding>)findChildRNSOrientationProvidingViewController
+{
+  UIViewController *lastViewController = [[self childViewControllers] lastObject];
+  if ([lastViewController respondsToSelector:@selector(evaluateOrientation)]) {
+    return static_cast<id<RNSOrientationProviding>>(lastViewController);
+  }
+  return nil;
+}
+
 - (UIViewController *)findChildRNSScreensViewController
 {
   UIViewController *lastViewController = [[self childViewControllers] lastObject];

ios/bottom-tabs/RCTConvert+RNSBottomTabs.h

@@ -11,6 +11,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (RNSBottomTabsIconType)RNSBottomTabsIconType:(nonnull id)json;
 
++ (RNSOrientation)RNSOrientation:(nonnull id)json;
+
 @end
 
 NS_ASSUME_NONNULL_END

ios/bottom-tabs/RCTConvert+RNSBottomTabs.mm

@@ -30,6 +30,22 @@ + (UIOffset)UIOffset:(id)json;
     RNSTabBarMinimizeBehaviorAutomatic,
     integerValue)
 
+RCT_ENUM_CONVERTER(
+    RNSOrientation,
+    (@{
+      @"inherit" : @(RNSOrientationInherit),
+      @"all" : @(RNSOrientationAll),
+      @"allButUpsideDown" : @(RNSOrientationAllButUpsideDown),
+      @"portrait" : @(RNSOrientationPortrait),
+      @"portraitUp" : @(RNSOrientationPortraitUp),
+      @"portraitDown" : @(RNSOrientationPortraitDown),
+      @"landscape" : @(RNSOrientationLandscape),
+      @"landscapeLeft" : @(RNSOrientationLandscapeLeft),
+      @"landscapeRight" : @(RNSOrientationLandscapeRight),
+    }),
+    RNSOrientationInherit,
+    integerValue)
+
 @end
 
 #endif // !RCT_NEW_ARCH_ENABLED

ios/bottom-tabs/RNSBottomTabsScreenComponentView.h

@@ -72,6 +72,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, nullable) UIColor *tabBarItemBadgeBackgroundColor;
 
 @property (nonatomic, nullable) NSString *title;
+@property (nonatomic, readonly) RNSOrientation orientation;
 
 @property (nonatomic) BOOL shouldUseRepeatedTabSelectionPopToRootSpecialEffect;
 @property (nonatomic) BOOL shouldUseRepeatedTabSelectionScrollToTopSpecialEffect;