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

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.kt

@@ -81,7 +81,17 @@ public object ReactScrollViewHelper {
   @JvmStatic
   public fun <T> emitScrollEvent(scrollView: T, xVelocity: Float, yVelocity: Float)
       where T : HasScrollEventThrottle?, T : ViewGroup {
-    emitScrollEvent(scrollView, ScrollEventType.SCROLL, xVelocity, yVelocity)
+    emitScrollEvent(scrollView, ScrollEventType.SCROLL, xVelocity, yVelocity, false)
+  }
+
+  /**
+   * Emits a scroll event without throttling. Used by MVCP to ensure scroll position updates reach
+   * JS immediately when the scroll position is adjusted programmatically.
+   */
+  @JvmStatic
+  public fun <T> emitScrollEventNoThrottle(scrollView: T, xVelocity: Float, yVelocity: Float)
+      where T : HasScrollEventThrottle?, T : ViewGroup {
+    emitScrollEvent(scrollView, ScrollEventType.SCROLL, xVelocity, yVelocity, true)
   }
 
   @JvmStatic
@@ -115,7 +125,7 @@ public object ReactScrollViewHelper {
 
   private fun <T> emitScrollEvent(scrollView: T, scrollEventType: ScrollEventType)
       where T : HasScrollEventThrottle?, T : ViewGroup {
-    emitScrollEvent(scrollView, scrollEventType, 0f, 0f)
+    emitScrollEvent(scrollView, scrollEventType, 0f, 0f, false)
   }
 
   private fun <T> emitScrollEvent(
@@ -123,13 +133,15 @@ public object ReactScrollViewHelper {
       scrollEventType: ScrollEventType,
       xVelocity: Float,
       yVelocity: Float,
+      skipThrottle: Boolean = false,
   ) where T : HasScrollEventThrottle?, T : ViewGroup {
     val now = System.currentTimeMillis()
     // Throttle the scroll event if scrollEventThrottle is set to be equal or more than 17 ms.
     // We limit the delta to 17ms so that small throttles intended to enable 60fps updates will not
     // inadvertently filter out any scroll events.
     if (
-        scrollEventType == ScrollEventType.SCROLL &&
+        !skipThrottle &&
+            scrollEventType == ScrollEventType.SCROLL &&
             scrollView.scrollEventThrottle >= max(17, now - scrollView.lastScrollDispatchTime)
     ) {
       // Scroll events are throttled.
@@ -161,7 +173,7 @@ public object ReactScrollViewHelper {
               contentView.height,
               scrollView.width,
               scrollView.height,
-          )
+          ),
       )
       if (scrollEventType == ScrollEventType.SCROLL) {
         scrollView.lastScrollDispatchTime = now
@@ -320,7 +332,12 @@ public object ReactScrollViewHelper {
    */
   @JvmStatic
   public fun <T> smoothScrollTo(scrollView: T, x: Int, y: Int)
-      where T : HasFlingAnimator?, T : HasScrollState?, T : HasStateWrapper?, T : ViewGroup {
+      where
+          T : HasFlingAnimator?,
+          T : HasScrollEventThrottle?,
+          T : HasScrollState?,
+          T : HasStateWrapper?,
+          T : ViewGroup {
     if (DEBUG_MODE) {
       FLog.i(TAG, "smoothScrollTo[%d] x %d y %d", scrollView.id, x, y)
     }
@@ -488,7 +505,12 @@ public object ReactScrollViewHelper {
   }
 
   public fun <T> registerFlingAnimator(scrollView: T)
-      where T : HasFlingAnimator?, T : HasScrollState?, T : HasStateWrapper?, T : ViewGroup {
+      where
+          T : HasFlingAnimator?,
+          T : HasScrollEventThrottle?,
+          T : HasScrollState?,
+          T : HasStateWrapper?,
+          T : ViewGroup {
     scrollView
         .getFlingAnimator()
         .addListener(
@@ -503,15 +525,21 @@ public object ReactScrollViewHelper {
                 scrollView.reactScrollViewScrollState.isFinished = true
                 notifyUserDrivenScrollEnded(scrollView)
                 updateFabricScrollState(scrollView)
+                // Dispatch an unthrottled scroll event to ensure JS state is updated after
+                // animation
+                emitScrollEventNoThrottle(scrollView, 0f, 0f)
               }
 
               override fun onAnimationCancel(animator: Animator) {
                 scrollView.reactScrollViewScrollState.isCanceled = true
                 notifyUserDrivenScrollEnded(scrollView)
+                // Dispatch an unthrottled scroll event to ensure JS state is updated after
+                // cancellation
+                emitScrollEventNoThrottle(scrollView, 0f, 0f)
               }
 
               override fun onAnimationRepeat(animator: Animator) = Unit
-            }
+            },
         )
   }
 
@@ -535,7 +563,7 @@ public object ReactScrollViewHelper {
               }
 
               override fun onAnimationRepeat(animator: Animator) = Unit
-            }
+            },
         )
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.kt

@@ -338,7 +338,7 @@ constructor(private val fpsListener: FpsListener? = null) :
     val child =
         scrollView.getChildAt(0)
             ?: throw RetryableMountingLayerException(
-                "scrollToEnd called on ScrollView without child"
+                "scrollToEnd called on ScrollView without child",
             )
 
     // ScrollView always has one child - the scrollable area
@@ -384,7 +384,7 @@ constructor(private val fpsListener: FpsListener? = null) :
     if (view.fadingEdgeLengthStart > 0 || view.fadingEdgeLengthEnd > 0) {
       view.isVerticalFadingEdgeEnabled = true
       view.setFadingEdgeLength(
-          Math.round(Math.max(view.fadingEdgeLengthStart, view.fadingEdgeLengthEnd).dpToPx())
+          Math.round(Math.max(view.fadingEdgeLengthStart, view.fadingEdgeLengthEnd).dpToPx()),
       )
     } else {
       view.isVerticalFadingEdgeEnabled = false
@@ -401,7 +401,7 @@ constructor(private val fpsListener: FpsListener? = null) :
   public fun setMaintainVisibleContentPosition(view: ReactScrollView, value: ReadableMap?) {
     if (value != null) {
       view.setMaintainVisibleContentPosition(
-          MaintainVisibleScrollPositionHelper.Config.fromReadableMap(value)
+          MaintainVisibleScrollPositionHelper.Config.fromReadableMap(value),
       )
     } else {
       view.setMaintainVisibleContentPosition(null)
@@ -467,17 +467,15 @@ constructor(private val fpsListener: FpsListener? = null) :
   public companion object {
     public const val REACT_CLASS: String = "RCTScrollView"
 
-    public fun createExportedCustomDirectEventTypeConstants(): Map<String, Any> =
-        mapOf(
-            getJSEventName(ScrollEventType.SCROLL) to mapOf("registrationName" to "onScroll"),
-            getJSEventName(ScrollEventType.BEGIN_DRAG) to
-                mapOf("registrationName" to "onScrollBeginDrag"),
-            getJSEventName(ScrollEventType.END_DRAG) to
-                mapOf("registrationName" to "onScrollEndDrag"),
-            getJSEventName(ScrollEventType.MOMENTUM_BEGIN) to
-                mapOf("registrationName" to "onMomentumScrollBegin"),
-            getJSEventName(ScrollEventType.MOMENTUM_END) to
-                mapOf("registrationName" to "onMomentumScrollEnd"),
-        )
+    public fun createExportedCustomDirectEventTypeConstants(): Map<String, Any> = mapOf(
+        getJSEventName(ScrollEventType.SCROLL) to mapOf("registrationName" to "onScroll"),
+        getJSEventName(ScrollEventType.BEGIN_DRAG) to
+            mapOf("registrationName" to "onScrollBeginDrag"),
+        getJSEventName(ScrollEventType.END_DRAG) to mapOf("registrationName" to "onScrollEndDrag"),
+        getJSEventName(ScrollEventType.MOMENTUM_BEGIN) to
+            mapOf("registrationName" to "onMomentumScrollBegin"),
+        getJSEventName(ScrollEventType.MOMENTUM_END) to
+            mapOf("registrationName" to "onMomentumScrollEnd"),
+    )
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.kt

@@ -155,7 +155,7 @@ public class ScrollEvent private constructor() : Event<ScrollEvent>() {
     @Deprecated(
         "Use the obtain version that explicitly takes surfaceId as an argument",
         ReplaceWith(
-            "obtain(surfaceId, viewTag, scrollEventType, scrollX, scrollY, xVelocity, yVelocity, contentWidth, contentHeight, scrollViewWidth, scrollViewHeight)"
+            "obtain(surfaceId, viewTag, scrollEventType, scrollX, scrollY, xVelocity, yVelocity, contentWidth, contentHeight, scrollViewWidth, scrollViewHeight)",
         ),
     )
     @JvmStatic
@@ -170,19 +170,18 @@ public class ScrollEvent private constructor() : Event<ScrollEvent>() {
         contentHeight: Int,
         scrollViewWidth: Int,
         scrollViewHeight: Int,
-    ): ScrollEvent =
-        obtain(
-            ViewUtil.NO_SURFACE_ID,
-            viewTag,
-            scrollEventType,
-            scrollX,
-            scrollY,
-            xVelocity,
-            yVelocity,
-            contentWidth,
-            contentHeight,
-            scrollViewWidth,
-            scrollViewHeight,
-        )
+    ): ScrollEvent = obtain(
+        ViewUtil.NO_SURFACE_ID,
+        viewTag,
+        scrollEventType,
+        scrollX,
+        scrollY,
+        xVelocity,
+        yVelocity,
+        contentWidth,
+        contentHeight,
+        scrollViewWidth,
+        scrollViewHeight,
+    )
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/VirtualViewContainerStateExperimental.kt

@@ -251,7 +251,7 @@ internal class IntervalTree(private val horizontal: Boolean) : MutableCollection
             rotateLeft(
                 requireNotNull(node.left) {
                   "[IntervalTree] node.left must not be null when performing left rotation around it"
-                }
+                },
             )
       }
       return rotateRight(node)
@@ -264,7 +264,7 @@ internal class IntervalTree(private val horizontal: Boolean) : MutableCollection
             rotateRight(
                 requireNotNull(node.right) {
                   "[IntervalTree] node.right must not be null when performing right rotation around it"
-                }
+                },
             )
       }
       return rotateLeft(node)
@@ -325,12 +325,11 @@ internal class IntervalTree(private val horizontal: Boolean) : MutableCollection
               node.left == null -> node.right
               node.right == null -> node.left
               else -> {
-                val successor =
-                    findMin(
-                        requireNotNull(node.right) {
-                          "[IntervalTree] node.right must not be null when finding node's successor"
-                        }
-                    )
+                val successor = findMin(
+                    requireNotNull(node.right) {
+                      "[IntervalTree] node.right must not be null when finding node's successor"
+                    },
+                )
                 node.virtualView = successor.virtualView
                 node.interval = successor.interval
                 node.right = delete(node.right, successor)

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/generate-nested-scroll-view.js

@@ -26,9 +26,9 @@
 
 'use strict';
 
-const crypto = require('crypto');
-const fs = require('fs');
-const path = require('path');
+const crypto = require('node:crypto');
+const fs = require('node:fs');
+const path = require('node:path');
 
 // SignedSource token - this placeholder gets replaced with the actual hash
 // Use string concatenation to avoid marking THIS script as generated

package/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.kt

@@ -117,20 +117,19 @@ internal open class SwipeRefreshLayoutManager :
     }
   }
 
-  override fun getExportedViewConstants(): MutableMap<String, Any> =
-      mutableMapOf(
-          "SIZE" to
-              mutableMapOf(
-                  "DEFAULT" to SwipeRefreshLayout.DEFAULT,
-                  "LARGE" to SwipeRefreshLayout.LARGE,
-              )
-      )
+  override fun getExportedViewConstants(): MutableMap<String, Any> = mutableMapOf(
+      "SIZE" to
+          mutableMapOf(
+              "DEFAULT" to SwipeRefreshLayout.DEFAULT,
+              "LARGE" to SwipeRefreshLayout.LARGE,
+          ),
+  )
 
   override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> {
     val baseEventTypeConstants = super.getExportedCustomDirectEventTypeConstants()
     val eventTypeConstants: MutableMap<String, Any> = baseEventTypeConstants ?: HashMap()
     eventTypeConstants.putAll(
-        mutableMapOf("topRefresh" to mutableMapOf("registrationName" to "onRefresh"))
+        mutableMapOf("topRefresh" to mutableMapOf("registrationName" to "onRefresh")),
     )
     return eventTypeConstants
   }

package/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.kt

@@ -141,7 +141,7 @@ internal class ReactSwitchManager :
           val reactTag = buttonView.id
           UIManagerHelper.getEventDispatcher(reactContext)
               ?.dispatchEvent(
-                  ReactSwitchEvent(UIManagerHelper.getSurfaceId(reactContext), reactTag, isChecked)
+                  ReactSwitchEvent(UIManagerHelper.getSurfaceId(reactContext), reactTag, isChecked),
               )
         }
   }

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

