react-native-tvos 0.77.0-0rc5 → 0.78.0-0

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

@@ -26,6 +26,7 @@ import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.HorizontalScrollView;
 import android.widget.OverScroller;
 import androidx.annotation.Nullable;
@@ -33,6 +34,7 @@ import androidx.core.view.ViewCompat;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.infer.annotation.Nullsafe;
+import com.facebook.react.R;
 import com.facebook.react.animated.NativeAnimatedModule;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.common.ReactConstants;
@@ -143,6 +145,20 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
     setClipChildren(false);
   }
 
+  @Override
+  public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
+    super.onInitializeAccessibilityNodeInfo(info);
+
+    // Expose the testID prop as the resource-id name of the view. Black-box E2E/UI testing
+    // frameworks, which interact with the UI through the accessibility framework, do not have
+    // access to view tags. This allows developers/testers to avoid polluting the
+    // content-description with test identifiers.
+    final String testId = (String) this.getTag(R.id.react_test_id);
+    if (testId != null) {
+      info.setViewIdResourceName(testId);
+    }
+  }
+
   public boolean getScrollEnabled() {
     return mScrollEnabled;
   }

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

@@ -112,7 +112,7 @@ public class ReactHorizontalScrollViewManager extends ViewGroupManager<ReactHori
   }
 
   @ReactProp(name = "snapToAlignment")
