Merge branch 'main' into @kligarski/add-e2e-tests

Author: kligarski

.github/workflows/android-e2e-test.yml

@@ -60,9 +60,11 @@ jobs:
         run: yarn
 
       - name: Install AVD dependencies
+        # libxkbfile1 is removed by "Free Disk Space (Ubuntu)" step first. Here we install it again
+        # as it seems to be needed by the emulator.
         run: |
           sudo apt update
-          sudo apt-get install -y libpulse0 libgl1
+          sudo apt-get install -y libpulse0 libgl1 libxkbfile1
 
       - name: Build app
         working-directory: ${{ env.WORKING_DIRECTORY }}

Example/ios/Podfile.lock

@@ -1550,7 +1550,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - RNReanimated (4.0.0-nightly-20250218-e5a0cdf69):
+  - RNReanimated (3.17.1):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1572,10 +1572,10 @@ PODS:
     - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNReanimated/reanimated (= 4.0.0-nightly-20250218-e5a0cdf69)
-    - RNReanimated/worklets (= 4.0.0-nightly-20250218-e5a0cdf69)
+    - RNReanimated/reanimated (= 3.17.1)
+    - RNReanimated/worklets (= 3.17.1)
     - Yoga
-  - RNReanimated/reanimated (4.0.0-nightly-20250218-e5a0cdf69):
+  - RNReanimated/reanimated (3.17.1):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1597,9 +1597,9 @@ PODS:
     - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNReanimated/reanimated/apple (= 4.0.0-nightly-20250218-e5a0cdf69)
+    - RNReanimated/reanimated/apple (= 3.17.1)
     - Yoga
-  - RNReanimated/reanimated/apple (4.0.0-nightly-20250218-e5a0cdf69):
+  - RNReanimated/reanimated/apple (3.17.1):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1622,7 +1622,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - RNReanimated/worklets (4.0.0-nightly-20250218-e5a0cdf69):
+  - RNReanimated/worklets (3.17.1):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1644,9 +1644,9 @@ PODS:
     - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNReanimated/worklets/apple (= 4.0.0-nightly-20250218-e5a0cdf69)
+    - RNReanimated/worklets/apple (= 3.17.1)
     - Yoga
-  - RNReanimated/worklets/apple (4.0.0-nightly-20250218-e5a0cdf69):
+  - RNReanimated/worklets/apple (3.17.1):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1669,7 +1669,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - RNScreens (4.7.0):
+  - RNScreens (4.10.0-beta.2):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1987,8 +1987,8 @@ SPEC CHECKSUMS:
   ReactCodegen: d3c2ea01d0f9eb6c3e5de3ad94ad2fc309465861
   ReactCommon: 179964ffc47fa62ad0e1eebac704e88c59b46667
   RNGestureHandler: 8b33b2c5688a54fcce223d184753757da498235c
-  RNReanimated: 4b99666c4ec2ecce0190b523cd733cae7b895d51
-  RNScreens: 3c663a4dd2df363ecc45cf7423ef8efa3bfcacf5
+  RNReanimated: f9bc911c24a63fc17e721302e1bca07fdedd9241
+  RNScreens: 8e23e16f57a7aa99391ab2fbe31175f87753f3fc
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   Yoga: 330be28eee1242da875db9e851b19a4df496b999
 

Example/package.json

@@ -29,7 +29,7 @@
     "react": "19.0.0",
     "react-native": "0.78.0-rc.5",
     "react-native-gesture-handler": "2.22.0",
-    "react-native-reanimated": "^4.0.0-nightly-20250218-e5a0cdf69",
+    "react-native-reanimated": "3.17.1",
     "react-native-restart": "^0.0.27",
     "react-native-safe-area-context": "5.1.0",
     "react-native-screens": "link:../"

Example/yarn.lock

@@ -3061,7 +3061,7 @@ __metadata:
     react-native: "npm:0.78.0-rc.5"
     react-native-codegen: "npm:^0.71.3"
     react-native-gesture-handler: "npm:2.22.0"
-    react-native-reanimated: "npm:^4.0.0-nightly-20250218-e5a0cdf69"
+    react-native-reanimated: "npm:3.17.1"
     react-native-restart: "npm:^0.0.27"
     react-native-safe-area-context: "npm:5.1.0"
     react-native-screens: "link:../"
@@ -8832,9 +8832,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-reanimated@npm:^4.0.0-nightly-20250218-e5a0cdf69":
-  version: 4.0.0-nightly-20250218-e5a0cdf69
-  resolution: "react-native-reanimated@npm:4.0.0-nightly-20250218-e5a0cdf69"
+"react-native-is-edge-to-edge@npm:1.1.6":
+  version: 1.1.6
+  resolution: "react-native-is-edge-to-edge@npm:1.1.6"
+  peerDependencies:
+    react: ">=18.2.0"
+    react-native: ">=0.73.0"
+  checksum: 10c0/5690e521e8310d21643634a8d0dacd524e19b76695f347b26f649fcac156a7a901fd6daef7f78482381a41e8445f4552f40ade13790fdf112fab15b0f54dbabd
+  languageName: node
+  linkType: hard
+
+"react-native-reanimated@npm:3.17.1":
+  version: 3.17.1
+  resolution: "react-native-reanimated@npm:3.17.1"
   dependencies:
     "@babel/plugin-transform-arrow-functions": "npm:^7.0.0-0"
     "@babel/plugin-transform-class-properties": "npm:^7.0.0-0"