@@ -210,7 +210,7 @@ internal class PreparedLayoutTextView(context: Context) : ViewGroup(context), Re
     val layout = checkNotNull(preparedLayout).layout
     if (start < 0 || end > layout.text.length || start >= end) {
       throw IllegalArgumentException(
-          "setSelection start and end are not in valid range. start: $start, end: $end, text length: ${layout.text.length}"
+          "setSelection start and end are not in valid range. start: $start, end: $end, text length: ${layout.text.length}",
       )
     }
 

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

@@ -21,6 +21,7 @@ import com.facebook.react.uimanager.IViewGroupManager
 import com.facebook.react.uimanager.LayoutShadowNode
 import com.facebook.react.uimanager.LengthPercentage
 import com.facebook.react.uimanager.LengthPercentageType
+import com.facebook.react.uimanager.PointerEvents
 import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.ReferenceStateWrapper
 import com.facebook.react.uimanager.StateWrapper
@@ -33,6 +34,7 @@ import com.facebook.react.uimanager.style.BorderStyle
 import com.facebook.react.uimanager.style.LogicalEdge
 import com.facebook.react.uimanager.style.Overflow
 import com.facebook.react.views.text.ReactTextViewAccessibilityDelegate.AccessibilityLinks
+import com.facebook.react.views.view.ImportantForInteractionHelper
 import java.util.HashMap
 
 @ReactModule(name = PreparedLayoutTextViewManager.REACT_CLASS)
