react-native 0.70.6 → 0.71.0-rc.1

package/Libraries/Text/BaseText/RCTBaseTextViewManager.m

@@ -36,12 +36,14 @@ RCT_REMAP_SHADOW_PROPERTY(fontWeight, textAttributes.fontWeight, NSString)
 RCT_REMAP_SHADOW_PROPERTY(fontStyle, textAttributes.fontStyle, NSString)
 RCT_REMAP_SHADOW_PROPERTY(fontVariant, textAttributes.fontVariant, NSArray)
 RCT_REMAP_SHADOW_PROPERTY(allowFontScaling, textAttributes.allowFontScaling, BOOL)
+RCT_REMAP_SHADOW_PROPERTY(dynamicTypeRamp, textAttributes.dynamicTypeRamp, RCTDynamicTypeRamp)
 RCT_REMAP_SHADOW_PROPERTY(maxFontSizeMultiplier, textAttributes.maxFontSizeMultiplier, CGFloat)
 RCT_REMAP_SHADOW_PROPERTY(letterSpacing, textAttributes.letterSpacing, CGFloat)
 // Paragraph Styles
 RCT_REMAP_SHADOW_PROPERTY(lineHeight, textAttributes.lineHeight, CGFloat)
 RCT_REMAP_SHADOW_PROPERTY(textAlign, textAttributes.alignment, NSTextAlignment)
 RCT_REMAP_SHADOW_PROPERTY(writingDirection, textAttributes.baseWritingDirection, NSWritingDirection)
+RCT_REMAP_SHADOW_PROPERTY(lineBreakStrategyIOS, textAttributes.lineBreakStrategy, NSLineBreakStrategy)
 // Decoration
 RCT_REMAP_SHADOW_PROPERTY(textDecorationColor, textAttributes.textDecorationColor, UIColor)
 RCT_REMAP_SHADOW_PROPERTY(textDecorationStyle, textAttributes.textDecorationStyle, NSUnderlineStyle)

package/Libraries/Text/RCTConvert+Text.m

@@ -11,25 +11,27 @@
 
 + (UITextAutocorrectionType)UITextAutocorrectionType:(id)json
 {
-  return
-    json == nil ? UITextAutocorrectionTypeDefault :
-    [RCTConvert BOOL:json] ? UITextAutocorrectionTypeYes :
-    UITextAutocorrectionTypeNo;
+  return json == nil           ? UITextAutocorrectionTypeDefault
+      : [RCTConvert BOOL:json] ? UITextAutocorrectionTypeYes
+                               : UITextAutocorrectionTypeNo;
 }
 
 + (UITextSpellCheckingType)UITextSpellCheckingType:(id)json
 {
-  return
-    json == nil ? UITextSpellCheckingTypeDefault :
-    [RCTConvert BOOL:json] ? UITextSpellCheckingTypeYes :
-    UITextSpellCheckingTypeNo;
+  return json == nil           ? UITextSpellCheckingTypeDefault
+      : [RCTConvert BOOL:json] ? UITextSpellCheckingTypeYes
+                               : UITextSpellCheckingTypeNo;
 }
 
-RCT_ENUM_CONVERTER(RCTTextTransform, (@{
-  @"none": @(RCTTextTransformNone),
-  @"capitalize": @(RCTTextTransformCapitalize),
-  @"uppercase": @(RCTTextTransformUppercase),
-  @"lowercase": @(RCTTextTransformLowercase),
-}), RCTTextTransformUndefined, integerValue)
+RCT_ENUM_CONVERTER(
+    RCTTextTransform,
+    (@{
+      @"none" : @(RCTTextTransformNone),
+      @"capitalize" : @(RCTTextTransformCapitalize),
+      @"uppercase" : @(RCTTextTransformUppercase),
+      @"lowercase" : @(RCTTextTransformLowercase),
+    }),
+    RCTTextTransformUndefined,
+    integerValue)
 
 @end

package/Libraries/Text/RCTTextAttributes.h

@@ -7,6 +7,7 @@
 
 #import <UIKit/UIKit.h>
 
+#import <React/RCTDynamicTypeRamp.h>
 #import <React/RCTTextDecorationLineType.h>
 
 #import "RCTTextTransform.h"
