From f35a959b6cd0c4420519faaf5f8b44ee7534bc0f Mon Sep 17 00:00:00 2001 From: Francois Laithier Date: Wed, 13 Nov 2024 18:16:40 -0800 Subject: [PATCH] Revert "[NoQA] Bump reanimated to v3.16.1" --- package-lock.json | 8 ++++---- package.json | 2 +- ...native-reanimated+3.15.3+001+hybrid-app.patch} | 4 ++-- ...imated+3.15.3+002+dontWhitelistTextProp.patch} | 0 ...ive-reanimated+3.15.3+003+fixNullViewTag.patch | 15 +++++++++++++++ 5 files changed, 22 insertions(+), 7 deletions(-) rename patches/{react-native-reanimated+3.16.1+001+hybrid-app.patch => react-native-reanimated+3.15.3+001+hybrid-app.patch} (91%) rename patches/{react-native-reanimated+3.16.1+002+dontWhitelistTextProp.patch => react-native-reanimated+3.15.3+002+dontWhitelistTextProp.patch} (100%) create mode 100644 patches/react-native-reanimated+3.15.3+003+fixNullViewTag.patch diff --git a/package-lock.json b/package-lock.json index fffe0be3b477..43fb37e2ab38 100644 --- a/package-lock.json +++ b/package-lock.json @@ -104,7 +104,7 @@ "react-native-plaid-link-sdk": "11.11.0", "react-native-qrcode-svg": "6.3.11", "react-native-quick-sqlite": "git+https://github.com/margelo/react-native-quick-sqlite#99f34ebefa91698945f3ed26622e002bd79489e0", - "react-native-reanimated": "3.16.1", + "react-native-reanimated": "3.15.3", "react-native-release-profiler": "^0.2.1", "react-native-render-html": "6.3.1", "react-native-safe-area-context": "4.10.9", @@ -35628,9 +35628,9 @@ } }, "node_modules/react-native-reanimated": { - "version": "3.16.1", - "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.16.1.tgz", - "integrity": "sha512-Wnbo7toHZ6kPLAD8JWKoKCTfNoqYOMW5vUEP76Rr4RBmJCrdXj6oauYP0aZnZq8NCbiP5bwwu7+RECcWtoetnQ==", + "version": "3.15.3", + "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.15.3.tgz", + "integrity": "sha512-5QBk/7PZvZ98Adxm4MRyglwzsRzReTQIe4Hd2wbBBAZ68IC4OYKvsc8cPEjgx3/1mG8HgHFYhbcDe5U2RjeFqw==", "license": "MIT", "dependencies": { "@babel/plugin-transform-arrow-functions": "^7.0.0-0", diff --git a/package.json b/package.json index f9fe15eadf93..971bcdb8fc22 100644 --- a/package.json +++ b/package.json @@ -161,7 +161,7 @@ "react-native-plaid-link-sdk": "11.11.0", "react-native-qrcode-svg": "6.3.11", "react-native-quick-sqlite": "git+https://github.com/margelo/react-native-quick-sqlite#99f34ebefa91698945f3ed26622e002bd79489e0", - "react-native-reanimated": "3.16.1", + "react-native-reanimated": "3.15.3", "react-native-release-profiler": "^0.2.1", "react-native-render-html": "6.3.1", "react-native-safe-area-context": "4.10.9", diff --git a/patches/react-native-reanimated+3.16.1+001+hybrid-app.patch b/patches/react-native-reanimated+3.15.3+001+hybrid-app.patch similarity index 91% rename from patches/react-native-reanimated+3.16.1+001+hybrid-app.patch rename to patches/react-native-reanimated+3.15.3+001+hybrid-app.patch index 835df1f034a9..3b40360d5860 100644 --- a/patches/react-native-reanimated+3.16.1+001+hybrid-app.patch +++ b/patches/react-native-reanimated+3.15.3+001+hybrid-app.patch @@ -1,9 +1,9 @@ diff --git a/node_modules/react-native-reanimated/scripts/reanimated_utils.rb b/node_modules/react-native-reanimated/scripts/reanimated_utils.rb -index 9fc7b15..e453d84 100644 +index af0935f..ccd2a9e 100644 --- a/node_modules/react-native-reanimated/scripts/reanimated_utils.rb +++ b/node_modules/react-native-reanimated/scripts/reanimated_utils.rb @@ -17,7 +17,11 @@ def find_config() - :react_native_reanimated_dir_from_pods_root => nil, + :react_native_common_dir => nil, } - react_native_node_modules_dir = File.join(File.dirname(`cd "#{Pod::Config.instance.installation_root.to_s}" && node --print "require.resolve('react-native/package.json')"`), '..') diff --git a/patches/react-native-reanimated+3.16.1+002+dontWhitelistTextProp.patch b/patches/react-native-reanimated+3.15.3+002+dontWhitelistTextProp.patch similarity index 100% rename from patches/react-native-reanimated+3.16.1+002+dontWhitelistTextProp.patch rename to patches/react-native-reanimated+3.15.3+002+dontWhitelistTextProp.patch diff --git a/patches/react-native-reanimated+3.15.3+003+fixNullViewTag.patch b/patches/react-native-reanimated+3.15.3+003+fixNullViewTag.patch new file mode 100644 index 000000000000..ca982c6f8036 --- /dev/null +++ b/patches/react-native-reanimated+3.15.3+003+fixNullViewTag.patch @@ -0,0 +1,15 @@ +diff --git a/node_modules/react-native-reanimated/src/createAnimatedComponent/createAnimatedComponent.tsx b/node_modules/react-native-reanimated/src/createAnimatedComponent/createAnimatedComponent.tsx +index 577b4a7..c60f0f8 100644 +--- a/node_modules/react-native-reanimated/src/createAnimatedComponent/createAnimatedComponent.tsx ++++ b/node_modules/react-native-reanimated/src/createAnimatedComponent/createAnimatedComponent.tsx +@@ -481,7 +481,9 @@ export function createAnimatedComponent( + ? (ref as HTMLElement) + : findNodeHandle(ref as Component); + +- this._componentViewTag = tag as number; ++ if (tag !== null) { ++ this._componentViewTag = tag as number; ++ } + + const { layout, entering, exiting, sharedTransitionTag } = this.props; + if (