Handle nil backgroundColor in ASTextNode2 #trivial (TextureGroup#841)

* Handle nil backgroundColor * Small improvement
AtomTickets · Apr 25, 2018 · e633977 · e633977
1 parent 27bdadc
commit e633977
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/Source/ASTextNode2.mm b/Source/ASTextNode2.mm
@@ -360,10 +360,10 @@ - (NSObject *)drawParametersForAsyncLayer:(_ASDisplayLayer *)layer
   [self prepareAttributedString:mutableText];
 
   return @{
-           @"container": copiedContainer,
-           @"text": mutableText,
-           @"bgColor": self.backgroundColor
-           };
+    @"container": copiedContainer,
+    @"text": mutableText,
+    @"bgColor": self.backgroundColor ?: [NSNull null]
+  };
 }
 
 /**
@@ -467,9 +467,13 @@ + (void)drawRect:(CGRect)bounds withParameters:(NSDictionary *)layoutDict isCanc
   }
 
   // Fill background color.
+  if (bgColor == (id)[NSNull null]) {
+    bgColor = nil;
+  }
+
   // They may have already drawn into this context in the pre-context block
   // so unfortunately we have to use the normal blend mode, not copy.
-  if (CGColorGetAlpha(bgColor.CGColor) > 0) {
+  if (bgColor && CGColorGetAlpha(bgColor.CGColor) > 0) {
     [bgColor setFill];
     UIRectFillUsingBlendMode(bounds, kCGBlendModeNormal);
   }