-  public void setSnapToAlignment(ReactHorizontalScrollView view, String alignment) {
+  public void setSnapToAlignment(ReactHorizontalScrollView view, @Nullable String alignment) {
     view.setSnapToAlignment(ReactScrollViewHelper.parseSnapToAlignment(alignment));
   }
 
@@ -169,7 +169,7 @@ public class ReactHorizontalScrollViewManager extends ViewGroupManager<ReactHori
    * @param scrollPerfTag
    */
   @ReactProp(name = "scrollPerfTag")
-  public void setScrollPerfTag(ReactHorizontalScrollView view, String scrollPerfTag) {
+  public void setScrollPerfTag(ReactHorizontalScrollView view, @Nullable String scrollPerfTag) {
     view.setScrollPerfTag(scrollPerfTag);
   }
 
@@ -180,7 +180,7 @@ public class ReactHorizontalScrollViewManager extends ViewGroupManager<ReactHori
 
   /** Controls overScroll behaviour */
   @ReactProp(name = "overScrollMode")
-  public void setOverScrollMode(ReactHorizontalScrollView view, String value) {
+  public void setOverScrollMode(ReactHorizontalScrollView view, @Nullable String value) {
     view.setOverScrollMode(ReactScrollViewHelper.parseOverScrollMode(value));
   }
 

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

@@ -0,0 +1,136 @@
+/*
+ * 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.
+ */
+
+package com.facebook.react.views.scroll
+
+import android.view.View
+import android.view.ViewGroup
+import android.view.accessibility.AccessibilityEvent
+import androidx.core.view.AccessibilityDelegateCompat
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
+import com.facebook.react.R
+import com.facebook.react.bridge.AssertionException
+import com.facebook.react.bridge.ReactSoftExceptionLogger
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.uimanager.ReactAccessibilityDelegate
+import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole
+
+internal class ReactScrollViewAccessibilityDelegate : AccessibilityDelegateCompat() {
+
+  private val TAG: String = ReactScrollViewAccessibilityDelegate::class.java.simpleName
+
+  override fun onInitializeAccessibilityEvent(host: View, event: AccessibilityEvent) {
+    super.onInitializeAccessibilityEvent(host, event)
+    if (host is ReactScrollView || host is ReactHorizontalScrollView) {
+      onInitializeAccessibilityEventInternal(host, event)
+    } else {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          AssertionException(
+              "ReactScrollViewAccessibilityDelegate should only be used with ReactScrollView or ReactHorizontalScrollView, not with class: ${host.javaClass.simpleName}"))
+    }
+  }
+
+  override fun onInitializeAccessibilityNodeInfo(host: View, info: AccessibilityNodeInfoCompat) {
+    super.onInitializeAccessibilityNodeInfo(host, info)
+    if (host is ReactScrollView || host is ReactHorizontalScrollView) {
+      onInitializeAccessibilityNodeInfoInternal(host, info)
+    } else {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          AssertionException(
+              "ReactScrollViewAccessibilityDelegate should only be used with ReactScrollView or ReactHorizontalScrollView, not with class: ${host.javaClass.simpleName}"))
+    }
+  }
+
+  private fun onInitializeAccessibilityEventInternal(view: View, event: AccessibilityEvent) {
+    val accessibilityCollection =
+        view.getTag(R.id.accessibility_collection) as? ReadableMap ?: return
+
+    event.itemCount = accessibilityCollection.getInt("itemCount")
+
+    val contentView = (view as? ViewGroup)?.getChildAt(0) as? ViewGroup ?: return
+
+    var firstVisibleIndex: Int? = null
+    var lastVisibleIndex: Int? = null
+
+    for (index in 0..<contentView.childCount) {
+      val nextChild = contentView.getChildAt(index)
+      val isVisible: Boolean =
+          if (view is ReactScrollView) {
+            view.isPartiallyScrolledInView(nextChild)
+          } else if (view is ReactHorizontalScrollView) {
+            view.isPartiallyScrolledInView(nextChild)
+          } else {
+            return
+          }
+      var accessibilityCollectionItem: ReadableMap? =
+          nextChild.getTag(R.id.accessibility_collection_item) as ReadableMap
+
+      if (nextChild !is ViewGroup) {
+        return
+      }
+
+      // If this child's accessibilityCollectionItem is null, we'll check one more
+      // nested child.
+      // Happens when getItemLayout is not passed in FlatList which adds an additional
+      // View in the hierarchy.
+      if (nextChild.childCount > 0 && accessibilityCollectionItem == null) {
+        val nestedNextChild = nextChild.getChildAt(0)
+        if (nestedNextChild != null) {
+          val nestedChildAccessibility =
+              nestedNextChild.getTag(R.id.accessibility_collection_item) as? ReadableMap
+          if (nestedChildAccessibility != null) {
+            accessibilityCollectionItem = nestedChildAccessibility
+          }
+        }
+      }
+
+      if (isVisible && accessibilityCollectionItem != null) {
+        if (firstVisibleIndex == null) {
+          firstVisibleIndex = accessibilityCollectionItem.getInt("itemIndex")
+        }
+        lastVisibleIndex = accessibilityCollectionItem.getInt("itemIndex")
+      }
+
+      if (firstVisibleIndex != null && lastVisibleIndex != null) {
+        event.fromIndex = firstVisibleIndex
+        event.toIndex = lastVisibleIndex
+      }
+    }
+  }
+
+  private fun onInitializeAccessibilityNodeInfoInternal(
+      view: View,
+      info: AccessibilityNodeInfoCompat
+  ) {
+    val accessibilityRole = AccessibilityRole.fromViewTag(view)
+
+    if (accessibilityRole != null) {
+      ReactAccessibilityDelegate.setRole(info, accessibilityRole, view.context)
+    }
+
+    val accessibilityCollection = view.getTag(R.id.accessibility_collection) as? ReadableMap
+
+    if (accessibilityCollection != null) {
+      val rowCount = accessibilityCollection.getInt("rowCount")
+      val columnCount = accessibilityCollection.getInt("columnCount")
+      val hierarchical = accessibilityCollection.getBoolean("hierarchical")
+
+      val collectionInfoCompat =
+          AccessibilityNodeInfoCompat.CollectionInfoCompat.obtain(
+              rowCount, columnCount, hierarchical)
+      info.setCollectionInfo(collectionInfoCompat)
+    }
+
+    if (view is ReactScrollView) {
+      info.isScrollable = view.scrollEnabled
+    } else if (view is ReactHorizontalScrollView) {
+      info.isScrollable = view.scrollEnabled
+    }
+  }
+}

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

@@ -123,7 +123,7 @@ public class ReactScrollViewManager extends ViewGroupManager<ReactScrollView>
   }
 
   @ReactProp(name = "snapToAlignment")
