Merge branch 'main' into @tomekzaw/react-native-0.77

software-mansion · Jan 10, 2025 · e864e7f · e864e7f
2 parents c9eb1c0 + 3667594
commit e864e7f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/...ages/react-native-reanimated/android/src/main/cpp/reanimated/android/LayoutAnimations.cpp b/...ages/react-native-reanimated/android/src/main/cpp/reanimated/android/LayoutAnimations.cpp
@@ -115,6 +115,10 @@ jni::local_ref<JArrayInt> LayoutAnimations::getSharedGroup(const int tag) {
   return jGroup;
 }
 
+void LayoutAnimations::invalidate() {
+  javaPart_ = nullptr;
+}
+
 void LayoutAnimations::registerNatives() {
   registerHybrid({
       makeNativeMethod("initHybrid", LayoutAnimations::initHybrid),

diff --git a/packages/react-native-reanimated/android/src/main/cpp/reanimated/android/LayoutAnimations.h b/packages/react-native-reanimated/android/src/main/cpp/reanimated/android/LayoutAnimations.h
@@ -67,6 +67,8 @@ class LayoutAnimations : public jni::HybridClass<LayoutAnimations> {
   int findPrecedingViewTagForTransition(int tag);
   jni::local_ref<JArrayInt> getSharedGroup(const int tag);
 
+  void invalidate();
+
  private:
   friend HybridBase;
   jni::global_ref<LayoutAnimations::javaobject> javaPart_;

diff --git a/packages/react-native-reanimated/android/src/main/cpp/reanimated/android/NativeProxy.cpp b/packages/react-native-reanimated/android/src/main/cpp/reanimated/android/NativeProxy.cpp
@@ -621,7 +621,10 @@ void NativeProxy::setupLayoutAnimations() {
 }
 
 void NativeProxy::invalidateCpp() {
+  layoutAnimations_->cthis()->invalidate();
+
   workletsModuleProxy_.reset();
+
   if (reanimatedModuleProxy_ != nullptr) {
     reanimatedModuleProxy_->invalidate();
   }