Merge pull request #52518 from Expensify/revert-52048-chore/bump-rean…

…imated-v0 [CP Staging] Revert "[NoQA] Bump reanimated to v3.16.1"
Expensify · Nov 14, 2024 · b99e6d3 · b99e6d3
2 parents 99da1ac + f35a959
commit b99e6d3
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git 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/...ve-reanimated+3.16.1+001+hybrid-app.patch → ...ve-reanimated+3.15.3+001+hybrid-app.patch b/...ve-reanimated+3.16.1+001+hybrid-app.patch → ...ve-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/...ed+3.16.1+002+dontWhitelistTextProp.patch → ...ed+3.15.3+002+dontWhitelistTextProp.patch b/...ed+3.16.1+002+dontWhitelistTextProp.patch → ...ed+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
@@ -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 (