-  public void setSnapToAlignment(ReactScrollView view, String alignment) {
+  public void setSnapToAlignment(ReactScrollView view, @Nullable String alignment) {
     view.setSnapToAlignment(ReactScrollViewHelper.parseSnapToAlignment(alignment));
   }
 
@@ -186,7 +186,7 @@ public class ReactScrollViewManager extends ViewGroupManager<ReactScrollView>
 
   /** Controls overScroll behaviour */
   @ReactProp(name = "overScrollMode")
-  public void setOverScrollMode(ReactScrollView view, String value) {
+  public void setOverScrollMode(ReactScrollView view, @Nullable String value) {
     view.setOverScrollMode(ReactScrollViewHelper.parseOverScrollMode(value));
   }
 

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

@@ -0,0 +1,152 @@
+/*
+ * 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.
+ */
+
+package com.facebook.react.views.switchview
+
+import android.content.Context
+import android.view.View
+import android.widget.CompoundButton
+import androidx.annotation.ColorInt
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.uimanager.BaseViewManager
+import com.facebook.react.uimanager.PixelUtil
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.UIManagerHelper
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.uimanager.ViewProps
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.AndroidSwitchManagerDelegate
+import com.facebook.react.viewmanagers.AndroidSwitchManagerInterface
+import com.facebook.yoga.YogaMeasureMode
+import com.facebook.yoga.YogaMeasureOutput
+
+internal class ReactSwitchManager :
+    BaseViewManager<ReactSwitch, ReactSwitchShadowNode>(),
+    AndroidSwitchManagerInterface<ReactSwitch> {
+
+  private val delegate: ViewManagerDelegate<ReactSwitch> = AndroidSwitchManagerDelegate(this)
+
+  override fun getName(): String = REACT_CLASS
+
+  override fun createShadowNodeInstance(): ReactSwitchShadowNode = ReactSwitchShadowNode()
+
+  override fun getShadowNodeClass(): Class<ReactSwitchShadowNode> =
+      ReactSwitchShadowNode::class.java
+
+  override fun createViewInstance(context: ThemedReactContext): ReactSwitch =
+      ReactSwitch(context).apply { showText = false }
+
+  override fun setBackgroundColor(view: ReactSwitch, @ColorInt backgroundColor: Int) {
+    view.setBackgroundColor(backgroundColor)
+  }
+
+  @ReactProp(name = "disabled", defaultBoolean = false)
+  override fun setDisabled(view: ReactSwitch, disabled: Boolean) {
+    view.isEnabled = !disabled
+  }
+
+  @ReactProp(name = ViewProps.ENABLED, defaultBoolean = true)
+  override fun setEnabled(view: ReactSwitch, enabled: Boolean) {
+    view.isEnabled = enabled
+  }
+
+  @ReactProp(name = ViewProps.ON)
+  override fun setOn(view: ReactSwitch, on: Boolean) {
+    setValueInternal(view, on)
+  }
+
+  @ReactProp(name = "value")
+  override fun setValue(view: ReactSwitch, value: Boolean) {
+    setValueInternal(view, value)
+  }
+
+  @ReactProp(name = "thumbTintColor", customType = "Color")
+  override fun setThumbTintColor(view: ReactSwitch, color: Int?) {
+    setThumbColor(view, color)
+  }
+
+  @ReactProp(name = "thumbColor", customType = "Color")
+  override fun setThumbColor(view: ReactSwitch, color: Int?) {
+    view.setThumbColor(color)
+  }
+
+  @ReactProp(name = "trackColorForFalse", customType = "Color")
+  override fun setTrackColorForFalse(view: ReactSwitch, color: Int?) {
+    view.setTrackColorForFalse(color)
+  }
+
+  @ReactProp(name = "trackColorForTrue", customType = "Color")
+  override fun setTrackColorForTrue(view: ReactSwitch, color: Int?) {
+    view.setTrackColorForTrue(color)
+  }
+
+  @ReactProp(name = "trackTintColor", customType = "Color")
+  override fun setTrackTintColor(view: ReactSwitch, color: Int?) {
+    view.setTrackColor(color)
+  }
+
+  override fun setNativeValue(view: ReactSwitch, value: Boolean) {
+    setValueInternal(view, value)
+  }
+
+  override fun receiveCommand(view: ReactSwitch, commandId: String, args: ReadableArray?) {
+    when (commandId) {
+      "setNativeValue" -> setValueInternal(view, args?.getBoolean(0) ?: false)
+    }
+  }
+
+  override fun addEventEmitters(reactContext: ThemedReactContext, view: ReactSwitch) {
+    view.setOnCheckedChangeListener(ON_CHECKED_CHANGE_LISTENER)
+  }
+
+  override fun updateExtraData(root: ReactSwitch, extraData: Any) {
+    // Do nothing
+  }
+
+  override fun getDelegate(): ViewManagerDelegate<ReactSwitch> = delegate
+
+  override fun measure(
+      context: Context,
+      localData: ReadableMap?,
+      props: ReadableMap?,
+      state: ReadableMap?,
+      width: Float,
+      widthMode: YogaMeasureMode,
+      height: Float,
+      heightMode: YogaMeasureMode,
+      attachmentsPositions: FloatArray?
+  ): Long {
+    val view = ReactSwitch(context).apply { showText = false }
+    val measureSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED)
+    view.measure(measureSpec, measureSpec)
+    return YogaMeasureOutput.make(
+        PixelUtil.toDIPFromPixel(view.measuredWidth.toFloat()),
+        PixelUtil.toDIPFromPixel(view.measuredHeight.toFloat()))
+  }
+
+  private fun setValueInternal(view: ReactSwitch, value: Boolean) {
+    // Temporarily remove the listener to avoid triggering JS events
+    view.setOnCheckedChangeListener(null)
+    view.setOn(value)
+    view.setOnCheckedChangeListener(ON_CHECKED_CHANGE_LISTENER)
+  }
+
+  internal companion object {
+    public const val REACT_CLASS: String = "AndroidSwitch"
+
+    private val ON_CHECKED_CHANGE_LISTENER =
+        CompoundButton.OnCheckedChangeListener { buttonView, isChecked ->
+          val reactContext = buttonView.context as ReactContext
+          val reactTag = buttonView.id
+          UIManagerHelper.getEventDispatcherForReactTag(reactContext, reactTag)
+              ?.dispatchEvent(
+                  ReactSwitchEvent(UIManagerHelper.getSurfaceId(reactContext), reactTag, isChecked))
+        }
+  }
+}

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

@@ -0,0 +1,52 @@
+/*
+ * 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.
+ */
+
+package com.facebook.react.views.switchview
+
+import android.view.View
+import com.facebook.react.uimanager.LayoutShadowNode
+import com.facebook.yoga.YogaMeasureFunction
+import com.facebook.yoga.YogaMeasureMode
+import com.facebook.yoga.YogaMeasureOutput
+import com.facebook.yoga.YogaNode
+
+internal class ReactSwitchShadowNode : LayoutShadowNode(), YogaMeasureFunction {
+  private var width = 0
+  private var height = 0
+  private var measured = false
+
+  init {
+    initMeasureFunction()
+  }
+
+  private fun initMeasureFunction() {
+    setMeasureFunction(this)
+  }
+
+  override fun measure(
+      node: YogaNode,
+      width: Float,
+      widthMode: YogaMeasureMode,
+      height: Float,
+      heightMode: YogaMeasureMode
+  ): Long {
+    if (!measured) {
+      // Create a switch with the default config and measure it; since we don't (currently)
+      // support setting custom switch text, this is fine, as all switches will measure the same
+      // on a specific device/theme/locale combination.
+      val reactSwitch = ReactSwitch(themedContext)
+      reactSwitch.showText = false
+      val spec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED)
+      reactSwitch.measure(spec, spec)
+      this.width = reactSwitch.measuredWidth
+      this.height = reactSwitch.measuredHeight
+      measured = true
+    }
+
+    return YogaMeasureOutput.make(this.width, this.height)
+  }
+}

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

