chore: Removed letter spacing calculations

CatchABus · CatchABus · commit df4824ae0331 · 2025-01-02T19:16:26.000+02:00
diff --git a/packages/core/platforms/ios/src/UIView+NativeScript.m b/packages/core/platforms/ios/src/UIView+NativeScript.m
@@ -15,8 +15,8 @@ - (void)nativeScriptSetTextDecorationAndTransform:(NSString*)text textDecoration
     }
     BOOL isTextType = [self isKindOfClass:[UITextField class]] || [self isKindOfClass:[UITextView class]] | [self isKindOfClass:[UILabel class]] | [self isKindOfClass:[UIButton class]];
     
-    if (letterSpacing != 0 && isTextType) {
-        NSNumber *kern = [NSNumber numberWithDouble:letterSpacing];
+    if (letterSpacing != 0 && isTextType && ((UITextView*)self).font != nil) {
+        NSNumber *kern = [NSNumber numberWithDouble:letterSpacing * ((UITextView*)self).font.pointSize];
         attrDict[NSKernAttributeName] = kern;
         if ([self isKindOfClass:[UITextField class]]) {
             [((UITextField*)self).defaultTextAttributes setValue:kern forKey:NSKernAttributeName];
@@ -31,13 +31,13 @@ - (void)nativeScriptSetTextDecorationAndTransform:(NSString*)text textDecoration
         if ([self isKindOfClass:[UIButton class]]) {
             paragraphStyle.alignment = ((UIButton*)self).titleLabel.textAlignment;
 
-            if (((UIButton*)self).titleLabel.font) {
+            if (((UIButton*)self).titleLabel.font != nil) {
                 paragraphStyle.lineSpacing = fmax(lineHeight - ((UIButton*)self).titleLabel.font.lineHeight, 0);
             }
         } else {
             paragraphStyle.alignment = ((UILabel*)self).textAlignment;
 
-            if (((UILabel*)self).font) {
+            if (((UILabel*)self).font != nil) {
                 paragraphStyle.lineSpacing = fmax(lineHeight - ((UILabel*)self).font.lineHeight, 0);
             }
         }
@@ -86,7 +86,7 @@ - (void)nativeScriptSetTextDecorationAndTransform:(NSString*)text textDecoration
 -(void)nativeScriptSetFormattedTextDecorationAndTransform:(NSDictionary*)details letterSpacing:(CGFloat)letterSpacing lineHeight:(CGFloat)lineHeight {
     NSMutableAttributedString *attrText = [NativeScriptUtils createMutableStringWithDetails:details];
     if (letterSpacing != 0) {
-        NSNumber *kern = [NSNumber numberWithDouble:letterSpacing];
+        NSNumber *kern = [NSNumber numberWithDouble:letterSpacing * ((UITextView*)self).font.pointSize];
         [attrText addAttribute:NSKernAttributeName value:kern range:(NSRange){
             0,
             attrText.length
@@ -101,14 +101,14 @@ -(void)nativeScriptSetFormattedTextDecorationAndTransform:(NSDictionary*)details
         if ([self isKindOfClass:[UIButton class]]) {
             paragraphStyle.alignment = ((UIButton*)self).titleLabel.textAlignment;
 
-            if (((UIButton*)self).titleLabel.font) {
+            if (((UIButton*)self).titleLabel.font != nil) {
                 paragraphStyle.lineSpacing = fmax(lineHeight - ((UIButton*)self).titleLabel.font.lineHeight, 0);
             }
         } else {
             // Paragraph alignment is also important for tappable spans as NSTextContainer takes it into account
             paragraphStyle.alignment = ((UILabel*)self).textAlignment;
 
-            if (((UILabel*)self).font) {
+            if (((UILabel*)self).font != nil) {
                 paragraphStyle.lineSpacing = fmax(lineHeight - ((UILabel*)self).font.lineHeight, 0);
             }
         }
diff --git a/packages/core/ui/text-base/index.android.ts b/packages/core/ui/text-base/index.android.ts
@@ -365,11 +365,6 @@ export class TextBase extends TextBaseCommon {
 	[fontSizeProperty.setNative](value: number) {
 		if (!this.formattedText) {
 			this.nativeTextViewProtected.setTextSize(value);
-
-			// Re-calculate letter-spacing
-			if (this.letterSpacing != 0) {
-				this._updateLetterSpacing(this.letterSpacing);
-			}
 		}
 	}
 
@@ -451,10 +446,10 @@ export class TextBase extends TextBaseCommon {
 	}
 
 	[letterSpacingProperty.getDefault](): number {
-		return org.nativescript.widgets.ViewHelper.getLetterspacing(this.nativeTextViewProtected) * this.fontSize;
+		return org.nativescript.widgets.ViewHelper.getLetterspacing(this.nativeTextViewProtected);
 	}
 	[letterSpacingProperty.setNative](value: number) {
-		this._updateLetterSpacing(value);
+		org.nativescript.widgets.ViewHelper.setLetterspacing(this.nativeTextViewProtected, value);
 	}
 
 	[paddingTopProperty.getDefault](): CoreTypes.LengthType {
@@ -503,11 +498,6 @@ export class TextBase extends TextBaseCommon {
 		}
 	}
 
-	_updateLetterSpacing(value: number): void {
-		const emValue = value / this.fontSize;
-		org.nativescript.widgets.ViewHelper.setLetterspacing(this.nativeTextViewProtected, emValue);
-	}
-
 	_setNativeText(reset = false): void {
 		if (reset) {
 			this.nativeTextViewProtected.setText(null);

Original file line number	Diff line number	Diff line change
`@@ -365,11 +365,6 @@ export class TextBase extends TextBaseCommon {`
`365`	`365`	`[fontSizeProperty.setNative](value: number) {`
`366`	`366`	`if (!this.formattedText) {`
`367`	`367`	`this.nativeTextViewProtected.setTextSize(value);`
`368`		`-`
`369`		`- // Re-calculate letter-spacing`
`370`		`- if (this.letterSpacing != 0) {`
`371`		`- this._updateLetterSpacing(this.letterSpacing);`
`372`		`- }`
`373`	`368`	`}`
`374`	`369`	`}`
`375`	`370`
`@@ -451,10 +446,10 @@ export class TextBase extends TextBaseCommon {`
`451`	`446`	`}`
`452`	`447`
`453`	`448`	`[letterSpacingProperty.getDefault](): number {`
`454`		`- return org.nativescript.widgets.ViewHelper.getLetterspacing(this.nativeTextViewProtected) * this.fontSize;`
	`449`	`+ return org.nativescript.widgets.ViewHelper.getLetterspacing(this.nativeTextViewProtected);`
`455`	`450`	`}`
`456`	`451`	`[letterSpacingProperty.setNative](value: number) {`
`457`		`- this._updateLetterSpacing(value);`
	`452`	`+ org.nativescript.widgets.ViewHelper.setLetterspacing(this.nativeTextViewProtected, value);`
`458`	`453`	`}`
`459`	`454`
`460`	`455`	`[paddingTopProperty.getDefault](): CoreTypes.LengthType {`
`@@ -503,11 +498,6 @@ export class TextBase extends TextBaseCommon {`
`503`	`498`	`}`
`504`	`499`	`}`
`505`	`500`
`506`		`- _updateLetterSpacing(value: number): void {`
`507`		`- const emValue = value / this.fontSize;`
`508`		`- org.nativescript.widgets.ViewHelper.setLetterspacing(this.nativeTextViewProtected, emValue);`
`509`		`- }`
`510`		`-`
`511`	`501`	`_setNativeText(reset = false): void {`
`512`	`502`	`if (reset) {`
`513`	`503`	`this.nativeTextViewProtected.setText(null);`