Skip to content

Commit 60b5bb4

Browse files
fix: upgrade app to material 3
1 parent 0b2ca14 commit 60b5bb4

File tree

4 files changed

+31
-29
lines changed

4 files changed

+31
-29
lines changed

example/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@
1212
"test": "jest"
1313
},
1414
"dependencies": {
15+
"add": "^2.0.6",
1516
"expo": "^47.0.0",
1617
"expo-splash-screen": "~0.17.5",
1718
"react": "18.1.0",
1819
"react-dom": "18.1.0",
1920
"react-native": "0.70.5",
20-
"react-native-paper": "^4.12.4",
21+
"react-native-paper": "^5.0.2",
2122
"react-native-web": "~0.18.7"
2223
},
2324
"devDependencies": {

example/src/App.tsx

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import {
66
Linking,
77
Image,
88
Animated,
9-
Platform,
109
} from 'react-native'
1110
import { SafeAreaProvider } from 'react-native-safe-area-context'
1211

@@ -117,7 +116,7 @@ function App() {
117116
const backgroundColor =
118117
theme.dark && theme.mode === 'adaptive'
119118
? overlay(3, theme.colors.surface)
120-
: (theme.colors.surface as any)
119+
: theme.colors.surface
121120

122121
const pastDate = new Date(new Date().setDate(new Date().getDate() - 5))
123122
const futureDate = new Date(new Date().setDate(new Date().getDate() + 5))
@@ -389,21 +388,19 @@ function Row({ children }: { children: any }) {
389388
function Label({ children }: { children: string }) {
390389
const theme = useTheme()
391390
return (
392-
<Text style={[styles.label, { ...theme.fonts.medium }]}>{children}</Text>
391+
<Text style={[styles.label, { ...theme.fonts.bodyLarge }]}>{children}</Text>
393392
)
394393
}
395394

395+
const theme = { version: 3 }
396396
export default function AppWithProviders() {
397-
const inner = (
398-
<PaperProvider>
399-
<App />
400-
</PaperProvider>
397+
return (
398+
<SafeAreaProvider>
399+
<PaperProvider theme={theme as any}>
400+
<App />
401+
</PaperProvider>
402+
</SafeAreaProvider>
401403
)
402-
403-
if (Platform.OS === 'web') {
404-
return <SafeAreaProvider>{inner}</SafeAreaProvider>
405-
}
406-
return <SafeAreaProvider>{inner}</SafeAreaProvider>
407404
}
408405

409406
function TwitterFollowButton({ userName }: { userName: string }) {

example/yarn.lock

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1228,10 +1228,10 @@
12281228
"@babel/helper-validator-identifier" "^7.19.1"
12291229
to-fast-properties "^2.0.0"
12301230

1231-
"@callstack/react-theme-provider@^3.0.7":
1232-
version "3.0.7"
1233-
resolved "https://registry.npmjs.org/@callstack/react-theme-provider/-/react-theme-provider-3.0.7.tgz#b7ce1a53d63ad5e83574b831ae0af6b7c6cc40e7"
1234-
integrity sha512-Ab6rbD2w4u9W3yf7LQQ8evx9m8fZNsoWxt+MFm3AyZnyKQNCJf4K7ip9tHHZgSs+HTdoj38lEqPehvFOVQKvAg==
1231+
"@callstack/react-theme-provider@^3.0.8":
1232+
version "3.0.8"
1233+
resolved "https://registry.npmjs.org/@callstack/react-theme-provider/-/react-theme-provider-3.0.8.tgz#d0d7ac71e422133c5f7b78f4c4aa1bc57f156f50"
1234+
integrity sha512-5U231sYY2sqQOaELX0WBCn+iluV8bFaXIS7em03k4W5Xz0AhGvKlnpLIhDGFP8im/SvNW7/2XoR0BsClhn9t6Q==
12351235
dependencies:
12361236
deepmerge "^3.2.0"
12371237
hoist-non-react-statics "^3.3.0"
@@ -2486,6 +2486,11 @@ acorn@^6.4.1:
24862486
resolved "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
24872487
integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
24882488

2489+
add@^2.0.6:
2490+
version "2.0.6"
2491+
resolved "https://registry.npmjs.org/add/-/add-2.0.6.tgz#248f0a9f6e5a528ef2295dbeec30532130ae2235"
2492+
integrity sha512-j5QzrmsokwWWp6kUcJQySpbG+xfOBqqKnup3OIk1pz+kB/80SLorZ9V8zHFLO92Lcd+hbvq8bT+zOGoPkmBV0Q==
2493+
24892494
24902495
version "1.1.2"
24912496
resolved "https://registry.npmjs.org/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6"
@@ -9367,19 +9372,14 @@ react-native-gradle-plugin@^0.70.3:
93679372
resolved "https://registry.npmjs.org/react-native-gradle-plugin/-/react-native-gradle-plugin-0.70.3.tgz#cbcf0619cbfbddaa9128701aa2d7b4145f9c4fc8"
93689373
integrity sha512-oOanj84fJEXUg9FoEAQomA8ISG+DVIrTZ3qF7m69VQUJyOGYyDZmPqKcjvRku4KXlEH6hWO9i4ACLzNBh8gC0A==
93699374

9370-
react-native-iphone-x-helper@^1.3.1:
9371-
version "1.3.1"
9372-
resolved "https://registry.npmjs.org/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz#20c603e9a0e765fd6f97396638bdeb0e5a60b010"
9373-
integrity sha512-HOf0jzRnq2/aFUcdCJ9w9JGzN3gdEg0zFE4FyYlp4jtidqU03D5X7ZegGKfT1EWteR0gPBGp9ye5T5FvSWi9Yg==
9374-
9375-
react-native-paper@^4.12.4:
9376-
version "4.12.4"
9377-
resolved "https://registry.npmjs.org/react-native-paper/-/react-native-paper-4.12.4.tgz#c04ce40d225dc267b7ee32be705dd553f44e0c0c"
9378-
integrity sha512-NMfLSIN0Ql/KCTSimhgzbEOgz371dqDAgChnp2VE4H7n1B0Pwy0bzPKmY/T8trVvEdmJRXrbXAusaFq8elDXNg==
9375+
react-native-paper@^5.0.2:
9376+
version "5.0.2"
9377+
resolved "https://registry.npmjs.org/react-native-paper/-/react-native-paper-5.0.2.tgz#1ea77d394988c0b8be9e933a1a7f6c16a180adc5"
9378+
integrity sha512-PRH2QtlpXovfbs82affDQO9BT7vK3lKa04daK56ov3YXezPmbJnPy1dAAyERrLUswtxyY/e6dQhnIMkkKg3k0Q==
93799379
dependencies:
9380-
"@callstack/react-theme-provider" "^3.0.7"
9380+
"@callstack/react-theme-provider" "^3.0.8"
93819381
color "^3.1.2"
9382-
react-native-iphone-x-helper "^1.3.1"
9382+
use-event-callback "^0.1.0"
93839383

93849384
react-native-web@~0.18.7:
93859385
version "0.18.8"
@@ -11158,6 +11158,11 @@ url@^0.11.0:
1115811158
punycode "1.3.2"
1115911159
querystring "0.2.0"
1116011160

11161+
use-event-callback@^0.1.0:
11162+
version "0.1.0"
11163+
resolved "https://registry.npmjs.org/use-event-callback/-/use-event-callback-0.1.0.tgz#29d7ce996802935c5387e7d3b606cf316da3457f"
11164+
integrity sha512-5fTzY5UEXHMK5UR0NRkUz6TPfWmmX9fO8Tx3SnHrfMPdrQ7Rna0gDBy0r56SP68TwsP9DgwSBzeysCu3A/Z2NA==
11165+
1116111166
use-sync-external-store@^1.0.0:
1116211167
version "1.2.0"
1116311168
resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a"

src/Date/DatePickerInputWithoutModal.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ function getLabel({
9494
const styles = StyleSheet.create({
9595
root: {
9696
flexGrow: 1,
97-
backgroundColor: 'pink',
9897
},
9998
inputContainer: {
10099
flexGrow: 1,

0 commit comments

Comments
 (0)