@@ -21,7 +21,6 @@ import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.common.ReactConstants;
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.uimanager.IllegalViewOperationException;
 import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.NativeViewHierarchyOptimizer;
@@ -35,7 +34,6 @@ import com.facebook.react.views.text.internal.ReactTextInlineImageShadowNode;
 import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
 import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
 import com.facebook.react.views.text.internal.span.CustomStyleSpan;
-import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
 import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
 import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
 import com.facebook.react.views.text.internal.span.ReactClickableSpan;
@@ -231,11 +229,7 @@ public abstract class ReactBaseTextShadowNode extends LayoutShadowNode {
       if (!Float.isNaN(effectiveLineHeight)
           && (parentTextAttributes == null
               || parentTextAttributes.getEffectiveLineHeight() != effectiveLineHeight)) {
-        if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
-          ops.add(new SetSpanOperation(start, end, new CustomLineHeightSpan(effectiveLineHeight)));
-        } else {
-          ops.add(new SetSpanOperation(start, end, new LegacyLineHeightSpan(effectiveLineHeight)));
-        }
+        ops.add(new SetSpanOperation(start, end, new CustomLineHeightSpan(effectiveLineHeight)));
       }
       ops.add(new SetSpanOperation(start, end, new ReactTagSpan(textShadowNode.getReactTag())));
     }

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

