[Shared Element Transition] Animation restart (software-mansion#4043)

## Summary This change allows restarting of animation in two cases: - when someone changes the current screen during transition animation - when an update of layout comes for shared view during the transition animation **Known limitation**: If the parent of shared view updates owns the layout during the shared transition it doesn't affect for shared view layout. This issue will be fixed in the future.
talut · Feb 17, 2023 · 5bcc258 · 5bcc258
1 parent c86db64
commit 5bcc258
Show file tree

Hide file tree

Showing 24 changed files with 576 additions and 111 deletions.
diff --git a/Common/cpp/LayoutAnimations/LayoutAnimationsManager.cpp b/Common/cpp/LayoutAnimations/LayoutAnimationsManager.cpp
@@ -94,6 +94,30 @@ void LayoutAnimationsManager::startLayoutAnimation(
       config->getJSValue(rt));
 }
 
+void LayoutAnimationsManager::cancelLayoutAnimation(
+    jsi::Runtime &rt,
+    int tag,
+    const std::string &type,
+    bool cancelled = true,
+    bool removeView = true) {
+  jsi::Value layoutAnimationRepositoryAsValue =
+      rt.global()
+          .getPropertyAsObject(rt, "global")
+          .getProperty(rt, "LayoutAnimationsManager");
+  jsi::Function cancelLayoutAnimation =
+      layoutAnimationRepositoryAsValue.getObject(rt).getPropertyAsFunction(
+          rt, "stop");
+  std::shared_ptr<Shareable> config;
+  {
+    auto lock = std::unique_lock<std::mutex>(animationsMutex_);
+    config = sharedTransitionAnimations_[tag];
+  }
+  if (config != nullptr) {
+    cancelLayoutAnimation.call(
+        rt, jsi::Value(tag), config->getJSValue(rt), cancelled, removeView);
+  }
+}
+
 /*
   The top screen on the stack triggers the animation, so we need to find
   the sibling view registered in the past. This method finds view

diff --git a/Common/cpp/LayoutAnimations/LayoutAnimationsManager.h b/Common/cpp/LayoutAnimations/LayoutAnimationsManager.h
@@ -30,6 +30,12 @@ class LayoutAnimationsManager {
       const std::string &type,
       const jsi::Object &values);
   void clearLayoutAnimationConfig(int tag);
+  void cancelLayoutAnimation(
+      jsi::Runtime &rt,
+      int tag,
+      const std::string &type,
+      bool cancelled /* = true */,
+      bool removeView /* = true */);
   int findPrecedingViewTagForTransition(int tag);
 
  private:

diff --git a/android/src/fabric/java/com/swmansion/reanimated/NativeProxy.java b/android/src/fabric/java/com/swmansion/reanimated/NativeProxy.java
@@ -88,6 +88,9 @@ public boolean hasAnimation(int tag, String type) {
 
             @Override
             public void clearAnimationConfig(int tag) {}
+
+            @Override
+            public void cancelAnimation(int tag, String type, boolean cancelled, boolean removeView) {}
         };
     }
 }
diff --git a/android/src/main/cpp/LayoutAnimations.cpp b/android/src/main/cpp/LayoutAnimations.cpp
@@ -64,6 +64,19 @@ void LayoutAnimations::clearAnimationConfigForTag(int tag) {
   clearAnimationConfigBlock_(tag);
 }
 
+void LayoutAnimations::setCancelAnimationForTag(
+    CancelAnimationConfigBlock cancelAnimationBlock) {
+  this->cancelAnimationBlock_ = cancelAnimationBlock;
+}
+
+void LayoutAnimations::cancelAnimationForTag(
+    int tag,
+    alias_ref<JString> type,
+    jboolean cancelled,
+    jboolean removeView) {
+  this->cancelAnimationBlock_(tag, type, cancelled, removeView);
+}
+
 bool LayoutAnimations::isLayoutAnimationEnabled() {
   return FeaturesConfig::isLayoutAnimationEnabled();
 }