@@ -108,7 +110,13 @@ internal class PreparedLayoutTextViewManager :
 
   @ReactProp(name = "overflow")
   fun setOverflow(view: PreparedLayoutTextView, overflow: String?): Unit {
-    view.overflow = overflow?.let { Overflow.fromString(it) } ?: Overflow.VISIBLE
+    view.overflow = Overflow.fromString(overflow)
+    ImportantForInteractionHelper.setImportantForInteraction(
+        view,
+        // <Text> has no pointerEvents prop, so it always behaves as AUTO.
+        PointerEvents.AUTO,
+        view.overflow,
+    )
   }
 
   @ReactProp(name = "accessible")

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

@@ -15,7 +15,7 @@ import com.facebook.react.common.assets.ReactFontManager as ReactFontAssetManage
 /** Responsible for loading and caching Typeface objects. */
 @Deprecated(
     message =
-        "This class is deprecated and will be deleted in the near future. Please use [com.facebook.react.common.assets.ReactFontManager] instead."
+        "This class is deprecated and will be deleted in the near future. Please use [com.facebook.react.common.assets.ReactFontManager] instead.",
 )
 @Suppress("DEPRECATION")
 public class ReactFontManager private constructor(private val delegate: ReactFontAssetManager) {

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

@@ -25,13 +25,12 @@ internal class ReactTextUpdate(
         textAlign: Int,
         textBreakStrategy: Int,
         justificationMode: Int,
-    ): ReactTextUpdate =
-        ReactTextUpdate(
-            text,
-            jsEventCounter,
-            textAlign,
-            textBreakStrategy,
-            justificationMode,
-        )
+    ): ReactTextUpdate = ReactTextUpdate(
+        text,
+        jsEventCounter,
+        textAlign,
+        textBreakStrategy,
+        justificationMode,
+    )
   }
 }

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