@@ -61,6 +61,7 @@ public class TextAttributeProps {
   public static final short TA_KEY_LINE_BREAK_STRATEGY = 25;
   public static final short TA_KEY_ROLE = 26;
   public static final short TA_KEY_TEXT_TRANSFORM = 27;
+  public static final short TA_KEY_MAX_FONT_SIZE_MULTIPLIER = 29;
 
   public static final int UNSET = -1;
 
@@ -81,6 +82,7 @@ public class TextAttributeProps {
   protected float mLineHeight = Float.NaN;
   protected boolean mIsColorSet = false;
   protected boolean mAllowFontScaling = true;
+  protected float mMaxFontSizeMultiplier = Float.NaN;
   protected int mColor;
   protected boolean mIsBackgroundColorSet = false;
   protected int mBackgroundColor;
@@ -227,6 +229,9 @@ public class TextAttributeProps {
         case TA_KEY_TEXT_TRANSFORM:
           result.setTextTransform(entry.getStringValue());
           break;
+        case TA_KEY_MAX_FONT_SIZE_MULTIPLIER:
+          result.setMaxFontSizeMultiplier((float) entry.getDoubleValue());
+          break;
       }
     }
 
@@ -243,6 +248,8 @@ public class TextAttributeProps {
     result.setLineHeight(getFloatProp(props, ViewProps.LINE_HEIGHT, ReactConstants.UNSET));
     result.setLetterSpacing(getFloatProp(props, ViewProps.LETTER_SPACING, Float.NaN));
     result.setAllowFontScaling(getBooleanProp(props, ViewProps.ALLOW_FONT_SCALING, true));
+    result.setMaxFontSizeMultiplier(
+        getFloatProp(props, ViewProps.MAX_FONT_SIZE_MULTIPLIER, Float.NaN));
     result.setFontSize(getFloatProp(props, ViewProps.FONT_SIZE, ReactConstants.UNSET));
     result.setColor(props.hasKey(ViewProps.COLOR) ? props.getInt(ViewProps.COLOR, 0) : null);
     result.setColor(
@@ -411,7 +418,14 @@ public class TextAttributeProps {
       mAllowFontScaling = allowFontScaling;
       setFontSize(mFontSizeInput);
       setLineHeight(mLineHeightInput);
-      setLetterSpacing(mLetterSpacingInput);
+    }
+  }
+
+  private void setMaxFontSizeMultiplier(float maxFontSizeMultiplier) {
+    if (maxFontSizeMultiplier != mMaxFontSizeMultiplier) {
+      mMaxFontSizeMultiplier = maxFontSizeMultiplier;
+      setFontSize(mFontSizeInput);
+      setLineHeight(mLineHeightInput);
     }
   }
 
@@ -420,7 +434,7 @@ public class TextAttributeProps {
     if (fontSize != ReactConstants.UNSET) {
       fontSize =
           mAllowFontScaling
-              ? (float) Math.ceil(PixelUtil.toPixelFromSP(fontSize))
+              ? (float) Math.ceil(PixelUtil.toPixelFromSP(fontSize, mMaxFontSizeMultiplier))
               : (float) Math.ceil(PixelUtil.toPixelFromDIP(fontSize));
     }
     mFontSize = (int) fontSize;

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

@@ -32,14 +32,12 @@ import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.react.common.mapbuffer.MapBuffer;
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate.Role;
 import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
 import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
 import com.facebook.react.views.text.internal.span.CustomStyleSpan;
-import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
 import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
 import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
 import com.facebook.react.views.text.internal.span.ReactClickableSpan;
@@ -319,15 +317,9 @@ public class TextLayoutManager {
                       textAttributes.mTextShadowColor)));
         }
         if (!Float.isNaN(textAttributes.getEffectiveLineHeight())) {
-          if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
-            ops.add(
-                new SetSpanOperation(
-                    start, end, new CustomLineHeightSpan(textAttributes.getEffectiveLineHeight())));
-          } else {
-            ops.add(
-                new SetSpanOperation(
-                    start, end, new LegacyLineHeightSpan(textAttributes.getEffectiveLineHeight())));
-          }
+          ops.add(
+              new SetSpanOperation(
+                  start, end, new CustomLineHeightSpan(textAttributes.getEffectiveLineHeight())));
         }
 
         ops.add(new SetSpanOperation(start, end, new ReactTagSpan(reactTag)));
