From c8878131cd0fae9604746ee22fb874ea2252ce82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Jan 2023 12:14:42 +0000 Subject: [PATCH 1/2] Bump react-native-paper from 4.12.4 to 5.1.4 Bumps [react-native-paper](https://github.com/callstack/react-native-paper) from 4.12.4 to 5.1.4. - [Release notes](https://github.com/callstack/react-native-paper/releases) - [Changelog](https://github.com/callstack/react-native-paper/blob/main/.release-it.json) - [Commits](https://github.com/callstack/react-native-paper/compare/v4.12.4...v5.1.4) --- updated-dependencies: - dependency-name: react-native-paper dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 51 ++++++++++++++++++++++++----------------------- package.json | 2 +- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1b9308a53c..425edbb81f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -53,7 +53,7 @@ "react-native-ios-context-menu": "1.15.3", "react-native-keychain": "8.1.1", "react-native-network-logger": "1.14.0", - "react-native-paper": "4.12.4", + "react-native-paper": "5.1.4", "react-native-popover-view": "4.1.0", "react-native-reanimated": "2.14.4", "react-native-restart": "0.0.24", @@ -17040,14 +17040,6 @@ "react-native": "*" } }, - "node_modules/react-native-iphone-x-helper": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz", - "integrity": "sha512-HOf0jzRnq2/aFUcdCJ9w9JGzN3gdEg0zFE4FyYlp4jtidqU03D5X7ZegGKfT1EWteR0gPBGp9ye5T5FvSWi9Yg==", - "peerDependencies": { - "react-native": ">=0.42.0" - } - }, "node_modules/react-native-keychain": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/react-native-keychain/-/react-native-keychain-8.1.1.tgz", @@ -17073,17 +17065,18 @@ } }, "node_modules/react-native-paper": { - "version": "4.12.4", - "resolved": "https://registry.npmjs.org/react-native-paper/-/react-native-paper-4.12.4.tgz", - "integrity": "sha512-NMfLSIN0Ql/KCTSimhgzbEOgz371dqDAgChnp2VE4H7n1B0Pwy0bzPKmY/T8trVvEdmJRXrbXAusaFq8elDXNg==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/react-native-paper/-/react-native-paper-5.1.4.tgz", + "integrity": "sha512-MpT7zmq/+bSXrKtjUHDKYadTSZvhE2d15oH+Sz77F+xq0/Xqwtg9aX3iHU4x0P92PRubRAbKiLkV0Qi9+beN7g==", "dependencies": { - "@callstack/react-theme-provider": "^3.0.7", + "@callstack/react-theme-provider": "^3.0.8", "color": "^3.1.2", - "react-native-iphone-x-helper": "^1.3.1" + "use-event-callback": "^0.1.0" }, "peerDependencies": { "react": "*", "react-native": "*", + "react-native-safe-area-context": "*", "react-native-vector-icons": "*" } }, @@ -19290,6 +19283,14 @@ "node": ">=0.10.0" } }, + "node_modules/use-event-callback": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/use-event-callback/-/use-event-callback-0.1.0.tgz", + "integrity": "sha512-5fTzY5UEXHMK5UR0NRkUz6TPfWmmX9fO8Tx3SnHrfMPdrQ7Rna0gDBy0r56SP68TwsP9DgwSBzeysCu3A/Z2NA==", + "peerDependencies": { + "react": ">=16.8" + } + }, "node_modules/use-latest-callback": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/use-latest-callback/-/use-latest-callback-0.1.5.tgz", @@ -32149,12 +32150,6 @@ "@dominicstop/ts-event-emitter": "^1.1.0" } }, - "react-native-iphone-x-helper": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz", - "integrity": "sha512-HOf0jzRnq2/aFUcdCJ9w9JGzN3gdEg0zFE4FyYlp4jtidqU03D5X7ZegGKfT1EWteR0gPBGp9ye5T5FvSWi9Yg==", - "requires": {} - }, "react-native-keychain": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/react-native-keychain/-/react-native-keychain-8.1.1.tgz", @@ -32174,13 +32169,13 @@ "requires": {} }, "react-native-paper": { - "version": "4.12.4", - "resolved": "https://registry.npmjs.org/react-native-paper/-/react-native-paper-4.12.4.tgz", - "integrity": "sha512-NMfLSIN0Ql/KCTSimhgzbEOgz371dqDAgChnp2VE4H7n1B0Pwy0bzPKmY/T8trVvEdmJRXrbXAusaFq8elDXNg==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/react-native-paper/-/react-native-paper-5.1.4.tgz", + "integrity": "sha512-MpT7zmq/+bSXrKtjUHDKYadTSZvhE2d15oH+Sz77F+xq0/Xqwtg9aX3iHU4x0P92PRubRAbKiLkV0Qi9+beN7g==", "requires": { - "@callstack/react-theme-provider": "^3.0.7", + "@callstack/react-theme-provider": "^3.0.8", "color": "^3.1.2", - "react-native-iphone-x-helper": "^1.3.1" + "use-event-callback": "^0.1.0" } }, "react-native-popover-view": { @@ -33848,6 +33843,12 @@ "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" }, + "use-event-callback": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/use-event-callback/-/use-event-callback-0.1.0.tgz", + "integrity": "sha512-5fTzY5UEXHMK5UR0NRkUz6TPfWmmX9fO8Tx3SnHrfMPdrQ7Rna0gDBy0r56SP68TwsP9DgwSBzeysCu3A/Z2NA==", + "requires": {} + }, "use-latest-callback": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/use-latest-callback/-/use-latest-callback-0.1.5.tgz", diff --git a/package.json b/package.json index eb9c5515cf..d8335615df 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "react-native-ios-context-menu": "1.15.3", "react-native-keychain": "8.1.1", "react-native-network-logger": "1.14.0", - "react-native-paper": "4.12.4", + "react-native-paper": "5.1.4", "react-native-popover-view": "4.1.0", "react-native-reanimated": "2.14.4", "react-native-restart": "0.0.24", From 3140fa224694961eb12548becc1ff6684abf8555 Mon Sep 17 00:00:00 2001 From: Hawken Rives Date: Tue, 24 Jan 2023 09:57:45 -0500 Subject: [PATCH 2/2] update theme import and change names --- modules/app-theme/index.ts | 4 +--- modules/app-theme/paper.ts | 11 ++++------- source/app.tsx | 4 ++-- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/modules/app-theme/index.ts b/modules/app-theme/index.ts index 702eb65c14..2fd799409a 100644 --- a/modules/app-theme/index.ts +++ b/modules/app-theme/index.ts @@ -1,8 +1,6 @@ import type {ThemingType} from '@callstack/react-theme-provider' import {createTheming} from '@callstack/react-theme-provider' -import {CombinedDefaultTheme, CombinedDarkTheme} from './paper' - -export {CombinedDefaultTheme, CombinedDarkTheme} +export {CombinedLightTheme, CombinedDarkTheme} from './paper' export type AppTheme = { accent: string diff --git a/modules/app-theme/paper.ts b/modules/app-theme/paper.ts index 2ccec90568..927bde0352 100644 --- a/modules/app-theme/paper.ts +++ b/modules/app-theme/paper.ts @@ -2,17 +2,14 @@ import merge from 'deepmerge' import { DarkTheme as NavigationDarkTheme, - DefaultTheme as NavigationDefaultTheme, + DefaultTheme as NavigationLightTheme, } from '@react-navigation/native' import { - DarkTheme as PaperDarkTheme, - DefaultTheme as PaperDefaultTheme, + MD3DarkTheme as PaperDarkTheme, + MD3LightTheme as PaperLightTheme, } from 'react-native-paper' -export const CombinedDefaultTheme = merge( - PaperDefaultTheme, - NavigationDefaultTheme, -) +export const CombinedLightTheme = merge(PaperLightTheme, NavigationLightTheme) export const CombinedDarkTheme = merge(PaperDarkTheme, NavigationDarkTheme) diff --git a/source/app.tsx b/source/app.tsx index 08b5884231..8cbc18a77f 100644 --- a/source/app.tsx +++ b/source/app.tsx @@ -16,7 +16,7 @@ import {Provider as ReduxProvider} from 'react-redux' import {Provider as PaperProvider} from 'react-native-paper' import {PersistQueryClientProvider} from '@tanstack/react-query-persist-client' import {store, persistor} from './redux' -import {ThemeProvider, CombinedDefaultTheme} from '@frogpond/app-theme' +import {ThemeProvider, CombinedLightTheme} from '@frogpond/app-theme' import {ActionSheetProvider} from '@expo/react-native-action-sheet' import {NavigationContainer} from '@react-navigation/native' @@ -37,7 +37,7 @@ export default function App(): JSX.Element { client={queryClient} persistOptions={{persister}} > - +