@@ -338,6 +338,14 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
     }
   }
 
+  @Override
+  protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+    super.onSizeChanged(w, h, oldw, oldh);
+    if (mAdjustsFontSizeToFit && (w != oldw || h != oldh)) {
+      mShouldAdjustSpannableFontSize = true;
+    }
+  }
+
   public void setText(ReactTextUpdate update) {
     try (SystraceSection s = new SystraceSection("ReactTextView.setText(ReactTextUpdate)")) {
       // Android's TextView crashes when it tries to relayout if LayoutParams are
@@ -690,13 +698,11 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
   }
 
   public void setOverflow(@Nullable String overflow) {
-    if (overflow == null) {
-      mOverflow = Overflow.VISIBLE;
-    } else {
-      @Nullable Overflow parsedOverflow = Overflow.fromString(overflow);
-      mOverflow = parsedOverflow == null ? Overflow.VISIBLE : parsedOverflow;
-    }
-
+    mOverflow = Overflow.fromString(overflow);
     invalidate();
   }
+
+  /* package */ Overflow getOverflow() {
+    return mOverflow;
+  }
 }

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

@@ -31,6 +31,7 @@ import com.facebook.react.uimanager.IViewManagerWithChildren
 import com.facebook.react.uimanager.LayoutShadowNode
 import com.facebook.react.uimanager.LengthPercentage
 import com.facebook.react.uimanager.LengthPercentageType
