From 750e88a72e2be2b430ae331c579d6f70bcf20d0a Mon Sep 17 00:00:00 2001
From: wwwcg <isarraypro@gmail.com>
Date: Wed, 23 Aug 2023 21:54:59 +0800
Subject: [PATCH] fix(ios): text will be clipped when exceeds lineHeight

---
 .../component/text/NativeRenderObjectText.mm     | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/renderer/native/ios/renderer/component/text/NativeRenderObjectText.mm b/renderer/native/ios/renderer/component/text/NativeRenderObjectText.mm
index f62e5760264..c117dd055fb 100644
--- a/renderer/native/ios/renderer/component/text/NativeRenderObjectText.mm
+++ b/renderer/native/ios/renderer/component/text/NativeRenderObjectText.mm
@@ -612,13 +612,18 @@ - (void)_setParagraphStyleOnAttributedString:(NSMutableAttributedString *)attrib
                       heightOfTallestSubview:(CGFloat)heightOfTallestSubview
                                 isNestedText:(BOOL)isNestedText {
     NSTextStorage *textStorage = [[NSTextStorage alloc] initWithAttributedString:attributedString];
-    if (fabs(_lineHeight - 0) < DBL_EPSILON) {
-        _lineHeight = fontLineHeight;
+    BOOL hasSetLineHeight = NO;
+    if (fabs(self.lineHeight - 0) < DBL_EPSILON) {
+        // If no fixed lineHeight is set, fontLineHeight is used.
+        self.lineHeight = fontLineHeight;
+    } else if (!self.adjustsFontSizeToFit) {
+        // Only when adjustsFontSizeToFit is not set, the fixed lineHeight can be used.
+        hasSetLineHeight = YES;
     }
     
     // check if we have lineHeight set on self
     __block BOOL hasParagraphStyle = NO;
-    if (_lineHeight || _textAlignSet || 1.f != _lineHeightMultiple) {
+    if (hasSetLineHeight || _textAlignSet || 1.0 != _lineHeightMultiple) {
         hasParagraphStyle = YES;
     }
 
@@ -644,8 +649,7 @@ - (void)_setParagraphStyleOnAttributedString:(NSMutableAttributedString *)attrib
         self.lineHeight = newLineHeight;
     }
 
-    __block CGFloat maximumFontLineHeight = 0;
-
+    __block CGFloat maximumFontLineHeight = 0.0;
     [textStorage enumerateAttribute:NSFontAttributeName
                             inRange:NSMakeRange(0, attributedString.length)
                             options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
@@ -671,7 +675,7 @@ - (void)_setParagraphStyleOnAttributedString:(NSMutableAttributedString *)attrib
         paragraphStyle.lineHeightMultiple = _lineHeightMultiple;
         maxHeight = MAX(maxHeight, maximumFontLineHeight);
         paragraphStyle.minimumLineHeight = lineHeight;
-        paragraphStyle.maximumLineHeight = maxHeight;
+        paragraphStyle.maximumLineHeight = hasSetLineHeight ? self.lineHeight : maxHeight;
         [attributedString addAttribute:NSParagraphStyleAttributeName
                                  value:paragraphStyle
                                  range:(NSRange) { 0, attributedString.length }];