react-native 0.82.0-nightly-20250829-b2d25c873 → 0.82.0-nightly-20250830-d3574313c

package/Libraries/Core/ReactNativeVersion.js

@@ -29,7 +29,7 @@ export default class ReactNativeVersion {
   static major: number = 0;
   static minor: number = 82;
   static patch: number = 0;
-  static prerelease: string | null = 'nightly-20250829-b2d25c873';
+  static prerelease: string | null = 'nightly-20250830-d3574313c';
 
   static getVersionString(): string {
     return `${this.major}.${this.minor}.${this.patch}${this.prerelease != null ? `-${this.prerelease}` : ''}`;

package/Libraries/Core/Timers/JSTimers.js

@@ -477,8 +477,10 @@ if (!NativeTiming) {
   ExportedJSTimers = ({
     callReactNativeMicrotasks: JSTimers.callReactNativeMicrotasks,
     queueReactNativeMicrotask: JSTimers.queueReactNativeMicrotask,
+    // $FlowFixMe[incompatible-variance]
   }: typeof JSTimers);
 } else {
+  // $FlowFixMe[incompatible-variance]
   ExportedJSTimers = JSTimers;
 }
 

package/Libraries/Utilities/Appearance.d.ts

@@ -9,7 +9,7 @@
 
 import {NativeEventSubscription} from '../EventEmitter/RCTNativeAppEventEmitter';
 
-type ColorSchemeName = 'light' | 'dark' | null | undefined;
+type ColorSchemeName = 'light' | 'dark' | 'unspecified';
 
 export namespace Appearance {
   type AppearancePreferences = {
@@ -26,7 +26,7 @@ export namespace Appearance {
    *
    * Example: `const colorScheme = Appearance.getColorScheme();`
    */
-  export function getColorScheme(): ColorSchemeName;
+  export function getColorScheme(): ColorSchemeName | null | undefined;
 
   /**
    * Set the color scheme preference. This is useful for overriding the default
@@ -34,9 +34,7 @@ export namespace Appearance {
    * appearance of the system UI, only the appearance of the app.
    * Only available on iOS 13+ and Android 10+.
    */
-  export function setColorScheme(
-    scheme: ColorSchemeName | null | undefined,
-  ): void;
+  export function setColorScheme(scheme: ColorSchemeName): void;
 
   /**
    * Add an event handler that is fired when appearance preferences change.

package/Libraries/Utilities/Appearance.js

@@ -14,7 +14,6 @@ import typeof INativeAppearance from './NativeAppearance';
 
 import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
 import EventEmitter from '../vendor/emitter/EventEmitter';
-import invariant from 'invariant';
 
 export type {AppearancePreferences};
 
@@ -60,7 +59,7 @@ function getState(): $NonMaybeType<typeof lazyState> {
       appearanceChanged: [AppearancePreferences],
     }>(NativeAppearance).addListener('appearanceChanged', newAppearance => {
       state.appearance = {
-        colorScheme: toColorScheme(newAppearance.colorScheme),
+        colorScheme: newAppearance.colorScheme,
       };
       eventEmitter.emit('change', state.appearance);
     });
@@ -83,7 +82,7 @@ export function getColorScheme(): ?ColorSchemeName {
       // Lazily initialize `state.appearance`. This should only
       // happen once because we never reassign a null value to it.
       state.appearance = {
-        colorScheme: toColorScheme(NativeAppearance.getColorScheme()),
+        colorScheme: NativeAppearance.getColorScheme(),
       };
     }
     colorScheme = state.appearance.colorScheme;
@@ -94,13 +93,13 @@ export function getColorScheme(): ?ColorSchemeName {
 /**
  * Updates the current color scheme to the supplied value.
  */
-export function setColorScheme(colorScheme: ?ColorSchemeName): void {
+export function setColorScheme(colorScheme: ColorSchemeName): void {
   const state = getState();
   const {NativeAppearance} = state;
   if (NativeAppearance != null) {
-    NativeAppearance.setColorScheme(colorScheme ?? 'unspecified');
+    NativeAppearance.setColorScheme(colorScheme);
     state.appearance = {
-      colorScheme: toColorScheme(NativeAppearance.getColorScheme()),
+      colorScheme,
     };
   }
 }
@@ -114,14 +113,3 @@ export function addChangeListener(
   const {eventEmitter} = getState();
   return eventEmitter.addListener('change', listener);
 }
-
-/**
- * TODO: (hramos) T52919652 Use ?ColorSchemeName once codegen supports union
- */
-function toColorScheme(colorScheme: ?string): ?ColorSchemeName {
-  invariant(
-    colorScheme === 'dark' || colorScheme === 'light' || colorScheme == null,
-    "Unrecognized color scheme. Did you mean 'dark', 'light' or null?",
-  );
-  return colorScheme;
-}

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(82),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"nightly-20250829-b2d25c873",
+                  RCTVersionPrerelease: @"nightly-20250830-d3574313c",
                   };
   });
   return __rnVersion;

package/ReactAndroid/api/ReactAndroid.api

@@ -2223,6 +2223,15 @@ public abstract interface class com/facebook/react/devsupport/interfaces/StackFr
 	public abstract fun toJSON ()Lorg/json/JSONObject;
 }
 
+public final class com/facebook/react/devsupport/interfaces/TracingState : java/lang/Enum {
+	public static final field DISABLED Lcom/facebook/react/devsupport/interfaces/TracingState;
+	public static final field ENABLEDINBACKGROUNDMODE Lcom/facebook/react/devsupport/interfaces/TracingState;
+	public static final field ENABLEDINCDPMODE Lcom/facebook/react/devsupport/interfaces/TracingState;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public static fun valueOf (Ljava/lang/String;)Lcom/facebook/react/devsupport/interfaces/TracingState;
+	public static fun values ()[Lcom/facebook/react/devsupport/interfaces/TracingState;
+}
+
 public final class com/facebook/react/fabric/ComponentFactory {
 	public fun <init> ()V
 }

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.82.0-nightly-20250829-b2d25c873
+VERSION_NAME=0.82.0-nightly-20250830-d3574313c
 react.internal.publishingGroup=com.facebook.react
 
 android.useAndroidX=true

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

@@ -15,6 +15,7 @@ import com.facebook.react.devsupport.interfaces.DevLoadingViewManager
 import com.facebook.react.devsupport.interfaces.DevSupportManager
 import com.facebook.react.devsupport.interfaces.PausedInDebuggerOverlayManager
 import com.facebook.react.devsupport.interfaces.RedBoxHandler
+import com.facebook.react.devsupport.interfaces.TracingState
 import com.facebook.react.packagerconnection.RequestHandler
 
 /**
@@ -80,4 +81,8 @@ internal class BridgelessDevSupportManager(
     hideRedboxDialog()
     reactInstanceDevHelper.reload("BridgelessDevSupportManager.handleReloadJS()")
   }
+
+  fun tracingState(): TracingState {
+    return TracingState.DISABLED
+  }
 }

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

@@ -52,6 +52,7 @@ import com.facebook.react.devsupport.InspectorFlags.getFuseboxEnabled
 import com.facebook.react.devsupport.StackTraceHelper.convertJavaStackTrace
 import com.facebook.react.devsupport.StackTraceHelper.convertJsStackTrace
 import com.facebook.react.devsupport.interfaces.BundleLoadCallback
+import com.facebook.react.devsupport.interfaces.DebuggerFrontendPanelName
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener
 import com.facebook.react.devsupport.interfaces.DevLoadingViewManager
 import com.facebook.react.devsupport.interfaces.DevOptionHandler
@@ -64,6 +65,8 @@ import com.facebook.react.devsupport.interfaces.PackagerStatusCallback
 import com.facebook.react.devsupport.interfaces.PausedInDebuggerOverlayManager
 import com.facebook.react.devsupport.interfaces.RedBoxHandler
 import com.facebook.react.devsupport.interfaces.StackFrame
+import com.facebook.react.devsupport.interfaces.TracingState
+import com.facebook.react.devsupport.interfaces.TracingStateProvider
 import com.facebook.react.devsupport.perfmonitor.PerfMonitorDevHelper
 import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags
@@ -180,6 +183,7 @@ public abstract class DevSupportManagerBase(
         }
 
   private var perfMonitorOverlayManager: PerfMonitorOverlayViewManager? = null
+  private var tracingStateProvider: TracingStateProvider? = null
 
   init {
     // We store JS bundle loaded from dev server in a single destination in app's data dir.
@@ -358,6 +362,43 @@ public abstract class DevSupportManagerBase(
       options[debuggerItemString] = DevOptionHandler { this.openDebugger() }
     }
 
+    if (ReactNativeFeatureFlags.perfMonitorV2Enabled()) {
+      val isConnected = isPackagerConnected
+      val tracingState = tracingStateProvider?.getTracingState() ?: TracingState.DISABLED
+
+      val analyzePerformanceItemString =
+          when (tracingState) {
+            TracingState.ENABLEDINBACKGROUNDMODE ->
+                applicationContext.getString(R.string.catalyst_performance_background)
+            TracingState.ENABLEDINCDPMODE ->
+                applicationContext.getString(R.string.catalyst_performance_cdp)
+            TracingState.DISABLED ->
+                applicationContext.getString(R.string.catalyst_performance_disabled)
+          }
+
+      if (!isConnected || tracingState == TracingState.ENABLEDINCDPMODE) {
+        disabledItemKeys.add(analyzePerformanceItemString)
+      }
+
+      options[analyzePerformanceItemString] =
+          when (tracingState) {
+            TracingState.ENABLEDINBACKGROUNDMODE ->
+                DevOptionHandler {
+                  UiThreadUtil.runOnUiThread {
+                    if (reactInstanceDevHelper is PerfMonitorDevHelper)
+                        reactInstanceDevHelper.inspectorTarget?.pauseAndAnalyzeBackgroundTrace()
+                  }
+                  openDebugger(DebuggerFrontendPanelName.PERFORMANCE.toString())
+                }
+            TracingState.DISABLED ->
+                DevOptionHandler {
+                  if (reactInstanceDevHelper is PerfMonitorDevHelper)
+                      reactInstanceDevHelper.inspectorTarget?.resumeBackgroundTrace()
+                }
+            TracingState.ENABLEDINCDPMODE -> DevOptionHandler {}
+          }
+    }
+
     options[applicationContext.getString(R.string.catalyst_change_bundle_location)] =
         DevOptionHandler {
           val context = reactInstanceDevHelper.currentActivity
@@ -409,26 +450,29 @@ public abstract class DevSupportManagerBase(
       }
     }
 
-    val fpsDebugLabel =
-        if (devSettings.isFpsDebugEnabled)
-            applicationContext.getString(R.string.catalyst_perf_monitor_stop)
-        else applicationContext.getString(R.string.catalyst_perf_monitor)
-    options[fpsDebugLabel] = DevOptionHandler {
-      if (!devSettings.isFpsDebugEnabled) {
-        // Request overlay permission if needed when "Show Perf Monitor" option is selected
-        val context: Context? = reactInstanceDevHelper.currentActivity
-        if (context == null) {
-          FLog.e(ReactConstants.TAG, "Unable to get reference to react activity")
-        } else {
-          requestPermission(context)
+    // Do not show legacy performance overlay if V2 is enabled
+    if (!ReactNativeFeatureFlags.perfMonitorV2Enabled()) {
+      val fpsDebugLabel =
+          if (devSettings.isFpsDebugEnabled)
+              applicationContext.getString(R.string.catalyst_perf_monitor_stop)
+          else applicationContext.getString(R.string.catalyst_perf_monitor)
+      options[fpsDebugLabel] = DevOptionHandler {
+        if (!devSettings.isFpsDebugEnabled) {
+          // Request overlay permission if needed when "Show Perf Monitor" option is selected
+          val context: Context? = reactInstanceDevHelper.currentActivity
+          if (context == null) {
+            FLog.e(ReactConstants.TAG, "Unable to get reference to react activity")
+          } else {
+            requestPermission(context)
+          }
         }
+        devSettings.isFpsDebugEnabled = !devSettings.isFpsDebugEnabled
+      }
+      options[applicationContext.getString(R.string.catalyst_settings)] = DevOptionHandler {
+        val intent = Intent(applicationContext, DevSettingsActivity::class.java)
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        applicationContext.startActivity(intent)
       }
-      devSettings.isFpsDebugEnabled = !devSettings.isFpsDebugEnabled
-    }
-    options[applicationContext.getString(R.string.catalyst_settings)] = DevOptionHandler {
-      val intent = Intent(applicationContext, DevSettingsActivity::class.java)
-      intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-      applicationContext.startActivity(intent)
     }
 
     if (customDevOptions.isNotEmpty()) {
@@ -942,6 +986,14 @@ public abstract class DevSupportManagerBase(
     devSettings.packagerConnectionSettings.setAdditionalOptionForPackager(name, value)
   }
 
+  /**
+   * Sets the background tracing state provider for bridgeless architecture. This is called
+   * internally by the ReactHost implementation.
+   */
+  internal fun setTracingStateProvider(provider: TracingStateProvider?) {
+    tracingStateProvider = provider
+  }
+
   public companion object {
     private const val JAVA_ERROR_COOKIE = -1
     private const val JSEXCEPTION_ERROR_COOKIE = -1

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

@@ -26,6 +26,7 @@ import androidx.core.view.WindowInsetsCompat
 import com.facebook.react.R
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.devsupport.interfaces.PerfMonitorOverlayManager
+import com.facebook.react.devsupport.interfaces.TracingState
 import com.facebook.react.devsupport.perfmonitor.PerfMonitorInspectorTargetBinding
 import com.facebook.react.devsupport.perfmonitor.PerfMonitorUpdateListener
 import com.facebook.react.uimanager.DisplayMetricsHolder
@@ -68,6 +69,11 @@ internal class PerfMonitorOverlayViewManager(
     }
   }
 
+  override fun onRecordingStateChanged(state: TracingState) {
+    // recordingState = state
+    // view?.updateRecordingState(state)
+  }
+
   override fun onNewFocusedEvent(data: PerfMonitorUpdateListener.LongTaskEventData) {
     UiThreadUtil.runOnUiThread {
       ensureInitialized()
@@ -148,6 +154,8 @@ internal class PerfMonitorOverlayViewManager(
     this.interactionDialog = dialog
   }
 
+  fun updateRecordingState(state: TracingState) {}
+
   private fun createButton(context: Context) {
     val buttonInner = createInnerLayout(context)
     buttonInner.addView(
@@ -177,7 +185,7 @@ internal class PerfMonitorOverlayViewManager(
               dpToPx(8f).toInt(),
           )
           addView(buttonInner)
-          setOnClickListener { inspectorTarget?.pauseAndAnalyzeTrace() }
+          setOnClickListener { inspectorTarget?.pauseAndAnalyzeBackgroundTrace() }
         }
     val dialog =
         createAnchoredDialog(context, dpToPx(0f), dpToPx(0f)).apply { setContentView(buttonView) }

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/TracingState.kt

@@ -0,0 +1,19 @@
+/*
+ * 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.devsupport.interfaces
+
+import com.facebook.proguard.annotations.DoNotStripAny
+
+// Keep in sync with `TracingState.h`
+// JNI wrapper for `jsinspector_modern::Tracing::TracingState`.
+@DoNotStripAny
+public enum class TracingState {
+  DISABLED, // There is no active trace
+  ENABLEDINBACKGROUNDMODE, // Trace is currently running in background mode
+  ENABLEDINCDPMODE, // Trace is currently running in CDP mode
+}

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/TracingStateProvider.kt

@@ -0,0 +1,12 @@
+/*
+ * 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.devsupport.interfaces
+
+internal interface TracingStateProvider {
+  fun getTracingState(): TracingState
+}

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

@@ -12,5 +12,9 @@ package com.facebook.react.devsupport.perfmonitor
  * exposing actions for the V2 Perf Monitor.
  */
 internal interface PerfMonitorInspectorTargetBinding {
-  public fun pauseAndAnalyzeTrace()
+  /** Attempt to pause the current background performance trace, and open in DevTools. */
+  public fun pauseAndAnalyzeBackgroundTrace()
+
+  /** Attempt to start a new background performance trace. */
+  public fun resumeBackgroundTrace()
 }

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

@@ -4,9 +4,10 @@
  * 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.devsupport.perfmonitor
 
+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(
@@ -17,4 +18,7 @@ internal interface PerfMonitorUpdateListener {
 
   /** 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

@@ -984,10 +984,9 @@ public class FabricUIManager
    * by an ImageView.
    */
   @UnstableReactNativeAPI
-  public void experimental_prefetchResource(
-      String componentName, int surfaceId, int reactTag, ReadableMapBuffer params) {
-    mMountingManager.experimental_prefetchResource(
-        mReactApplicationContext, componentName, surfaceId, reactTag, params);
+  public void experimental_prefetchResources(String componentName, ReadableMapBuffer params) {
+    mMountingManager.experimental_prefetchResources(
+        mReactApplicationContext, componentName, params);
   }
 
   void setBinding(FabricUIManagerBinding binding) {

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.kt

@@ -331,23 +331,19 @@ internal class MountingManager(
    *
    * @param reactContext
    * @param componentName
-   * @param surfaceId surface ID
-   * @param reactTag reactTag that should be set as ID of the view instance
    * @param params prefetch request params defined in C++
    */
   @Suppress("FunctionName")
   @AnyThread
   @UnstableReactNativeAPI
-  fun experimental_prefetchResource(
+  fun experimental_prefetchResources(
       reactContext: ReactContext?,
       componentName: String?,
-      surfaceId: Int,
-      reactTag: Int,
       params: MapBuffer?,
   ) {
     viewManagerRegistry
         .get(checkNotNull(componentName))
-        .experimental_prefetchResource(reactContext, surfaceId, reactTag, params)
+        .experimental_prefetchResources(reactContext, params)
   }
 
   fun enqueuePendingEvent(

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.kt

@@ -15,6 +15,6 @@ public object ReactNativeVersion {
     "major" to 0,
     "minor" to 82,
     "patch" to 0,
-    "prerelease" to "nightly-20250829-b2d25c873"
+    "prerelease" to "nightly-20250830-d3574313c"
   )
 }

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.kt

@@ -95,21 +95,30 @@ public class ReactHostImpl(
     private val useDevSupport: Boolean,
     devSupportManagerFactory: DevSupportManagerFactory? = null,
 ) : ReactHost {
+  private val reactHostImplDevHelper = ReactHostImplDevHelper(this)
+
   public override val devSupportManager: DevSupportManager =
-      (devSupportManagerFactory ?: DefaultDevSupportManagerFactory()).create(
-          applicationContext = context.applicationContext,
-          reactInstanceManagerHelper = ReactHostImplDevHelper(this),
-          packagerPathForJSBundleName = reactHostDelegate.jsMainModulePath,
-          enableOnCreate = true,
-          redBoxHandler = null,
-          devBundleDownloadListener = null,
-          minNumShakes = 2,
-          customPackagerCommandHandlers = null,
-          surfaceDelegateFactory = null,
-          devLoadingViewManager = null,
-          pausedInDebuggerOverlayManager = null,
-          useDevSupport = useDevSupport,
-      )
+      (devSupportManagerFactory ?: DefaultDevSupportManagerFactory())
+          .create(
+              applicationContext = context.applicationContext,
+              reactInstanceManagerHelper = reactHostImplDevHelper,
+              packagerPathForJSBundleName = reactHostDelegate.jsMainModulePath,
+              enableOnCreate = true,
+              redBoxHandler = null,
+              devBundleDownloadListener = null,
+              minNumShakes = 2,
+              customPackagerCommandHandlers = null,
+              surfaceDelegateFactory = null,
+              devLoadingViewManager = null,
+              pausedInDebuggerOverlayManager = null,
+              useDevSupport = useDevSupport,
+          )
+          .also { devSupportManager ->
+            // Wire up the tracing state provider
+            if (devSupportManager is DevSupportManagerBase) {
+              devSupportManager.setTracingStateProvider(reactHostImplDevHelper)
+            }
+          }
   public override val memoryPressureRouter: MemoryPressureRouter = MemoryPressureRouter(context)
 
   private val attachedSurfaces: MutableSet<ReactSurfaceImpl> = HashSet()

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImplDevHelper.kt

@@ -16,6 +16,8 @@ import com.facebook.react.bridge.ReactContext
 import com.facebook.react.common.annotations.FrameworkAPI
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.devsupport.ReactInstanceDevHelper
+import com.facebook.react.devsupport.interfaces.TracingState
+import com.facebook.react.devsupport.interfaces.TracingStateProvider
 import com.facebook.react.devsupport.perfmonitor.PerfMonitorDevHelper
 import com.facebook.react.devsupport.perfmonitor.PerfMonitorInspectorTarget
 import com.facebook.react.interfaces.TaskInterface
@@ -30,7 +32,7 @@ import com.facebook.react.modules.core.DeviceEventManagerModule
 @UnstableReactNativeAPI
 @OptIn(FrameworkAPI::class)
 internal class ReactHostImplDevHelper(private val delegate: ReactHostImpl) :
-    ReactInstanceDevHelper, PerfMonitorDevHelper {
+    ReactInstanceDevHelper, PerfMonitorDevHelper, TracingStateProvider {
 
   override val currentActivity: Activity?
     get() = delegate.lastUsedActivity
@@ -77,4 +79,8 @@ internal class ReactHostImplDevHelper(private val delegate: ReactHostImpl) :
 
   override fun loadBundle(bundleLoader: JSBundleLoader): TaskInterface<Boolean> =
       delegate.loadBundle(bundleLoader)
+
+  override fun getTracingState(): TracingState {
+    return delegate.reactHostInspectorTarget?.tracingState() ?: TracingState.DISABLED
+  }
 }

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostInspectorTarget.kt

@@ -12,6 +12,7 @@ import com.facebook.proguard.annotations.DoNotStripAny
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.common.annotations.FrameworkAPI
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
+import com.facebook.react.devsupport.interfaces.TracingState
 import com.facebook.react.devsupport.perfmonitor.PerfMonitorInspectorTarget
 import com.facebook.react.devsupport.perfmonitor.PerfMonitorUpdateListener
 import com.facebook.soloader.SoLoader
@@ -40,12 +41,28 @@ internal class ReactHostInspectorTarget(reactHostImpl: ReactHostImpl) :
 
   external fun stopAndDiscardBackgroundTrace()
 
+  external fun tracingStateAsInt(): Int
+
+  fun tracingState(): TracingState {
+    return TracingState.entries[tracingStateAsInt()]
+  }
+
   override fun addPerfMonitorListener(listener: PerfMonitorUpdateListener) {
     perfMonitorListeners.add(listener)
   }
 
-  override fun pauseAndAnalyzeTrace() {
-    // TODO(T233874551)
+  override fun pauseAndAnalyzeBackgroundTrace() {
+    stopAndStashBackgroundTrace()
+    perfMonitorListeners.forEach { listener ->
+      listener.onRecordingStateChanged(TracingState.DISABLED)
+    }
+  }
+
+  override fun resumeBackgroundTrace() {
+    startBackgroundTrace()
+    perfMonitorListeners.forEach { listener ->
+      listener.onRecordingStateChanged(TracingState.ENABLEDINBACKGROUNDMODE)
+    }
   }
 
   fun handleNativePerfMonitorMetricUpdate(

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.kt

@@ -22,7 +22,7 @@ public object PixelUtil {
     return TypedValue.applyDimension(
         TypedValue.COMPLEX_UNIT_DIP,
         value,
-        DisplayMetricsHolder.getWindowDisplayMetrics(),
+        DisplayMetricsHolder.getScreenDisplayMetrics(),
     )
   }
 
@@ -40,7 +40,7 @@ public object PixelUtil {
       return Float.NaN
     }
 
-    val displayMetrics = DisplayMetricsHolder.getWindowDisplayMetrics()
+    val displayMetrics = DisplayMetricsHolder.getScreenDisplayMetrics()
     val scaledValue = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, value, displayMetrics)
 
     if (maxFontScale >= 1) {
@@ -63,13 +63,13 @@ public object PixelUtil {
       return Float.NaN
     }
 
-    return value / DisplayMetricsHolder.getWindowDisplayMetrics().density
+    return value / DisplayMetricsHolder.getScreenDisplayMetrics().density
   }
 
   /** @return [Float] that represents the density of the display metrics for device screen. */
   @JvmStatic
   public fun getDisplayMetricDensity(): Float =
-      DisplayMetricsHolder.getWindowDisplayMetrics().density
+      DisplayMetricsHolder.getScreenDisplayMetrics().density
 
   /* Kotlin extensions */
   public fun Int.dpToPx(): Float = toPixelFromDIP(this.toFloat())

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java

@@ -488,13 +488,10 @@ public abstract class ViewManager<T extends View, C extends ReactShadowNode>
    * ViewManager.
    *
    * @param reactContext {@link com.facebook.react.bridge.ReactContext} used for the view.
-   * @param surfaceId {@link int} surface ID
-   * @param reactTag reactTag that should be set as ID of the view instance
    * @param params {@link MapBuffer} prefetch request params defined in C++
    */
   @UnstableReactNativeAPI
-  public void experimental_prefetchResource(
-      ReactContext reactContext, int surfaceId, int reactTag, MapBuffer params) {
+  public void experimental_prefetchResources(ReactContext reactContext, MapBuffer params) {
     return;
   }
 

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

@@ -160,7 +160,7 @@ public constructor(reactTextViewManagerCallback: ReactTextViewManagerCallback? =
     YogaMeasureOutput.make(layoutWidth, layoutHeight)
   }
 
-  private val mTextBaselineFunction = YogaBaselineFunction { node, width, height ->
+  private val textBaselineFunction = YogaBaselineFunction { node, width, height ->
     val text =
         checkNotNull(preparedSpannableText) {
           "Spannable element has not been prepared in onBeforeLayout"
@@ -176,7 +176,7 @@ public constructor(reactTextViewManagerCallback: ReactTextViewManagerCallback? =
   private fun initMeasureFunction() {
     if (!isVirtual) {
       setMeasureFunction(textMeasureFunction)
-      setBaselineFunction(mTextBaselineFunction)
+      setBaselineFunction(textBaselineFunction)
     }
   }
 

package/ReactAndroid/src/main/jni/react/hermes/reactexecutor/OnLoad.cpp

@@ -44,7 +44,8 @@ static void installBindings(jsi::Runtime& runtime) {
   react::bindNativeLogger(runtime, &reactAndroidLoggingHook);
 }
 
-class HermesExecutorHolder
+class [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] HermesExecutorHolder
     : public jni::HybridClass<HermesExecutorHolder, JavaScriptExecutorHolder> {
  public:
   static constexpr auto kJavaDescriptor =
@@ -110,6 +111,10 @@ class HermesExecutorHolder
 } // namespace facebook::react
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) {
-  return facebook::jni::initialize(
-      vm, [] { facebook::react::HermesExecutorHolder::registerNatives(); });
+  return facebook::jni::initialize(vm, [] {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+    facebook::react::HermesExecutorHolder::registerNatives();
+#pragma clang diagnostic pop
+  });
 }