+import com.facebook.react.uimanager.PointerEvents
 import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.ReferenceStateWrapper
 import com.facebook.react.uimanager.StateWrapper
@@ -44,6 +45,7 @@ import com.facebook.react.uimanager.style.BorderStyle.Companion.fromString
 import com.facebook.react.uimanager.style.LogicalEdge
 import com.facebook.react.views.text.DefaultStyleValuesUtil.getDefaultTextColorHighlight
 import com.facebook.react.views.text.ReactTypefaceUtils.getFontWeightAdjustment
+import com.facebook.react.views.view.ImportantForInteractionHelper
 import java.util.HashMap
 
 /** View manager for `<Text>` nodes. */
@@ -52,7 +54,7 @@ import java.util.HashMap
 public open class ReactTextViewManager
 @JvmOverloads
 public constructor(
-    protected var reactTextViewManagerCallback: ReactTextViewManagerCallback? = null
+    protected var reactTextViewManagerCallback: ReactTextViewManagerCallback? = null,
 ) :
     BaseViewManager<ReactTextView, LayoutShadowNode>(),
     IViewManagerWithChildren,
@@ -116,7 +118,7 @@ public constructor(
   override fun createShadowNodeInstance(): LayoutShadowNode = LayoutShadowNode()
 
   public fun createShadowNodeInstance(
-      reactTextViewManagerCallback: ReactTextViewManagerCallback?
+      reactTextViewManagerCallback: ReactTextViewManagerCallback?,
   ): LayoutShadowNode = LayoutShadowNode()
 
   override fun getShadowNodeClass(): Class<LayoutShadowNode> = LayoutShadowNode::class.java
@@ -175,7 +177,7 @@ public constructor(
 
     val textBreakStrategy =
         TextAttributeProps.getTextBreakStrategy(
-            paragraphAttributes.getString(TextLayoutManager.PA_KEY_TEXT_BREAK_STRATEGY)
+            paragraphAttributes.getString(TextLayoutManager.PA_KEY_TEXT_BREAK_STRATEGY),
         )
     val currentJustificationMode =
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) 0 else view.justificationMode
@@ -236,6 +238,12 @@ public constructor(
   @ReactProp(name = "overflow")
   public fun setOverflow(view: ReactTextView, overflow: String?) {
     view.setOverflow(overflow)
+    ImportantForInteractionHelper.setImportantForInteraction(
+        view,
+        // <Text> has no pointerEvents prop, so it always behaves as AUTO.
+        PointerEvents.AUTO,
+        view.overflow,
+    )
   }
 
   @ReactProp(name = "accessible")

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

@@ -10,12 +10,14 @@ package com.facebook.react.views.text
 import android.content.Context
 import android.content.res.AssetManager
 import android.content.res.Configuration
+import android.graphics.Paint
 import android.graphics.Typeface
+import android.graphics.fonts.FontVariationAxis
 import android.os.Build
+import com.facebook.common.logging.FLog
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.common.ReactConstants
 import com.facebook.react.common.assets.ReactFontManager
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import kotlin.math.max
 import kotlin.math.min
 
@@ -122,10 +124,7 @@ public object ReactTypefaceUtils {
 
   @JvmStatic
   public fun getFontWeightAdjustment(context: Context): Int =
-      if (
-          Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
-              ReactNativeFeatureFlags.enableAndroidFontWeightAdjustment()
-      ) {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
         context.resources.configuration.fontWeightAdjustment
       } else {
         0
@@ -151,4 +150,44 @@ public object ReactTypefaceUtils {
 
     return Typeface.create(baseTypeface, adjustedWeight, italic)
   }
+
+  internal fun parseFontVariationSettings(fontVariationSettings: String?): String? {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+      return null
+    }
+
+    if (fontVariationSettings.isNullOrEmpty()) {
+      return fontVariationSettings
+    }
+
+    if (fontVariationSettings.trim().equals("normal", ignoreCase = true)) {
+      return ""
+    }
+
+    return try {
+      FontVariationAxis.fromFontVariationSettings(fontVariationSettings)
+      fontVariationSettings
+    } catch (exception: IllegalArgumentException) {
+      FLog.w(ReactConstants.TAG, "Invalid fontVariationSettings: $fontVariationSettings")
+      null
+    }
+  }
+
+  internal fun applyFontVariationSettings(paint: Paint, fontVariationSettings: String?) {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+      return
+    }
+
+    try {
+      paint.setFontVariationSettings(fontVariationSettings)
+    } catch (exception: IllegalArgumentException) {
+      // Paint instances are reused, so explicitly clear axes from a previous layout.
+      paint.setFontVariationSettings(null)
+      FLog.w(
+          ReactConstants.TAG,
+          "Invalid fontVariationSettings: $fontVariationSettings",
+          exception,
+      )
+    }
+  }
 }

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

@@ -25,6 +25,7 @@ import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.ViewProps
 import com.facebook.react.views.text.ReactTypefaceUtils.parseFontStyle
 import com.facebook.react.views.text.ReactTypefaceUtils.parseFontVariant
+import com.facebook.react.views.text.ReactTypefaceUtils.parseFontVariationSettings
 import com.facebook.react.views.text.ReactTypefaceUtils.parseFontWeight
 import kotlin.math.ceil
 
@@ -153,6 +154,10 @@ public class TextAttributeProps private constructor() {
   public var fontFeatureSettings: String? = null
     private set
 
+  /** @see android.graphics.Paint.setFontVariationSettings */
+  public var fontVariationSettings: String? = null
+    private set
+
   @Deprecated("Use lineHeight instead", ReplaceWith("lineHeight"))
   public val effectiveLineHeight: Float
     get() = lineHeight
@@ -396,6 +401,7 @@ public class TextAttributeProps private constructor() {
     public const val TA_KEY_TEXT_TRANSFORM: Int = 27
     public const val TA_KEY_MAX_FONT_SIZE_MULTIPLIER: Int = 29
     public const val TA_KEY_TEXT_EFFECTS: Int = 30
+    public const val TA_KEY_FONT_VARIATION_SETTINGS: Int = 31
     private const val TE_KEY_NAME: Int = 0
     private const val TE_KEY_PROPS: Int = 1
 
@@ -433,6 +439,8 @@ public class TextAttributeProps private constructor() {
           TA_KEY_FONT_WEIGHT -> result.setFontWeight(entry.stringValue)
           TA_KEY_FONT_STYLE -> result.setFontStyle(entry.stringValue)
           TA_KEY_FONT_VARIANT -> result.setFontVariant(entry.mapBufferValue)
+          TA_KEY_FONT_VARIATION_SETTINGS ->
+              result.fontVariationSettings = parseFontVariationSettings(entry.stringValue)
           TA_KEY_ALLOW_FONT_SCALING -> result.allowFontScaling = entry.booleanValue
           TA_KEY_LETTER_SPACING -> result.letterSpacing = entry.doubleValue.toFloat()
           TA_KEY_LINE_HEIGHT -> result.lineHeight = entry.doubleValue.toFloat()
@@ -464,7 +472,7 @@ public class TextAttributeProps private constructor() {
                       props =
                           if (effectMap.contains(TE_KEY_PROPS)) effectMap.getString(TE_KEY_PROPS)
                           else null,
-                  )
+                  ),
               )
             }
             result.textEffects = list
@@ -500,6 +508,8 @@ public class TextAttributeProps private constructor() {
       result.setFontWeight(getStringProp(props, ViewProps.FONT_WEIGHT))
       result.setFontStyle(getStringProp(props, ViewProps.FONT_STYLE))
       result.setFontVariant(getArrayProp(props, ViewProps.FONT_VARIANT))
+      result.fontVariationSettings =
+          parseFontVariationSettings(getStringProp(props, ViewProps.FONT_VARIATION_SETTINGS))
       result.includeFontPadding = getBooleanProp(props, ViewProps.INCLUDE_FONT_PADDING, true)
       result.setTextDecorationLine(getStringProp(props, ViewProps.TEXT_DECORATION_LINE))
       result.textDecorationColor =
@@ -507,7 +517,7 @@ public class TextAttributeProps private constructor() {
       result.textDecorationStyle =
           TextDecorationStyle.fromString(getStringProp(props, "textDecorationStyle"))
       result.setTextShadowOffset(
-          if (props.hasKey(PROP_SHADOW_OFFSET)) props.getMap(PROP_SHADOW_OFFSET) else null
+          if (props.hasKey(PROP_SHADOW_OFFSET)) props.getMap(PROP_SHADOW_OFFSET) else null,
       )
       result.textShadowRadius = getFloatProp(props, PROP_SHADOW_RADIUS, 1f)
       result.textShadowColor = getIntProp(props, PROP_SHADOW_COLOR, DEFAULT_TEXT_SHADOW_COLOR)