fix: compile on visionOS

callstackincubator · Dec 12, 2024 · fb84a0c · fb84a0c
1 parent c30274b
commit fb84a0c
Show file tree

Hide file tree

Showing 7 changed files with 334 additions and 256 deletions.
diff --git a/apps/example/src/App.tsx b/apps/example/src/App.tsx
@@ -13,12 +13,7 @@ import {
   useColorScheme,
   Platform,
 } from 'react-native';
-import {
-  DarkTheme,
-  DefaultTheme,
-  NavigationContainer,
-  useNavigation,
-} from '@react-navigation/native';
+import { NavigationContainer, useNavigation } from '@react-navigation/native';
 import { createStackNavigator } from '@react-navigation/stack';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
@@ -30,7 +25,6 @@ import SFSymbols from './Examples/SFSymbols';
 import LabeledTabs from './Examples/Labeled';
 import NativeBottomTabs from './Examples/NativeBottomTabs';
 import TintColorsExample from './Examples/TintColors';
-import NativeBottomTabsVectorIcons from './Examples/NativeBottomTabsVectorIcons';
 import NativeBottomTabsEmbeddedStacks from './Examples/NativeBottomTabsEmbeddedStacks';
 import NativeBottomTabsSVGs from './Examples/NativeBottomTabsSVGs';
 import NativeBottomTabsRemoteIcons from './Examples/NativeBottomTabsRemoteIcons';
@@ -131,10 +125,6 @@ const examples = [
     component: HiddenTab,
     name: 'Four Tabs - With Hidden Tab',
   },
-  {
-    component: NativeBottomTabsVectorIcons,
-    name: 'Native Bottom Tabs with Vector Icons',
-  },
   {
     component: NativeBottomTabsSVGs,
     name: 'Native Bottom Tabs with SVG Icons',
@@ -189,12 +179,10 @@ export default function Navigation() {
   const [mode, setMode] = React.useState<'native' | 'js'>(defaultStack);
 
   const NavigationStack = mode === 'js' ? Stack : NativeStack;
-  const colorScheme = useColorScheme();
-  const theme = colorScheme === 'dark' ? DarkTheme : DefaultTheme;
 
   return (
     <SafeAreaProvider>
-      <NavigationContainer theme={theme}>
+      <NavigationContainer>
         <NavigationStack.Navigator initialRouteName="BottomTabs Example">
           <NavigationStack.Screen
             name="BottomTabs Example"

diff --git a/apps/example/src/Examples/NativeBottomTabsVectorIcons.tsx b/apps/example/src/Examples/NativeBottomTabsVectorIcons.tsx
diff --git a/apps/example/visionos/Podfile b/apps/example/visionos/Podfile
@@ -1,3 +1,5 @@
+plugin 'cocoapods-swift-modular-headers'
+
 ws_dir = Pathname.new(__dir__)
 ws_dir = ws_dir.parent until
   File.exist?("#{ws_dir}/node_modules/react-native-test-app/visionos/test_app.rb") ||
@@ -6,4 +8,9 @@ require "#{ws_dir}/node_modules/react-native-test-app/visionos/test_app.rb"
 
 workspace 'ReactNativeBottomTabsExample.xcworkspace'
 
+apply_modular_headers_for_swift_dependencies()
+
 use_test_app!
+
+
+