Adding post rendering onComplete handler to reset animation state

erikschlegel · erikschlegel · commit 697de6740b99 · 2016-02-10T06:56:06.000-05:00
diff --git a/ReactWindows/ReactNative/UIManager/NativeViewHierarchyManager.cs b/ReactWindows/ReactNative/UIManager/NativeViewHierarchyManager.cs
@@ -104,8 +104,7 @@ public void BeginAnimation(int reactTag, AnimationManager animation, ICallback c
             DispatcherHelpers.AssertOnDispatcher();
             var viewToAnimate = ResolveView(reactTag);
             int animationId = animation.AnimationId;
-
-
+            
         }
 
         /// <summary>
@@ -213,7 +212,7 @@ internal void ConfigureLayoutAnimation(JObject config, ICallback success, ICallb
             _LayoutAnimator.InitializeFromConfig(config);
         }
 
-        void ClearLayoutAnimation()
+        public void ClearLayoutAnimation()
         {
             _LayoutAnimator.Reset();
         }
diff --git a/ReactWindows/ReactNative/UIManager/UIViewOperationQueue.cs b/ReactWindows/ReactNative/UIManager/UIViewOperationQueue.cs
@@ -16,8 +16,7 @@ namespace ReactNative.UIManager
     /// <see cref="UIManagerModule"/> once a JavaScript batch of UI operations
     /// is finished.
     /// </summary>
-    public class 
-        UIViewOperationQueue
+    public class UIViewOperationQueue
     {
         private readonly int[] _measureBuffer = new int[4];
 
@@ -177,6 +176,14 @@ public void EnqueueCreateView(
                 initialProperties));
         }
 
+        /// <summary>
+        /// Clears the animation layout updates.
+        /// </summary>
+        public void ClearAnimationLayout()
+        {
+            _nativeViewHierarchyManager.ClearLayoutAnimation();
+        }
+
         internal void EnqueueConfigureLayoutAnimation(JObject config, ICallback success, ICallback error)
         {
             EnqueueOperation(() => _nativeViewHierarchyManager.ConfigureLayoutAnimation(config, success, error));
@@ -365,10 +372,17 @@ internal void ExecuteOperations(int batchId)
                     {
                         operation();
                     }
+
+                    OnOperationGroupExecuted();
                 }
             }
         }
 
+        internal void OnOperationGroupExecuted()
+        {
+            _nativeViewHierarchyManager.ClearLayoutAnimation();
+        }
+
         private void EnqueueOperation(Action action)
         {
             lock (_operationsLock)

Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,7 @@ public void BeginAnimation(int reactTag, AnimationManager animation, ICallback c`
`104`	`104`	`DispatcherHelpers.AssertOnDispatcher();`
`105`	`105`	`var viewToAnimate = ResolveView(reactTag);`
`106`	`106`	`int animationId = animation.AnimationId;`
`107`		`-`
`108`		`-`
	`107`	`+`
`109`	`108`	`}`
`110`	`109`
`111`	`110`	`/// <summary>`
`@@ -213,7 +212,7 @@ internal void ConfigureLayoutAnimation(JObject config, ICallback success, ICallb`
`213`	`212`	`_LayoutAnimator.InitializeFromConfig(config);`
`214`	`213`	`}`
`215`	`214`
`216`		`- void ClearLayoutAnimation()`
	`215`	`+ public void ClearLayoutAnimation()`
`217`	`216`	`{`
`218`	`217`	`_LayoutAnimator.Reset();`
`219`	`218`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,7 @@ namespace ReactNative.UIManager`
`16`	`16`	`/// <see cref="UIManagerModule"/> once a JavaScript batch of UI operations`
`17`	`17`	`/// is finished.`
`18`	`18`	`/// </summary>`
`19`		`- public class`
`20`		`- UIViewOperationQueue`
	`19`	`+ public class UIViewOperationQueue`
`21`	`20`	`{`
`22`	`21`	`private readonly int[] _measureBuffer = new int[4];`
`23`	`22`
`@@ -177,6 +176,14 @@ public void EnqueueCreateView(`
`177`	`176`	`initialProperties));`
`178`	`177`	`}`
`179`	`178`
	`179`	`+ /// <summary>`
	`180`	`+ /// Clears the animation layout updates.`
	`181`	`+ /// </summary>`
	`182`	`+ public void ClearAnimationLayout()`
	`183`	`+ {`
	`184`	`+ _nativeViewHierarchyManager.ClearLayoutAnimation();`
	`185`	`+ }`
	`186`	`+`
`180`	`187`	`internal void EnqueueConfigureLayoutAnimation(JObject config, ICallback success, ICallback error)`
`181`	`188`	`{`
`182`	`189`	`EnqueueOperation(() => _nativeViewHierarchyManager.ConfigureLayoutAnimation(config, success, error));`
`@@ -365,10 +372,17 @@ internal void ExecuteOperations(int batchId)`
`365`	`372`	`{`
`366`	`373`	`operation();`
`367`	`374`	`}`
	`375`	`+`
	`376`	`+ OnOperationGroupExecuted();`
`368`	`377`	`}`
`369`	`378`	`}`
`370`	`379`	`}`
`371`	`380`
	`381`	`+ internal void OnOperationGroupExecuted()`
	`382`	`+ {`
	`383`	`+ _nativeViewHierarchyManager.ClearLayoutAnimation();`
	`384`	`+ }`
	`385`	`+`
`372`	`386`	`private void EnqueueOperation(Action action)`
`373`	`387`	`{`
`374`	`388`	`lock (_operationsLock)`