@@ -36,11 +37,13 @@ extern NSString *const RCTTextAttributesTagAttributeName;
 @property (nonatomic, copy, nullable) NSString *fontStyle;
 @property (nonatomic, copy, nullable) NSArray<NSString *> *fontVariant;
 @property (nonatomic, assign) BOOL allowFontScaling;
+@property (nonatomic, assign) RCTDynamicTypeRamp dynamicTypeRamp;
 @property (nonatomic, assign) CGFloat letterSpacing;
 // Paragraph Styles
 @property (nonatomic, assign) CGFloat lineHeight;
 @property (nonatomic, assign) NSTextAlignment alignment;
 @property (nonatomic, assign) NSWritingDirection baseWritingDirection;
+@property (nonatomic, assign) NSLineBreakStrategy lineBreakStrategy;
 // Decoration
 @property (nonatomic, strong, nullable) UIColor *textDecorationColor;
 @property (nonatomic, assign) NSUnderlineStyle textDecorationStyle;

package/Libraries/Text/RCTTextAttributes.m

@@ -27,6 +27,7 @@ NSString *const RCTTextAttributesTagAttributeName = @"RCTTextAttributesTagAttrib
     _maxFontSizeMultiplier = NAN;
     _alignment = NSTextAlignmentNatural;
     _baseWritingDirection = NSWritingDirectionNatural;
+    _lineBreakStrategy = NSLineBreakStrategyNone;
     _textShadowRadius = NAN;
     _opacity = NAN;
     _textTransform = RCTTextTransformUndefined;
@@ -44,39 +45,56 @@ NSString *const RCTTextAttributesTagAttributeName = @"RCTTextAttributesTagAttrib
   // Color
   _foregroundColor = textAttributes->_foregroundColor ?: _foregroundColor;
   _backgroundColor = textAttributes->_backgroundColor ?: _backgroundColor;
-  _opacity = !isnan(textAttributes->_opacity) ? (isnan(_opacity) ? 1.0 : _opacity) * textAttributes->_opacity : _opacity;
+  _opacity =
+      !isnan(textAttributes->_opacity) ? (isnan(_opacity) ? 1.0 : _opacity) * textAttributes->_opacity : _opacity;
 
   // Font
   _fontFamily = textAttributes->_fontFamily ?: _fontFamily;
   _fontSize = !isnan(textAttributes->_fontSize) ? textAttributes->_fontSize : _fontSize;
-  _fontSizeMultiplier = !isnan(textAttributes->_fontSizeMultiplier) ? textAttributes->_fontSizeMultiplier : _fontSizeMultiplier;
-  _maxFontSizeMultiplier = !isnan(textAttributes->_maxFontSizeMultiplier) ? textAttributes->_maxFontSizeMultiplier : _maxFontSizeMultiplier;
+  _fontSizeMultiplier =
+      !isnan(textAttributes->_fontSizeMultiplier) ? textAttributes->_fontSizeMultiplier : _fontSizeMultiplier;
+  _maxFontSizeMultiplier =
+      !isnan(textAttributes->_maxFontSizeMultiplier) ? textAttributes->_maxFontSizeMultiplier : _maxFontSizeMultiplier;
   _fontWeight = textAttributes->_fontWeight ?: _fontWeight;
   _fontStyle = textAttributes->_fontStyle ?: _fontStyle;
   _fontVariant = textAttributes->_fontVariant ?: _fontVariant;
-  _allowFontScaling = textAttributes->_allowFontScaling || _allowFontScaling;  // *
+  _allowFontScaling = textAttributes->_allowFontScaling || _allowFontScaling; // *
+  _dynamicTypeRamp = textAttributes->_dynamicTypeRamp != RCTDynamicTypeRampUndefined ? textAttributes->_dynamicTypeRamp
+                                                                                     : _dynamicTypeRamp;
   _letterSpacing = !isnan(textAttributes->_letterSpacing) ? textAttributes->_letterSpacing : _letterSpacing;
 
   // Paragraph Styles
   _lineHeight = !isnan(textAttributes->_lineHeight) ? textAttributes->_lineHeight : _lineHeight;
   _alignment = textAttributes->_alignment != NSTextAlignmentNatural ? textAttributes->_alignment : _alignment; // *