@@ -89,6 +102,8 @@ void LayoutAnimations::registerNatives() {
       makeNativeMethod(
           "clearAnimationConfigForTag",
           LayoutAnimations::clearAnimationConfigForTag),
+      makeNativeMethod(
+          "cancelAnimationForTag", LayoutAnimations::cancelAnimationForTag),
       makeNativeMethod(
           "isLayoutAnimationEnabled",
           LayoutAnimations::isLayoutAnimationEnabled),

diff --git a/android/src/main/cpp/LayoutAnimations.h b/android/src/main/cpp/LayoutAnimations.h
@@ -16,6 +16,8 @@ class LayoutAnimations : public jni::HybridClass<LayoutAnimations> {
       void(int, alias_ref<JString>, alias_ref<JMap<jstring, jstring>>)>;
   using HasAnimationBlock = std::function<bool(int, const std::string &)>;
   using ClearAnimationConfigBlock = std::function<void(int)>;
+  using CancelAnimationConfigBlock =
+      std::function<void(int, alias_ref<JString>, jboolean, jboolean)>;
   using FindPrecedingViewTagForTransitionBlock = std::function<int(int)>;
 
  public:
@@ -36,6 +38,8 @@ class LayoutAnimations : public jni::HybridClass<LayoutAnimations> {
   void setHasAnimationBlock(HasAnimationBlock hasAnimationBlock);
   void setClearAnimationConfigBlock(
       ClearAnimationConfigBlock clearAnimationConfigBlock);
+  void setCancelAnimationForTag(
+      CancelAnimationConfigBlock cancelAnimationBlock);
   void setFindPrecedingViewTagForTransition(
       FindPrecedingViewTagForTransitionBlock
           findPrecedingViewTagForTransitionBlock);
@@ -46,6 +50,11 @@ class LayoutAnimations : public jni::HybridClass<LayoutAnimations> {
       bool isSharedTransition);
   void endLayoutAnimation(int tag, bool cancelled, bool removeView);
   void clearAnimationConfigForTag(int tag);
+  void cancelAnimationForTag(
+      int tag,
+      alias_ref<JString> type,
+      jboolean cancelled,
+      jboolean removeView);
   int findPrecedingViewTagForTransition(int tag);
 
  private:
@@ -54,6 +63,7 @@ class LayoutAnimations : public jni::HybridClass<LayoutAnimations> {
   AnimationStartingBlock animationStartingBlock_;
   HasAnimationBlock hasAnimationBlock_;
   ClearAnimationConfigBlock clearAnimationConfigBlock_;
+  CancelAnimationConfigBlock cancelAnimationBlock_;
   FindPrecedingViewTagForTransitionBlock
       findPrecedingViewTagForTransitionBlock_;
 

diff --git a/android/src/main/cpp/NativeProxy.cpp b/android/src/main/cpp/NativeProxy.cpp
@@ -385,6 +385,21 @@ void NativeProxy::installJSIBindings(
             tag);
       });
 
+  layoutAnimations->cthis()->setCancelAnimationForTag(
+      [wrt, weakModule](
+          int tag,
+          alias_ref<JString> type,
+          jboolean cancelled,
+          jboolean removeView) {
+        if (auto reaModule = weakModule.lock()) {
+          if (auto runtime = wrt.lock()) {
+            jsi::Runtime &rt = *runtime;
+            reaModule->layoutAnimationsManager().cancelLayoutAnimation(
+                rt, tag, type->toStdString(), cancelled, removeView);
+          }
+        }
+      });
+
   layoutAnimations->cthis()->setFindPrecedingViewTagForTransition(
       [weakModule](int tag) {
         if (auto module = weakModule.lock()) {

diff --git a/android/src/main/java/com/swmansion/reanimated/layoutReanimation/AnimationsManager.java b/android/src/main/java/com/swmansion/reanimated/layoutReanimation/AnimationsManager.java
@@ -535,6 +535,9 @@ private void registerExitingAncestors(View view) {
   }
 
   private void maybeDropAncestors(View exitingView) {
+    if (!(exitingView.getParent() instanceof View)) {
+      return;
+    }
     View parent = (View) exitingView.getParent();
     while (parent != null && !(parent instanceof RootView)) {
       View view = parent;
@@ -631,8 +634,12 @@ private static Point convertScreenLocationToViewCoordinates(Point fromPoint, Vie
     return new Point(fromPoint.x - toPoint[0], fromPoint.y - toPoint[1]);
   }
 
-  public void viewsDidLayout() {
-    mSharedTransitionManager.viewsDidLayout();
+  public void screenDidLayout() {
+    mSharedTransitionManager.screenDidLayout();
+  }
+
+  public void viewDidLayout(View view) {
+    mSharedTransitionManager.viewDidLayout(view);
   }
 
   public void notifyAboutViewsRemoval(int[] tagsToDelete) {

diff --git a/android/src/main/java/com/swmansion/reanimated/layoutReanimation/LayoutAnimations.java b/android/src/main/java/com/swmansion/reanimated/layoutReanimation/LayoutAnimations.java
@@ -33,6 +33,9 @@ public LayoutAnimations(ReactApplicationContext context) {
 
   public native void clearAnimationConfigForTag(int tag);
 
+  public native void cancelAnimationForTag(
+      int tag, String type, boolean cancelled, boolean removeView);
+
   public native boolean isLayoutAnimationEnabled();
 
   public native int findPrecedingViewTagForTransition(int tag);

diff --git a/android/src/main/java/com/swmansion/reanimated/layoutReanimation/NativeMethodsHolder.java b/android/src/main/java/com/swmansion/reanimated/layoutReanimation/NativeMethodsHolder.java
@@ -9,6 +9,8 @@ public interface NativeMethodsHolder {
 
   void clearAnimationConfig(int tag);
 
+  void cancelAnimation(int tag, String type, boolean cancelled, boolean removeView);
+
   boolean isLayoutAnimationEnabled();
 
   int findPrecedingViewTagForTransition(int tag);