bugfix: sizeThatFit:

Author: ibireme

YYKit/Text/YYLabel.m

@@ -448,9 +448,40 @@ - (void)setBounds:(CGRect)bounds {
 }
 
 - (CGSize)sizeThatFits:(CGSize)size {
-    [self _updateIfNeeded];
-    if (!self._innerLayout) return size;
-    return [self._innerLayout textBoundingSize];
+    if (_ignoreCommonProperties) {
+        return _innerLayout.textBoundingSize;
+    }
+    
+    if ((!_verticalForm && size.width == self.bounds.size.width) ||
+        (_verticalForm && size.height == self.bounds.size.height)) {
+        [self _updateIfNeeded];
+        YYTextLayout *layout = self._innerLayout;
+        BOOL contains = NO;
+        if (layout.container.maximumNumberOfRows == 0) {
+            if (layout.truncatedLine == nil) {
+                contains = YES;
+            }
+        } else {
+            if (layout.rowCount <= layout.container.maximumNumberOfRows) {
+                contains = YES;
+            }
+        }
+        if (contains) {
+            return layout.textBoundingSize;
+        }
+    }
+    
+    if (!_verticalForm) {
+        size.height = YYTextContainerMaxSize.height;
+    } else {
+        size.width = YYTextContainerMaxSize.width;
+    }
+    
+    YYTextContainer *container = [_innerContainer copy];
+    container.size = size;
+    
+    YYTextLayout *layout = [YYTextLayout layoutWithContainer:container text:_innerText];
+    return layout.textBoundingSize;
 }
 
 - (NSString *)accessibilityLabel {

YYKit/Text/YYTextView.m

@@ -2442,24 +2442,31 @@ - (void)tintColorDidChange {
 }
 
 - (CGSize)sizeThatFits:(CGSize)size {
-    YYTextLayout *textLayout = self.textLayout;
-    CGSize currentSize = CGSizePixelCeil(textLayout.textBoundingSize);
-    if (_verticalForm) {
-        if (currentSize.height == size.height) return currentSize;
-    } else {
-        if (currentSize.width == size.width) return currentSize;
+    if ((!_verticalForm && size.width == self.bounds.size.width) ||
+        (_verticalForm && size.height == self.bounds.size.height)) {
+        [self _updateIfNeeded];
+        if (!_verticalForm) {
+            if (_containerView.bounds.size.height <= size.height) {
+                return _containerView.bounds.size;
+            }
+        } else {
+            if (_containerView.bounds.size.width <= size.width) {
+                return _containerView.bounds.size;
+            }
+        }
     }
 
-    if (_verticalForm) {
-        size.width = CGFLOAT_MAX;
+    if (!_verticalForm) {
+        size.height = YYTextContainerMaxSize.height;
     } else {
-        size.height = CGFLOAT_MAX;
+        size.width = YYTextContainerMaxSize.width;
     }
-    YYTextContainer *newContainer = _innerContainer.copy;
-    newContainer.size = size;
-    YYTextLayout *newLayout = [YYTextLayout layoutWithContainer:newContainer text:textLayout.text];
-    CGSize newSize = newLayout.textBoundingSize;
-    return CGSizePixelCeil(newSize);
+    
+    YYTextContainer *container = [_innerContainer copy];
+    container.size = size;
+    
+    YYTextLayout *layout = [YYTextLayout layoutWithContainer:container text:_innerText];
+    return layout.textBoundingSize;
 }
 
 #pragma mark - Override UIResponder