react-native-tvos 0.87.1-1 → 0.88.0-0rc2

package/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.kt

@@ -152,7 +152,7 @@ internal object TextLayoutManager {
     }
 
     return TextAttributeProps.getLayoutDirection(
-        textAttributes.getString(TextAttributeProps.TA_KEY_LAYOUT_DIRECTION.toInt())
+        textAttributes.getString(TextAttributeProps.TA_KEY_LAYOUT_DIRECTION.toInt()),
     ) == LayoutDirection.RTL
   }
 
@@ -259,21 +259,23 @@ internal object TextLayoutManager {
           TextAttributeProps.fromMapBuffer(fragment.getMapBuffer(FR_KEY_TEXT_ATTRIBUTES))
 
       sb.append(
-          TextTransform.apply(fragment.getString(FR_KEY_STRING), textAttributes.textTransform)
+          TextTransform.apply(fragment.getString(FR_KEY_STRING), textAttributes.textTransform),
       )
 
       val end = sb.length
       val reactTag =
           if (fragment.contains(FR_KEY_REACT_TAG)) fragment.getInt(FR_KEY_REACT_TAG) else View.NO_ID
       if (fragment.contains(FR_KEY_IS_ATTACHMENT) && fragment.getBoolean(FR_KEY_IS_ATTACHMENT)) {
-        val width = PixelUtil.toPixelFromSP(fragment.getDouble(FR_KEY_WIDTH))
-        val height = PixelUtil.toPixelFromSP(fragment.getDouble(FR_KEY_HEIGHT))
         ops.add(
             SetSpanOperation(
                 sb.length - 1,
                 sb.length,
-                TextInlineViewPlaceholderSpan(reactTag, width.toInt(), height.toInt()),
-            )
+                TextInlineViewPlaceholderSpan(
+                    reactTag,
+                    inlineViewSizeToPixels(fragment.getDouble(FR_KEY_WIDTH)),
+                    inlineViewSizeToPixels(fragment.getDouble(FR_KEY_HEIGHT)),
+                ),
+            ),
         )
       } else if (end >= start) {
         val roleIsLink =
@@ -306,13 +308,14 @@ internal object TextLayoutManager {
         }
         if (!textAttributes.letterSpacing.isNaN()) {
           ops.add(
-              SetSpanOperation(start, end, CustomLetterSpacingSpan(textAttributes.letterSpacing))
+              SetSpanOperation(start, end, CustomLetterSpacingSpan(textAttributes.letterSpacing)),
           )
         }
         ops.add(SetSpanOperation(start, end, ReactAbsoluteSizeSpan(textAttributes.fontSize)))
         if (
             textAttributes.fontStyle != ReactConstants.UNSET ||
                 textAttributes.fontWeight != ReactConstants.UNSET ||
+                textAttributes.fontVariationSettings != null ||
                 textAttributes.fontFamily != null
         ) {
           ops.add(
@@ -323,11 +326,12 @@ internal object TextLayoutManager {
                       textAttributes.fontStyle,
                       textAttributes.fontWeight,
                       textAttributes.fontFeatureSettings,
+                      textAttributes.fontVariationSettings,
                       textAttributes.fontFamily,
                       assets,
                       fontWeightAdjustment,
                   ),
-              )
+              ),
           )
         }
         if (textAttributes.isUnderlineTextDecorationSet) {
@@ -339,7 +343,7 @@ internal object TextLayoutManager {
                       textAttributes.textDecorationColor,
                       textAttributes.textDecorationStyle,
                   ),
-              )
+              ),
           )
         }
         if (textAttributes.isLineThroughTextDecorationSet) {
@@ -351,7 +355,7 @@ internal object TextLayoutManager {
                       textAttributes.textDecorationColor,
                       textAttributes.textDecorationStyle,
                   ),
-              )
+              ),
           )
         }
         if (
@@ -370,7 +374,7 @@ internal object TextLayoutManager {
                       textAttributes.textShadowRadius,
                       textAttributes.textShadowColor,
                   ),
-              )
+              ),
           )
         }
         if (!textAttributes.lineHeight.isNaN()) {
@@ -467,7 +471,7 @@ internal object TextLayoutManager {
                   } else {
                     Double.NaN
                   },
-          )
+          ),
       )
     }
 
