Skip to content

Commit 8d1aa66

Browse files
authored
fix: change topScreenFrame and belowTopScreenFrame to match Reanimated API (#2091)
## Description It seems that [here](software-mansion/react-native-reanimated@80bcfd8), Reanimated has changed their API and change the naming of used props to `topScreenStyle` and `belowTopScreenStyle`. This PR resolves this change by matching the naming to their API. ## Changes - Updated Reanimated to nightly 3.9.0 - Changed naming of `topScreenFrame` and `belowTopScreenFrame` props ## Checklist - [x] Ensured that CI passes
1 parent 458aad9 commit 8d1aa66

File tree

3 files changed

+56
-9
lines changed

3 files changed

+56
-9
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
"react-native": "0.72.4",
104104
"react-native-builder-bob": "^0.23.2",
105105
"react-native-gesture-handler": "^2.13.3",
106-
"react-native-reanimated": "3.7.0-nightly-20240109-9e2c33716",
106+
"react-native-reanimated": "3.9.0-nightly-20240402-12717cdb5",
107107
"react-native-safe-area-context": "^4.8.1",
108108
"react-native-windows": "^0.64.8",
109109
"react-test-renderer": "^18.2.0",

src/native-stack/types.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,11 +507,11 @@ export interface MeasuredDimensions {
507507
}
508508

509509
export type AnimatedScreenTransition = {
510-
topScreenFrame: (
510+
topScreenStyle: (
511511
event: PanGestureHandlerEventPayload,
512512
screenSize: MeasuredDimensions
513513
) => Record<string, unknown>;
514-
belowTopScreenFrame: (
514+
belowTopScreenStyle: (
515515
event: PanGestureHandlerEventPayload,
516516
screenSize: MeasuredDimensions
517517
) => Record<string, unknown>;

yarn.lock

Lines changed: 53 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,11 @@
274274
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
275275
integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
276276

277+
"@babel/helper-plugin-utils@^7.24.0":
278+
version "7.24.0"
279+
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz#945681931a52f15ce879fd5b86ce2dae6d3d7f2a"
280+
integrity sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==
281+
277282
"@babel/helper-remap-async-to-generator@^7.18.9", "@babel/helper-remap-async-to-generator@^7.22.5":
278283
version "7.22.9"
279284
resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz#53a25b7484e722d7efb9c350c75c032d4628de82"
@@ -714,6 +719,13 @@
714719
dependencies:
715720
"@babel/helper-plugin-utils" "^7.22.5"
716721

722+
"@babel/plugin-transform-arrow-functions@^7.0.0-0":
723+
version "7.24.1"
724+
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.1.tgz#2bf263617060c9cc45bcdbf492b8cc805082bf27"
725+
integrity sha512-ngT/3NkRhsaep9ck9uj2Xhv9+xB1zShY3tM3g6om4xxCELwCDN4g4Aq5dRn48+0hasAql7s2hdBOysCfNpr4fw==
726+
dependencies:
727+
"@babel/helper-plugin-utils" "^7.24.0"
728+
717729
"@babel/plugin-transform-arrow-functions@^7.23.3":
718730
version "7.23.3"
719731
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz#94c6dcfd731af90f27a79509f9ab7fb2120fc38b"
@@ -1052,6 +1064,14 @@
10521064
dependencies:
10531065
"@babel/helper-plugin-utils" "^7.22.5"
10541066

1067+
"@babel/plugin-transform-nullish-coalescing-operator@^7.0.0-0":
1068+
version "7.24.1"
1069+
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.1.tgz#0cd494bb97cb07d428bd651632cb9d4140513988"
1070+
integrity sha512-iQ+caew8wRrhCikO5DrUYx0mrmdhkaELgFa+7baMcVuhxIkN7oxt06CZ51D65ugIb1UWRQ8oQe+HXAVM6qHFjw==
1071+
dependencies:
1072+
"@babel/helper-plugin-utils" "^7.24.0"
1073+
"@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
1074+
10551075
"@babel/plugin-transform-nullish-coalescing-operator@^7.23.3":
10561076
version "7.23.4"
10571077
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz#45556aad123fc6e52189ea749e33ce090637346e"
@@ -1068,7 +1088,7 @@
10681088
"@babel/helper-plugin-utils" "^7.22.5"
10691089
"@babel/plugin-syntax-numeric-separator" "^7.10.4"
10701090

1071-
"@babel/plugin-transform-object-assign@^7.0.0", "@babel/plugin-transform-object-assign@^7.16.7":
1091+
"@babel/plugin-transform-object-assign@^7.0.0":
10721092
version "7.22.5"
10731093
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.22.5.tgz#290c1b9555dcea48bb2c29ad94237777600d04f9"
10741094
integrity sha512-iDhx9ARkXq4vhZ2CYOSnQXkmxkDgosLi3J8Z17mKz7LyzthtkdVchLD7WZ3aXeCuvJDOW3+1I5TpJmwIbF9MKQ==
@@ -1110,6 +1130,15 @@
11101130
"@babel/helper-plugin-utils" "^7.22.5"
11111131
"@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
11121132

1133+
"@babel/plugin-transform-optional-chaining@^7.0.0-0":
1134+
version "7.24.1"
1135+
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.1.tgz#26e588acbedce1ab3519ac40cc748e380c5291e6"
1136+
integrity sha512-n03wmDt+987qXwAgcBlnUUivrZBPZ8z1plL0YvgQalLm+ZE5BMhGm94jhxXtA1wzv1Cu2aaOv1BM9vbVttrzSg==
1137+
dependencies:
1138+
"@babel/helper-plugin-utils" "^7.24.0"
1139+
"@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
1140+
"@babel/plugin-syntax-optional-chaining" "^7.8.3"
1141+
11131142
"@babel/plugin-transform-optional-chaining@^7.23.3":
11141143
version "7.23.4"
11151144
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz#6acf61203bdfc4de9d4e52e64490aeb3e52bd017"
@@ -1261,6 +1290,13 @@
12611290
dependencies:
12621291
"@babel/helper-plugin-utils" "^7.22.5"
12631292

1293+
"@babel/plugin-transform-shorthand-properties@^7.0.0-0":
1294+
version "7.24.1"
1295+
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.1.tgz#ba9a09144cf55d35ec6b93a32253becad8ee5b55"
1296+
integrity sha512-LyjVB1nsJ6gTTUKRjRWx9C1s9hE7dLfP/knKdrfeH9UPtAGjYGgxIbFfx7xyLIEWs7Xe1Gnf8EWiUqfjLhInZA==
1297+
dependencies:
1298+
"@babel/helper-plugin-utils" "^7.24.0"
1299+
12641300
"@babel/plugin-transform-shorthand-properties@^7.23.3":
12651301
version "7.23.3"
12661302
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz#97d82a39b0e0c24f8a981568a8ed851745f59210"
@@ -1305,6 +1341,13 @@
13051341
dependencies:
13061342
"@babel/helper-plugin-utils" "^7.22.5"
13071343

1344+
"@babel/plugin-transform-template-literals@^7.0.0-0":
1345+
version "7.24.1"
1346+
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.1.tgz#15e2166873a30d8617e3e2ccadb86643d327aab7"
1347+
integrity sha512-WRkhROsNzriarqECASCNu/nojeXCDTE/F2HmRgOzi7NGvyfYGq1NEjKBK3ckLfRgGc6/lPAqP0vDOSw3YtG34g==
1348+
dependencies:
1349+
"@babel/helper-plugin-utils" "^7.24.0"
1350+
13081351
"@babel/plugin-transform-template-literals@^7.23.3":
13091352
version "7.23.3"
13101353
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz#5f0f028eb14e50b5d0f76be57f90045757539d07"
@@ -8600,12 +8643,16 @@ react-native-iphone-x-helper@^1.3.0:
86008643
resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz#20c603e9a0e765fd6f97396638bdeb0e5a60b010"
86018644
integrity sha512-HOf0jzRnq2/aFUcdCJ9w9JGzN3gdEg0zFE4FyYlp4jtidqU03D5X7ZegGKfT1EWteR0gPBGp9ye5T5FvSWi9Yg==
86028645

8603-
react-native-reanimated@3.7.0-nightly-20240109-9e2c33716:
8604-
version "3.7.0-nightly-20240109-9e2c33716"
8605-
resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-3.7.0-nightly-20240109-9e2c33716.tgz#ec647feabf1a0ba6673830f6ee2f3d57e0aa63b7"
8606-
integrity sha512-HMhmzQmAglaHuWwTiMVKx3fKZURi8oVP4u/76KYNBvUDK1Vh+sR54aFQ6d3X877LObw+R9vgr8LmajisY4poVQ==
8646+
react-native-reanimated@3.9.0-nightly-20240402-12717cdb5:
8647+
version "3.9.0-nightly-20240402-12717cdb5"
8648+
resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-3.9.0-nightly-20240402-12717cdb5.tgz#43af7da098ae92774da5432e7ce6d7f54dd8c46a"
8649+
integrity sha512-SRbR7rEoZUqr5KCl6iEISoDaiT5RvpFNGTyi28RfLHBWa8750l10w4U0/AbQJ5v5MeTtkLD32t7CLISWgMy0Bw==
86078650
dependencies:
8608-
"@babel/plugin-transform-object-assign" "^7.16.7"
8651+
"@babel/plugin-transform-arrow-functions" "^7.0.0-0"
8652+
"@babel/plugin-transform-nullish-coalescing-operator" "^7.0.0-0"
8653+
"@babel/plugin-transform-optional-chaining" "^7.0.0-0"
8654+
"@babel/plugin-transform-shorthand-properties" "^7.0.0-0"
8655+
"@babel/plugin-transform-template-literals" "^7.0.0-0"
86098656
"@babel/preset-typescript" "^7.16.7"
86108657
convert-source-map "^2.0.0"
86118658
invariant "^2.2.4"

0 commit comments

Comments
 (0)