support for tabs nested in screen-stack

Author: kligarski

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);
 
@@ -71,6 +77,7 @@ const TAB_CONFIGS: TabConfiguration[] = [
       },
       iconResourceName: 'sym_action_email', // Android specific
       title: 'Tab3',
+      orientation: 'portrait',
     },
     contentViewRenderFn: Tab3,
   },
@@ -109,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;

ios/RNSScreen.mm

@@ -1986,6 +1986,15 @@ - (void)presentViewController:(UIViewController *)viewControllerToPresent
 
 - (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]);
 }