Merge 4014862 into 7702509

infernojs · Oct 25, 2021 · fc22a87 · fc22a87
2 parents 7702509 + 4014862
commit fc22a87
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/docs/animations-demo-inner/dist/bundle.js b/docs/animations-demo-inner/dist/bundle.js
diff --git a/packages/inferno-animation/src/animationCoordinator.ts b/packages/inferno-animation/src/animationCoordinator.ts
@@ -53,16 +53,18 @@ function _runAnimationPhases() {
     switch (phase) {
       case AnimationPhase.ACTIVATE_ANIMATION:
         // Final phase - Activate animations
+        // This is a special case and is executed differently from others
         _animationActivationQueue = _animationActivationQueue.concat(animationQueue);
         if (_nextActivateAnimationFrame === IDLE) {
           // Animations are activated on the next animation frame
           _nextActivateAnimationFrame = requestAnimationFrame(_runActivateAnimationPhase);
         }
         break;
-      case AnimationPhase.ACTIVATE_TRANSITIONS:
-        // Force reflow before executing ACTIVATE_TRANSITIONS
-        forceReflow();
       default:
+        if (phase === AnimationPhase.ACTIVATE_TRANSITIONS) {
+          // Force reflow before executing ACTIVATE_TRANSITIONS
+          forceReflow();
+        }
         for (let j = 0; j < animationQueue.length; j++) {
           animationQueue[j](phase);
         }
@@ -80,16 +82,18 @@ function _debugAnimationPhases(phase: AnimationPhase, animationQueue) {
   switch (phase) {
     case AnimationPhase.ACTIVATE_ANIMATION:
       // Final phase - Activate animations
+      // This is a special case and is executed differently from others
       _animationActivationQueue = _animationActivationQueue.concat(animationQueue);
       if (_nextActivateAnimationFrame === IDLE) {
         // Animations are activated on the next animation frame
         _nextActivateAnimationFrame = requestAnimationFrame(_runActivateAnimationPhase);
       }
       break;
-    case AnimationPhase.ACTIVATE_TRANSITIONS:
-      // Force reflow before executing ACTIVATE_TRANSITIONS
-      forceReflow();
     default:
+      if (phase === AnimationPhase.ACTIVATE_TRANSITIONS) {
+        // Force reflow before executing ACTIVATE_TRANSITIONS
+        forceReflow();
+      }
       for (let j = 0; j < animationQueue.length; j++) {
         animationQueue[j](phase);
       }

diff --git a/packages/inferno-animation/src/animations.ts b/packages/inferno-animation/src/animations.ts
@@ -96,6 +96,7 @@ function _didAppear(phase: AnimationPhase, dom: HTMLElement, cls: AnimationClass
         [dom],
         _getDidAppearTransitionCallback(dom, cls)
       );
+      return;
     case AnimationPhase.ACTIVATE_ANIMATION:
       // 4. Activate target state (called async via requestAnimationFrame)
       setDimensions(dom, dimensions.width, dimensions.height);
@@ -133,11 +134,13 @@ function _willDisappear(phase: AnimationPhase, dom: HTMLElement, callback: Funct
         [dom],
         callback
       );
+      return;
     case AnimationPhase.ACTIVATE_ANIMATION:
       // 4. Activate target state (called async via requestAnimationFrame)
       addClassName(dom, cls.end);
       removeClassName(dom, cls.start);
       clearDimensions(dom);
+      return;
   }
 }
 
@@ -254,6 +257,7 @@ function _willMove(phase: AnimationPhase, cls: AnimationClass, animState) {
       }
       // TODO: Set dimensions
       if (parentVNode.$MV) parentVNode.$MV = false;
+      return;
   }
 }