From 1f7b838d5e05395238ca4b80c7ab7ad7b346de1d Mon Sep 17 00:00:00 2001
From: Michael Schneider <mischneider1@gmail.com>
Date: Tue, 22 Nov 2016 14:16:35 -0800
Subject: [PATCH] Not animated for end updates if animation is already going on
 within ASTableView

Fix strange artifacts in ASTableView are visible when changing the device orientation or other animations are going on while calling endUpdates
---
 AsyncDisplayKit/ASTableView.mm                    | 5 +++--
 AsyncDisplayKit/Private/_ASCoreAnimationExtras.h  | 7 +++++++
 AsyncDisplayKit/Private/_ASCoreAnimationExtras.mm | 5 +++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/AsyncDisplayKit/ASTableView.mm b/AsyncDisplayKit/ASTableView.mm
index 99220dbad5..e5008616e6 100644
--- a/AsyncDisplayKit/ASTableView.mm
+++ b/AsyncDisplayKit/ASTableView.mm
@@ -21,6 +21,7 @@
 #import "ASInternalHelpers.h"
 #import "ASLayout.h"
 #import "_ASDisplayLayer.h"
+#import "_ASCoreAnimationExtras.h"
 #import "ASTableNode.h"
 #import "ASEqualityHelpers.h"
 #import "ASTableView+Undeprecated.h"
@@ -610,7 +611,7 @@ static NSString * const kCellReuseIdentifier = @"_ASTableViewCell";
     } else {
       [self beginUpdates];
       [_dataController relayoutAllNodes];
-      [self endUpdates];
+      [self endUpdatesAnimated:(ASDisplayNodeLayerHasAnimations(self.layer) == NO) completion:nil];
     }
   }
   
@@ -1583,7 +1584,7 @@ static NSString * const kCellReuseIdentifier = @"_ASTableViewCell";
     // If the node height changed, trigger a height requery.
     if (oldSize.height != calculatedSize.height) {
       [self beginUpdates];
-      [self endUpdates];
+      [self endUpdatesAnimated:(ASDisplayNodeLayerHasAnimations(self.layer) == NO) completion:nil];
     }
   }
 }
diff --git a/AsyncDisplayKit/Private/_ASCoreAnimationExtras.h b/AsyncDisplayKit/Private/_ASCoreAnimationExtras.h
index 2998ea5f5a..77087d2a83 100644
--- a/AsyncDisplayKit/Private/_ASCoreAnimationExtras.h
+++ b/AsyncDisplayKit/Private/_ASCoreAnimationExtras.h
@@ -53,4 +53,11 @@ extern UIViewContentMode ASDisplayNodeUIContentModeFromCAContentsGravity(NSStrin
  */
 extern UIImage *ASDisplayNodeStretchableBoxContentsWithColor(UIColor *color, CGSize innerSize);
 
+/**
+ Checks whether a layer has ongoing animations
+ @param layer A layer to check if animations are ongoing
+ @return YES if the layer has ongoing animations, otherwise NO
+ */
+extern BOOL ASDisplayNodeLayerHasAnimations(CALayer *layer);
+
 ASDISPLAYNODE_EXTERN_C_END
diff --git a/AsyncDisplayKit/Private/_ASCoreAnimationExtras.mm b/AsyncDisplayKit/Private/_ASCoreAnimationExtras.mm
index 64eea95892..cfab3b2629 100644
--- a/AsyncDisplayKit/Private/_ASCoreAnimationExtras.mm
+++ b/AsyncDisplayKit/Private/_ASCoreAnimationExtras.mm
@@ -154,3 +154,8 @@ UIViewContentMode ASDisplayNodeUIContentModeFromCAContentsGravity(NSString *cons
   // If asserts disabled, fall back to this
   return UIViewContentModeScaleToFill;
 }
+
+BOOL ASDisplayNodeLayerHasAnimations(CALayer *layer)
+{
+  return (layer.animationKeys.count != 0);
+}