Fix synchronous state of node if +viewClass is overwritten

TextureGroup · Jan 30, 2018 · 9dc7a4b · 9dc7a4b
1 parent fef965f
commit 9dc7a4b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/Source/ASDisplayNode.mm b/Source/ASDisplayNode.mm
@@ -252,7 +252,10 @@ - (void)_initializeInstance
 #endif
 
   _viewClass = [self.class viewClass];
+  setFlag(Synchronous, ![_viewClass isSubclassOfClass:[_ASDisplayView class]]);
+
   _layerClass = [self.class layerClass];
+
   _contentsScaleForDisplay = ASScreenScale();
   _drawingPriority = ASDefaultDrawingPriority;
 

diff --git a/Tests/ASDisplayNodeTests.mm b/Tests/ASDisplayNodeTests.mm
@@ -173,6 +173,13 @@ - (void)displayWillStartAsynchronously:(BOOL)asynchronously
 
 @end
 
+@interface ASSynchronousTestDisplayNode : ASDisplayNode
+@end
+
+@implementation ASSynchronousTestDisplayNode
++ (Class)viewClass { return [UIView class]; }
+@end
+
 @interface UIDisplayNodeTestView : UIView
 @end
 
@@ -2354,4 +2361,10 @@ - (void)testScreenScale
   XCTAssertEqual(ASScreenScale(), UIScreen.mainScreen.scale);
 }
 
+- (void)testThatIfViewClassIsOverwrittenItsSynchronous
+{
+  ASSynchronousTestDisplayNode *node = [[ASSynchronousTestDisplayNode alloc] init];
+  XCTAssertTrue([node isSynchronous], @"Node should be synchronous if viewClass is ovewritten and not a subclass of _ASDisplayView");
+}
+
 @end