Fix placeholder (#1555)

* Fix placeholder * [Unit Tests] Add Placeholder Test (#1555)
TextureGroup · Jun 28, 2019 · 59ab0e8 · 59ab0e8
1 parent d4c0d74
commit 59ab0e8
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 0 deletions.
diff --git a/Source/ASDisplayNode.mm b/Source/ASDisplayNode.mm
@@ -878,6 +878,18 @@ - (void)setAutomaticallyRelayoutOnLayoutMarginsChanges:(BOOL)flag
   _flags.automaticallyRelayoutOnLayoutMarginsChanges = flag;
 }
 
+- (BOOL)placeholderEnabled
+{
+  MutexLocker l(__instanceLock__);
+  return _flags.placeholderEnabled;
+}
+
+- (void)setPlaceholderEnabled:(BOOL)flag
+{
+  MutexLocker l(__instanceLock__);
+  _flags.placeholderEnabled = flag;
+}
+
 - (void)__setNodeController:(ASNodeController *)controller
 {
   // See docs for why we don't lock.

diff --git a/Tests/ASDisplayNodeTests.mm b/Tests/ASDisplayNodeTests.mm
@@ -182,6 +182,11 @@ - (void)displayWillStartAsynchronously:(BOOL)asynchronously
   return &self->_clipCornerLayers;
 }
 
++ (UIImage *)displayWithParameters:(id<NSObject>)parameter isCancelled:(NS_NOESCAPE asdisplaynode_iscancelled_block_t)isCancelled
+{
+  return nil;
+}
+
 @end
 
 @interface ASSynchronousTestDisplayNodeViaViewClass : ASDisplayNode
@@ -2726,4 +2731,25 @@ - (void)testLayerActionForKeyIsCalled
   OCMVerifyAll(mockNode);
 }
 
+- (void)testPlaceholder
+{
+  UIWindow *window = [[UIWindow alloc] initWithFrame:CGRectMake(0, 0, 50, 50)];
+  ASTestDisplayNode *node = [[ASTestDisplayNode alloc] init];
+  node.placeholderEnabled = YES;
+  node.frame = window.bounds;
+  [window addSubnode:node];
+  [window makeKeyAndVisible];
+
+  CALayer *layer = node.layer;
+  XCTAssertNotNil(layer);
+  BOOL hasPlaceholderLayer = NO;
+  for (CALayer *sublayer in layer.sublayers) {
+    if (sublayer.zPosition == 9999.0) {
+      hasPlaceholderLayer = YES;
+      break;
+    }
+  }
+  XCTAssertTrue(hasPlaceholderLayer);
+}
+
 @end