-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
## Summary This PR adds support for React Native 0.75 (currently: **0.75.0-rc.6**). https://swmansion.slack.com/archives/C048Z2NNEBY/p1719603649642539 ## Test plan --------- Co-authored-by: szydlovsky <9szydlowski9@gmail.com>
- Loading branch information
1 parent
f26aebb
commit 7df5fd5
Showing
48 changed files
with
3,024 additions
and
911 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
13 changes: 13 additions & 0 deletions
13
.yarn/patches/@react-native-community-slider-npm-4.5.2-a70d91fe5a.patch
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,13 @@ | ||
| diff --git a/react-native-slider.podspec b/react-native-slider.podspec | ||
| index 54d77bd5e64ac01af46a8c177452b8fb6c889afa..e1903fbdcb4af2a4f89ee94f0e67d59461a98eea 100644 | ||
| --- a/react-native-slider.podspec | ||
| +++ b/react-native-slider.podspec | ||
| @@ -13,7 +13,7 @@ Pod::Spec.new do |s| | ||
|
|
||
| s.authors = package['author'] | ||
| s.homepage = package['homepage'] | ||
| - s.platforms = { :ios => "9.0", :visionos => "1.0" } | ||
| + s.platforms = { :ios => "10.0", :visionos => "1.0" } | ||
|
|
||
| s.source = { :git => "https://github.com/callstack/react-native-slider.git", :tag => "v#{s.version}" } | ||
| s.source_files = "ios/**/*.{h,m,mm}" |
52 changes: 52 additions & 0 deletions
52
.yarn/patches/react-native-pager-view-npm-6.3.3-7b62f58674.patch
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,52 @@ | ||
| diff --git a/android/src/fabric/java/com/reactnativepagerview/PagerViewViewManager.kt b/android/src/fabric/java/com/reactnativepagerview/PagerViewViewManager.kt | ||
| index aa974a6bad63f5015a75834f9740abacd0771e0d..c8e2f8583a5fbd89216b982d6115c34375f009e5 100644 | ||
| --- a/android/src/fabric/java/com/reactnativepagerview/PagerViewViewManager.kt | ||
| +++ b/android/src/fabric/java/com/reactnativepagerview/PagerViewViewManager.kt | ||
| @@ -88,7 +88,7 @@ class PagerViewViewManager : ViewGroupManager<NestedScrollableHost>(), RNCViewPa | ||
| return host | ||
| } | ||
|
|
||
| - override fun addView(host: NestedScrollableHost, child: View?, index: Int) { | ||
| + fun addView(host: NestedScrollableHost, child: View?, index: Int) { | ||
| PagerViewViewManagerImpl.addView(host, child, index) | ||
| } | ||
|
|
||
| diff --git a/android/src/paper/java/com/reactnativepagerview/PagerViewViewManager.kt b/android/src/paper/java/com/reactnativepagerview/PagerViewViewManager.kt | ||
| index 4d0adffe6a658de709319e0700b35f726783dca2..d3d99a2f2b8ce7f91e4056d07664d4fb6efc8115 100644 | ||
| --- a/android/src/paper/java/com/reactnativepagerview/PagerViewViewManager.kt | ||
| +++ b/android/src/paper/java/com/reactnativepagerview/PagerViewViewManager.kt | ||
| @@ -69,7 +69,7 @@ class PagerViewViewManager : ViewGroupManager<NestedScrollableHost>() { | ||
| return host | ||
| } | ||
|
|
||
| - override fun addView(host: NestedScrollableHost, child: View?, index: Int) { | ||
| + fun addView(host: NestedScrollableHost, child: View?, index: Int) { | ||
| PagerViewViewManagerImpl.addView(host, child, index) | ||
| } | ||
|
|
||
| diff --git a/lib/typescript/PagerView.d.ts b/lib/typescript/PagerView.d.ts | ||
| index f800118e8a8132a760cd7e21c712cf9c55ace7df..003900a2bef8fc81d04d5d059e445bbe18c7b022 100644 | ||
| --- a/lib/typescript/PagerView.d.ts | ||
| +++ b/lib/typescript/PagerView.d.ts | ||
| @@ -69,7 +69,7 @@ declare class PagerViewInternal extends React.Component<NativeProps> { | ||
| render(): JSX.Element; | ||
| } | ||
| export declare const PagerView: React.ForwardRefExoticComponent<Omit<NativeProps, "useLegacy"> & { | ||
| - useNext: boolean; | ||
| + useNext?: boolean; | ||
| } & React.RefAttributes<PagerViewInternal>>; | ||
| export type PagerView = PagerViewInternal & typeof PagerView; | ||
| export {}; | ||
| diff --git a/src/PagerView.tsx b/src/PagerView.tsx | ||
| index 62faa7490cebb6ec8fcbaca16a35a6f4bfbad00d..79e36d5020b534db7aa869c7ddc7cb6f401125e0 100644 | ||
| --- a/src/PagerView.tsx | ||
| +++ b/src/PagerView.tsx | ||
| @@ -225,7 +225,7 @@ class PagerViewInternal extends React.Component<NativeProps> { | ||
| } | ||
|
|
||
| // Temporary solution. It should be removed once all things get fixed | ||
| -type PagerViewProps = Omit<NativeProps, 'useLegacy'> & { useNext: boolean }; | ||
| +type PagerViewProps = Omit<NativeProps, 'useLegacy'> & { useNext?: boolean }; | ||
|
|
||
| export const PagerView = React.forwardRef<PagerViewInternal, PagerViewProps>( | ||
| (props, ref) => { |
22 changes: 22 additions & 0 deletions
22
.yarn/patches/react-native-safe-area-context-npm-4.10.8-bcca33ef13.patch
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,22 @@ | ||
| diff --git a/android/src/main/java/com/th3rdwave/safeareacontext/SafeAreaViewShadowNode.kt b/android/src/main/java/com/th3rdwave/safeareacontext/SafeAreaViewShadowNode.kt | ||
| index c1103ac1c3d124bf5856262015653bfe05ddd9af..a57fa38c8ed84eb7560b8c326c7a1d7de36a28c9 100644 | ||
| --- a/android/src/main/java/com/th3rdwave/safeareacontext/SafeAreaViewShadowNode.kt | ||
| +++ b/android/src/main/java/com/th3rdwave/safeareacontext/SafeAreaViewShadowNode.kt | ||
| @@ -143,7 +143,7 @@ class SafeAreaViewShadowNode : LayoutShadowNode() { | ||
| override fun setPaddings(index: Int, padding: Dynamic) { | ||
| val spacingType = ViewProps.PADDING_MARGIN_SPACING_TYPES[index] | ||
| mPaddings[spacingType] = | ||
| - if (padding.getType() == ReadableType.Number) padding.asDouble().toFloat() else Float.NaN | ||
| + if (padding.type == ReadableType.Number) padding.asDouble().toFloat() else Float.NaN | ||
| super.setPaddings(index, padding) | ||
| mNeedsUpdate = true | ||
| } | ||
| @@ -163,7 +163,7 @@ class SafeAreaViewShadowNode : LayoutShadowNode() { | ||
| override fun setMargins(index: Int, margin: Dynamic) { | ||
| val spacingType = ViewProps.PADDING_MARGIN_SPACING_TYPES[index] | ||
| mMargins[spacingType] = | ||
| - if (margin.getType() == ReadableType.Number) margin.asDouble().toFloat() else Float.NaN | ||
| + if (margin.type == ReadableType.Number) margin.asDouble().toFloat() else Float.NaN | ||
| super.setMargins(index, margin) | ||
| mNeedsUpdate = true | ||
| } |
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
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
2 changes: 1 addition & 1 deletion
2
apps/fabric-example/android/gradle/wrapper/gradle-wrapper.properties
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,14 @@ | ||
| pluginManagement { includeBuild("../../../node_modules/react-native/node_modules/@react-native/gradle-plugin") } | ||
| plugins { id("com.facebook.react.settings") } | ||
| extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() } | ||
| rootProject.name = 'FabricExample' | ||
| apply from: file("../../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) | ||
| include ':app' | ||
| includeBuild('../../../node_modules/@react-native/gradle-plugin') | ||
| includeBuild('../../../node_modules/react-native/node_modules/@react-native/gradle-plugin') | ||
| // includeBuild('../../../node_modules/react-native') { | ||
| // dependencySubstitution { | ||
| // substitute(module("com.facebook.react:react-android")).using(project(":packages:react-native:ReactAndroid")) | ||
| // substitute(module("com.facebook.react:react-native")).using(project(":packages:react-native:ReactAndroid")) | ||
| // substitute(module("com.facebook.react:hermes-android")).using(project(":packages:react-native:ReactAndroid:hermes-engine")) | ||
| // substitute(module("com.facebook.react:hermes-engine")).using(project(":packages:react-native:ReactAndroid:hermes-engine")) | ||
| // } | ||
| // } |
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.