chore: Reverted line-height changes

CatchABus · CatchABus · commit b35dca7cd692 · 2024-11-19T00:31:36.000+02:00
diff --git a/packages/core/platforms/ios/src/UIView+NativeScript.m b/packages/core/platforms/ios/src/UIView+NativeScript.m
@@ -26,19 +26,13 @@ - (void)nativeScriptSetTextDecorationAndTransform:(NSString*)text textDecoration
     BOOL isTextView = [self isKindOfClass:[UITextView class]];
     if (lineHeight > 0) {
         NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
+        // Note: Avoid using lineSpacing as it will append the height as extra space
+        paragraphStyle.minimumLineHeight = lineHeight;
         // make sure a possible previously set text alignment setting is not lost when line height is specified
         if ([self isKindOfClass:[UIButton class]]) {
             paragraphStyle.alignment = ((UIButton*)self).titleLabel.textAlignment;
-
-            if (((UIButton*)self).titleLabel.font) {
-                paragraphStyle.lineSpacing = lineHeight - ((UIButton*)self).titleLabel.font.lineHeight;
-            }
         } else {
             paragraphStyle.alignment = ((UILabel*)self).textAlignment;
-
-            if (((UILabel*)self).font) {
-                paragraphStyle.lineSpacing = lineHeight - ((UILabel*)self).font.lineHeight;
-            }
         }
         
         if ([self isKindOfClass:[UILabel class]]) {
@@ -95,20 +89,14 @@ -(void)nativeScriptSetFormattedTextDecorationAndTransform:(NSDictionary*)details
     BOOL isLabel = [self isKindOfClass:[UILabel class]];
     if (lineHeight > 0) {
         NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
+        // Note: Avoid using lineSpacing as it will append the height as extra space
+        paragraphStyle.minimumLineHeight = lineHeight;
         // make sure a possible previously set text alignment setting is not lost when line height is specified
         if ([self isKindOfClass:[UIButton class]]) {
             paragraphStyle.alignment = ((UIButton*)self).titleLabel.textAlignment;
-
-            if (((UIButton*)self).titleLabel.font) {
-                paragraphStyle.lineSpacing = lineHeight - ((UIButton*)self).titleLabel.font.lineHeight;
-            }
         } else {
             // Paragraph alignment is also important for tappable spans as NSTextContainer takes it into account
             paragraphStyle.alignment = ((UILabel*)self).textAlignment;
-
-            if (((UILabel*)self).font) {
-                paragraphStyle.lineSpacing = lineHeight - ((UILabel*)self).font.lineHeight;
-            }
         }
         
         if (isLabel) {
diff --git a/packages/core/ui/text-base/index.android.ts b/packages/core/ui/text-base/index.android.ts
@@ -367,14 +367,6 @@ export class TextBase extends TextBaseCommon {
 		if (!this.formattedText) {
 			this.nativeTextViewProtected.setTextSize(value);
 
-			// Re-calculate line-height
-			if (this.lineHeight != 0) {
-				// It's done automatically for API 28+
-				if (SDK_VERSION < 28) {
-					this._setLineHeightLegacy(this.lineHeight);
-				}
-			}
-
 			// Re-calculate letter-spacing
 			if (this.letterSpacing != 0) {
 				this._updateLetterSpacing(this.letterSpacing);
@@ -386,12 +378,16 @@ export class TextBase extends TextBaseCommon {
 		return this.nativeTextViewProtected.getLineHeight() / layout.getDisplayDensity();
 	}
 	[lineHeightProperty.setNative](value: number) {
-		// Note: android throws exception in the case of negative line height
-		// so make sure that minimum is zero
+		const dpValue = value * layout.getDisplayDensity();
+
 		if (SDK_VERSION >= 28) {
-			this.nativeTextViewProtected.setLineHeight(Math.max(value * layout.getDisplayDensity(), 0));
+			this.nativeTextViewProtected.setLineHeight(dpValue);
 		} else {
-			this._setLineHeightLegacy(value);
+			const fontHeight = this.nativeTextViewProtected.getPaint().getFontMetricsInt(null);
+			// Actual line spacing is the diff of line height and font height
+			const lineSpacing = Math.max(dpValue - fontHeight, 0);
+
+			this.nativeTextViewProtected.setLineSpacing(lineSpacing, 1);
 		}
 	}
 
@@ -500,15 +496,6 @@ export class TextBase extends TextBaseCommon {
 		}
 	}
 
-	_setLineHeightLegacy(value: number): void {
-		const dpValue = value * layout.getDisplayDensity();
-		const fontHeight = this.nativeTextViewProtected.getPaint().getFontMetricsInt(null);
-		// Actual line spacing is the diff of line height and font height
-		const lineSpacing = Math.max(dpValue - fontHeight, 0);
-
-		this.nativeTextViewProtected.setLineSpacing(lineSpacing, 1);
-	}
-
 	_updateLetterSpacing(value: number): void {
 		const emValue = value / this.fontSize;
 		org.nativescript.widgets.ViewHelper.setLetterspacing(this.nativeTextViewProtected, emValue);
