fix: refresh cached spannables for font weight changes

Author: TorinAsakura

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.kt

@@ -109,7 +109,12 @@ internal object TextLayoutManager {
 
   private const val DEFAULT_ADJUST_FONT_SIZE_TO_FIT = false
 
-  private val tagToSpannableCache = ConcurrentHashMap<Int, Spannable>()
+  private data class CachedSpannable(
+      val spannable: Spannable,
+      val fontWeightAdjustment: Int,
+  )
+
+  private val tagToSpannableCache = ConcurrentHashMap<Int, CachedSpannable>()
 
   // Lazily cached Method for StaticLayout.Builder.setUseBoundsForWidth (API 35+).
   // Reflection is needed because some internal targets compile against an SDK older than 35.
@@ -123,8 +128,15 @@ internal object TextLayoutManager {
     }
   }
 
-  fun setCachedSpannableForTag(reactTag: Int, sp: Spannable): Unit {
-    tagToSpannableCache[reactTag] = sp
+  fun setCachedSpannableForTag(reactTag: Int, sp: Spannable): Unit =
+      setCachedSpannableForTag(reactTag, 0, sp)
+
+  fun setCachedSpannableForTag(
+      reactTag: Int,
+      fontWeightAdjustment: Int,
+      sp: Spannable,
+  ): Unit {
+    tagToSpannableCache[reactTag] = CachedSpannable(sp, fontWeightAdjustment)
   }
 
   fun deleteCachedSpannableForTag(reactTag: Int): Unit {
@@ -702,7 +714,20 @@ internal object TextLayoutManager {
     var text: Spannable?
     if (attributedString.contains(AS_KEY_CACHE_ID)) {
       val cacheId = attributedString.getInt(AS_KEY_CACHE_ID)
-      text = checkNotNull(tagToSpannableCache[cacheId])
+      val cachedSpannable = checkNotNull(tagToSpannableCache[cacheId])
+      text =
+          if (cachedSpannable.fontWeightAdjustment == fontWeightAdjustment) {
+            cachedSpannable.spannable
+          } else {
+            createSpannableFromAttributedString(
+                assets,
+                fontWeightAdjustment,
+                attributedString.getMapBuffer(AS_KEY_FRAGMENTS),
+                reactTextViewManagerCallback,
+                null,
+                textEffectRegistry,
+            )
+          }
     } else {
       text =
           createSpannableFromAttributedString(
@@ -962,7 +987,15 @@ internal object TextLayoutManager {
 
     val paint: TextPaint
     if (attributedString.contains(AS_KEY_CACHE_ID)) {
-      paint = text.getSpans(0, 0, ReactTextPaintHolderSpan::class.java)[0].textPaint
+      val textPaintHolderSpans = text.getSpans(0, 0, ReactTextPaintHolderSpan::class.java)
+      paint =
+          if (textPaintHolderSpans.isNotEmpty()) {
+            textPaintHolderSpans[0].textPaint
+          } else {
+            val baseTextAttributes =
+                TextAttributeProps.fromMapBuffer(attributedString.getMapBuffer(AS_KEY_BASE_ATTRIBUTES))
+            scratchPaintWithAttributes(baseTextAttributes, assets, fontWeightAdjustment)
+          }
     } else {
       val baseTextAttributes =
           TextAttributeProps.fromMapBuffer(attributedString.getMapBuffer(AS_KEY_BASE_ATTRIBUTES))

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt

@@ -1117,7 +1117,7 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
         sb.length,
         Spannable.SPAN_INCLUSIVE_INCLUSIVE,
     )
-    TextLayoutManager.setCachedSpannableForTag(id, sb)
+    TextLayoutManager.setCachedSpannableForTag(id, getFontWeightAdjustment(context), sb)
   }
 
   public fun setEventDispatcher(eventDispatcher: EventDispatcher?) {

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/text/TextLayoutManagerFontWeightAdjustmentTest.kt

@@ -8,10 +8,17 @@
 package com.facebook.react.views.text
 
 import android.content.res.AssetManager
+import android.graphics.Typeface
+import android.text.SpannableString
 import android.text.TextPaint
 import com.facebook.react.bridge.JavaOnlyMap
+import com.facebook.react.common.mapbuffer.WritableMapBuffer
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests
 import com.facebook.react.uimanager.DisplayMetricsHolder
 import com.facebook.react.uimanager.ReactStylesDiffMap
+import com.facebook.react.views.text.internal.span.CustomStyleSpan
+import com.facebook.react.views.text.internal.span.ReactTextPaintHolderSpan
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.After
 import org.junit.Before
@@ -27,12 +34,14 @@ class TextLayoutManagerFontWeightAdjustmentTest {
 
   @Before
   fun setUp() {
+    ReactNativeFeatureFlagsForTests.setUp()
     DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(RuntimeEnvironment.getApplication())
   }
 
   @After
   fun tearDown() {
     DisplayMetricsHolder.setScreenDisplayMetrics(null)
+    ReactNativeFeatureFlags.dangerouslyReset()
   }
 
   @Test
@@ -65,6 +74,35 @@ class TextLayoutManagerFontWeightAdjustmentTest {
     assertThat(paint.typeface).isNull()
   }
 
+  @Test
+  fun `cached spannable is recreated when Android font weight adjustment changes`() {
+    val cachedSpannable = SpannableString("A")
+    cachedSpannable.setSpan(
+        ReactTextPaintHolderSpan(TextPaint(TextPaint.ANTI_ALIAS_FLAG)),
+        0,
+        cachedSpannable.length,
+        0,
+    )
+    TextLayoutManager.setCachedSpannableForTag(CACHE_ID, 0, cachedSpannable)
+
+    val adjustedSpannable =
+        TextLayoutManager.getOrCreateSpannableForText(
+            RuntimeEnvironment.getApplication().assets,
+            FONT_WEIGHT_ADJUSTMENT_BOLD_TEXT,
+            cachedAttributedString(),
+            null,
+        )
+
+    assertThat(adjustedSpannable).isNotSameAs(cachedSpannable)
+    val customStyleSpan =
+        adjustedSpannable.getSpans(0, adjustedSpannable.length, CustomStyleSpan::class.java)[0]
+    val paint = TextPaint(TextPaint.ANTI_ALIAS_FLAG)
+
+    customStyleSpan.updateDrawState(paint)
+
+    assertThat(paint.typeface).isNotSameAs(Typeface.DEFAULT)
+  }
+
   private fun invokeUpdateTextPaint(
       paint: TextPaint,
       textAttributes: TextAttributeProps,
@@ -87,6 +125,25 @@ class TextLayoutManagerFontWeightAdjustmentTest {
   }
 
   private companion object {
+    const val CACHE_ID = 1001
     const val FONT_WEIGHT_ADJUSTMENT_BOLD_TEXT = 300
+
+    fun cachedAttributedString(): WritableMapBuffer {
+      val textAttributes =
+          WritableMapBuffer().put(TextAttributeProps.TA_KEY_FONT_WEIGHT, "normal").put(
+              TextAttributeProps.TA_KEY_FONT_SIZE,
+              14.0,
+          )
+      val fragment =
+          WritableMapBuffer()
+              .put(TextLayoutManager.FR_KEY_STRING, "A")
+              .put(TextLayoutManager.FR_KEY_REACT_TAG, 1)
+              .put(TextLayoutManager.FR_KEY_TEXT_ATTRIBUTES, textAttributes)
+      val fragments = WritableMapBuffer().put(0, fragment)
+      return WritableMapBuffer()
+          .put(TextLayoutManager.AS_KEY_CACHE_ID, CACHE_ID)
+          .put(TextLayoutManager.AS_KEY_FRAGMENTS, fragments)
+          .put(TextLayoutManager.AS_KEY_BASE_ATTRIBUTES, WritableMapBuffer())
+    }
   }
 }