@@ -629,8 +621,8 @@ public class TextLayoutManager {
         && ((maximumNumberOfLines != ReactConstants.UNSET
                 && maximumNumberOfLines != 0
                 && layout.getLineCount() > maximumNumberOfLines)
-            || (heightYogaMeasureMode != YogaMeasureMode.UNDEFINED
-                && layout.getHeight() > height))) {
+            || (heightYogaMeasureMode != YogaMeasureMode.UNDEFINED && layout.getHeight() > height)
+            || (text.length() == 1 && layout.getLineWidth(0) > width))) {
       // TODO: We could probably use a smarter algorithm here. This will require 0(n)
       // measurements based on the number of points the font size needs to be reduced by.
       currentFontSize -= Math.max(1, (int) PixelUtil.toPixelFromDIP(1));
@@ -648,6 +640,9 @@ public class TextLayoutManager {
             text.getSpanFlags(span));
         text.removeSpan(span);
       }
+      if (boring != null) {
+        boring = BoringLayout.isBoring(text, paint);
+      }
       layout =
           createLayout(
               text,

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

@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+
+package com.facebook.react.views.text.frescosupport
+
+import android.view.View
+import com.facebook.drawee.backends.pipeline.Fresco
+import com.facebook.drawee.controller.AbstractDraweeControllerBuilder
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.BaseViewManager
+import com.facebook.react.uimanager.ThemedReactContext
+
+/**
+ * Manages Images embedded in Text nodes using Fresco. Since they are used only as a virtual nodes
+ * any type of native view operation will throw an [IllegalStateException].
+ */
+@ReactModule(name = FrescoBasedReactTextInlineImageViewManager.REACT_CLASS)
+internal class FrescoBasedReactTextInlineImageViewManager
+@JvmOverloads
+constructor(
+    private val draweeControllerBuilder:
+        @JvmSuppressWildcards
+        AbstractDraweeControllerBuilder<*, *, *, *>? =
+        null,
+    private val callerContext: Any? = null
+) : BaseViewManager<View, FrescoBasedReactTextInlineImageShadowNode>() {
+
+  override fun getName(): String = REACT_CLASS
+
+  public override fun createViewInstance(context: ThemedReactContext): View {
+    throw IllegalStateException("RCTTextInlineImage doesn't map into a native view")
+  }
+
+  override fun createShadowNodeInstance(): FrescoBasedReactTextInlineImageShadowNode =
+      FrescoBasedReactTextInlineImageShadowNode(
+          draweeControllerBuilder ?: Fresco.newDraweeControllerBuilder(), callerContext)
+
+  override fun getShadowNodeClass(): Class<FrescoBasedReactTextInlineImageShadowNode> =
+      FrescoBasedReactTextInlineImageShadowNode::class.java
+
+  override fun updateExtraData(root: View, extraData: Any) = Unit
+
+  public companion object {
+    public const val REACT_CLASS: String = "RCTTextInlineImage"
+  }
+}

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

@@ -14,7 +14,7 @@ public class ShadowStyleSpan(
     private val dx: Float,
     private val dy: Float,
     private val radius: Float,
-    private val color: Int
+    public val color: Int
 ) : CharacterStyle(), ReactSpan {
   public override fun updateDrawState(textPaint: TextPaint) {
     textPaint.setShadowLayer(radius, dx, dy, color)

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java

@@ -55,7 +55,6 @@ import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.build.ReactBuildConfig;
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.uimanager.BackgroundStyleApplicator;
 import com.facebook.react.uimanager.LengthPercentage;
 import com.facebook.react.uimanager.LengthPercentageType;
@@ -77,7 +76,6 @@ import com.facebook.react.views.text.TextLayoutManager;
 import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
 import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
 import com.facebook.react.views.text.internal.span.CustomStyleSpan;
-import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
 import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
 import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
 import com.facebook.react.views.text.internal.span.ReactForegroundColorSpan;
@@ -913,13 +911,7 @@ public class ReactEditText extends AppCompatEditText {
 
     float lineHeight = mTextAttributes.getEffectiveLineHeight();
     if (!Float.isNaN(lineHeight)) {
-      if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
-        workingText.setSpan(
-            new CustomLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
-      } else {
-        workingText.setSpan(
-            new LegacyLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
-      }
+      workingText.setSpan(new CustomLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
     }
   }