react-native 0.83.0-nightly-20250911-dab8a4562 → 0.83.0-nightly-20250913-4fb42c84d

package/Libraries/Components/Switch/Switch.js

@@ -264,7 +264,7 @@ const Switch: component(
       disabled,
       onTintColor: trackColorForTrue,
       style: StyleSheet.compose(
-        {height: 31, width: 51},
+        {alignSelf: 'flex-start' as const},
         StyleSheet.compose(
           style,
           ios_backgroundColor == null

package/Libraries/Core/ReactNativeVersion.js

@@ -29,7 +29,7 @@ export default class ReactNativeVersion {
   static major: number = 0;
   static minor: number = 83;
   static patch: number = 0;
-  static prerelease: string | null = 'nightly-20250911-dab8a4562';
+  static prerelease: string | null = 'nightly-20250913-4fb42c84d';
 
   static getVersionString(): string {
     return `${this.major}.${this.minor}.${this.patch}${this.prerelease != null ? `-${this.prerelease}` : ''}`;

package/Libraries/Image/RCTImageBlurUtils.mm

@@ -30,7 +30,8 @@ UIImage *RCTBlurredImageWithRadius(UIImage *inputImage, CGFloat radius)
                }].CGImage;
   }
 
-  vImage_Buffer buffer1, buffer2;
+  vImage_Buffer buffer1;
+  vImage_Buffer buffer2;
   buffer1.width = buffer2.width = CGImageGetWidth(imageRef);
   buffer1.height = buffer2.height = CGImageGetHeight(imageRef);
   buffer1.rowBytes = buffer2.rowBytes = CGImageGetBytesPerRow(imageRef);

package/Libraries/Image/RCTImageUtils.mm

@@ -212,7 +212,8 @@ BOOL RCTUpscalingRequired(
   sourceSize.height *= scale;
 
   // Calculate aspect ratios if needed (don't bother if resizeMode == stretch)
-  CGFloat aspect = 0.0, targetAspect = 0.0;
+  CGFloat aspect = 0.0;
+  CGFloat targetAspect = 0.0;
   if (resizeMode != RCTResizeModeStretch) {
     aspect = sourceSize.width / sourceSize.height;
     targetAspect = destSize.width / destSize.height;

package/Libraries/Lists/SectionList.d.ts

@@ -35,7 +35,11 @@ export interface SectionBase<ItemT, SectionT = DefaultSectionT> {
 
   renderItem?: SectionListRenderItem<ItemT, SectionT> | undefined;
 
-  ItemSeparatorComponent?: React.ComponentType<any> | null | undefined;
+  ItemSeparatorComponent?:
+    | React.ComponentType<any>
+    | React.ReactElement
+    | null
+    | undefined;
 
   keyExtractor?: ((item: ItemT, index: number) => string) | undefined;
 }

package/Libraries/NativeAnimation/RCTAnimationUtils.mm

@@ -90,9 +90,15 @@ uint32_t RCTInterpolateColorInRange(CGFloat value, NSArray<NSNumber *> *inputRan
   CGFloat inputMin = inputRange[rangeIndex].doubleValue;
   CGFloat inputMax = inputRange[rangeIndex + 1].doubleValue;
 
-  CGFloat redMin, greenMin, blueMin, alphaMin;
+  CGFloat redMin;
+  CGFloat greenMin;
+  CGFloat blueMin;
+  CGFloat alphaMin;
   [outputRange[rangeIndex] getRed:&redMin green:&greenMin blue:&blueMin alpha:&alphaMin];
-  CGFloat redMax, greenMax, blueMax, alphaMax;
+  CGFloat redMax;
+  CGFloat greenMax;
+  CGFloat blueMax;
+  CGFloat alphaMax;
   [outputRange[rangeIndex + 1] getRed:&redMax green:&greenMax blue:&blueMax alpha:&alphaMax];
 
   return RCTColorFromComponents(

package/React/Base/RCTBridgeModule.h

@@ -69,6 +69,7 @@ RCT_EXTERN_C_END
  * will be used as the JS module name. If omitted, the JS module name will
  * match the Objective-C class name.
  */
+#ifndef RCT_FIT_RM_OLD_RUNTIME
 #define RCT_EXPORT_MODULE(js_name)          \
   RCT_EXTERN void RCTRegisterModule(Class); \
   +(NSString *)moduleName                   \
@@ -80,6 +81,17 @@ RCT_EXTERN_C_END
     RCTRegisterModule(self);                \
   }
 
+#else
+
+#define RCT_EXPORT_MODULE(js_name)          \
+  RCT_EXTERN void RCTRegisterModule(Class); \
+  +(NSString *)moduleName                   \
+  {                                         \
+    return @ #js_name;                      \
+  }
+
+#endif // RCT_FIT_RM_OLD_RUNTIME
+
 /**
  * Same as RCT_EXPORT_MODULE, but uses __attribute__((constructor)) for module
  * registration. Useful for registering swift classes that forbids use of load

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(83),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"nightly-20250911-dab8a4562",
+                  RCTVersionPrerelease: @"nightly-20250913-4fb42c84d",
                   };
   });
   return __rnVersion;

package/React/FBReactNativeSpec/FBReactNativeSpecJSI-generated.cpp

@@ -137,6 +137,11 @@ static jsi::Value __hostFunction_NativeReactNativeFeatureFlagsCxxSpecJSI_enableA
     rt
   );
 }
+static jsi::Value __hostFunction_NativeReactNativeFeatureFlagsCxxSpecJSI_enableAndroidLinearText(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  return static_cast<NativeReactNativeFeatureFlagsCxxSpecJSI *>(&turboModule)->enableAndroidLinearText(
+    rt
+  );
+}
 static jsi::Value __hostFunction_NativeReactNativeFeatureFlagsCxxSpecJSI_enableAndroidTextMeasurementOptimizations(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   return static_cast<NativeReactNativeFeatureFlagsCxxSpecJSI *>(&turboModule)->enableAndroidTextMeasurementOptimizations(
     rt
@@ -456,6 +461,7 @@ NativeReactNativeFeatureFlagsCxxSpecJSI::NativeReactNativeFeatureFlagsCxxSpecJSI
   methodMap_["disableTextLayoutManagerCacheAndroid"] = MethodMetadata {0, __hostFunction_NativeReactNativeFeatureFlagsCxxSpecJSI_disableTextLayoutManagerCacheAndroid};
   methodMap_["enableAccessibilityOrder"] = MethodMetadata {0, __hostFunction_NativeReactNativeFeatureFlagsCxxSpecJSI_enableAccessibilityOrder};
   methodMap_["enableAccumulatedUpdatesInRawPropsAndroid"] = MethodMetadata {0, __hostFunction_NativeReactNativeFeatureFlagsCxxSpecJSI_enableAccumulatedUpdatesInRawPropsAndroid};
+  methodMap_["enableAndroidLinearText"] = MethodMetadata {0, __hostFunction_NativeReactNativeFeatureFlagsCxxSpecJSI_enableAndroidLinearText};
   methodMap_["enableAndroidTextMeasurementOptimizations"] = MethodMetadata {0, __hostFunction_NativeReactNativeFeatureFlagsCxxSpecJSI_enableAndroidTextMeasurementOptimizations};
   methodMap_["enableBridgelessArchitecture"] = MethodMetadata {0, __hostFunction_NativeReactNativeFeatureFlagsCxxSpecJSI_enableBridgelessArchitecture};
   methodMap_["enableCppPropsIteratorSetter"] = MethodMetadata {0, __hostFunction_NativeReactNativeFeatureFlagsCxxSpecJSI_enableCppPropsIteratorSetter};

package/React/FBReactNativeSpec/FBReactNativeSpecJSI.h

@@ -337,6 +337,7 @@ public:
   virtual bool disableTextLayoutManagerCacheAndroid(jsi::Runtime &rt) = 0;
   virtual bool enableAccessibilityOrder(jsi::Runtime &rt) = 0;
   virtual bool enableAccumulatedUpdatesInRawPropsAndroid(jsi::Runtime &rt) = 0;
+  virtual bool enableAndroidLinearText(jsi::Runtime &rt) = 0;
   virtual bool enableAndroidTextMeasurementOptimizations(jsi::Runtime &rt) = 0;
   virtual bool enableBridgelessArchitecture(jsi::Runtime &rt) = 0;
   virtual bool enableCppPropsIteratorSetter(jsi::Runtime &rt) = 0;
@@ -516,6 +517,14 @@ private:
       return bridging::callFromJs<bool>(
           rt, &T::enableAccumulatedUpdatesInRawPropsAndroid, jsInvoker_, instance_);
     }
+    bool enableAndroidLinearText(jsi::Runtime &rt) override {
+      static_assert(
+          bridging::getParameterCount(&T::enableAndroidLinearText) == 1,
+          "Expected enableAndroidLinearText(...) to have 1 parameters");
+
+      return bridging::callFromJs<bool>(
+          rt, &T::enableAndroidLinearText, jsInvoker_, instance_);
+    }
     bool enableAndroidTextMeasurementOptimizations(jsi::Runtime &rt) override {
       static_assert(
           bridging::getParameterCount(&T::enableAndroidTextMeasurementOptimizations) == 1,

package/React/FBReactNativeSpec/react/renderer/components/FBReactNativeSpec/ComponentDescriptors.cpp

@@ -21,7 +21,6 @@ registry->add(concreteComponentDescriptorProvider<AndroidDrawerLayoutComponentDe
 registry->add(concreteComponentDescriptorProvider<AndroidSwipeRefreshLayoutComponentDescriptor>());
 registry->add(concreteComponentDescriptorProvider<DebuggingOverlayComponentDescriptor>());
 registry->add(concreteComponentDescriptorProvider<PullToRefreshViewComponentDescriptor>());
-registry->add(concreteComponentDescriptorProvider<SwitchComponentDescriptor>());
 registry->add(concreteComponentDescriptorProvider<UnimplementedNativeViewComponentDescriptor>());
 }
 

package/React/FBReactNativeSpec/react/renderer/components/FBReactNativeSpec/ComponentDescriptors.h

@@ -21,7 +21,6 @@ using AndroidDrawerLayoutComponentDescriptor = ConcreteComponentDescriptor<Andro
 using AndroidSwipeRefreshLayoutComponentDescriptor = ConcreteComponentDescriptor<AndroidSwipeRefreshLayoutShadowNode>;
 using DebuggingOverlayComponentDescriptor = ConcreteComponentDescriptor<DebuggingOverlayShadowNode>;
 using PullToRefreshViewComponentDescriptor = ConcreteComponentDescriptor<PullToRefreshViewShadowNode>;
-using SwitchComponentDescriptor = ConcreteComponentDescriptor<SwitchShadowNode>;
 using UnimplementedNativeViewComponentDescriptor = ConcreteComponentDescriptor<UnimplementedNativeViewShadowNode>;
 
 void FBReactNativeSpec_registerComponentDescriptorsFromCodegen(

package/React/FBReactNativeSpec/react/renderer/components/FBReactNativeSpec/ShadowNodes.cpp

@@ -17,7 +17,6 @@ extern const char AndroidDrawerLayoutComponentName[] = "AndroidDrawerLayout";
 extern const char AndroidSwipeRefreshLayoutComponentName[] = "AndroidSwipeRefreshLayout";
 extern const char DebuggingOverlayComponentName[] = "DebuggingOverlay";
 extern const char PullToRefreshViewComponentName[] = "PullToRefreshView";
-extern const char SwitchComponentName[] = "Switch";
 extern const char UnimplementedNativeViewComponentName[] = "UnimplementedNativeView";
 
 } // namespace facebook::react

package/React/FBReactNativeSpec/react/renderer/components/FBReactNativeSpec/ShadowNodes.h

@@ -73,17 +73,6 @@ using PullToRefreshViewShadowNode = ConcreteViewShadowNode<
     PullToRefreshViewEventEmitter,
     PullToRefreshViewState>;
 
-JSI_EXPORT extern const char SwitchComponentName[];
-
-/*
- * `ShadowNode` for <Switch> component.
- */
-using SwitchShadowNode = ConcreteViewShadowNode<
-    SwitchComponentName,
-    SwitchProps,
-    SwitchEventEmitter,
-    SwitchState>;
-
 JSI_EXPORT extern const char UnimplementedNativeViewComponentName[];
 
 /*

package/React/FBReactNativeSpec/react/renderer/components/FBReactNativeSpec/States.h

@@ -25,8 +25,6 @@ using DebuggingOverlayState = StateData;
 
 using PullToRefreshViewState = StateData;
 
-using SwitchState = StateData;
-
 using UnimplementedNativeViewState = StateData;
 
 } // namespace facebook::react

package/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm

@@ -81,7 +81,8 @@
     return;
   }
 
-  CGFloat top = 0, left = 0;
+  CGFloat top = 0;
+  CGFloat left = 0;
   if (contentSize.width < boundsSize.width) {
     left = (boundsSize.width - contentSize.width) * 0.5f;
   }

package/React/Views/RCTBorderDrawing.m

@@ -80,7 +80,9 @@ static void RCTPathAddEllipticArc(
     CGFloat endAngle,
     BOOL clockwise)
 {
-  CGFloat xScale = 1, yScale = 1, radius = 0;
+  CGFloat xScale = 1;
+  CGFloat yScale = 1;
+  CGFloat radius = 0;
   if (size.width != 0) {
     xScale = 1;
     yScale = size.height / size.width;

package/React/Views/ScrollView/RCTScrollView.m

@@ -679,7 +679,8 @@ RCT_SCROLL_EVENT_HANDLER(scrollViewDidScrollToTop, onScrollToTop)
     return;
   }
 
-  CGFloat top = 0, left = 0;
+  CGFloat top = 0;
+  CGFloat left = 0;
   if (contentSize.width < boundsSize.width) {
     left = (boundsSize.width - contentSize.width) * 0.5f;
   }

package/ReactAndroid/gradle.properties

@@ -1,5 +1,4 @@
-VERSION_NAME=0.83.0-nightly-20250911-dab8a4562
-HERMES_VERSION_NAME=1000.0.0
+VERSION_NAME=0.83.0-nightly-20250913-4fb42c84d
 react.internal.publishingGroup=com.facebook.react
 react.internal.hermesPublishingGroup=com.facebook.hermes
 

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.kt

@@ -25,7 +25,7 @@ public abstract class ReactContextBaseJavaModule : BaseJavaModule {
    * this method whenever you actually need the Activity and make sure to check for `null`.
    */
   @Deprecated(
-      "Deprecated in 0.80.0. Use getReactApplicationContext.getCurrentActivity() instead.",
+      "Deprecated in 0.80.0. Use getReactApplicationContext().getCurrentActivity() instead.",
       ReplaceWith("reactApplicationContext.currentActivity"),
   )
   protected fun getCurrentActivity(): Activity? {

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorOverlayManager.kt

@@ -43,29 +43,23 @@ internal class PerfMonitorOverlayManager(
   fun enable() {
     enabled = true
     init()
-    UiThreadUtil.runOnUiThread { view?.show() }
   }
 
   /** Disable the Perf Monitor overlay. Will remain hidden when updates are received. */
   fun disable() {
     UiThreadUtil.runOnUiThread { view?.hide() }
+    view = null
     enabled = false
   }
 
   /** Reset the Perf Monitor overlay, e.g. after a reload. */
   fun reset() {
-    UiThreadUtil.runOnUiThread { view?.resetState() }
-
     // Update with current recording state
     onRecordingStateChanged(
         devHelper.inspectorTarget?.getTracingState() ?: TracingState.ENABLEDINCDPMODE
     )
   }
 
-  override fun onNewFocusedEvent(data: PerfMonitorUpdateListener.LongTaskEventData) {
-    view?.updateFocusedEvent(data)
-  }
-
   override fun onRecordingStateChanged(state: TracingState) {
     tracingState = state
     view?.updateRecordingState(state)

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorOverlayView.kt

@@ -13,8 +13,6 @@ import android.graphics.Color
 import android.graphics.Typeface
 import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.GradientDrawable
-import android.os.Handler
-import android.os.Looper
 import android.view.Gravity
 import android.view.Window
 import android.view.WindowManager
@@ -26,197 +24,89 @@ import com.facebook.react.R
 import com.facebook.react.devsupport.interfaces.TracingState
 import com.facebook.react.uimanager.DisplayMetricsHolder
 import com.facebook.react.uimanager.PixelUtil
-import java.util.Locale
 
 internal class PerfMonitorOverlayView(
     private val context: Context,
     private val onButtonPress: () -> Unit,
 ) {
-  private var hidden: Boolean = true
-  private var hasEventData: Boolean = false
-  private val metricsDialog: Dialog
-  private val toolbarDialog: Dialog
-  private val tooltipDialog: Dialog
-  private lateinit var buttonLabel: TextView
-  private lateinit var recordingStateLabel: TextView
-  private lateinit var durationLabel: TextView
+  private val dialog: Dialog
+  private lateinit var statusLabel: TextView
   private lateinit var tooltipLabel: TextView
-  private var ttl: Int = 0
-  private var hideAfterTimeoutHandler: Handler? = null
+  private lateinit var statusIndicator: TextView
 
   init {
     DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(context)
-    tooltipDialog = createTooltipDialog()
-    metricsDialog = createMetricsDialog()
-    toolbarDialog = createToolbarDialog()
+    dialog = createToolbarDialog()
   }
 
   fun show() {
-    toolbarDialog.show()
-    tooltipDialog.show()
-    if (hasEventData) {
-      toolbarDialog.window?.decorView?.post { updateMetricsDialogPosition() }
-      metricsDialog.show()
-    }
-    hidden = false
+    dialog.show()
   }
 
   fun hide() {
-    metricsDialog.hide()
-    toolbarDialog.hide()
-    tooltipDialog.hide()
-    hidden = true
-  }
-
-  fun resetState() {
-    hasEventData = false
-    metricsDialog.hide()
-  }
-
-  fun updateFocusedEvent(data: PerfMonitorUpdateListener.LongTaskEventData) {
-    durationLabel.text = String.format(Locale.US, "%d ms", data.durationMs)
-    durationLabel.setTextColor(getDurationHighlightColor(data.responsivenessScore))
-    hasEventData = true
-    ttl = data.ttl
-
-    hideAfterTimeoutHandler?.removeCallbacksAndMessages(null)
-
-    if (!hidden) {
-      metricsDialog.show()
-
-      // Schedule hiding metrics overlay after ttl milliseconds
-      if (ttl > 0) {
-        if (hideAfterTimeoutHandler == null) {
-          hideAfterTimeoutHandler = Handler(Looper.getMainLooper())
-        }
-        hideAfterTimeoutHandler?.postDelayed({ metricsDialog.hide() }, ttl.toLong())
-      }
-    }
+    dialog.hide()
   }
 
   fun updateRecordingState(state: TracingState) {
-    recordingStateLabel.text =
-        when (state) {
-          TracingState.ENABLEDINBACKGROUNDMODE -> "Profiling: ON"
-          TracingState.DISABLED -> "Profiling: OFF"
-          TracingState.ENABLEDINCDPMODE -> "Profiling: DISABLED"
-        }
-    buttonLabel.text =
-        when (state) {
-          TracingState.ENABLEDINBACKGROUNDMODE -> "Open ↗️"
-          TracingState.DISABLED -> "Start"
-          TracingState.ENABLEDINCDPMODE -> ""
-        }
-    tooltipLabel.text =
-        when (state) {
-          TracingState.ENABLEDINBACKGROUNDMODE -> "Dev Menu > Finish performance trace"
-          TracingState.DISABLED -> "Dev Menu > Start performance trace"
-          TracingState.ENABLEDINCDPMODE -> ""
-        }
     if (state == TracingState.ENABLEDINCDPMODE) {
-      tooltipDialog.hide()
-    } else {
-      tooltipDialog.show()
+      dialog.hide()
+      return
     }
 
-    toolbarDialog.window?.decorView?.post { updateMetricsDialogPosition() }
+    if (state == TracingState.ENABLEDINBACKGROUNDMODE) {
+      (statusIndicator.background as GradientDrawable).setColor(Color.RED)
+      statusLabel.text = "Background Profiling Active"
+      tooltipLabel.text = "Press ☰ to open"
+    } else {
+      (statusIndicator.background as GradientDrawable).setColor(Color.GRAY)
+      statusLabel.text = "Background Profiling Stopped"
+      tooltipLabel.text = "Press ☰ to restart"
+    }
+    dialog.show()
   }
 
-  private fun createMetricsDialog(): Dialog {
-    val containerLayout = createInnerLayout()
-    val longTaskLabel =
-        TextView(context).apply {
-          textSize = TEXT_SIZE_PRIMARY
-          text = "Long Task"
-          setTextColor(Color.WHITE)
-          typeface = TYPEFACE_BOLD
-        }
-    durationLabel =
+  private fun createToolbarDialog(): Dialog {
+    statusIndicator =
         TextView(context).apply {
-          textSize = TEXT_SIZE_PRIMARY
-          setTextColor(COLOR_TEXT_GREEN)
-          typeface = TYPEFACE_BOLD
+          width = dpToPx(12f).toInt()
+          height = dpToPx(12f).toInt()
+          background =
+              GradientDrawable().apply {
+                shape = GradientDrawable.OVAL
+                setColor(Color.RED)
+              }
         }
-    containerLayout.addView(longTaskLabel)
-    containerLayout.addView(durationLabel)
 
-    val dialog =
-        createAnchoredDialog(getMetricsDialogOffsetX(), dpToPx(16f)).apply {
-          setContentView(containerLayout)
+    val textContainer =
+        LinearLayout(context).apply {
+          orientation = LinearLayout.VERTICAL
+          layoutParams =
+              LinearLayout.LayoutParams(
+                  LinearLayout.LayoutParams.WRAP_CONTENT,
+                  LinearLayout.LayoutParams.WRAP_CONTENT,
+              )
         }
-    dialog.window?.apply {
-      attributes =
-          attributes?.apply {
-            flags =
-                flags or
-                    WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or
-                    WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
-          }
-    }
-
-    return dialog
-  }
-
-  private fun createToolbarDialog(): Dialog {
-    val buttonInner = createInnerLayout()
-    recordingStateLabel =
+    statusLabel =
         TextView(context).apply {
           textSize = TEXT_SIZE_PRIMARY
           setTextColor(Color.WHITE)
           typeface = TYPEFACE_BOLD
         }
-    buttonInner.addView(recordingStateLabel)
-    buttonLabel =
-        TextView(context).apply {
-          textSize = TEXT_SIZE_PRIMARY
-          setTextColor(COLOR_TEXT_BLUE)
-          typeface = TYPEFACE_BOLD
-        }
-    buttonInner.addView(buttonLabel)
-    val buttonView =
-        LinearLayout(context).apply {
-          orientation = LinearLayout.VERTICAL
-          setPadding(
-              dpToPx(8f).toInt(),
-              dpToPx(16f).toInt(),
-              dpToPx(16f).toInt(),
-              dpToPx(8f).toInt(),
-          )
-          addView(buttonInner)
-          setOnClickListener { onButtonPress() }
-        }
-
-    val dialog = createAnchoredDialog(dpToPx(0f), dpToPx(0f)).apply { setContentView(buttonView) }
-    dialog.window?.apply {
-      attributes =
-          attributes?.apply { flags = flags or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE }
-    }
-
-    return dialog
-  }
-
-  private fun createTooltipDialog(): Dialog {
-    val containerLayout = createInnerLayout()
     tooltipLabel =
         TextView(context).apply {
           textSize = TEXT_SIZE_ACCESSORY
           setTextColor(Color.WHITE)
+          typeface = TYPEFACE_BOLD
         }
-    containerLayout.addView(tooltipLabel)
+    textContainer.addView(statusLabel)
+    textContainer.addView(tooltipLabel)
 
-    val dialog =
-        createAnchoredDialog(dpToPx(16f), dpToPx(52f)).apply { setContentView(containerLayout) }
-    dialog.window?.apply {
-      attributes =
-          attributes?.apply {
-            flags =
-                flags or
-                    WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or
-                    WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
-          }
-    }
+    val containerLayout = createInnerLayout()
+    containerLayout.setOnClickListener { onButtonPress() }
+    containerLayout.addView(statusIndicator)
+    containerLayout.addView(textContainer)
 
-    return dialog
+    return createAnchoredDialog(dpToPx(12f), dpToPx(12f)).apply { setContentView(containerLayout) }
   }
 
   private fun createAnchoredDialog(offsetX: Float, offsetY: Float): Dialog {
@@ -278,35 +168,12 @@ internal class PerfMonitorOverlayView(
     }
   }
 
-  private fun getMetricsDialogOffsetX(): Float {
-    val toolbarWidth = toolbarDialog?.window?.decorView?.width ?: 0
-    return toolbarWidth.toFloat()
-  }
-
-  private fun updateMetricsDialogPosition() {
-    metricsDialog?.window?.apply {
-      attributes = attributes?.apply { x = getMetricsDialogOffsetX().toInt() }
-    }
-  }
-
-  private fun getDurationHighlightColor(responsivenessScore: Int): Int {
-    return when (responsivenessScore) {
-      2 -> COLOR_TEXT_RED
-      1 -> COLOR_TEXT_YELLOW
-      else -> COLOR_TEXT_GREEN
-    }
-  }
-
   private fun dpToPx(dp: Float): Float = PixelUtil.toPixelFromDIP(dp)
 
   companion object {
-    private val COLOR_TEXT_GREEN = Color.parseColor("#4AEB2F")
-    private val COLOR_TEXT_YELLOW = Color.parseColor("#FFAA00")
-    private val COLOR_TEXT_RED = Color.parseColor("#FF0000")
-    private val COLOR_TEXT_BLUE = Color.parseColor("#00B0FF")
     private val COLOR_OVERLAY_BORDER = Color.parseColor("#6C6C6C")
-    private val TEXT_SIZE_PRIMARY = 13f
-    private val TEXT_SIZE_ACCESSORY = 9f
+    private val TEXT_SIZE_PRIMARY = 12f
+    private val TEXT_SIZE_ACCESSORY = 10f
     private val TYPEFACE_BOLD = Typeface.create("sans-serif", Typeface.BOLD)
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorUpdateListener.kt

@@ -10,15 +10,6 @@ import com.facebook.react.devsupport.interfaces.TracingState
 
 /** [Experimental] An interface for subscribing to updates for the V2 Perf Monitor. */
 internal interface PerfMonitorUpdateListener {
-  data class LongTaskEventData(
-      val durationMs: Int,
-      val responsivenessScore: Int,
-      val ttl: Int,
-  )
-
-  /** Called when a new active performance event should be displayed. */
-  fun onNewFocusedEvent(data: LongTaskEventData)
-
   /** Called when the recording state of the background performance trace has changed. */
   fun onRecordingStateChanged(state: TracingState)
 }

package/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java

@@ -99,7 +99,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Queue;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -738,11 +737,17 @@ public class FabricUIManager
    *     vertical insets.
    */
   private long getEncodedScreenSizeWithoutVerticalInsets(int surfaceId) {
-    SurfaceMountingManager surfaceMountingManager = mMountingManager.getSurfaceManager(surfaceId);
-    Objects.requireNonNull(surfaceMountingManager);
-    ThemedReactContext context = Objects.requireNonNull(surfaceMountingManager.getContext());
-    return DisplayMetricsHolder.getEncodedScreenSizeWithoutVerticalInsets(
-        context.getCurrentActivity());
+    ThemedReactContext context =
+        mMountingManager
+            .getSurfaceManagerEnforced(surfaceId, "getEncodedScreenSizeWithoutVerticalInsets")
+            .getContext();
+    if (context == null) {
+      FLog.w(TAG, "Couldn't get context from SurfaceMountingManager for surfaceId %d", surfaceId);
+      return 0;
+    } else {
+      return DisplayMetricsHolder.getEncodedScreenSizeWithoutVerticalInsets(
+          context.getCurrentActivity());
+    }
   }
 
   @Override

package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<8300eb10fb4906468cd5f04afd8e16cd>>
+ * @generated SignedSource<<af10f4eea240ae4a228de9bbc4b78b7e>>
  */
 
 /**
@@ -90,6 +90,12 @@ public object ReactNativeFeatureFlags {
   @JvmStatic
   public fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean = accessor.enableAccumulatedUpdatesInRawPropsAndroid()
 
+  /**
+   * Enables linear text rendering on Android wherever subpixel text rendering is enabled
+   */
+  @JvmStatic
+  public fun enableAndroidLinearText(): Boolean = accessor.enableAndroidLinearText()
+
   /**
    * Enables various optimizations throughout the path of measuring text on Android.
    */