create-expo-stack 2.22.0 → 2.23.1

package/README.md

@@ -129,21 +129,28 @@ Thanks go to these wonderful people:
             <sub><b>Sam Moore</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/DavidJGrimsley">
+            <img src="https://avatars.githubusercontent.com/u/114373822?v=4" width="100;" alt="DavidJGrimsley"/>
+            <br />
+            <sub><b>David Grimsley</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/ernestoresende">
             <img src="https://avatars.githubusercontent.com/u/55156145?v=4" width="100;" alt="ernestoresende"/>
             <br />
             <sub><b>Ernesto Resende</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/PickleNik">
             <img src="https://avatars.githubusercontent.com/u/31113245?v=4" width="100;" alt="PickleNik"/>
             <br />
             <sub><b>Null</b></sub>
         </a>
-    </td></tr>
-<tr>
+    </td>
     <td align="center">
         <a href="https://github.com/frankcalise">
             <img src="https://avatars.githubusercontent.com/u/374022?v=4" width="100;" alt="frankcalise"/>
@@ -178,15 +185,15 @@ Thanks go to these wonderful people:
             <br />
             <sub><b>Gaurav Bhandari</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/finnbayer">
             <img src="https://avatars.githubusercontent.com/u/115630860?v=4" width="100;" alt="finnbayer"/>
             <br />
             <sub><b>Finn Bayer</b></sub>
         </a>
-    </td></tr>
-<tr>
+    </td>
     <td align="center">
         <a href="https://github.com/saimon24">
             <img src="https://avatars.githubusercontent.com/u/2514208?v=4" width="100;" alt="saimon24"/>
@@ -221,13 +228,6 @@ Thanks go to these wonderful people:
             <br />
             <sub><b>Jacek Pudysz</b></sub>
         </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/DavidJGrimsley">
-            <img src="https://avatars.githubusercontent.com/u/114373822?v=4" width="100;" alt="DavidJGrimsley"/>
-            <br />
-            <sub><b>David Grimsley</b></sub>
-        </a>
     </td></tr>
 <tr>
     <td align="center">

package/build/commands/create-expo-stack.js

@@ -17,6 +17,7 @@ const utilities_1 = require("../utilities");
 const constants_1 = require("../constants");
 const types_1 = require("../types");
 const clearStylingPackages_1 = __importDefault(require("../utilities/clearStylingPackages"));
+const softwareMansion_1 = require("../utilities/softwareMansion");
 const systemCommand_1 = require("../utilities/systemCommand");
 const validateProjectName_1 = require("../utilities/validateProjectName");
 const prompts_1 = require("@clack/prompts");
@@ -272,6 +273,11 @@ const command = {
                 if (options.vexoAnalytics || options['vexo-analytics'] || options.vexoanalytics) {
                     cliResults.packages.push({ name: 'vexo-analytics', type: 'analytics' });
                 }
+                softwareMansion_1.softwareMansionPackageOptions.forEach(({ name, aliases }) => {
+                    if (aliases.some((alias) => options[alias]) && (0, softwareMansion_1.shouldAddSoftwareMansionPackage)(name, cliResults)) {
+                        cliResults.packages.push({ name, type: 'software-mansion' });
+                    }
+                });
                 // By this point, all cliResults should be set
                 info('');
                 highlight('Your project configuration:');
@@ -309,10 +315,6 @@ const command = {
                                 script += '--drawer+tabs ';
                             }
                         }
-                        const stateManagementPackage = cliResults.packages.find((p) => p.type === 'state-management');
-                        if (stateManagementPackage) {
-                            script += `--${stateManagementPackage.name} `;
-                        }
                     }
                     else {
                         // Add the packages
@@ -330,6 +332,16 @@ const command = {
                             }
                         });
                     }