@@ -8847,11 +8857,12 @@ __metadata:
     "@babel/preset-typescript": "npm:^7.16.7"
     convert-source-map: "npm:^2.0.0"
     invariant: "npm:^2.2.4"
+    react-native-is-edge-to-edge: "npm:1.1.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
     react: "*"
     react-native: "*"
-  checksum: 10c0/7c483675cfc5bed5cc2729ddd3566dffc927cb14a7990218ad223c8e86ae7d89d10896d1423bac7ec297a71ba166ffb837d59771d009f75d0f314e1e5f61a50a
+  checksum: 10c0/da4f653a675816eb0b3502aa5029c21ec4ec8889bcbbbbc174d567db1c05d9529d638a22c2e4085bf5a97ad2e184988d64cfa9b77774cb32322f29ab4e6c2585
   languageName: node
   linkType: hard
 

FabricExample/e2e/examplesTests/events.e2e.ts

@@ -12,6 +12,8 @@ const pressBack = async () => {
 
 const awaitClassicalEventBehavior = async () => {
   if (device.getPlatform() === 'ios') {
+    // The order of events in this test differs from the Paper version of the same test.
+    // Please see https://github.com/software-mansion/react-native-screens/pull/2785 for details.
     await expect(
       element(by.text('9. Chats | transitionStart | closing')),
     ).toExist();
@@ -21,14 +23,14 @@ const awaitClassicalEventBehavior = async () => {
     await expect(
       element(by.text('11. Main | transitionStart | opening')),
     ).toExist();
+    await expect(element(by.text('12. Privacy | beforeRemove'))).toExist();
+    await expect(element(by.text('13. Chats | beforeRemove'))).toExist();
     await expect(
-      element(by.text('12. Chats | transitionEnd | closing')),
+      element(by.text('14. Chats | transitionEnd | closing')),
     ).toExist();
     await expect(
-      element(by.text('13. Privacy | transitionEnd | closing')),
+      element(by.text('15. Privacy | transitionEnd | closing')),
     ).toExist();
-    await expect(element(by.text('14. Privacy | beforeRemove'))).toExist();
-    await expect(element(by.text('15. Chats | beforeRemove'))).toExist();
     await expect(
       element(by.text('16. Main | transitionEnd | opening')),
     ).toExist();

FabricExample/ios/Podfile.lock

@@ -2069,13 +2069,13 @@ SPEC CHECKSUMS:
   React-RuntimeHermes: eff796dfd1df04f9f2cd8b37be37a47d90a4ab4c
   React-runtimescheduler: 4bd885d85b7841b823c2164725c959c6dbc0fd4e
   React-timing: ddfc36f45351e851633b857cf75eb167e119d3b7
-  React-utils: d1482eca4f773398cf0bdb0b99283e16dc710a96
-  ReactAppDependencyProvider: e7d2fe30cf4bb2090d5bea9b4ca29dd8e548ed71
-  ReactCodegen: 87717e46389a7c2f57866d8ee66c8955bb41d986
-  ReactCommon: bd1703fa1b6b6ccb2494bed17caf93f1861ce315
-  RNGestureHandler: 70069ab3e0431b03f6e465b65745f87a1a02c6c0
-  RNReanimated: bc7be90dec8df273a2d14da13a64f9da4b694e59
-  RNScreens: 197b022c17c45ca4fe1c3e6f5d5c9022c21faf3f
+  React-utils: 9ea2e9d57dd01e5b9cf1270969e3179ac3b7f325
+  ReactAppDependencyProvider: 19db96cb59117f0cf2e32993b7a2ba34b6397c57
+  ReactCodegen: d3c2ea01d0f9eb6c3e5de3ad94ad2fc309465861
+  ReactCommon: 179964ffc47fa62ad0e1eebac704e88c59b46667
+  RNGestureHandler: 4e7defe5095e936424173fc75f0bf2af5bba8e23
+  RNReanimated: 183ca222293bd622678e387100e54d03d952c73b
+  RNScreens: 2aa993d221ba928ee75682f3c0940620a8d46865
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   Yoga: 330be28eee1242da875db9e851b19a4df496b999
 

FabricExample/package.json

@@ -51,7 +51,7 @@
     "@types/react": "^19.0.0",
     "@types/react-test-renderer": "^19.0.0",
     "babel-jest": "^29.6.3",
-    "detox": "^20.34.2",
+    "detox": "^20.34.5",
     "eslint": "^8.19.0",
     "jest": "^29.6.3",
     "patch-package": "^8.0.0",

FabricExample/yarn.lock

@@ -2902,7 +2902,7 @@ __metadata:
     "@types/react": "npm:^19.0.0"
     "@types/react-test-renderer": "npm:^19.0.0"
     babel-jest: "npm:^29.6.3"
-    detox: "npm:^20.34.2"
+    detox: "npm:^20.34.5"
     eslint: "npm:^8.19.0"
     jest: "npm:^29.6.3"
     jotai: "npm:^2.9.0"
@@ -4256,16 +4256,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"detox@npm:^20.34.2":
-  version: 20.34.2
-  resolution: "detox@npm:20.34.2"
+"detox@npm:^20.34.5":
+  version: 20.34.5
+  resolution: "detox@npm:20.34.5"
   dependencies:
     ajv: "npm:^8.6.3"
     bunyan: "npm:^1.8.12"
     bunyan-debug-stream: "npm:^3.1.0"
     caf: "npm:^15.0.1"
     chalk: "npm:^4.0.0"
-    child-process-promise: "npm:^2.2.0"
     detox-copilot: "npm:^0.0.27"
     execa: "npm:^5.1.1"
     find-up: "npm:^5.0.0"
@@ -4279,6 +4278,7 @@ __metadata:
     multi-sort-stream: "npm:^1.0.3"
     multipipe: "npm:^4.0.0"
     node-ipc: "npm:9.2.1"
+    promisify-child-process: "npm:^4.1.2"
     proper-lockfile: "npm:^3.0.2"
     resolve-from: "npm:^5.0.0"
     sanitize-filename: "npm:^1.6.1"
@@ -4303,7 +4303,7 @@ __metadata:
       optional: true
   bin:
     detox: local-cli/cli.js
-  checksum: 10c0/d7531648552d0dce11f98ce438edd24d0c0185ac3785466fcbc402b0932a00741226ccb6da0ec81324dc14f02c8d20e5cd980dec7bdfaef0a3040c2f73a5d8d6
+  checksum: 10c0/1be4c20e93981a72b574222fbfed542c9c1225e82565f757c44801b4527a66b58f37f8dff78aa77b4ba0b52124ca69c8214b4b402596699257dca9a6da207d83
   languageName: node
   linkType: hard
 
@@ -8389,13 +8389,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"promise-polyfill@npm:^6.0.1":
-  version: 6.1.0
-  resolution: "promise-polyfill@npm:6.1.0"
-  checksum: 10c0/8fa1172b1b50efbc43f5eb8772e6a526ef70b9856f3d49172c8bea0ccee4413b29eb5d7f8b44015fe43b2d77a9db16d4c49d337b48b218661f92e5ab1c1fc672
-  languageName: node
-  linkType: hard
-
 "promise-retry@npm:^2.0.1":
   version: 2.0.1
   resolution: "promise-retry@npm:2.0.1"
@@ -8415,6 +8408,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"promisify-child-process@npm:^4.1.2":
+  version: 4.1.2
+  resolution: "promisify-child-process@npm:4.1.2"
+  checksum: 10c0/e5347137f1c333af4b7b4d2272a091d31007b30320af4b852f30f41776db378e22b3db1e67e40026a18301c243d9c9780e41c211cfce76ba26aedba17e3a385c
+  languageName: node
+  linkType: hard
+
 "prompts@npm:^2.0.1, prompts@npm:^2.4.2":
   version: 2.4.2
   resolution: "prompts@npm:2.4.2"
@@ -8447,13 +8447,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pseudomap@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "pseudomap@npm:1.0.2"
-  checksum: 10c0/5a91ce114c64ed3a6a553aa7d2943868811377388bb31447f9d8028271bae9b05b340fe0b6961a64e45b9c72946aeb0a4ab635e8f7cb3715ffd0ff2beeb6a679
-  languageName: node
-  linkType: hard
-
 "punycode@npm:^2.1.0":
   version: 2.3.1
   resolution: "punycode@npm:2.3.1"
@@ -10281,7 +10274,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"which@npm:^1.2.9, which@npm:^1.3.1":
+"which@npm:^1.3.1":
   version: 1.3.1
   resolution: "which@npm:1.3.1"
   dependencies:

android/src/fabric/java/com/swmansion/rnscreens/FabricEnabledHeaderConfigViewGroup.kt

@@ -23,24 +23,19 @@ abstract class FabricEnabledHeaderConfigViewGroup(
         mStateWrapper = wrapper
     }
 
-    fun updatePaddings(
-        paddingStart: Int,
-        paddingEnd: Int,
-    ) {
-        // Do nothing on Fabric. This method is used only on Paper.
-    }
-
     fun updateHeaderConfigState(
         width: Int,
         height: Int,
         paddingStart: Int,
         paddingEnd: Int,
     ) {
+        // Implementation of this method differs between Fabric & Paper!
         updateState(width, height, paddingStart, paddingEnd)
     }
 
+    // Implementation of this method differs between Fabric & Paper!
     @UiThread
-    fun updateState(
+    private fun updateState(
         width: Int,
         height: Int,
         paddingStart: Int,