Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3970,7 +3970,7 @@ PODS:
- RNWorklets
- SocketRocket
- Yoga
- RNScreens (4.15.4):
- RNScreens (4.25.0-beta.1):
- boost
- DoubleConversion
- fast_float
Expand All @@ -3997,10 +3997,10 @@ PODS:
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNScreens/common (= 4.15.4)
- RNScreens/common (= 4.25.0-beta.1)
- SocketRocket
- Yoga
- RNScreens/common (4.15.4):
- RNScreens/common (4.25.0-beta.1):
- boost
- DoubleConversion
- fast_float
Expand Down Expand Up @@ -4807,7 +4807,7 @@ SPEC CHECKSUMS:
GTMAppAuth: f69bd07d68cd3b766125f7e072c45d7340dea0de
GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
GzipSwift: 893f3e48e597a1a4f62fafcb6514220fcf8287fa
hermes-engine: b39ec807040f5a775de027a4a9647c0f4222c6ef
hermes-engine: 164a2a741070fc695f1930a2d7a5b885a98c32ce
libavif: 84bbb62fb232c3018d6f1bab79beea87e35de7b7
libdav1d: 23581a4d8ec811ff171ed5e2e05cd27bad64c39f
libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
Expand Down Expand Up @@ -4934,7 +4934,7 @@ SPEC CHECKSUMS:
RNPermissions: 518f0a0c439acc74e2b9937e0e7d29e5031ae949
RNReactNativeHapticFeedback: 5f1542065f0b24c9252bd8cf3e83bc9c548182e4
RNReanimated: fbcb7fd8da5b0b088401542c58fb5d266388f1cf
RNScreens: 4f2aed147a2775017923789d8a0a2d377712ec2e
RNScreens: f157fcda842dd004cbb55e536d592f20e805fb0b
RNSentry: f73f4da92e4c20841ab16e1fa22fc289bc2f9f4e
RNShare: 1c1fde2c4134b9cf220ffebbd6df9c414036d382
RNSVG: 74eb75bd44d62ba9969941e80d8f9832971c681f
Expand Down
17 changes: 8 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
"react-native-reanimated": "4.2.1",
"react-native-render-html": "6.3.1",
"react-native-safe-area-context": "5.6.2",
"react-native-screens": "4.15.4",
"react-native-screens": "4.25.0-beta.1",
"react-native-share": "11.0.2",
"react-native-svg": "15.12.1",
"react-native-tab-view": "^4.3.0",
Expand Down Expand Up @@ -361,6 +361,7 @@
"webpack-merge": "^5.8.0"
},
"overrides": {
"react-native-screens": "4.25.0-beta.1",
"babel-plugin-react-compiler": "0.0.0-experimental-a1856f3-20260422",
"braces": "3.0.3",
"yargs": "17.7.2",
Expand Down
8 changes: 4 additions & 4 deletions patches/react-native-screens/details.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# `react-native-screens` patches

### [react-native-screens+4.15.4+001+fix-lifecycle-events-in-fragment-host.patch](react-native-screens+4.15.4+001+fix-lifecycle-events-in-fragment-host.patch)
### [react-native-screens+4.25.0-beta.1.patch](react-native-screens+4.25.0-beta.1.patch)

- Reason: In HybridApp, React Native is hosted inside a `ReactNativeFragment`, which causes `ScreenFragment.dispatchViewAnimationEvent()` to silently dismiss lifecycle events for root screen fragments. This prevents `transitionStart`/`transitionEnd` from being emitted, which breaks `TransitionTracker` (`src/libs/Navigation/TransitionTracker.ts`). The fix allows event dispatch when the parent fragment is not a `ScreenFragment`.
- Upstream PR/issue: https://github.com/software-mansion/react-native-screens/pull/3854 — once merged and released, bump the version and remove this patch.
- Reason: `SafeAreaView.web.tsx` only has a `default` export, but `safe-area/index.ts` re-exports it as a named export (`export { SafeAreaView } from './SafeAreaView'`). Webpack resolves the `.web` variant for web builds, causing a `ModuleDependencyWarning` that fails the Storybook smoke test. The fix adds a named export alongside the existing default export.
- Upstream PR/issue: https://github.com/software-mansion/react-native-screens/pull/3956 — once merged and released, bump the version and remove this patch.
- E/App issue: 🛑
- PR Introducing Patch: https://github.com/Expensify/App/pull/85759
- PR Introducing Patch: https://github.com/Expensify/App/pull/89199

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
diff --git a/node_modules/react-native-screens/lib/module/components/safe-area/SafeAreaView.web.js b/node_modules/react-native-screens/lib/module/components/safe-area/SafeAreaView.web.js
index 398afe2..60f14e2 100644
--- a/node_modules/react-native-screens/lib/module/components/safe-area/SafeAreaView.web.js
+++ b/node_modules/react-native-screens/lib/module/components/safe-area/SafeAreaView.web.js
@@ -1,4 +1,5 @@
import { View } from 'react-native';
const SafeAreaView = View;
+export { SafeAreaView };
export default SafeAreaView;
//# sourceMappingURL=SafeAreaView.web.js.map
diff --git a/node_modules/react-native-screens/src/components/safe-area/SafeAreaView.web.tsx b/node_modules/react-native-screens/src/components/safe-area/SafeAreaView.web.tsx
index aff03a5..3398bef 100644
--- a/node_modules/react-native-screens/src/components/safe-area/SafeAreaView.web.tsx
+++ b/node_modules/react-native-screens/src/components/safe-area/SafeAreaView.web.tsx
@@ -1,5 +1,8 @@
+// Implementation adapted from `react-native-safe-area-context`:
+// https://github.com/AppAndFlow/react-native-safe-area-context/blob/v5.6.1/src/SafeAreaView.tsx
import { View } from 'react-native';

const SafeAreaView = View;

+export { SafeAreaView };
export default SafeAreaView;
Loading