+                    if (isNativewindUISelected) {
+                        cliResults.packages.forEach((p) => {
+                            if (p.type === 'state-management' ||
+                                p.type === 'internationalization' ||
+                                p.type === 'analytics' ||
+                                p.type === 'software-mansion') {
+                                script += `--${p.name} `;
+                            }
+                        });
+                    }
                     // Check if the user wants to skip installing packages
                     if (cliResults.flags.noInstall) {
                         script += '--no-install ';
@@ -361,7 +373,6 @@ const command = {
                 const stylingPackage = packages.find((p) => p.type === 'styling');
                 const internalizationPackage = packages.find((p) => p.type === 'internationalization');
                 const analyticsPackage = packages.find((p) => p.type === 'analytics');
-                //add the state management package if it is selected
                 const stateManagementPackage = packages.find((p) => p.type === 'state-management') || undefined;
                 let files = [];
                 files = (0, utilities_1.configureProjectFiles)(authenticationPackage, files, navigationPackage, stylingPackage, analyticsPackage, toolbox, cliResults, internalizationPackage, stateManagementPackage);
@@ -401,4 +412,4 @@ const command = {
     })
 };
 exports.default = command;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"create-expo-stack.js","sourceRoot":"","sources":["../../src/commands/create-expo-stack.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"create-expo-stack.js","sourceRoot":"","sources":["../../src/commands/create-expo-stack.ts"],"names":[],"mappings":"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"}

package/build/templates/base/App.tsx.ejs

@@ -6,7 +6,7 @@ import { StatusBar } from 'expo-status-bar';
 
 <% if (props.internalizationPackage?.name === "i18next") { %>
   import './translation';
-  import { InternalizationExample } from 'components/InternalizationExample';
+  import { InternalizationExample } from './components/InternalizationExample';
 <% } %>
 
 <% if (props.stylingPackage?.name === "nativewind") { %>

package/build/templates/base/components/TabBarIcon.tsx.ejs

@@ -1,9 +1,9 @@
 import FontAwesome from '@expo/vector-icons/FontAwesome';
-import { StyleSheet } from 'react-native';
+import { ColorValue, StyleSheet } from 'react-native';
 
 export const TabBarIcon = (props: {
   name: React.ComponentProps<typeof FontAwesome>['name'];
-  color: string;
+  color: ColorValue;
 }) => {
   return <FontAwesome size={28} style={styles.tabBarIcon} {...props} />;
 };

package/build/templates/base/package.json.ejs

@@ -72,10 +72,24 @@
 
     <% if (props.navigationPackage?.type === "navigation") { %>
       "@react-navigation/native": "^7.1.6",
+    <% } %>
+
+    <% if (props.navigationPackage?.type === "navigation" || props.packages?.some((p) => p.name === "react-native-gesture-handler")) { %>
       "react-native-gesture-handler": "~2.31.1",
+    <% } %>
+
+    <% if (props.navigationPackage?.type === "navigation" || props.packages?.some((p) => p.name === "react-native-screens")) { %>
       "react-native-screens": "4.25.2",
     <% } %>
 
+    <% if (props.packages?.some((p) => p.name === "react-native-svg")) { %>
+      "react-native-svg": "15.15.4",
+    <% } %>
+
+    <% if (props.packages?.some((p) => p.name === "react-native-keyboard-controller")) { %>
+      "react-native-keyboard-controller": "1.21.6",
+    <% } %>
+
     <% if (props.navigationPackage?.name === "react-navigation") { %>
       "@react-navigation/stack": "^7.4.8",
       "@expo/vector-icons": "^15.0.2",

package/build/templates/packages/expo-router/drawer/app/modal.tsx.ejs

@@ -4,7 +4,7 @@ import { Platform } from 'react-native';
 import { ScreenContent } from '@/components/ScreenContent';
 
 <% if (props.internalizationPackage?.name === "i18next") { %>
-  import { InternalizationExample } from 'components/InternalizationExample';
+  import { InternalizationExample } from '../components/InternalizationExample';
 <% } %>
 
 export default function Modal() {

package/build/templates/packages/expo-router/stack/app/index.tsx.ejs

@@ -13,7 +13,7 @@ import { Container } from '@/components/Container';
 import { ScreenContent } from '@/components/ScreenContent';
 
 <% if (props.internalizationPackage?.name === "i18next") { %>
-  import { InternalizationExample } from 'components/InternalizationExample';
+  import { InternalizationExample } from '../components/InternalizationExample';
 <% } %>
 
 export default function Home() {
@@ -30,13 +30,21 @@ export default function Home() {
           <InternalizationExample />
         <% } %>
         </ScreenContent>
+        <% if (props.stylingPackage?.name === "nativewind") { %>
+        <View className={styles.buttonWrapper}>
+        <% } %>
         <Link href={{ pathname: '/details', params: { name: 'Dan' } }} asChild>
           <% if (props.stylingPackage?.name === "unistyles") { %>
               <Button title="Show Details" style={styles.button} />
+          <% } else if (props.stylingPackage?.name === "nativewind") { %>
+              <Button title="Show Details" className="mx-6" />
           <% } else { %>
               <Button title="Show Details" />
           <% } %>
         </Link>
+        <% if (props.stylingPackage?.name === "nativewind") { %>
+        </View>
+        <% } %>
       </Container>
     </View>
   );
@@ -45,7 +53,8 @@ export default function Home() {
 <% if (props.stylingPackage?.name === "nativewind") { %>
 const styles = {
   container: "flex flex-1 bg-white",
-}
+  buttonWrapper: "mx-4",
+};
 <% } else if (props.stylingPackage?.name === "stylesheet") { %>
 const styles = StyleSheet.create({
   container: {

package/build/templates/packages/expo-router/tabs/app/modal.tsx.ejs

@@ -4,7 +4,7 @@ import { Platform } from 'react-native';
 import { ScreenContent } from '@/components/ScreenContent';
 
 <% if (props.internalizationPackage?.name === "i18next") { %>
-  import { InternalizationExample } from 'components/InternalizationExample';
+  import { InternalizationExample } from '../components/InternalizationExample';
 <% } %>
 
 export default function Modal() {

package/build/templates/packages/i18next/translation/index.ts.ejs

@@ -1,6 +1,6 @@
-import { init18n } from 'core/i18n/init';
-import en from 'translation/en.json';
-import fr from 'translation/fr.json';
+import { init18n } from '../core/i18n/init';
+import en from './en.json';
+import fr from './fr.json';
 
 export const resources = {
   en: {

package/build/templates/packages/nativewind/components/EditScreenInfo.tsx.ejs

@@ -18,7 +18,7 @@ export const EditScreenInfo: React.FC<EditScreenInfoProps> = ({ path }) => {
   const description = "Change any of the text, save the file, and your app will automatically update."
 <% } %>
   return (
-    <View>
+    <View className={styles.container}>
       <View className={styles.getStartedContainer}>
         <Text className={styles.getStartedText}>{title}</Text>
         <View className={`${styles.codeHighlightContainer} ${styles.homeScreenFilename}`}>
@@ -33,6 +33,7 @@ export const EditScreenInfo: React.FC<EditScreenInfoProps> = ({ path }) => {
 };
 
 const styles = {
+  container: `w-full`,
   codeHighlightContainer: `rounded-md px-1`,
   getStartedContainer: `items-center mx-12`,
   getStartedText: `text-lg leading-6 text-center`,

package/build/templates/packages/nativewindui/components/TabBarIcon.tsx.ejs

@@ -1,9 +1,9 @@
 import FontAwesome from '@expo/vector-icons/FontAwesome';
-import { StyleSheet } from 'react-native';
+import { ColorValue, StyleSheet } from 'react-native';
 
 export const TabBarIcon = (props: {
   name: React.ComponentProps<typeof FontAwesome>['name'];
-  color: string;
+  color: ColorValue;
 }) => {
   return <FontAwesome size={28} style={styles.tabBarIcon} {...props} />;
 };

package/build/templates/packages/nativewindui/drawer/app/(drawer)/index.tsx.ejs

@@ -1,5 +1,5 @@
 import { Stack } from 'expo-router';
-import { useHeaderHeight } from '@react-navigation/elements';
+import { useHeaderHeight } from 'expo-router/react-navigation';
 import { FlashList } from '@shopify/flash-list';
 import { cssInterop } from 'nativewind';
 import * as React from 'react';
@@ -27,12 +27,12 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';
 <% if (props.stylingPackage?.options.selectedComponents.includes('action-sheet')) { %>
 import { useActionSheet } from '@expo/react-native-action-sheet';
 <% } %>
-import { Icon } from '@roninoss/icons';
 <% if (props.stylingPackage?.options.selectedComponents.includes('ratings-indicator')) { %>
 import * as StoreReview from 'expo-store-review';
 <% } %>
 
 import { Container } from '@/components/Container';
+import { Icon } from '@/components/nativewindui/Icon';
 <% if (props.stylingPackage?.options.selectedComponents.includes('activity-indicator')) { %>
 import { ActivityIndicator } from '@/components/nativewindui/ActivityIndicator';
 <% } %>
@@ -59,6 +59,7 @@ import { Text } from '@/components/nativewindui/Text';
 import { Toggle } from '@/components/nativewindui/Toggle';
 <% } %>
 import { useColorScheme } from '@/lib/useColorScheme';
+import { useHeaderSearchBar } from '@/lib/useHeaderSearchBar';
 
 export default function Home() {
   const searchValue = useHeaderSearchBar({ hideWhenScrolling: COMPONENTS.length === 0 });
@@ -75,7 +76,6 @@ export default function Home() {
           contentInsetAdjustmentBehavior="automatic"
           keyboardShouldPersistTaps="handled"
           data={data}
-          estimatedItemSize={200}
           contentContainerClassName="py-4 android:pb-12"
           extraData={searchValue}
           keyExtractor={keyExtractor}
@@ -112,7 +112,7 @@ function ListEmptyComponent() {
 
   return (
     <View style={{ height }} className="flex-1 items-center justify-center gap-1 px-12">
-      <Icon name="file-plus-outline" size={42} color={colors.grey} />
+      <Icon name="doc.badge.plus" size={42} color={colors.grey} />
         <Text variant='title3' className='pb-1 text-center font-semibold'>
           No Components Installed
         </Text>
@@ -226,8 +226,8 @@ const COMPONENTS: ComponentItem[] = [
           <DatePicker
             value={date}
             mode='datetime'
-            onChange={(ev) => {
-              setDate(new Date(ev.nativeEvent.timestamp));
+            onValueChange={(_event, selectedDate) => {
+              setDate(selectedDate);
             }}
           />
         </View>
@@ -532,4 +532,4 @@ const COMPONENTS: ComponentItem[] = [
     },
   },
   <% } %>
-];
+];

package/build/templates/packages/nativewindui/drawer/app/_layout.tsx.ejs

@@ -1,6 +1,6 @@
 import '../global.css';
 import 'expo-dev-client';
-import { ThemeProvider as NavThemeProvider } from '@react-navigation/native';
+import { ThemeProvider as NavThemeProvider } from 'expo-router/react-navigation';
 <% if (props.stylingPackage?.options.selectedComponents.includes('action-sheet')) { %>
 import { ActionSheetProvider } from '@expo/react-native-action-sheet';
 <% } %>
@@ -13,8 +13,8 @@ import { StatusBar } from 'expo-status-bar';
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
 <% } %>
 
-import { ThemeToggle } from '@/components/ThemeToggle';
-import { useColorScheme, useInitialAndroidBarSync } from '@/lib/useColorScheme';
+import { ThemeToggle } from '@/components/nativewindui/ThemeToggle';
+import { useColorScheme } from '@/lib/useColorScheme';
 import { NAV_THEME } from '@/theme';
 
 export {
@@ -23,7 +23,6 @@ export {
 } from 'expo-router';
 
 export default function RootLayout() {
-  useInitialAndroidBarSync();
   const { colorScheme, isDarkColorScheme } = useColorScheme();
 
   return (
@@ -72,4 +71,4 @@ const MODAL_OPTIONS = {
   animation: 'fade_from_bottom', // for android
   title: 'Settings',
   headerRight: () => <ThemeToggle />,
-} as const;
+} as const;

package/build/templates/packages/nativewindui/drawer/app/modal.tsx.ejs

@@ -1,7 +1,7 @@
-import { Icon } from '@roninoss/icons';
 import { StatusBar } from 'expo-status-bar';
 import { Linking, Platform, View } from 'react-native';
 
+import { Icon } from '@/components/nativewindui/Icon';
 import { Text } from '@/components/nativewindui/Text';
 import { useColorScheme } from '@/lib/useColorScheme';
 
@@ -13,7 +13,7 @@ export default function ModalScreen() {
         style={Platform.OS === 'ios' ? 'light' : colorScheme === 'dark' ? 'light' : 'dark'}
       />
       <View className="flex-1 items-center justify-center gap-1 px-12">
-        <Icon name="file-plus-outline" size={42} color={colors.grey} />
+        <Icon name="doc.badge.plus" size={42} color={colors.grey} />
         <Text variant="title3" className="pb-1 text-center font-semibold">
           NativewindUI
         </Text>

package/build/templates/packages/nativewindui/lib/useHeaderSearchBar.tsx.ejs

@@ -0,0 +1,33 @@
+import { useNavigation } from 'expo-router/react-navigation';
+import * as React from 'react';
+import type { SearchBarProps } from 'react-native-screens';
+
+import { useColorScheme } from './useColorScheme';
+
+function useHeaderSearchBar(props: SearchBarProps = {}) {
+  const { colorScheme, colors } = useColorScheme();
+  const navigation = useNavigation();
+  const [search, setSearch] = React.useState('');
+
+  React.useLayoutEffect(() => {
+    navigation.setOptions({
+      headerSearchBarOptions: {
+        placeholder: 'Search...',
+        textColor: colors.foreground,
+        tintColor: colors.primary,
+        headerIconColor: colors.foreground,
+        hintTextColor: colors.grey,
+        hideWhenScrolling: false,
+        onChangeText(event) {
+          setSearch(event.nativeEvent.text);
+        },
+        ...props,
+      } satisfies SearchBarProps,
+    });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [navigation, colorScheme]);
+
+  return search;
+}
+
+export { useHeaderSearchBar };

package/build/templates/packages/nativewindui/stack/app/_layout.tsx.ejs

@@ -3,7 +3,7 @@ import '@/global.css';
 <% if (props.stylingPackage?.options.selectedComponents.includes('action-sheet')) { %>
 import { ActionSheetProvider } from '@expo/react-native-action-sheet';
 <% } %>
-import { ThemeProvider as NavThemeProvider } from '@react-navigation/native';
+import { ThemeProvider as NavThemeProvider } from 'expo-router/react-navigation';
 import * as Device from 'expo-device';
 import { Link, Stack } from 'expo-router';
 import { StatusBar } from 'expo-status-bar';

package/build/templates/packages/nativewindui/stack/app/index.tsx.ejs

@@ -1,4 +1,4 @@
-import { useHeaderHeight } from '@react-navigation/elements';
+import { useHeaderHeight } from 'expo-router/react-navigation';
 import { FlashList } from '@shopify/flash-list';
 import { cssInterop } from 'nativewind';
 import * as React from 'react';
@@ -21,11 +21,9 @@ import {
   View,
 } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
-import { SearchBarProps } from 'react-native-screens';
 <% if (props.stylingPackage?.options.selectedComponents.includes('action-sheet')) { %>
 import { useActionSheet } from '@expo/react-native-action-sheet';
 <% } %>
-import { useNavigation } from '@react-navigation/native';
 <% if (props.stylingPackage?.options.selectedComponents.includes('button')) { %>
 import * as Haptics from 'expo-haptics';
 <% } else { %>
@@ -64,6 +62,7 @@ import { Text } from '@/components/nativewindui/Text';
 <% if (props.stylingPackage?.options.selectedComponents.includes('toggle')) { %>
 import { Toggle } from '@/components/nativewindui/Toggle';
 <% } %>
+import { useHeaderSearchBar } from '@/lib/useHeaderSearchBar';
 import { useColorScheme } from '@/lib/useColorScheme';
 import { COLORS } from '@/theme/colors';
 
@@ -95,32 +94,6 @@ export default function Screen() {
   );
 }
 
-function useHeaderSearchBar(props: SearchBarProps = {}) {
-  const { colorScheme, colors } = useColorScheme();
-  const navigation = useNavigation();
-  const [search, setSearch] = React.useState('');
-
-  React.useLayoutEffect(() => {
-    navigation.setOptions({
-      headerSearchBarOptions: {
-        placeholder: 'Search...',
-        textColor: colors.foreground,
-        tintColor: colors.primary,
-        headerIconColor: colors.foreground,
-        hintTextColor: colors.grey,
-        hideWhenScrolling: false,
-        onChangeText(ev) {
-          setSearch(ev.nativeEvent.text);
-        },
-        ...props,
-      } satisfies SearchBarProps,
-    });
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [navigation, colorScheme]);
-  
-  return search;
-}
-
 function ListEmptyComponent() {
   const insets = useSafeAreaInsets();
   const dimensions = useWindowDimensions();
@@ -315,16 +288,13 @@ const COMPONENTS: ComponentItem[] = [
     name: 'Progress Indicator',
     component: function ProgressIndicatorExample() {
       const [progress, setProgress] = React.useState(13);
+      React.useEffect(() => {
+        const intervalId = setInterval(() => {
+          setProgress((prev) => (prev >= 99 ? 0 : prev + 5));
+        }, 1000);
 
-       React.useEffect(() => {
-        let id: ReturnType<typeof setInterval> | null = null;
-        if (!id) {
-          id = setInterval(() => {
-            setProgress((prev) => (prev >= 99 ? 0 : prev + 5));
-          }, 1000);
-        }
         return () => {
-          if (id) clearInterval(id);
+          clearInterval(intervalId);
         };
       }, []);
       return (
@@ -378,8 +348,8 @@ const COMPONENTS: ComponentItem[] = [
           <DatePicker
             value={date}
             mode='datetime'
-            onChange={(ev) => {
-              setDate(new Date(ev.nativeEvent.timestamp));
+            onValueChange={(_event, selectedDate) => {
+              setDate(selectedDate);
             }}
           />
         </View>