-  _baseWritingDirection = textAttributes->_baseWritingDirection != NSWritingDirectionNatural ? textAttributes->_baseWritingDirection : _baseWritingDirection; // *
+  _baseWritingDirection = textAttributes->_baseWritingDirection != NSWritingDirectionNatural
+      ? textAttributes->_baseWritingDirection
+      : _baseWritingDirection; // *
+  _lineBreakStrategy = textAttributes->_lineBreakStrategy ?: _lineBreakStrategy;
 
   // Decoration
   _textDecorationColor = textAttributes->_textDecorationColor ?: _textDecorationColor;
-  _textDecorationStyle = textAttributes->_textDecorationStyle != NSUnderlineStyleSingle ? textAttributes->_textDecorationStyle : _textDecorationStyle; // *
-  _textDecorationLine = textAttributes->_textDecorationLine != RCTTextDecorationLineTypeNone ? textAttributes->_textDecorationLine : _textDecorationLine; // *
+  _textDecorationStyle = textAttributes->_textDecorationStyle != NSUnderlineStyleSingle
+      ? textAttributes->_textDecorationStyle
+      : _textDecorationStyle; // *
+  _textDecorationLine = textAttributes->_textDecorationLine != RCTTextDecorationLineTypeNone
+      ? textAttributes->_textDecorationLine
+      : _textDecorationLine; // *
 
   // Shadow
-  _textShadowOffset = !CGSizeEqualToSize(textAttributes->_textShadowOffset, CGSizeZero) ? textAttributes->_textShadowOffset : _textShadowOffset; // *
+  _textShadowOffset = !CGSizeEqualToSize(textAttributes->_textShadowOffset, CGSizeZero)
+      ? textAttributes->_textShadowOffset
+      : _textShadowOffset; // *
   _textShadowRadius = !isnan(textAttributes->_textShadowRadius) ? textAttributes->_textShadowRadius : _textShadowRadius;
   _textShadowColor = textAttributes->_textShadowColor ?: _textShadowColor;
 
   // Special
-  _isHighlighted = textAttributes->_isHighlighted || _isHighlighted;  // *
+  _isHighlighted = textAttributes->_isHighlighted || _isHighlighted; // *
   _tag = textAttributes->_tag ?: _tag;
-  _layoutDirection = textAttributes->_layoutDirection != UIUserInterfaceLayoutDirectionLeftToRight ? textAttributes->_layoutDirection : _layoutDirection;
-  _textTransform = textAttributes->_textTransform != RCTTextTransformUndefined ? textAttributes->_textTransform : _textTransform;
+  _layoutDirection = textAttributes->_layoutDirection != UIUserInterfaceLayoutDirectionLeftToRight
+      ? textAttributes->_layoutDirection
+      : _layoutDirection;
+  _textTransform =
+      textAttributes->_textTransform != RCTTextTransformUndefined ? textAttributes->_textTransform : _textTransform;
 }
 
 - (NSParagraphStyle *)effectiveParagraphStyle
@@ -93,34 +111,40 @@ NSString *const RCTTextAttributesTagAttributeName = @"RCTTextAttributesTagAttrib
         alignment = NSTextAlignmentRight;
       }
     }
-    
+
     paragraphStyle.alignment = alignment;
     isParagraphStyleUsed = YES;
   }
-  
+
   if (_baseWritingDirection != NSWritingDirectionNatural) {
     paragraphStyle.baseWritingDirection = _baseWritingDirection;
     isParagraphStyleUsed = YES;
   }
-  
+
+  if (_lineBreakStrategy != NSLineBreakStrategyNone) {
+    if (@available(iOS 14.0, *)) {
+      paragraphStyle.lineBreakStrategy = _lineBreakStrategy;
+      isParagraphStyleUsed = YES;
+    }
+  }
+
   if (!isnan(_lineHeight)) {
     CGFloat lineHeight = _lineHeight * self.effectiveFontSizeMultiplier;
     paragraphStyle.minimumLineHeight = lineHeight;
     paragraphStyle.maximumLineHeight = lineHeight;
     isParagraphStyleUsed = YES;
   }