@@ -488,8 +492,8 @@ internal object TextLayoutManager {
         spannable.setSpan(
             TextInlineViewPlaceholderSpan(
                 fragment.reactTag,
-                PixelUtil.toPixelFromSP(fragment.width).toInt(),
-                PixelUtil.toPixelFromSP(fragment.height).toInt(),
+                inlineViewSizeToPixels(fragment.width),
+                inlineViewSizeToPixels(fragment.height),
             ),
             start,
             end,
@@ -547,6 +551,7 @@ internal object TextLayoutManager {
         if (
             fragment.props.fontStyle != ReactConstants.UNSET ||
                 fragment.props.fontWeight != ReactConstants.UNSET ||
+                fragment.props.fontVariationSettings != null ||
                 fragment.props.fontFamily != null
         ) {
           spannable.setSpan(
@@ -554,6 +559,7 @@ internal object TextLayoutManager {
                   fragment.props.fontStyle,
                   fragment.props.fontWeight,
                   fragment.props.fontFeatureSettings,
+                  fragment.props.fontVariationSettings,
                   fragment.props.fontFamily,
                   assets,
                   fontWeightAdjustment,
@@ -654,6 +660,10 @@ internal object TextLayoutManager {
     return spannable
   }
 
+  @VisibleForTesting
+  internal fun inlineViewSizeToPixels(size: Double): Int =
+      ceil(PixelUtil.toPixelFromDIP(size).toDouble()).toInt()
+
   @OptIn(UnstableReactNativeAPI::class)
   fun getOrCreateSpannableForText(
       assets: AssetManager,
@@ -668,14 +678,13 @@ internal object TextLayoutManager {
       fontWeightAdjustment: Int,
       attributedString: MapBuffer,
       reactTextViewManagerCallback: ReactTextViewManagerCallback?,
-  ): Spannable =
-      getOrCreateSpannableForText(
-          assets,
-          fontWeightAdjustment,
-          attributedString,
-          reactTextViewManagerCallback,
-          null,
-      )
+  ): Spannable = getOrCreateSpannableForText(
+      assets,
+      fontWeightAdjustment,
+      attributedString,
+      reactTextViewManagerCallback,
+      null,
+  )
 
   @OptIn(UnstableReactNativeAPI::class)
   internal fun getOrCreateSpannableForText(
@@ -683,14 +692,13 @@ internal object TextLayoutManager {
       attributedString: MapBuffer,
       reactTextViewManagerCallback: ReactTextViewManagerCallback?,
       textEffectRegistry: TextEffectRegistry?,
-  ): Spannable =
-      getOrCreateSpannableForText(
-          assets,
-          0,
-          attributedString,
-          reactTextViewManagerCallback,
-          textEffectRegistry,
-      )
+  ): Spannable = getOrCreateSpannableForText(
+      assets,
+      0,
+      attributedString,
+      reactTextViewManagerCallback,
+      textEffectRegistry,
+  )
 
   @OptIn(UnstableReactNativeAPI::class)
   internal fun getOrCreateSpannableForText(
@@ -729,14 +737,13 @@ internal object TextLayoutManager {
       textEffectRegistry: TextEffectRegistry? = null,
   ): Spannable {
     if (ReactNativeFeatureFlags.enableAndroidTextMeasurementOptimizations()) {
-      val spannable =
-          buildSpannableFromFragmentsOptimized(
-              assets,
-              fontWeightAdjustment,
-              fragments,
-              outputReactTags,
-              textEffectRegistry,
-          )
+      val spannable = buildSpannableFromFragmentsOptimized(
+          assets,
+          fontWeightAdjustment,
+          fragments,
+          outputReactTags,
+          textEffectRegistry,
+      )
 
       reactTextViewManagerCallback?.onPostProcessSpannable(spannable)
       return spannable
@@ -886,6 +893,7 @@ internal object TextLayoutManager {
     if (
         baseTextAttributes.fontStyle != ReactConstants.UNSET ||
             baseTextAttributes.fontWeight != ReactConstants.UNSET ||
+            baseTextAttributes.fontVariationSettings != null ||
             baseTextAttributes.fontFamily != null
     ) {
       val typeface =
@@ -897,7 +905,7 @@ internal object TextLayoutManager {
               assets,
           )
       paint.setTypeface(
-          ReactTypefaceUtils.applyFontWeightAdjustment(typeface, fontWeightAdjustment)
+          ReactTypefaceUtils.applyFontWeightAdjustment(typeface, fontWeightAdjustment),
       )
 
       if (
@@ -915,6 +923,8 @@ internal object TextLayoutManager {
         paint.setTypeface(typeface)
       }
     }
+
+    ReactTypefaceUtils.applyFontVariationSettings(paint, baseTextAttributes.fontVariationSettings)
   }
 
   /**
@@ -958,14 +968,13 @@ internal object TextLayoutManager {
       reactTextViewManagerCallback: ReactTextViewManagerCallback?,
       textEffectRegistry: TextEffectRegistry? = null,
   ): Layout {
-    val text =
-        getOrCreateSpannableForText(
-            assets,
-            fontWeightAdjustment,
-            attributedString,
-            reactTextViewManagerCallback,
-            textEffectRegistry,
-        )
+    val text = getOrCreateSpannableForText(
+        assets,
+        fontWeightAdjustment,
+        attributedString,
+        reactTextViewManagerCallback,
+        textEffectRegistry,
+    )
 
     val paint: TextPaint
     if (attributedString.contains(AS_KEY_CACHE_ID)) {
@@ -977,15 +986,15 @@ internal object TextLayoutManager {
     }
 
     return createLayout(
-            text,
-            paint,
-            attributedString,
-            paragraphAttributes,
-            width,
-            widthYogaMeasureMode,
-            height,
-            heightYogaMeasureMode,
-        )
+        text,
+        paint,
+        attributedString,
+        paragraphAttributes,
+        width,
+        widthYogaMeasureMode,
+        height,
+        heightYogaMeasureMode,
+    )
         .layout
   }
 
@@ -1003,7 +1012,7 @@ internal object TextLayoutManager {
 
     val textBreakStrategy =
         TextAttributeProps.getTextBreakStrategy(
-            paragraphAttributes.getString(PA_KEY_TEXT_BREAK_STRATEGY)
+            paragraphAttributes.getString(PA_KEY_TEXT_BREAK_STRATEGY),
         )
     val includeFontPadding =
         if (paragraphAttributes.contains(PA_KEY_INCLUDE_FONT_PADDING))
@@ -1011,7 +1020,7 @@ internal object TextLayoutManager {
         else DEFAULT_INCLUDE_FONT_PADDING
     val hyphenationFrequency =
         TextAttributeProps.getHyphenationFrequency(
-            paragraphAttributes.getString(PA_KEY_HYPHENATION_FREQUENCY)
+            paragraphAttributes.getString(PA_KEY_HYPHENATION_FREQUENCY),
         )
     val adjustFontSizeToFit =
         if (paragraphAttributes.contains(PA_KEY_ADJUST_FONT_SIZE_TO_FIT))
@@ -1024,7 +1033,7 @@ internal object TextLayoutManager {
     val ellipsizeMode =
         if (paragraphAttributes.contains(PA_KEY_ELLIPSIZE_MODE))
             TextAttributeProps.getEllipsizeMode(
-                paragraphAttributes.getString(PA_KEY_ELLIPSIZE_MODE)
+                paragraphAttributes.getString(PA_KEY_ELLIPSIZE_MODE),
             )
         else null
 
@@ -1088,19 +1097,18 @@ internal object TextLayoutManager {
       heightYogaMeasureMode: YogaMeasureMode,
       reactTextViewManagerCallback: ReactTextViewManagerCallback?,
       textEffectRegistry: TextEffectRegistry? = null,
-  ): PreparedLayout =
-      createPreparedLayout(
-          assets,
-          0,
-          attributedString,
-          paragraphAttributes,
-          width,
-          widthYogaMeasureMode,
-          height,
-          heightYogaMeasureMode,
-          reactTextViewManagerCallback,
-          textEffectRegistry,
-      )
+  ): PreparedLayout = createPreparedLayout(
+      assets,
+      0,
+      attributedString,
+      paragraphAttributes,
+      width,
+      widthYogaMeasureMode,
+      height,
+      heightYogaMeasureMode,
+      reactTextViewManagerCallback,
+      textEffectRegistry,
+  )
 
   @JvmStatic
   @OptIn(UnstableReactNativeAPI::class)
@@ -1118,42 +1126,39 @@ internal object TextLayoutManager {
   ): PreparedLayout {
     val fragments = attributedString.getMapBuffer(AS_KEY_FRAGMENTS)
     val reactTags = IntArray(fragments.count)
-    val text =
-        createSpannableFromAttributedString(
-            assets,
-            fontWeightAdjustment,
-            fragments,
-            reactTextViewManagerCallback,
-            reactTags,
-            textEffectRegistry,
-        )
+    val text = createSpannableFromAttributedString(
+        assets,
+        fontWeightAdjustment,
+        fragments,
+        reactTextViewManagerCallback,
+        reactTags,
+        textEffectRegistry,
+    )
     val baseTextAttributes =
         TextAttributeProps.fromMapBuffer(attributedString.getMapBuffer(AS_KEY_BASE_ATTRIBUTES))
-    val result =
-        createLayout(
-            text,
-            newPaintWithAttributes(baseTextAttributes, assets, fontWeightAdjustment),
-            attributedString,
-            paragraphAttributes,
-            width,
-            widthYogaMeasureMode,
-            height,
-            heightYogaMeasureMode,
-        )
+    val result = createLayout(
+        text,
+        newPaintWithAttributes(baseTextAttributes, assets, fontWeightAdjustment),
+        attributedString,
+        paragraphAttributes,
+        width,
+        widthYogaMeasureMode,
+        height,
+        heightYogaMeasureMode,
+    )
 
     val maximumNumberOfLines =
         if (paragraphAttributes.contains(PA_KEY_MAX_NUMBER_OF_LINES))
             paragraphAttributes.getInt(PA_KEY_MAX_NUMBER_OF_LINES)
         else ReactConstants.UNSET
 
-    val verticalOffset =
-        getVerticalOffset(
-            result.layout,
-            paragraphAttributes,
-            height,
-            heightYogaMeasureMode,
-            maximumNumberOfLines,
-        )
+    val verticalOffset = getVerticalOffset(
+        result.layout,
+        paragraphAttributes,
+        height,
+        heightYogaMeasureMode,
+        maximumNumberOfLines,
+    )
 
     return PreparedLayout(
         result.layout,
@@ -1283,20 +1288,19 @@ internal object TextLayoutManager {
       reactTextViewManagerCallback: ReactTextViewManagerCallback?,
       attachmentsPositions: FloatArray?,
       textEffectRegistry: TextEffectRegistry? = null,
-  ): Long =
-      measureText(
-          assets,
-          0,
-          attributedString,
-          paragraphAttributes,
-          width,
-          widthYogaMeasureMode,
-          height,
-          heightYogaMeasureMode,
-          reactTextViewManagerCallback,
-          attachmentsPositions,
-          textEffectRegistry,
-      )
+  ): Long = measureText(
+      assets,
+      0,
+      attributedString,
+      paragraphAttributes,
+      width,
+      widthYogaMeasureMode,
+      height,
+      heightYogaMeasureMode,
+      reactTextViewManagerCallback,
+      attachmentsPositions,
+      textEffectRegistry,
+  )
 
   @JvmStatic
   @OptIn(UnstableReactNativeAPI::class)
@@ -1314,19 +1318,18 @@ internal object TextLayoutManager {
       textEffectRegistry: TextEffectRegistry? = null,
   ): Long {
     // TODO(5578671): Handle text direction (see View#getTextDirectionHeuristic)
-    val layout =
-        createLayoutForMeasurement(
-            assets,
-            fontWeightAdjustment,
-            attributedString,
-            paragraphAttributes,
-            width,
-            widthYogaMeasureMode,
-            height,
-            heightYogaMeasureMode,
-            reactTextViewManagerCallback,
-            textEffectRegistry,
-        )
+    val layout = createLayoutForMeasurement(
+        assets,
+        fontWeightAdjustment,
+        attributedString,
+        paragraphAttributes,
+        width,
+        widthYogaMeasureMode,
+        height,
+        heightYogaMeasureMode,
+        reactTextViewManagerCallback,
+        textEffectRegistry,
+    )
 
     val maximumNumberOfLines =
         if (paragraphAttributes.contains(PA_KEY_MAX_NUMBER_OF_LINES))
@@ -1583,17 +1586,16 @@ internal object TextLayoutManager {
       height: Float,
       reactTextViewManagerCallback: ReactTextViewManagerCallback?,
       textEffectRegistry: TextEffectRegistry? = null,
-  ): WritableArray =
-      measureLines(
-          assetManager,
-          0,
-          attributedString,
-          paragraphAttributes,
-          width,
-          height,
-          reactTextViewManagerCallback,
-          textEffectRegistry,
-      )
+  ): WritableArray = measureLines(
+      assetManager,
+      0,
+      attributedString,
+      paragraphAttributes,
+      width,
+      height,
+      reactTextViewManagerCallback,
+      textEffectRegistry,
+  )
 
   @JvmStatic
   @OptIn(UnstableReactNativeAPI::class)
@@ -1607,19 +1609,18 @@ internal object TextLayoutManager {
       reactTextViewManagerCallback: ReactTextViewManagerCallback?,
       textEffectRegistry: TextEffectRegistry? = null,
   ): WritableArray {
-    val layout =
-        createLayoutForMeasurement(
-            assetManager,
-            fontWeightAdjustment,
-            attributedString,
-            paragraphAttributes,
-            width,
-            YogaMeasureMode.EXACTLY,
-            height,
-            YogaMeasureMode.EXACTLY,
-            reactTextViewManagerCallback,
-            textEffectRegistry,
-        )
+    val layout = createLayoutForMeasurement(
+        assetManager,
+        fontWeightAdjustment,
+        attributedString,
+        paragraphAttributes,
+        width,
+        YogaMeasureMode.EXACTLY,
+        height,
+        YogaMeasureMode.EXACTLY,
+        reactTextViewManagerCallback,
+        textEffectRegistry,
+    )
     return FontMetricsUtil.getFontMetrics(
         layout.text,
         layout,

package/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/CustomStyleSpan.kt

@@ -31,6 +31,7 @@ internal class CustomStyleSpan(
     private val privateStyle: Int,
     private val privateWeight: Int,
     val fontFeatureSettings: String?,
+    val fontVariationSettings: String?,
     val fontFamily: String?,
     private val assetManager: AssetManager,
     private val fontWeightAdjustment: Int = 0,
@@ -41,6 +42,7 @@ internal class CustomStyleSpan(
         privateStyle,
         privateWeight,
         fontFeatureSettings,
+        fontVariationSettings,
         fontFamily,
         assetManager,
         fontWeightAdjustment,
@@ -53,6 +55,7 @@ internal class CustomStyleSpan(
         privateStyle,
         privateWeight,
         fontFeatureSettings,
+        fontVariationSettings,
         fontFamily,
         assetManager,
         fontWeightAdjustment,
@@ -81,6 +84,7 @@ internal class CustomStyleSpan(
         style: Int,
         weight: Int,
         fontFeatureSettingsParam: String?,
+        fontVariationSettingsParam: String?,
         family: String?,
         assetManager: AssetManager,
         fontWeightAdjustment: Int,
@@ -92,6 +96,7 @@ internal class CustomStyleSpan(
       paint.apply {
         fontFeatureSettings = fontFeatureSettingsParam
         setTypeface(adjustedTypeface)
+        ReactTypefaceUtils.applyFontVariationSettings(this, fontVariationSettingsParam)
         isSubpixelText = true
         isLinearText = true
       }

package/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactClickableSpan.kt

@@ -44,7 +44,7 @@ internal class ReactClickableSpan(val reactTag: Int) : ClickableSpan(), ReactSpa
     val context = view.context as ReactContext
     val eventDispatcher = UIManagerHelper.getEventDispatcher(context)
     eventDispatcher?.dispatchEvent(
-        ViewGroupClickEvent(UIManagerHelper.getSurfaceId(context), reactTag)
+        ViewGroupClickEvent(UIManagerHelper.getSurfaceId(context), reactTag),
     )
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactLinkSpan.kt

@@ -44,7 +44,7 @@ internal class ReactLinkSpan(val fragmentIndex: Int) : ClickableSpan(), ReactSpa
     val reactTag = preparedLayout.reactTags[fragmentIndex]
     val eventDispatcher = UIManagerHelper.getEventDispatcher(context)
     eventDispatcher?.dispatchEvent(
-        ViewGroupClickEvent(UIManagerHelper.getSurfaceId(context), reactTag)
+        ViewGroupClickEvent(UIManagerHelper.getSurfaceId(context), reactTag),
     )
   }