diff --git a/ios/Podfile.lock b/ios/Podfile.lock index d688213fafb4..cd58d5c7aa87 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1733,7 +1733,7 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga - - react-native-pager-view (6.3.4): + - react-native-pager-view (6.4.1): - DoubleConversion - glog - hermes-engine @@ -1746,7 +1746,7 @@ PODS: - React-featureflags - React-graphics - React-ImageManager - - react-native-pager-view/common (= 6.3.4) + - react-native-pager-view/common (= 6.4.1) - React-NativeModulesApple - React-RCTFabric - React-rendererdebug @@ -1755,7 +1755,7 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga - - react-native-pager-view/common (6.3.4): + - react-native-pager-view/common (6.4.1): - DoubleConversion - glog - hermes-engine @@ -3187,7 +3187,7 @@ SPEC CHECKSUMS: react-native-keyboard-controller: 5075321af7b1c834cfb9582230659d032c963278 react-native-launch-arguments: 5f41e0abf88a15e3c5309b8875d6fd5ac43df49d react-native-netinfo: fb5112b1fa754975485884ae85a3fb6a684f49d5 - react-native-pager-view: 6bff9b0883b902571530ddd1b2ea9dc570f321f6 + react-native-pager-view: 94195f1bf32e7f78359fa20057c97e632364a08b react-native-pdf: dd6ae39a93607a80919bef9f3499e840c693989d react-native-performance: 3c608307be10964f8a97d3af462f37125b6d8fa5 react-native-plaid-link-sdk: f91a22b45b7c3d4cd6c47273200dc57df35068b0 diff --git a/package-lock.json b/package-lock.json index a7c9fc4fb570..d1f12a745f5a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -104,7 +104,7 @@ "react-native-localize": "^2.2.6", "react-native-modal": "^13.0.0", "react-native-onyx": "2.0.66", - "react-native-pager-view": "6.3.4", + "react-native-pager-view": "6.4.1", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", "react-native-permissions": "^3.10.0", @@ -38200,9 +38200,9 @@ } }, "node_modules/react-native-pager-view": { - "version": "6.3.4", - "resolved": "https://registry.npmjs.org/react-native-pager-view/-/react-native-pager-view-6.3.4.tgz", - "integrity": "sha512-4PEQd52EOwWcfiFJZ4VGSlY+GZfumvUzNbAozsMEgJaLvOHOMMl+Arfsc0txgtGdS49uEiHFLLZthZQzxx/Mog==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/react-native-pager-view/-/react-native-pager-view-6.4.1.tgz", + "integrity": "sha512-HnDxXTRHnR6WJ/vnOitv0C32KG9MJjxLnxswuQlBJmQ7RxF2GWOHSPIRAdZ9fLxdLstV38z9Oz1C95+t+yXkcg==", "peerDependencies": { "react": "*", "react-native": "*" diff --git a/package.json b/package.json index 2945464ec907..c80750550b80 100644 --- a/package.json +++ b/package.json @@ -161,7 +161,7 @@ "react-native-localize": "^2.2.6", "react-native-modal": "^13.0.0", "react-native-onyx": "2.0.66", - "react-native-pager-view": "6.3.4", + "react-native-pager-view": "6.4.1", "react-native-pdf": "6.7.3", "react-native-performance": "^5.1.0", "react-native-permissions": "^3.10.0", diff --git a/patches/react-native-pager-view+6.3.4+001+add-view.patch b/patches/react-native-pager-view+6.3.4+001+add-view.patch deleted file mode 100644 index 9d3b645700f9..000000000000 --- a/patches/react-native-pager-view+6.3.4+001+add-view.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/node_modules/react-native-pager-view/android/src/fabric/java/com/reactnativepagerview/PagerViewViewManager.kt b/node_modules/react-native-pager-view/android/src/fabric/java/com/reactnativepagerview/PagerViewViewManager.kt -index aa974a6..e9c4a52 100644 ---- a/node_modules/react-native-pager-view/android/src/fabric/java/com/reactnativepagerview/PagerViewViewManager.kt -+++ b/node_modules/react-native-pager-view/android/src/fabric/java/com/reactnativepagerview/PagerViewViewManager.kt -@@ -88,7 +88,7 @@ class PagerViewViewManager : ViewGroupManager(), RNCViewPa - return host - } - -- override fun addView(host: NestedScrollableHost, child: View?, index: Int) { -+ override fun addView(host: NestedScrollableHost, child: View, index: Int) { - PagerViewViewManagerImpl.addView(host, child, index) - } - diff --git a/patches/react-native-pager-view+6.3.4+002+rn-75-fixes.patch b/patches/react-native-pager-view+6.3.4+002+rn-75-fixes.patch deleted file mode 100644 index 694da9da1049..000000000000 --- a/patches/react-native-pager-view+6.3.4+002+rn-75-fixes.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/node_modules/react-native-pager-view/src/PagerView.tsx b/node_modules/react-native-pager-view/src/PagerView.tsx -index 62faa74..e3fb020 100644 ---- a/node_modules/react-native-pager-view/src/PagerView.tsx -+++ b/node_modules/react-native-pager-view/src/PagerView.tsx -@@ -20,17 +20,6 @@ import LEGACY_PagerViewNativeComponent, { - Commands as LEGACY_PagerViewNativeCommands, - } from './specs/LEGACY_PagerViewNativeComponent'; - --// The Fabric component for PagerView uses a work around present also in ScrollView: --// https://github.com/callstack/react-native-pager-view/blob/master/ios/Fabric/RNCPagerViewComponentView.mm#L362-L368 --// That workaround works only if we add these lines in to make sure that the RCTEventEmitter is registered properly --// in the JS callable modules. --// NOTE: This is a workaround as we would like to get rid of these lines below. But for the time being, as the cut date for --// 0.74 approaches, we need to keep these lines. --// As soon as we figure out how to move forward, we will provide guidance and/or submit a PR to fix this. --if (Platform.OS === 'ios') { -- require('react-native/Libraries/Renderer/shims/ReactNative'); // Force side effects to prevent T55744311 --} -- - /** - * Container that allows to flip left and right between child views. Each - * child view of the `PagerView` will be treated as a separate page diff --git a/patches/react-native-pager-view+6.3.4+003+position-absolute.patch b/patches/react-native-pager-view+6.3.4+003+position-absolute.patch deleted file mode 100644 index 466e040f0816..000000000000 --- a/patches/react-native-pager-view+6.3.4+003+position-absolute.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/node_modules/react-native-pager-view/src/utils.tsx b/node_modules/react-native-pager-view/src/utils.tsx -index 0d7d265..2f022a4 100644 ---- a/node_modules/react-native-pager-view/src/utils.tsx -+++ b/node_modules/react-native-pager-view/src/utils.tsx -@@ -1,5 +1,5 @@ - import React, { Children, ReactNode } from 'react'; --import { StyleSheet, View } from 'react-native'; -+import { Platform, StyleSheet, View } from 'react-native'; - - export const LEGACY_childrenWithOverriddenStyle = (children?: ReactNode) => { - return Children.map(children, (child) => { -@@ -29,6 +29,7 @@ export const childrenWithOverriddenStyle = ( - height: '100%', - width: '100%', - paddingHorizontal: pageMargin / 2, -+ position: Platform.OS === 'android' ? 'absolute' : undefined, - }} - collapsable={false} - > diff --git a/patches/react-native-pager-view+6.3.4+004+hybrid-app.patch b/patches/react-native-pager-view+6.3.4+004+hybrid-app.patch deleted file mode 100644 index 4b8f45e87f38..000000000000 --- a/patches/react-native-pager-view+6.3.4+004+hybrid-app.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/node_modules/react-native-pager-view/ios/Fabric/RNCPagerViewComponentView.mm b/node_modules/react-native-pager-view/ios/Fabric/RNCPagerViewComponentView.mm -index 83fa497..a8f792a 100644 ---- a/node_modules/react-native-pager-view/ios/Fabric/RNCPagerViewComponentView.mm -+++ b/node_modules/react-native-pager-view/ios/Fabric/RNCPagerViewComponentView.mm -@@ -2,7 +2,7 @@ - - #import - #import "RNCPagerViewComponentView.h" --#import -+#import - #import - #import - #import