-  
+
   if (isParagraphStyleUsed) {
     return [paragraphStyle copy];
   }
-  
+
   return nil;
 }
 
 - (NSDictionary<NSAttributedStringKey, id> *)effectiveTextAttributes
 {
-  NSMutableDictionary<NSAttributedStringKey, id> *attributes =
-    [NSMutableDictionary dictionaryWithCapacity:10];
+  NSMutableDictionary<NSAttributedStringKey, id> *attributes = [NSMutableDictionary dictionaryWithCapacity:10];
 
   // Font
   UIFont *font = self.effectiveFont;
@@ -159,7 +183,7 @@ NSString *const RCTTextAttributesTagAttributeName = @"RCTTextAttributesTagAttrib
   }
 
   if (_textDecorationLine == RCTTextDecorationLineTypeStrikethrough ||
-      _textDecorationLine == RCTTextDecorationLineTypeUnderlineStrikethrough){
+      _textDecorationLine == RCTTextDecorationLineTypeUnderlineStrikethrough) {
     isTextDecorationEnabled = YES;
     attributes[NSStrikethroughStyleAttributeName] = @(_textDecorationStyle);
   }
@@ -208,6 +232,12 @@ NSString *const RCTTextAttributesTagAttributeName = @"RCTTextAttributesTagAttrib
 
   if (fontScalingEnabled) {
     CGFloat fontSizeMultiplier = !isnan(_fontSizeMultiplier) ? _fontSizeMultiplier : 1.0;
+    if (_dynamicTypeRamp != RCTDynamicTypeRampUndefined) {
+      UIFontMetrics *fontMetrics = RCTUIFontMetricsForDynamicTypeRamp(_dynamicTypeRamp);
+      // Using a specific font size reduces rounding errors from -scaledValueForValue:
+      CGFloat requestedSize = isnan(_fontSize) ? RCTBaseSizeForDynamicTypeRamp(_dynamicTypeRamp) : _fontSize;
+      fontSizeMultiplier = [fontMetrics scaledValueForValue:requestedSize] / requestedSize;
+    }
     CGFloat maxFontSizeMultiplier = !isnan(_maxFontSizeMultiplier) ? _maxFontSizeMultiplier : 0.0;
     return maxFontSizeMultiplier >= 1.0 ? fminf(maxFontSizeMultiplier, fontSizeMultiplier) : fontSizeMultiplier;
   } else {
@@ -220,7 +250,8 @@ NSString *const RCTTextAttributesTagAttributeName = @"RCTTextAttributesTagAttrib
   UIColor *effectiveForegroundColor = _foregroundColor ?: [UIColor blackColor];
 
   if (!isnan(_opacity)) {
-    effectiveForegroundColor = [effectiveForegroundColor colorWithAlphaComponent:CGColorGetAlpha(effectiveForegroundColor.CGColor) * _opacity];
+    effectiveForegroundColor =
+        [effectiveForegroundColor colorWithAlphaComponent:CGColorGetAlpha(effectiveForegroundColor.CGColor) * _opacity];
   }
 
   return effectiveForegroundColor;
@@ -228,10 +259,11 @@ NSString *const RCTTextAttributesTagAttributeName = @"RCTTextAttributesTagAttrib
 
 - (UIColor *)effectiveBackgroundColor
 {
-  UIColor *effectiveBackgroundColor = _backgroundColor;// ?: [[UIColor whiteColor] colorWithAlphaComponent:0];
+  UIColor *effectiveBackgroundColor = _backgroundColor; // ?: [[UIColor whiteColor] colorWithAlphaComponent:0];
 
   if (effectiveBackgroundColor && !isnan(_opacity)) {
-    effectiveBackgroundColor = [effectiveBackgroundColor colorWithAlphaComponent:CGColorGetAlpha(effectiveBackgroundColor.CGColor) * _opacity];
+    effectiveBackgroundColor =
+        [effectiveBackgroundColor colorWithAlphaComponent:CGColorGetAlpha(effectiveBackgroundColor.CGColor) * _opacity];
   }
 
   return effectiveBackgroundColor ?: [UIColor clearColor];
@@ -243,7 +275,7 @@ static NSString *capitalizeText(NSString *text)
   NSMutableArray *newWords = [NSMutableArray new];
   NSNumberFormatter *num = [NSNumberFormatter new];
   for (NSString *item in words) {
-    NSString *word; 
+    NSString *word;
     if ([item length] > 0 && [num numberFromString:[item substringWithRange:NSMakeRange(0, 1)]] == nil) {
       word = [item capitalizedString];
     } else {
@@ -293,37 +325,26 @@ static NSString *capitalizeText(NSString *text)
 #define RCTTextAttributesCompareStrings(a) ((a == textAttributes->a) || [a isEqualToString:textAttributes->a])
 #define RCTTextAttributesCompareOthers(a) (a == textAttributes->a)
 
-  return
-    RCTTextAttributesCompareObjects(_foregroundColor) &&
-    RCTTextAttributesCompareObjects(_backgroundColor) &&
-    RCTTextAttributesCompareFloats(_opacity) &&
-    // Font
-    RCTTextAttributesCompareObjects(_fontFamily) &&
-    RCTTextAttributesCompareFloats(_fontSize) &&
-    RCTTextAttributesCompareFloats(_fontSizeMultiplier) &&
-    RCTTextAttributesCompareFloats(_maxFontSizeMultiplier) &&
-    RCTTextAttributesCompareStrings(_fontWeight) &&
-    RCTTextAttributesCompareObjects(_fontStyle) &&
-    RCTTextAttributesCompareObjects(_fontVariant) &&
-    RCTTextAttributesCompareOthers(_allowFontScaling) &&
-    RCTTextAttributesCompareFloats(_letterSpacing) &&
-    // Paragraph Styles
-    RCTTextAttributesCompareFloats(_lineHeight) &&
-    RCTTextAttributesCompareFloats(_alignment) &&
-    RCTTextAttributesCompareOthers(_baseWritingDirection) &&
-    // Decoration
-    RCTTextAttributesCompareObjects(_textDecorationColor) &&
-    RCTTextAttributesCompareOthers(_textDecorationStyle) &&
-    RCTTextAttributesCompareOthers(_textDecorationLine) &&
-    // Shadow
-    RCTTextAttributesCompareSize(_textShadowOffset) &&
-    RCTTextAttributesCompareFloats(_textShadowRadius) &&
-    RCTTextAttributesCompareObjects(_textShadowColor) &&
-    // Special
-    RCTTextAttributesCompareOthers(_isHighlighted) &&
-    RCTTextAttributesCompareObjects(_tag) &&
-    RCTTextAttributesCompareOthers(_layoutDirection) &&
-    RCTTextAttributesCompareOthers(_textTransform);
+  return RCTTextAttributesCompareObjects(_foregroundColor) && RCTTextAttributesCompareObjects(_backgroundColor) &&
+      RCTTextAttributesCompareFloats(_opacity) &&
+      // Font
+      RCTTextAttributesCompareObjects(_fontFamily) && RCTTextAttributesCompareFloats(_fontSize) &&
+      RCTTextAttributesCompareFloats(_fontSizeMultiplier) && RCTTextAttributesCompareFloats(_maxFontSizeMultiplier) &&
+      RCTTextAttributesCompareStrings(_fontWeight) && RCTTextAttributesCompareObjects(_fontStyle) &&
+      RCTTextAttributesCompareObjects(_fontVariant) && RCTTextAttributesCompareOthers(_allowFontScaling) &&
+      RCTTextAttributesCompareOthers(_dynamicTypeRamp) && RCTTextAttributesCompareFloats(_letterSpacing) &&
+      // Paragraph Styles
+      RCTTextAttributesCompareFloats(_lineHeight) && RCTTextAttributesCompareFloats(_alignment) &&
+      RCTTextAttributesCompareOthers(_baseWritingDirection) && RCTTextAttributesCompareOthers(_lineBreakStrategy) &&
+      // Decoration
+      RCTTextAttributesCompareObjects(_textDecorationColor) && RCTTextAttributesCompareOthers(_textDecorationStyle) &&
+      RCTTextAttributesCompareOthers(_textDecorationLine) &&
+      // Shadow
+      RCTTextAttributesCompareSize(_textShadowOffset) && RCTTextAttributesCompareFloats(_textShadowRadius) &&
+      RCTTextAttributesCompareObjects(_textShadowColor) &&
+      // Special
+      RCTTextAttributesCompareOthers(_isHighlighted) && RCTTextAttributesCompareObjects(_tag) &&
+      RCTTextAttributesCompareOthers(_layoutDirection) && RCTTextAttributesCompareOthers(_textTransform);
 }
 
 @end

package/Libraries/Text/RawText/RCTRawTextShadowView.m

@@ -27,7 +27,8 @@
 - (NSString *)description
 {
   NSString *superDescription = super.description;
-  return [[superDescription substringToIndex:superDescription.length - 1] stringByAppendingFormat:@"; text: %@>", self.text];
+  return [[superDescription substringToIndex:superDescription.length - 1]
+      stringByAppendingFormat:@"; text: %@>", self.text];
 }
 
 @end

package/Libraries/Text/Text/NSTextStorage+FontScaling.m

@@ -8,8 +8,8 @@
 #import "NSTextStorage+FontScaling.h"
 
 typedef NS_OPTIONS(NSInteger, RCTTextSizeComparisonOptions) {
-  RCTTextSizeComparisonSmaller     = 1 << 0,
-  RCTTextSizeComparisonLarger      = 1 << 1,
+  RCTTextSizeComparisonSmaller = 1 << 0,
+  RCTTextSizeComparisonLarger = 1 << 1,
   RCTTextSizeComparisonWithinRange = 1 << 2,
 };
 
@@ -19,7 +19,7 @@ typedef NS_OPTIONS(NSInteger, RCTTextSizeComparisonOptions) {
                minimumFontSize:(CGFloat)minimumFontSize
                maximumFontSize:(CGFloat)maximumFontSize
 {
-  CGFloat bottomRatio = 1.0/128.0;
+  CGFloat bottomRatio = 1.0 / 128.0;
   CGFloat topRatio = 128.0;
   CGFloat ratio = 1.0;
 
@@ -28,17 +28,11 @@ typedef NS_OPTIONS(NSInteger, RCTTextSizeComparisonOptions) {
   CGFloat lastRatioWhichFits = 0.02;
 
   while (true) {
-    [self scaleFontSizeWithRatio:ratio
-                 minimumFontSize:minimumFontSize
-                 maximumFontSize:maximumFontSize];
+    [self scaleFontSizeWithRatio:ratio minimumFontSize:minimumFontSize maximumFontSize:maximumFontSize];
 
-    RCTTextSizeComparisonOptions comparsion =
-      [self compareToSize:size thresholdRatio:0.01];
+    RCTTextSizeComparisonOptions comparsion = [self compareToSize:size thresholdRatio:0.01];
 
-    if (
-        (comparsion & RCTTextSizeComparisonWithinRange) &&
-        (comparsion & RCTTextSizeComparisonSmaller)
-    ) {
+    if ((comparsion & RCTTextSizeComparisonWithinRange) && (comparsion & RCTTextSizeComparisonSmaller)) {
       return;
     } else if (comparsion & RCTTextSizeComparisonSmaller) {
       bottomRatio = ratio;
@@ -50,26 +44,18 @@ typedef NS_OPTIONS(NSInteger, RCTTextSizeComparisonOptions) {
     ratio = (topRatio + bottomRatio) / 2.0;
 
     CGFloat kRatioThreshold = 0.005;
-    if (
-        ABS(topRatio - bottomRatio) < kRatioThreshold ||
-        ABS(topRatio - ratio) < kRatioThreshold ||
-        ABS(bottomRatio - ratio) < kRatioThreshold
-    ) {
-      [self replaceCharactersInRange:(NSRange){0, self.length}
-                withAttributedString:originalAttributedString];
-
-      [self scaleFontSizeWithRatio:lastRatioWhichFits
-                   minimumFontSize:minimumFontSize
-                   maximumFontSize:maximumFontSize];
+    if (ABS(topRatio - bottomRatio) < kRatioThreshold || ABS(topRatio - ratio) < kRatioThreshold ||
+        ABS(bottomRatio - ratio) < kRatioThreshold) {
+      [self replaceCharactersInRange:(NSRange){0, self.length} withAttributedString:originalAttributedString];
+
+      [self scaleFontSizeWithRatio:lastRatioWhichFits minimumFontSize:minimumFontSize maximumFontSize:maximumFontSize];
       return;
     }
 
-    [self replaceCharactersInRange:(NSRange){0, self.length}
-              withAttributedString:originalAttributedString];
+    [self replaceCharactersInRange:(NSRange){0, self.length} withAttributedString:originalAttributedString];
   }
 }
 
-
 - (RCTTextSizeComparisonOptions)compareToSize:(CGSize)size thresholdRatio:(CGFloat)thresholdRatio
 {
   NSLayoutManager *layoutManager = self.layoutManagers.firstObject;
@@ -88,13 +74,11 @@ typedef NS_OPTIONS(NSInteger, RCTTextSizeComparisonOptions) {
   CGSize measuredSize = [layoutManager usedRectForTextContainer:textContainer].size;
 
   // Does it fit the size?
-  BOOL fitsSize =
-    size.width >= measuredSize.width &&
-    size.height >= measuredSize.height;
+  BOOL fitsSize = size.width >= measuredSize.width && size.height >= measuredSize.height;
 
   CGSize thresholdSize = (CGSize){
-    size.width * thresholdRatio,
-    size.height * thresholdRatio,
+      size.width * thresholdRatio,
+      size.height * thresholdRatio,
   };
 
   RCTTextSizeComparisonOptions result = 0;
@@ -117,19 +101,15 @@ typedef NS_OPTIONS(NSInteger, RCTTextSizeComparisonOptions) {
   [self enumerateAttribute:NSFontAttributeName
                    inRange:(NSRange){0, self.length}
                    options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
-                usingBlock:
-    ^(UIFont *_Nullable font, NSRange range, BOOL *_Nonnull stop) {
-      if (!font) {
-        return;
-      }
+                usingBlock:^(UIFont *_Nullable font, NSRange range, BOOL *_Nonnull stop) {
+                  if (!font) {
+                    return;
+                  }
 
-      CGFloat fontSize = MAX(MIN(font.pointSize * ratio, maximumFontSize), minimumFontSize);
+                  CGFloat fontSize = MAX(MIN(font.pointSize * ratio, maximumFontSize), minimumFontSize);
 
-      [self addAttribute:NSFontAttributeName
-                   value:[font fontWithSize:fontSize]
-                   range:range];
-    }
-  ];
+                  [self addAttribute:NSFontAttributeName value:[font fontWithSize:fontSize] range:range];
+                }];
 
   [self endEditing];
 }

package/Libraries/Text/Text/RCTDynamicTypeRamp.h

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <Foundation/Foundation.h>
+
+#import <React/RCTConvert.h>
+
+typedef NS_ENUM(NSInteger, RCTDynamicTypeRamp) {
+  RCTDynamicTypeRampUndefined,
+  RCTDynamicTypeRampCaption2,
+  RCTDynamicTypeRampCaption1,
+  RCTDynamicTypeRampFootnote,
+  RCTDynamicTypeRampSubheadline,
+  RCTDynamicTypeRampCallout,
+  RCTDynamicTypeRampBody,
+  RCTDynamicTypeRampHeadline,
+  RCTDynamicTypeRampTitle3,
+  RCTDynamicTypeRampTitle2,
+  RCTDynamicTypeRampTitle1,
+  RCTDynamicTypeRampLargeTitle
+};
+
+@interface RCTConvert (DynamicTypeRamp)
+
++ (RCTDynamicTypeRamp)RCTDynamicTypeRamp:(nullable id)json;
+
+@end
+
+/// Generates a `UIFontMetrics` instance representing a particular Dynamic Type ramp.
+UIFontMetrics *_Nonnull RCTUIFontMetricsForDynamicTypeRamp(RCTDynamicTypeRamp dynamicTypeRamp);
+/// The "reference" size for a particular font scale ramp, equal to a text element's size under default text size
+/// settings.
+CGFloat RCTBaseSizeForDynamicTypeRamp(RCTDynamicTypeRamp dynamicTypeRamp);

package/Libraries/Text/Text/RCTDynamicTypeRamp.m

@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <React/RCTDynamicTypeRamp.h>
+
+@implementation RCTConvert (DynamicTypeRamp)
+
+RCT_ENUM_CONVERTER(
+    RCTDynamicTypeRamp,
+    (@{
+      @"caption2" : @(RCTDynamicTypeRampCaption2),
+      @"caption1" : @(RCTDynamicTypeRampCaption1),
+      @"footnote" : @(RCTDynamicTypeRampFootnote),
+      @"subheadline" : @(RCTDynamicTypeRampSubheadline),
+      @"callout" : @(RCTDynamicTypeRampCallout),
+      @"body" : @(RCTDynamicTypeRampBody),
+      @"headline" : @(RCTDynamicTypeRampHeadline),
+      @"title3" : @(RCTDynamicTypeRampTitle3),
+      @"title2" : @(RCTDynamicTypeRampTitle2),
+      @"title1" : @(RCTDynamicTypeRampTitle1),
+      @"largeTitle" : @(RCTDynamicTypeRampLargeTitle),
+    }),
+    RCTDynamicTypeRampUndefined,
+    integerValue)
+
+@end
+
+UIFontMetrics *RCTUIFontMetricsForDynamicTypeRamp(RCTDynamicTypeRamp dynamicTypeRamp)
+{
+  static NSDictionary<NSNumber *, UIFontTextStyle> *mapping;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    mapping = @{
+      @(RCTDynamicTypeRampCaption2) : UIFontTextStyleCaption2,
+      @(RCTDynamicTypeRampCaption1) : UIFontTextStyleCaption1,
+      @(RCTDynamicTypeRampFootnote) : UIFontTextStyleFootnote,
+      @(RCTDynamicTypeRampSubheadline) : UIFontTextStyleSubheadline,
+      @(RCTDynamicTypeRampCallout) : UIFontTextStyleCallout,
+      @(RCTDynamicTypeRampBody) : UIFontTextStyleBody,
+      @(RCTDynamicTypeRampHeadline) : UIFontTextStyleHeadline,
+      @(RCTDynamicTypeRampTitle3) : UIFontTextStyleTitle3,
+      @(RCTDynamicTypeRampTitle2) : UIFontTextStyleTitle2,
+      @(RCTDynamicTypeRampTitle1) : UIFontTextStyleTitle1,
+      @(RCTDynamicTypeRampLargeTitle) : UIFontTextStyleLargeTitle,
+    };
+  });
+
+  id textStyle =
+      mapping[@(dynamicTypeRamp)] ?: UIFontTextStyleBody; // Default to body if we don't recognize the specified ramp
+  return [UIFontMetrics metricsForTextStyle:textStyle];
+}
+
+CGFloat RCTBaseSizeForDynamicTypeRamp(RCTDynamicTypeRamp dynamicTypeRamp)
+{
+  static NSDictionary<NSNumber *, NSNumber *> *mapping;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    // Values taken from
+    // https://developer.apple.com/design/human-interface-guidelines/foundations/typography/#specifications
+    mapping = @{
+      @(RCTDynamicTypeRampCaption2) : @11,
+      @(RCTDynamicTypeRampCaption1) : @12,
+      @(RCTDynamicTypeRampFootnote) : @13,
+      @(RCTDynamicTypeRampSubheadline) : @15,
+      @(RCTDynamicTypeRampCallout) : @16,
+      @(RCTDynamicTypeRampBody) : @17,
+      @(RCTDynamicTypeRampHeadline) : @17,
+      @(RCTDynamicTypeRampTitle3) : @20,
+      @(RCTDynamicTypeRampTitle2) : @22,
+      @(RCTDynamicTypeRampTitle1) : @28,
+      @(RCTDynamicTypeRampLargeTitle) : @34,
+    };
+  });
+
+  NSNumber *baseSize =
+      mapping[@(dynamicTypeRamp)] ?: @17; // Default to body size if we don't recognize the specified ramp
+  return CGFLOAT_IS_DOUBLE ? [baseSize doubleValue] : [baseSize floatValue];
+}