Respect prop Text.allowFontScaling when sizing text

sammy-SC · facebook-github-bot · commit e9b89b5ff2b0 · 2022-10-25T05:51:25.000-07:00
Summary:
changelog:
[iOS][Fixed] Fix Text.allowFontScaling prop in the new architecture

Reviewed By: javache

Differential Revision: D40643536

fbshipit-source-id: 1fb77b226089ce5e9ffc642b1d9a3de266d202c3
diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm
@@ -71,7 +71,8 @@ inline static UIFontWeight RCTUIFontWeightFromInteger(NSInteger fontWeight)
   fontProperties.weight = textAttributes.fontWeight.has_value()
       ? RCTUIFontWeightFromInteger((NSInteger)textAttributes.fontWeight.value())
       : NAN;
-  fontProperties.sizeMultiplier = textAttributes.fontSizeMultiplier;
+  fontProperties.sizeMultiplier =
+      textAttributes.allowFontScaling.value_or(true) ? textAttributes.fontSizeMultiplier : 1;
 
   return RCTFontWithFontProperties(fontProperties);
 }

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,8 @@ inline static UIFontWeight RCTUIFontWeightFromInteger(NSInteger fontWeight)`
`71`	`71`	`fontProperties.weight = textAttributes.fontWeight.has_value()`
`72`	`72`	`? RCTUIFontWeightFromInteger((NSInteger)textAttributes.fontWeight.value())`
`73`	`73`	`: NAN;`
`74`		`- fontProperties.sizeMultiplier = textAttributes.fontSizeMultiplier;`
	`74`	`+ fontProperties.sizeMultiplier =`
	`75`	`+ textAttributes.allowFontScaling.value_or(true) ? textAttributes.fontSizeMultiplier : 1;`
`75`	`76`
`76`	`77`	`return RCTFontWithFontProperties(fontProperties);`
`77`	`78`	`}`