react-native-reanimated 3.12.0-set-experimental → 3.12.0

package/Common/cpp/Fabric/ShadowTreeCloner.cpp

@@ -26,7 +26,10 @@ ShadowNode::Unshared cloneShadowTreeWithNewProps(
   const auto props = source->getComponentDescriptor().cloneProps(
       propsParserContext, source->getProps(), std::move(rawProps));
 
-  auto newChildNode = source->clone({/* .props = */ props, ShadowNodeFragment::childrenPlaceholder(), source->getState()});
+  auto newChildNode = source->clone(
+      {/* .props = */ props,
+       ShadowNodeFragment::childrenPlaceholder(),
+       source->getState()});
 
   for (auto it = ancestors.rbegin(); it != ancestors.rend(); ++it) {
     auto &parentNode = it->first.get();
@@ -50,11 +53,10 @@ ShadowNode::Unshared cloneShadowTreeWithNewProps(
 
     children[childIndex] = newChildNode;
 
-    newChildNode = parentNode.clone({
-        ShadowNodeFragment::propsPlaceholder(),
-        std::make_shared<ShadowNode::ListOfShared>(children),
-        parentNode.getState()
-    });
+    newChildNode = parentNode.clone(
+        {ShadowNodeFragment::propsPlaceholder(),
+         std::make_shared<ShadowNode::ListOfShared>(children),
+         parentNode.getState()});
   }
 
   return std::const_pointer_cast<ShadowNode>(newChildNode);

package/Common/cpp/LayoutAnimations/LayoutAnimationsManager.cpp

@@ -159,11 +159,6 @@ int LayoutAnimationsManager::findPrecedingViewTagForTransition(const int tag) {
   return -1;
 }
 
-const std::vector<int> LayoutAnimationsManager::getSharedGroup(const int tag) {
-  auto const &groupName = viewTagToSharedTag_[tag];
-  return sharedTransitionGroups_[groupName];
-}
-
 #ifndef NDEBUG
 std::string LayoutAnimationsManager::getScreenSharedTagPairString(
     const int screenTag,

package/Common/cpp/LayoutAnimations/LayoutAnimationsManager.h

@@ -43,7 +43,6 @@ class LayoutAnimationsManager {
   void clearSharedTransitionConfig(const int tag);
   void cancelLayoutAnimation(jsi::Runtime &rt, const int tag) const;
   int findPrecedingViewTagForTransition(const int tag);
-  const std::vector<int> getSharedGroup(const int tag);
 #ifndef NDEBUG
   std::string getScreenSharedTagPairString(
       const int screenTag,

package/android/build.gradle

@@ -366,6 +366,13 @@ android {
                 srcDirs += "src/reactNativeVersionPatch/ReanimatedUIManager/latest"
             }
 
+            // ReactHost
+            if (REACT_NATIVE_MINOR_VERSION <= 72) {
+                srcDirs += "src/reactNativeVersionPatch/ReactHost/72"
+            } else {
+                srcDirs += "src/reactNativeVersionPatch/ReactHost/latest"
+            }
+
             // ReactFeatureFlags 
             if (IS_NEW_ARCHITECTURE_ENABLED) {
                 if (REACT_NATIVE_MINOR_VERSION <= 72) {

package/android/src/main/cpp/AndroidUIScheduler.cpp

@@ -34,7 +34,7 @@ class UISchedulerWrapper : public UIScheduler {
 
 AndroidUIScheduler::AndroidUIScheduler(
     jni::alias_ref<AndroidUIScheduler::javaobject> jThis)
-    : javaPart_(jni::make_weak(jThis)),
+    : javaPart_(jni::make_global(jThis)),
       uiScheduler_(
           std::make_shared<UISchedulerWrapper>(jni::make_global(jThis))) {}
 
@@ -49,8 +49,8 @@ void AndroidUIScheduler::triggerUI() {
 
 void AndroidUIScheduler::scheduleTriggerOnUI() {
   static const auto method =
-      javaPart_.lockLocal()->getClass()->getMethod<void()>("scheduleTriggerOnUI");
-  method(javaPart_.lockLocal());
+      javaPart_->getClass()->getMethod<void()>("scheduleTriggerOnUI");
+  method(javaPart_.get());
 }
 
 void AndroidUIScheduler::registerNatives() {

package/android/src/main/cpp/AndroidUIScheduler.h

@@ -33,7 +33,7 @@ class AndroidUIScheduler : public jni::HybridClass<AndroidUIScheduler> {
 
   void triggerUI();
 
-  jni::weak_ref<AndroidUIScheduler::javaobject> javaPart_;
+  jni::global_ref<AndroidUIScheduler::javaobject> javaPart_;
   std::shared_ptr<UIScheduler> uiScheduler_;
 
   explicit AndroidUIScheduler(

package/android/src/main/cpp/LayoutAnimations.cpp

@@ -100,23 +100,10 @@ void LayoutAnimations::setFindPrecedingViewTagForTransition(
       findPrecedingViewTagForTransitionBlock;
 }
 
-void LayoutAnimations::setGetSharedGroupBlock(GetSharedGroupBlock getSharedGroupBlock) {
-  getSharedGroupBlock_ = getSharedGroupBlock;
-}
-
 int LayoutAnimations::findPrecedingViewTagForTransition(int tag) {
   return findPrecedingViewTagForTransitionBlock_(tag);
 }
 
-jni::local_ref<JArrayInt> LayoutAnimations::getSharedGroup(int tag) {
-  std::vector<int> group = getSharedGroupBlock_(tag);
-  auto jGroup = JArrayInt::newArray(group.size());
-  for (int i = 0; i < group.size(); i++) {
-    jGroup->setRegion(0, group.size(), group.data());
-  }
-  return jGroup;
-}
-
 void LayoutAnimations::registerNatives() {
   registerHybrid({
       makeNativeMethod("initHybrid", LayoutAnimations::initHybrid),
@@ -137,9 +124,6 @@ void LayoutAnimations::registerNatives() {
       makeNativeMethod(
           "findPrecedingViewTagForTransition",
           LayoutAnimations::findPrecedingViewTagForTransition),
-      makeNativeMethod(
-        "getSharedGroup",
-        LayoutAnimations::getSharedGroup),
 #ifndef NDEBUG
       makeNativeMethod(
           "checkDuplicateSharedTag", LayoutAnimations::checkDuplicateSharedTag),

package/android/src/main/cpp/LayoutAnimations.h

@@ -22,7 +22,6 @@ class LayoutAnimations : public jni::HybridClass<LayoutAnimations> {
   using ClearAnimationConfigBlock = std::function<void(int)>;
   using CancelAnimationBlock = std::function<void(int)>;
   using FindPrecedingViewTagForTransitionBlock = std::function<int(int)>;
-  using GetSharedGroupBlock = std::function<std::vector<int>(int)>;
 
  public:
   static auto constexpr kJavaDescriptor =
@@ -54,7 +53,6 @@ class LayoutAnimations : public jni::HybridClass<LayoutAnimations> {
   void setFindPrecedingViewTagForTransition(
       FindPrecedingViewTagForTransitionBlock
           findPrecedingViewTagForTransitionBlock);
-  void setGetSharedGroupBlock(GetSharedGroupBlock getSharedGroupBlock);
 
   void progressLayoutAnimation(
       int tag,
@@ -64,7 +62,6 @@ class LayoutAnimations : public jni::HybridClass<LayoutAnimations> {
   void clearAnimationConfigForTag(int tag);
   void cancelAnimationForTag(int tag);
   int findPrecedingViewTagForTransition(int tag);
-  jni::local_ref<JArrayInt> getSharedGroup(int tag);
 
  private:
   friend HybridBase;
@@ -76,7 +73,6 @@ class LayoutAnimations : public jni::HybridClass<LayoutAnimations> {
   CancelAnimationBlock cancelAnimationBlock_;
   FindPrecedingViewTagForTransitionBlock
       findPrecedingViewTagForTransitionBlock_;
-  GetSharedGroupBlock getSharedGroupBlock_;
 #ifndef NDEBUG
   CheckDuplicateSharedTag checkDuplicateSharedTag_;
 #endif

package/android/src/main/cpp/NativeProxy.cpp

@@ -652,16 +652,6 @@ void NativeProxy::setupLayoutAnimations() {
           return -1;
         }
       });
-
-  layoutAnimations_->cthis()->setGetSharedGroupBlock(
-    [weakNativeReanimatedModule](int tag) -> std::vector<int> {
-      if (auto nativeReanimatedModule = weakNativeReanimatedModule.lock()) {
-        return nativeReanimatedModule->layoutAnimationsManager()
-          .getSharedGroup(tag);
-      } else {
-        return {};
-      }
-    });
 }
 
 } // namespace reanimated

package/android/src/main/java/com/swmansion/reanimated/layoutReanimation/AnimationsManager.java

@@ -494,7 +494,7 @@ public class AnimationsManager implements ViewHierarchyObserver {
   }
 
   public boolean hasAnimationForTag(int tag, int type) {
-    return mNativeMethodsHolder != null && mNativeMethodsHolder.hasAnimation(tag, type);
+    return mNativeMethodsHolder.hasAnimation(tag, type);
   }
 
   public boolean isLayoutAnimationEnabled() {
@@ -680,7 +680,7 @@ public class AnimationsManager implements ViewHierarchyObserver {
     }
   }
 
-  protected View resolveView(int tag) {
+  private View resolveView(int tag) {
     if (mExitingViews.containsKey(tag)) {
       return mExitingViews.get(tag);
     } else {
@@ -718,14 +718,6 @@ public class AnimationsManager implements ViewHierarchyObserver {
     mSharedTransitionManager.screenDidLayout(view);
   }
 
-  public void navigationTabChanged(View previousTab, View newTab) {
-    mSharedTransitionManager.navigationTabChanged(previousTab, newTab);
-  }
-
-  public void visitNativeTreeAndMakeSnapshot(View view) {
-    mSharedTransitionManager.visitNativeTreeAndMakeSnapshot(view);
-  }
-
   public void viewDidLayout(View view) {
     mSharedTransitionManager.viewDidLayout(view);
   }

package/android/src/main/java/com/swmansion/reanimated/layoutReanimation/LayoutAnimations.java

@@ -52,8 +52,6 @@ public class LayoutAnimations {
 
   public native int findPrecedingViewTagForTransition(int tag);
 
-  public native int[] getSharedGroup(int tag);
-
   private void endLayoutAnimation(int tag, boolean removeView) {
     AnimationsManager animationsManager = getAnimationsManager();
     if (animationsManager == null) {

package/android/src/main/java/com/swmansion/reanimated/layoutReanimation/NativeMethodsHolder.java

@@ -18,6 +18,4 @@ public interface NativeMethodsHolder {
   int findPrecedingViewTagForTransition(int tag);
 
   void checkDuplicateSharedTag(int viewTag, int screenTag);
-
-  int[] getSharedGroup(int viewTag);
 }

package/android/src/main/java/com/swmansion/reanimated/layoutReanimation/ReanimatedNativeHierarchyManager.java

@@ -1,19 +1,10 @@
 package com.swmansion.reanimated.layoutReanimation;
 
-import android.content.Context;
 import android.os.Build;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.lifecycle.Lifecycle;
-import androidx.lifecycle.LifecycleObserver;
-import androidx.lifecycle.OnLifecycleEvent;
-
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.UiThreadUtil;
@@ -30,15 +21,10 @@ import com.facebook.react.uimanager.layoutanimation.LayoutAnimationListener;
 import com.swmansion.reanimated.ReanimatedModule;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 class ReaLayoutAnimator extends LayoutAnimationController {
@@ -228,14 +214,12 @@ public class ReanimatedNativeHierarchyManager extends NativeViewHierarchyManager
   private final ReaLayoutAnimator mReaLayoutAnimator;
   private final HashMap<Integer, Set<Integer>> mPendingDeletionsForTag = new HashMap<>();
   private boolean initOk = true;
-  private final TabNavigatorObserver tabNavigatorObserver;
 
   public ReanimatedNativeHierarchyManager(
       ViewManagerRegistry viewManagers, ReactApplicationContext reactContext) {
     super(viewManagers);
 
     mReaLayoutAnimator = new ReaLayoutAnimator(reactContext, this);
-    tabNavigatorObserver = new TabNavigatorObserver(mReaLayoutAnimator);
 
     Class<?> clazz = this.getClass().getSuperclass();
     if (clazz == null) {
@@ -309,14 +293,6 @@ public class ReanimatedNativeHierarchyManager extends NativeViewHierarchyManager
         if (!hasHeader || !container.isLayoutRequested()) {
           mReaLayoutAnimator.getAnimationsManager().screenDidLayout(container);
         }
-        View screen = resolveView(tag);
-        View screenFragmentManager = (View) screen.getParent();
-        if (screenFragmentManager != null) {
-          View screenHolder = (View) screenFragmentManager.getParent();
-          if (screenHolder.getClass().getSimpleName().equals("ScreenContainer")) {
-            tabNavigatorObserver.handleScreenContainerUpdate(screen);
-          }
-        }
       }
       View view = resolveView(tag);
       if (view != null && mReaLayoutAnimator != null) {
@@ -325,8 +301,6 @@ public class ReanimatedNativeHierarchyManager extends NativeViewHierarchyManager
     } catch (IllegalViewOperationException e) {
       // (IllegalViewOperationException) == (vm == null)
       e.printStackTrace();
-    } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
-      throw new RuntimeException(e);
     }
   }
 

package/android/src/main/java/com/swmansion/reanimated/layoutReanimation/SharedTransitionManager.java

@@ -5,9 +5,6 @@ import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
-
-import androidx.fragment.app.Fragment;
-
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.uimanager.IllegalViewOperationException;
 import com.facebook.react.uimanager.PixelUtil;
@@ -19,9 +16,6 @@ import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.react.uimanager.events.EventDispatcherListener;
 import com.facebook.react.views.view.ReactViewGroup;
 import com.swmansion.reanimated.Utils;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -271,29 +265,17 @@ public class SharedTransitionManager {
               mNativeMethodsHolder.findPrecedingViewTagForTransition(sharedView.getId());
         }
       }
-
       boolean bothAreRemoved = !addedNewScreen && viewTags.contains(targetViewTag);
       if (targetViewTag < 0) {
         continue;
       }
-
-      View siblingView = null;
-      try {
-        siblingView = reanimatedNativeHierarchyManager.resolveView(targetViewTag);
-      } catch (IllegalViewOperationException e){
-        // TODO: figure out why this happens
-        continue;
-      }
-
-      siblingView = tabNavigatorWorkaround(sharedView, siblingView);
-
       View viewSource, viewTarget;
       if (addedNewScreen) {
-        viewSource = siblingView;
+        viewSource = reanimatedNativeHierarchyManager.resolveView(targetViewTag);
         viewTarget = sharedView;
       } else {
         viewSource = sharedView;
-        viewTarget = siblingView;
+        viewTarget = reanimatedNativeHierarchyManager.resolveView(targetViewTag);
       }
       if (bothAreRemoved) {
         // case for nested stack
@@ -311,41 +293,33 @@ public class SharedTransitionManager {
           continue;
         }
 
-        ViewGroup sourceStack = (ViewGroup) findStack(viewSourceScreen);
-        if (sourceStack == null) {
+        ViewGroup stack = (ViewGroup) findStack(viewSourceScreen);
+        if (stack == null) {
           continue;
         }
-        int stackId = sourceStack.getId();
-        ViewGroupManager stackViewManager = (ViewGroupManager)reanimatedNativeHierarchyManager.resolveViewManager(stackId);
-        boolean isInSameStack = false;
-        for (int i = 0; i < stackViewManager.getChildCount(sourceStack); i++) {
-          if (stackViewManager.getChildAt(sourceStack, i) == viewTargetScreen) {
-            isInSameStack = true;
-          }
+
+        ViewGroupManager stackViewGroupManager =
+            (ViewGroupManager) reanimatedNativeHierarchyManager.resolveViewManager(stack.getId());
+        int screensCount = stackViewGroupManager.getChildCount(stack);
+
+        if (screensCount < 2) {
+          continue;
         }
-        if (isInSameStack) {
-          ViewGroupManager stackViewGroupManager =
-                  (ViewGroupManager) reanimatedNativeHierarchyManager.resolveViewManager(sourceStack.getId());
-          int screensCount = stackViewGroupManager.getChildCount(sourceStack);
-          if (screensCount < 2) {
-            continue;
-          }
 
-          View topScreen = stackViewGroupManager.getChildAt(sourceStack, screensCount - 1);
-          View secondScreen = stackViewGroupManager.getChildAt(sourceStack, screensCount - 2);
-          boolean isValidConfiguration;
-          if (addedNewScreen) {
-            isValidConfiguration =
-                    secondScreen.getId() == viewSourceScreen.getId()
-                            && topScreen.getId() == viewTargetScreen.getId();
-          } else {
-            isValidConfiguration =
-                    topScreen.getId() == viewSourceScreen.getId()
-                            && secondScreen.getId() == viewTargetScreen.getId();
-          }
-          if (!isValidConfiguration) {
-            continue;
-          }
+        View topScreen = stackViewGroupManager.getChildAt(stack, screensCount - 1);
+        View secondScreen = stackViewGroupManager.getChildAt(stack, screensCount - 2);
+        boolean isValidConfiguration;
+        if (addedNewScreen) {
+          isValidConfiguration =
+              secondScreen.getId() == viewSourceScreen.getId()
+                  && topScreen.getId() == viewTargetScreen.getId();
+        } else {
+          isValidConfiguration =
+              topScreen.getId() == viewSourceScreen.getId()
+                  && secondScreen.getId() == viewTargetScreen.getId();
+        }
+        if (!isValidConfiguration) {
+          continue;
         }
       }
 
@@ -366,7 +340,7 @@ public class SharedTransitionManager {
       }
       Snapshot targetViewSnapshot = mSnapshotRegistry.get(viewTarget.getId());
       if (targetViewSnapshot == null) {
-        makeSnapshot(viewTarget);
+        continue;
       }
 
       newTransitionViews.add(viewSource);
@@ -405,57 +379,6 @@ public class SharedTransitionManager {
     return sharedElements;
   }
 
-  View tabNavigatorWorkaround(View sharedView, View siblingView) {
-    View maybeTabNavigatorForSharedView = getTabNavigator(sharedView);
-
-    if (maybeTabNavigatorForSharedView == null) {
-      return siblingView;
-    }
-
-    int siblingTag = siblingView.getId();
-    int[] sharedGroup = mNativeMethodsHolder.getSharedGroup(sharedView.getId());
-    int siblingIndex = -1;
-    for (int i = 0; i < sharedGroup.length; i++) {
-      if (sharedGroup[i] == siblingTag) {
-        siblingIndex = i;
-      }
-    }
-
-    for (int i = siblingIndex; i >= 0; i--) {
-      int viewTag = sharedGroup[i];
-      View view = mAnimationsManager.resolveView(viewTag);
-      if (maybeTabNavigatorForSharedView == getTabNavigator(view)) {
-        return view;
-      }
-    }
-
-    return siblingView;
-  }
-
-  View getTabNavigator(View view) {
-    View currentView = view;
-    while (currentView != null) {
-      if (currentView.getClass().getSimpleName().equals("ScreenContainer")) {
-        return currentView;
-      }
-      if (currentView.getClass().getSimpleName().equals("Screen")
-          && currentView.getParent() != null
-          && currentView.getParent().getClass().getSimpleName().equals("ScreensCoordinatorLayout")) {
-        View screen = currentView;
-        Class<?> screenClass = screen.getClass();
-        try {
-          Method getContainer = screenClass.getMethod("getContainer");
-          currentView = (View)getContainer.invoke(screen);
-        } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException ignored) {}
-      } else if (currentView.getParent() instanceof View) {
-        currentView = (View) currentView.getParent();
-      } else {
-        break;
-      }
-    }
-    return null;
-  }
-
   private void setupTransitionContainer() {
     if (mTransitionContainer == null) {
       ReactContext context = mAnimationsManager.getContext();
@@ -717,14 +640,6 @@ public class SharedTransitionManager {
   }
 
   void visitNativeTreeAndMakeSnapshot(View view) {
-    if (view.getClass().getSimpleName().equals("ScreenStack")) {
-      View screen = view;
-      Class<?> screenClass = screen.getClass();
-      try {
-        Method getTopScreen = screenClass.getMethod("getTopScreen");
-        view = (View)getTopScreen.invoke(screen);
-      } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException ignored) {}
-    }
     if (!(view instanceof ViewGroup)) {
       return;
     }
@@ -781,82 +696,4 @@ public class SharedTransitionManager {
       }
     }
   }
-
-  public void navigationTabChanged(View previousTab, View newTab) {
-    mAddedSharedViews.clear();
-    List<SharedElement> sharedElements = new ArrayList<>();
-    List<View> sharedViews = new ArrayList<>();
-    findSharedViewsForScreen(previousTab, sharedViews);
-    sortViewsByTags(sharedViews);
-    for (View sharedView : sharedViews) {
-      int[] sharedGroup = mNativeMethodsHolder.getSharedGroup(sharedView.getId());
-      for (int i = sharedGroup.length - 1; i >= 0; i--) {
-        View targetView = mAnimationsManager.resolveView(sharedGroup[i]);
-        if (isChildOfScreen(targetView, newTab)) {
-          Snapshot sourceViewSnapshot = mSnapshotRegistry.get(sharedView.getId());
-          if (sourceViewSnapshot == null) {
-            continue;
-          }
-          SharedElement sharedElement = new SharedElement(
-            sharedView,
-            sourceViewSnapshot,
-            targetView,
-            new Snapshot(targetView)
-          );
-          sharedElements.add(sharedElement);
-          break;
-        }
-      }
-    }
-    if (sharedElements.isEmpty()) {
-      return;
-    }
-    mSharedElements = sharedElements;
-    mSharedElementsWithAnimation.clear();
-    for (SharedElement sharedElement : sharedElements) {
-      mSharedElementsLookup.put(sharedElement.sourceView.getId(), sharedElement);
-      mSharedElementsWithAnimation.add(sharedElement);
-    }
-    setupTransitionContainer();
-    reparentSharedViewsForCurrentTransition(sharedElements);
-    startSharedTransition(mSharedElementsWithAnimation, LayoutAnimations.Types.SHARED_ELEMENT_TRANSITION);
-  }
-
-  private void findSharedViewsForScreen(View view, List<View> sharedViews) {
-    if (view.getClass().getSimpleName().equals("ScreenStack")) {
-      View screen = view;
-      Class<?> screenClass = screen.getClass();
-      try {
-        Method getTopScreen = screenClass.getMethod("getTopScreen");
-        view = (View)getTopScreen.invoke(screen);
-      } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException ignored) {}
-    }
-    if (!(view instanceof ViewGroup)) {
-      return;
-    }
-    ViewGroup viewGroup = (ViewGroup) view;
-    if (mAnimationsManager.hasAnimationForTag(
-            view.getId(), LayoutAnimations.Types.SHARED_ELEMENT_TRANSITION)) {
-      sharedViews.add(view);
-    }
-    for (int i = 0; i < viewGroup.getChildCount(); i++) {
-      View child = viewGroup.getChildAt(i);
-      findSharedViewsForScreen(child, sharedViews);
-    }
-  }
-
-  private boolean isChildOfScreen(View view, View screen) {
-    View currentView = view;
-    while (currentView != null) {
-      if (currentView == screen) {
-        return true;
-      }
-      if (!(currentView.getParent() instanceof View)) {
-        return false;
-      }
-      currentView = (View) currentView.getParent();
-    }
-    return false;
-  }
-
 }

package/android/src/main/java/com/swmansion/reanimated/layoutReanimation/Snapshot.java

@@ -6,9 +6,6 @@ import com.facebook.react.uimanager.IllegalViewOperationException;
 import com.facebook.react.uimanager.NativeViewHierarchyManager;
 import com.facebook.react.uimanager.ViewManager;
 import com.swmansion.reanimated.ReactNativeUtils;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -120,36 +117,9 @@ public class Snapshot {
     borderRadii = new ReactNativeUtils.BorderRadii(0, 0, 0, 0, 0);
   }
 
-  private int[] tryToFixLocation(View view) {
-    int[] location = new int[2];
-    View currentView = view;
-    while (currentView != null) {
-      location[0] += currentView.getX();
-      location[1] += currentView.getY();
-      if (currentView.getParent() != null
-          && currentView.getParent().getClass().getSimpleName().equals("ScreensCoordinatorLayout")
-          && currentView.getClass().getSimpleName().equals("Screen")) {
-        View screen = currentView;
-        Class<?> screenClass = screen.getClass();
-        try {
-          Method getContainer = screenClass.getMethod("getContainer");
-          currentView = (View)getContainer.invoke(screen);
-        } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException ignored) {}
-      } else if (currentView.getParent() instanceof View) {
-        currentView = (View) currentView.getParent();
-      } else {
-        break;
-      }
-    }
-    return location;
-  }
-
   public Snapshot(View view) {
     int[] location = new int[2];
     view.getLocationOnScreen(location);
-    if (location[0] == 0 && location[1] == 0) {
-      location = tryToFixLocation(view);
-    }
     originX = location[0];
     originY = location[1];
     width = view.getWidth();

package/android/src/main/java/com/swmansion/reanimated/nativeProxy/NativeProxyCommon.java

@@ -6,17 +6,16 @@ import android.provider.Settings;
 import android.util.Log;
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.react.ReactApplication;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableNativeArray;
-import com.facebook.react.devsupport.interfaces.DevSupportManager;
 import com.facebook.soloader.SoLoader;
 import com.swmansion.common.GestureHandlerStateManager;
 import com.swmansion.reanimated.AndroidUIScheduler;
 import com.swmansion.reanimated.BuildConfig;
+import com.swmansion.reanimated.DevMenuUtils;
 import com.swmansion.reanimated.NativeProxy;
 import com.swmansion.reanimated.NodesManager;
 import com.swmansion.reanimated.ReanimatedModule;
@@ -83,16 +82,7 @@ public abstract class NativeProxyCommon {
 
   private void addDevMenuOption() {
     // In Expo, `ApplicationContext` is not an instance of `ReactApplication`
-    if (mContext.get().getApplicationContext() instanceof ReactApplication) {
-      final DevSupportManager devSupportManager =
-          ((ReactApplication) mContext.get().getApplicationContext())
-              .getReactNativeHost()
-              .getReactInstanceManager()
-              .getDevSupportManager();
-
-      devSupportManager.addCustomDevOption(
-          "Toggle slow animations (Reanimated)", this::toggleSlowAnimations);
-    }
+    DevMenuUtils.addDevMenuOption(mContext.get(), this::toggleSlowAnimations);
   }
 
   @DoNotStrip