Skip to content

Commit a9d33df

Browse files
committed
chore: update expo deps + fix type errors
1 parent d2e6730 commit a9d33df

File tree

7 files changed

+152
-115
lines changed

7 files changed

+152
-115
lines changed

apps/showcase/app/(tabs)/components/_layout.tsx

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,10 @@ import type {
33
MaterialTopTabNavigationOptions,
44
} from '@react-navigation/material-top-tabs';
55
import { createMaterialTopTabNavigator } from '@react-navigation/material-top-tabs';
6-
import {
7-
useTheme,
8-
type ParamListBase,
9-
type TabNavigationState,
10-
} from '@react-navigation/native';
6+
import { useTheme, type ParamListBase, type TabNavigationState } from '@react-navigation/native';
117
import { Stack, withLayoutContext } from 'expo-router';
8+
import React from 'react';
129
import { useWindowDimensions } from 'react-native';
13-
1410
const { Navigator } = createMaterialTopTabNavigator();
1511

1612
const MaterialTopTabs = withLayoutContext<
@@ -24,9 +20,10 @@ export default function MaterialTopTabsLayout() {
2420
const { colors } = useTheme();
2521
const { width } = useWindowDimensions();
2622
return (
27-
<>
23+
<React.Fragment>
2824
<Stack.Screen options={{ headerShadowVisible: false }} />
2925
<MaterialTopTabs
26+
id={undefined}
3027
initialRouteName='index'
3128
screenOptions={{
3229
tabBarActiveTintColor: colors.text,
@@ -56,6 +53,6 @@ export default function MaterialTopTabsLayout() {
5653
}}
5754
/>
5855
</MaterialTopTabs>
59-
</>
56+
</React.Fragment>
6057
);
6158
}

apps/showcase/app/material-top-tabs/_layout.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ import type {
33
MaterialTopTabNavigationOptions,
44
} from '@react-navigation/material-top-tabs';
55
import { createMaterialTopTabNavigator } from '@react-navigation/material-top-tabs';
6-
import {
7-
useTheme,
8-
type ParamListBase,
9-
type TabNavigationState,
10-
} from '@react-navigation/native';
6+
import { useTheme, type ParamListBase, type TabNavigationState } from '@react-navigation/native';
117
import { withLayoutContext } from 'expo-router';
128

139
const { Navigator } = createMaterialTopTabNavigator();
@@ -23,6 +19,7 @@ export default function MaterialTopTabsLayout() {
2319
const { colors } = useTheme();
2420
return (
2521
<MaterialTopTabs
22+
id={undefined}
2623
initialRouteName='index'
2724
screenOptions={{
2825
tabBarActiveTintColor: colors.text,

apps/showcase/app/navigation-menu.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { TextRef } from '@rn-primitives/types';
1+
import type { ViewRef } from '@rn-primitives/types';
22
import { useNavigation } from 'expo-router';
33
import * as React from 'react';
44
import { Platform, Pressable, StyleSheet, View } from 'react-native';
@@ -154,8 +154,8 @@ const components: { title: string; href: string; description: string }[] = [
154154
];
155155

156156
const ListItem = React.forwardRef<
157-
TextRef,
158-
React.ComponentPropsWithoutRef<typeof Text> & { title: string; href: string }
157+
ViewRef,
158+
React.ComponentPropsWithoutRef<typeof View> & { title: string; href: string }
159159
>(({ className, title, children, ...props }, ref) => {
160160
return (
161161
<View role='listitem'>

apps/showcase/app/table.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ const MIN_COLUMN_WIDTHS = [120, 120, 100, 120];
2424

2525
export default function TableScreen() {
2626
const { width } = useWindowDimensions();
27-
const [isPopoverOpen, setIsPopoverOpen] = React.useState(false);
2827
const insets = useSafeAreaInsets();
2928

3029
const columnWidths = React.useMemo(() => {
@@ -42,7 +41,7 @@ export default function TableScreen() {
4241
<TableHeader>
4342
<TableRow>
4443
<TableHead className='px-0.5' style={{ width: columnWidths[0] }}>
45-
<Popover open={isPopoverOpen} onOpenChange={setIsPopoverOpen}>
44+
<Popover>
4645
<PopoverTrigger asChild>
4746
<Button variant='ghost' size='sm' className='flex-row justify-start gap-3'>
4847
<Text className={cn('text-base text-muted-foreground font-medium')}>

apps/showcase/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
"@tanstack/react-table": "^8.11.7",
3333
"class-variance-authority": "^0.7.0",
3434
"clsx": "^2.1.0",
35-
"expo": "^53.0.7",
35+
"expo": "^53.0.9",
3636
"expo-font": "~13.3.1",
3737
"expo-haptics": "~14.1.4",
38-
"expo-linking": "~7.1.4",
38+
"expo-linking": "~7.1.5",
3939
"expo-navigation-bar": "~4.2.4",
40-
"expo-router": "~5.0.5",
40+
"expo-router": "~5.0.7",
4141
"expo-splash-screen": "~0.30.8",
4242
"expo-status-bar": "~2.2.3",
4343
"expo-system-ui": "~5.0.7",

packages/templates/starter-base/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
"@rn-primitives/types": "~1.2.0",
2323
"class-variance-authority": "^0.7.0",
2424
"clsx": "^2.1.0",
25-
"expo": "^53.0.7",
26-
"expo-linking": "~7.1.4",
25+
"expo": "^53.0.9",
26+
"expo-linking": "~7.1.5",
2727
"expo-navigation-bar": "~4.2.4",
28-
"expo-router": "~5.0.5",
28+
"expo-router": "~5.0.7",
2929
"expo-splash-screen": "~0.30.8",
3030
"expo-status-bar": "~2.2.3",
3131
"expo-system-ui": "~5.0.7",

0 commit comments

Comments
 (0)