[iOS] fix text color error

apache · Feb 14, 2019 · a2a58f7 · a2a58f7
1 parent 3e8cd4a
commit a2a58f7
Showing 1 changed file with 21 additions and 11 deletions.
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.mm b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.mm
@@ -174,6 +174,8 @@ - (instancetype)initWithRef:(NSString *)ref
             _useCoreTextAttr = nil;
         }
 
+        _color[0] = -1.0;
+
         [self fillCSSStyles:styles];
         [self fillAttributes:attributes];
 
@@ -256,20 +258,24 @@ - (void)fillCSSStyles:(NSDictionary *)styles
     WX_STYLE_FILL_TEXT_PIXEL(letterSpacing, letterSpacing, YES)
     WX_STYLE_FILL_TEXT(wordWrap, wordWrap, NSString, YES);
 
-    UIColor* color = [UIColor blackColor];
+    UIColor* color = nil;
     id value = styles[@"color"];
     if (value) {
-        if(![WXUtility isBlankString:value]){
+        if([WXUtility isBlankString:value]){
+            color = [UIColor blackColor];
+        } else {
             color = [WXConvert UIColor:value];
         }
-        [self setNeedsRepaint];
+        if (color) {
+            [self setNeedsRepaint];
+            CGFloat red, green, blue, alpha;
+            [color getRed:&red green:&green blue:&blue alpha:&alpha];
+            _color[0] = red;
+            _color[1] = green;
+            _color[2] = blue;
+            _color[3] = alpha;
+        }
     }
-    CGFloat red, green, blue, alpha;
-    [color getRed:&red green:&green blue:&blue alpha:&alpha];
-    _color[0] = red;
-    _color[1] = green;
-    _color[2] = blue;
-    _color[3] = alpha;
 
     if (_fontFamily && !_observerIconfont) {
         // notification received when custom icon font file download finish
@@ -489,7 +495,9 @@ - (NSMutableAttributedString *)buildCTAttributeString
         string = @"";
     }
     NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString: string];
-    [attributedString addAttribute:NSForegroundColorAttributeName value:[UIColor colorWithRed:_color[0] green:_color[1] blue:_color[2] alpha:_color[3]] range:NSMakeRange(0, string.length)];
+    if (_color[0] >= 0) {
+        [attributedString addAttribute:NSForegroundColorAttributeName value:[UIColor colorWithRed:_color[0] green:_color[1] blue:_color[2] alpha:_color[3]] range:NSMakeRange(0, string.length)];
+    }
 
     // set font
     UIFont *font = [WXUtility fontWithSize:_fontSize textWeight:_fontWeight textStyle:_fontStyle fontFamily:_fontFamily scaleFactor:self.weexInstance.pixelScaleFactor useCoreText:[self useCoreText]];
@@ -579,7 +587,9 @@ - (NSAttributedString *)buildAttributeString
     NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:string];
 
     // set textColor
-    [attributedString addAttribute:NSForegroundColorAttributeName value:[UIColor colorWithRed:_color[0] green:_color[1] blue:_color[2] alpha:_color[3]] range:NSMakeRange(0, string.length)];
+    if (_color[0] >= 0) {
+        [attributedString addAttribute:NSForegroundColorAttributeName value:[UIColor colorWithRed:_color[0] green:_color[1] blue:_color[2] alpha:_color[3]] range:NSMakeRange(0, string.length)];
+    }
 
     // set font
     UIFont *font = [WXUtility fontWithSize:_fontSize textWeight:_fontWeight textStyle:_fontStyle fontFamily:_fontFamily scaleFactor:self.weexInstance.pixelScaleFactor];