-
Notifications
You must be signed in to change notification settings - Fork 2.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into Rory-FixPodCache
- Loading branch information
Showing
147 changed files
with
2,360 additions
and
2,118 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| diff --git a/node_modules/@react-navigation/native-stack/src/types.tsx b/node_modules/@react-navigation/native-stack/src/types.tsx | ||
| index 206fb0b..7a34a8e 100644 | ||
| --- a/node_modules/@react-navigation/native-stack/src/types.tsx | ||
| +++ b/node_modules/@react-navigation/native-stack/src/types.tsx | ||
| @@ -490,6 +490,14 @@ export type NativeStackNavigationOptions = { | ||
| * Only supported on iOS and Android. | ||
| */ | ||
| freezeOnBlur?: boolean; | ||
| + // partial changes from https://github.com/react-navigation/react-navigation/commit/90cfbf23bcc5259f3262691a9eec6c5b906e5262 | ||
| + // patch can be removed when new version of `native-stack` will be released | ||
| + /** | ||
| + * Whether the keyboard should hide when swiping to the previous screen. Defaults to `false`. | ||
| + * | ||
| + * Only supported on iOS | ||
| + */ | ||
| + keyboardHandlingEnabled?: boolean; | ||
| }; | ||
|
|
||
| export type NativeStackNavigatorProps = DefaultNavigatorOptions< | ||
| diff --git a/node_modules/@react-navigation/native-stack/src/views/NativeStackView.native.tsx b/node_modules/@react-navigation/native-stack/src/views/NativeStackView.native.tsx | ||
| index a005c43..03d8b50 100644 | ||
| --- a/node_modules/@react-navigation/native-stack/src/views/NativeStackView.native.tsx | ||
| +++ b/node_modules/@react-navigation/native-stack/src/views/NativeStackView.native.tsx | ||
| @@ -161,6 +161,7 @@ const SceneView = ({ | ||
| statusBarTranslucent, | ||
| statusBarColor, | ||
| freezeOnBlur, | ||
| + keyboardHandlingEnabled, | ||
| } = options; | ||
|
|
||
| let { | ||
| @@ -289,6 +290,7 @@ const SceneView = ({ | ||
| onNativeDismissCancelled={onNativeDismissCancelled} | ||
| // this prop is available since rn-screens 3.16 | ||
| freezeOnBlur={freezeOnBlur} | ||
| + hideKeyboardOnSwipe={keyboardHandlingEnabled} | ||
| > | ||
| <NavigationContext.Provider value={navigation}> | ||
| <NavigationRouteContext.Provider value={route}> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| diff --git a/node_modules/expo-av/android/build.gradle b/node_modules/expo-av/android/build.gradle | ||
| index 2d68ca6..c3fa3c5 100644 | ||
| --- a/node_modules/expo-av/android/build.gradle | ||
| +++ b/node_modules/expo-av/android/build.gradle | ||
| @@ -7,10 +7,11 @@ apply plugin: 'maven-publish' | ||
| group = 'host.exp.exponent' | ||
| version = '13.10.4' | ||
|
|
||
| +def REACT_NATIVE_PATH = this.hasProperty('reactNativeProject') ? this.reactNativeProject + '/node_modules/react-native/package.json' : 'react-native/package.json' | ||
| def REACT_NATIVE_BUILD_FROM_SOURCE = findProject(":ReactAndroid") != null | ||
| def REACT_NATIVE_DIR = REACT_NATIVE_BUILD_FROM_SOURCE | ||
| ? findProject(":ReactAndroid").getProjectDir().parent | ||
| - : new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).parent | ||
| + : new File(["node", "--print", "require.resolve('${REACT_NATIVE_PATH}')"].execute(null, rootDir).text.trim()).parent | ||
|
|
||
| def reactNativeArchitectures() { | ||
| def value = project.getProperties().get("reactNativeArchitectures") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.