react-native-tvos 0.82.1-0 → 0.83.0-0

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

@@ -0,0 +1,219 @@
+/*
+ * 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.perfmonitor
+
+import android.app.Dialog
+import android.content.Context
+import android.graphics.Color
+import android.graphics.Typeface
+import android.graphics.drawable.ColorDrawable
+import android.graphics.drawable.GradientDrawable
+import android.view.Gravity
+import android.view.Window
+import android.view.WindowManager
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import com.facebook.react.R
+import com.facebook.react.devsupport.interfaces.TracingState
+import com.facebook.react.uimanager.DisplayMetricsHolder
+import com.facebook.react.uimanager.PixelUtil
+
+internal class PerfMonitorOverlayView(
+    private val context: Context,
+    private val onButtonPress: () -> Unit,
+) {
+  private val dialog: Dialog
+  private lateinit var statusIndicator: TextView
+  private lateinit var statusLabel: TextView
+  private lateinit var tooltipLabel: TextView
+  private lateinit var issuesContainer: LinearLayout
+  private lateinit var issueCountLabel: TextView
+
+  init {
+    DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(context)
+    dialog = createToolbarDialog()
+  }
+
+  fun show() {
+    dialog.show()
+  }
+
+  fun hide() {
+    dialog.hide()
+  }
+
+  fun updateRecordingState(state: TracingState) {
+    if (state == TracingState.ENABLEDINCDPMODE) {
+      dialog.hide()
+      return
+    }
+
+    if (state == TracingState.ENABLEDINBACKGROUNDMODE) {
+      (statusIndicator.background as GradientDrawable).setColor(Color.RED)
+      statusLabel.text = "Profiling Active"
+      tooltipLabel.text =
+          if (context.packageManager.hasSystemFeature("android.hardware.touchscreen")) "Tap to open"
+          else "Press ☰ to open"
+    } else {
+      (statusIndicator.background as GradientDrawable).setColor(Color.GRAY)
+      statusLabel.text = "Profiling Stopped"
+      tooltipLabel.text =
+          if (context.packageManager.hasSystemFeature("android.hardware.touchscreen"))
+              "Tap to restart"
+          else "Press ☰ to restart"
+    }
+    dialog.show()
+  }
+
+  fun updatePerfIssueCount(count: Int) {
+    issueCountLabel.text = count.toString()
+    issuesContainer.visibility = if (count == 0) LinearLayout.GONE else LinearLayout.VISIBLE
+  }
+
+  private fun createToolbarDialog(): Dialog {
+    statusIndicator =
+        TextView(context).apply {
+          width = dpToPx(12f).toInt()
+          height = dpToPx(12f).toInt()
+          background =
+              GradientDrawable().apply {
+                shape = GradientDrawable.OVAL
+                setColor(Color.RED)
+              }
+        }
+
+    val textContainer =
+        LinearLayout(context).apply {
+          orientation = LinearLayout.VERTICAL
+          setPadding(dpToPx(2f).toInt(), 0, 0, 0)
+        }
+    statusLabel =
+        TextView(context).apply {
+          textSize = TEXT_SIZE_PRIMARY
+          setTextColor(Color.WHITE)
+          typeface = TYPEFACE_BOLD
+        }
+    tooltipLabel =
+        TextView(context).apply {
+          textSize = TEXT_SIZE_ACCESSORY
+          setTextColor(Color.WHITE)
+          typeface = TYPEFACE_BOLD
+        }
+    textContainer.addView(statusLabel)
+    textContainer.addView(tooltipLabel)
+
+    issuesContainer =
+        LinearLayout(context).apply {
+          setPadding(dpToPx(8f).toInt(), 0, 0, 0)
+          visibility = LinearLayout.GONE
+        }
+    issueCountLabel =
+        TextView(context).apply {
+          textSize = TEXT_SIZE_PRIMARY
+          setTextColor(Color.WHITE)
+          typeface = TYPEFACE_BOLD
+          val alertDrawable =
+              context.getDrawable(android.R.drawable.ic_dialog_alert)?.apply {
+                setBounds(
+                    0,
+                    1,
+                    dpToPx(TEXT_SIZE_PRIMARY).toInt(),
+                    dpToPx(TEXT_SIZE_PRIMARY).toInt() + 1,
+                )
+              }
+          setCompoundDrawables(alertDrawable, null, null, null)
+          compoundDrawablePadding = dpToPx(6f).toInt()
+        }
+    issuesContainer.addView(issueCountLabel)
+
+    val containerLayout = createInnerLayout()
+    containerLayout.setOnClickListener { onButtonPress() }
+    containerLayout.addView(statusIndicator)
+    containerLayout.addView(textContainer)
+    containerLayout.addView(issuesContainer)
+
+    val dialog =
+        createAnchoredDialog(dpToPx(12f), dpToPx(12f)).apply { setContentView(containerLayout) }
+    dialog.window?.apply {
+      attributes =
+          attributes?.apply { flags = flags or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE }
+    }
+
+    return dialog
+  }
+
+  private fun createAnchoredDialog(offsetX: Float, offsetY: Float): Dialog {
+    val dialog =
+        Dialog(context, R.style.NoAnimationDialog).apply {
+          requestWindowFeature(Window.FEATURE_NO_TITLE)
+          window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+          window?.setDimAmount(0f)
+          setCancelable(false)
+        }
+    dialog.window?.apply {
+      attributes =
+          attributes?.apply {
+            width = WindowManager.LayoutParams.WRAP_CONTENT
+            height = WindowManager.LayoutParams.WRAP_CONTENT
+            gravity = Gravity.TOP or Gravity.END
+            x = offsetX.toInt()
+            y = offsetY.toInt()
+          }
+    }
+    dialog.window?.decorView?.let { decorView ->
+      ViewCompat.setOnApplyWindowInsetsListener(decorView) { view, windowInsets ->
+        val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+        val layoutParams = (view.layoutParams as WindowManager.LayoutParams)
+        layoutParams.y = insets.top + offsetY.toInt()
+        dialog.window?.attributes = layoutParams
+        WindowInsetsCompat.CONSUMED
+      }
+    }
+
+    return dialog
+  }
+
+  private fun createInnerLayout(): LinearLayout {
+    return LinearLayout(context).apply {
+      orientation = LinearLayout.HORIZONTAL
+      gravity = Gravity.CENTER_VERTICAL
+      val paddingHorizontal = dpToPx(14f).toInt()
+      val paddingVertical = dpToPx(7f).toInt()
+      setPadding(paddingHorizontal, paddingVertical, paddingHorizontal, paddingVertical)
+      layoutParams =
+          LinearLayout.LayoutParams(
+              LinearLayout.LayoutParams.WRAP_CONTENT,
+              LinearLayout.LayoutParams.WRAP_CONTENT,
+          )
+      background =
+          GradientDrawable().apply {
+            shape = GradientDrawable.RECTANGLE
+            setColor(Color.BLACK)
+            cornerRadius = dpToPx(14.5f)
+            alpha = (0.4 * 255).toInt()
+            setStroke(dpToPx(1f).toInt(), COLOR_OVERLAY_BORDER)
+          }
+      showDividers = LinearLayout.SHOW_DIVIDER_MIDDLE
+      dividerDrawable =
+          object : ColorDrawable(Color.TRANSPARENT) {
+            override fun getIntrinsicWidth(): Int = dpToPx(10f).toInt()
+          }
+    }
+  }
+
+  private fun dpToPx(dp: Float): Float = PixelUtil.toPixelFromDIP(dp)
+
+  companion object {
+    private val COLOR_OVERLAY_BORDER = Color.parseColor("#6C6C6C")
+    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

@@ -4,21 +4,16 @@
  * 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(
-      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)
+
+  /** Called when a new Performance Issue is added. */
+  fun onPerfIssueAdded(name: String)
 }

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

@@ -65,6 +65,8 @@ import com.facebook.react.fabric.mounting.mountitems.BatchMountItem;
 import com.facebook.react.fabric.mounting.mountitems.DispatchCommandMountItem;
 import com.facebook.react.fabric.mounting.mountitems.MountItem;
 import com.facebook.react.fabric.mounting.mountitems.MountItemFactory;
+import com.facebook.react.fabric.mounting.mountitems.PrefetchResourcesMountItem;
+import com.facebook.react.fabric.mounting.mountitems.SynchronousMountItem;
 import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags;
 import com.facebook.react.internal.interop.InteropEventEmitter;
@@ -98,7 +100,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;
@@ -178,7 +179,7 @@ public class FabricUIManager
 
   private final BatchEventDispatchedListener mBatchEventDispatchedListener;
 
-  private final CopyOnWriteArrayList<UIManagerListener> mListeners = new CopyOnWriteArrayList<>();
+  private final List<UIManagerListener> mListeners = new CopyOnWriteArrayList<>();
 
   private boolean mMountNotificationScheduled = false;
   private List<Integer> mSurfaceIdsWithPendingMountNotification = new ArrayList<>();
@@ -737,11 +738,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
@@ -785,34 +792,7 @@ public class FabricUIManager
     //    android.view.View.updateDisplayListIfDirty(View.java:20466)
     // 3. A view is deleted while its parent is being drawn, causing a crash.
 
-    MountItem synchronousMountItem =
-        new MountItem() {
-          @Override
-          public void execute(MountingManager mountingManager) {
-            try {
-              mountingManager.updateProps(reactTag, props);
-            } catch (Exception ex) {
-              // TODO T42943890: Fix animations in Fabric and remove this try/catch?
-              // There might always be race conditions between surface teardown and
-              // animations/other operations, so it may not be feasible to remove this.
-              // Practically 100% of reported errors from this point are because the
-              // surface has stopped by this point, but the MountItem was queued before
-              // the surface was stopped. It's likely not feasible to prevent all such races.
-            }
-          }
-
-          @Override
-          public int getSurfaceId() {
-            return View.NO_ID;
-          }
-
-          @Override
-          public String toString() {
-            String propsString =
-                IS_DEVELOPMENT_ENVIRONMENT ? props.toHashMap().toString() : "<hidden>";
-            return String.format("SYNC UPDATE PROPS [%d]: %s", reactTag, propsString);
-          }
-        };
+    MountItem synchronousMountItem = new SynchronousMountItem(reactTag, props);
 
     // If the reactTag exists, we assume that it might at the end of the next
     // batch of MountItems. Otherwise, we try to execute immediately.
@@ -984,9 +964,17 @@ public class FabricUIManager
    * by an ImageView.
    */
   @UnstableReactNativeAPI
-  public void experimental_prefetchResources(String componentName, ReadableMapBuffer params) {
-    mMountingManager.experimental_prefetchResources(
-        mReactApplicationContext, componentName, params);
+  public void experimental_prefetchResources(
+      int surfaceId, String componentName, ReadableMapBuffer params) {
+    if (ReactNativeFeatureFlags.enableImagePrefetchingOnUiThreadAndroid()) {
+      mMountItemDispatcher.addMountItem(
+          new PrefetchResourcesMountItem(surfaceId, componentName, params));
+    } else {
+      SurfaceMountingManager surfaceMountingManager = mMountingManager.getSurfaceManager(surfaceId);
+      if (surfaceMountingManager != null) {
+        surfaceMountingManager.experimental_prefetchResources(surfaceId, componentName, params);
+      }
+    }
   }
 
   void setBinding(FabricUIManagerBinding binding) {
@@ -1384,24 +1372,21 @@ public class FabricUIManager
         // delay paint.
         UiThreadUtil.getUiThreadHandler()
             .postAtFrontOfQueue(
-                new Runnable() {
-                  @Override
-                  public void run() {
-                    mMountNotificationScheduled = false;
-
-                    // Create a copy in case mount hooks trigger more mutations
-                    final List<Integer> surfaceIdsToReportMount =
-                        mSurfaceIdsWithPendingMountNotification;
-                    mSurfaceIdsWithPendingMountNotification = new ArrayList<>();
-
-                    final @Nullable FabricUIManagerBinding binding = mBinding;
-                    if (binding == null || mDestroyed) {
-                      return;
-                    }
-
-                    for (int surfaceId : surfaceIdsToReportMount) {
-                      binding.reportMount(surfaceId);
-                    }
+                () -> {
+                  mMountNotificationScheduled = false;
+
+                  // Create a copy in case mount hooks trigger more mutations
+                  final List<Integer> surfaceIdsToReportMount =
+                      mSurfaceIdsWithPendingMountNotification;
+                  mSurfaceIdsWithPendingMountNotification = new ArrayList<>();
+
+                  final @Nullable FabricUIManagerBinding binding = mBinding;
+                  if (binding == null || mDestroyed) {
+                    return;
+                  }
+
+                  for (int surfaceId : surfaceIdsToReportMount) {
+                    binding.reportMount(surfaceId);
                   }
                 });
       }

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

@@ -43,7 +43,11 @@ internal class MountItemDispatcher(
   private var lastFrameTimeNanos: Long = 0L
 
   fun addViewCommandMountItem(mountItem: DispatchCommandMountItem) {
-    viewCommandMountItems.add(mountItem)
+    if (!ReactNativeFeatureFlags.disableEarlyViewCommandExecution()) {
+      viewCommandMountItems.add(mountItem)
+    } else {
+      mountItems.add(mountItem)
+    }
   }
 
   fun addMountItem(mountItem: MountItem) {
@@ -147,13 +151,47 @@ internal class MountItemDispatcher(
 
     itemDispatchListener.willMountItems(mountItemsToDispatch)
 
+    val dispatchViewCommand: (command: DispatchCommandMountItem) -> Unit = { command ->
+      if (ReactNativeFeatureFlags.enableFabricLogs()) {
+        printMountItem(command, "dispatchMountItems: Executing viewCommandMountItem")
+      }
+      try {
+        executeOrEnqueue(command)
+      } catch (e: RetryableMountingLayerException) {
+        // If the exception is marked as Retryable, we retry the viewcommand exactly once, after
+        // the current batch of mount items has finished executing.
+        if (command.getRetries() == 0) {
+          command.incrementRetries()
+          addViewCommandMountItem(command)
+        } else {
+          // It's very common for commands to be executed on views that no longer exist - for
+          // example, a blur event on TextInput being fired because of a navigation event away
+          // from the current screen. If the exception is marked as Retryable, we log a soft
+          // exception but never crash in debug.
+          // It's not clear that logging this is even useful, because these events are very
+          // common, mundane, and there's not much we can do about them currently.
+          ReactSoftExceptionLogger.logSoftException(
+              TAG,
+              ReactNoCrashSoftException("Caught exception executing ViewCommand: $command", e),
+          )
+        }
+      } catch (e: Throwable) {
+        // Non-retryable exceptions are logged as soft exceptions in prod, but crash in Debug.
+        ReactSoftExceptionLogger.logSoftException(
+            TAG,
+            RuntimeException("Caught exception executing ViewCommand: $command", e),
+        )
+      }
+    }
+
     // As an optimization, execute all ViewCommands first
     // This should be:
     // 1) Performant: ViewCommands are often a replacement for SetNativeProps, which we've always
     // wanted to be as "synchronous" as possible.
     // 2) Safer: ViewCommands are inherently disconnected from the tree commit/diff/mount process.
     // JS imperatively queues these commands.
-    //    If JS has queued a command, it's reasonable to assume that the more time passes, the more
+    //    If JS has queued a command, it's reasonable to assume that the more time passes, the
+    // more
     // likely it is that the view disappears.
     //    Thus, by executing ViewCommands early, we should actually avoid a category of
     // errors/glitches.
@@ -164,36 +202,7 @@ internal class MountItemDispatcher(
       )
 
       for (command in commands) {
-        if (ReactNativeFeatureFlags.enableFabricLogs()) {
-          printMountItem(command, "dispatchMountItems: Executing viewCommandMountItem")
-        }
-        try {
-          executeOrEnqueue(command)
-        } catch (e: RetryableMountingLayerException) {
-          // If the exception is marked as Retryable, we retry the viewcommand exactly once, after
-          // the current batch of mount items has finished executing.
-          if (command.getRetries() == 0) {
-            command.incrementRetries()
-            addViewCommandMountItem(command)
-          } else {
-            // It's very common for commands to be executed on views that no longer exist - for
-            // example, a blur event on TextInput being fired because of a navigation event away
-            // from the current screen. If the exception is marked as Retryable, we log a soft
-            // exception but never crash in debug.
-            // It's not clear that logging this is even useful, because these events are very
-            // common, mundane, and there's not much we can do about them currently.
-            ReactSoftExceptionLogger.logSoftException(
-                TAG,
-                ReactNoCrashSoftException("Caught exception executing ViewCommand: $command", e),
-            )
-          }
-        } catch (e: Throwable) {
-          // Non-retryable exceptions are logged as soft exceptions in prod, but crash in Debug.
-          ReactSoftExceptionLogger.logSoftException(
-              TAG,
-              RuntimeException("Caught exception executing ViewCommand: $command", e),
-          )
-        }
+        dispatchViewCommand(command)
       }
 
       Systrace.endSection(Systrace.TRACE_TAG_REACT)
@@ -227,6 +236,12 @@ internal class MountItemDispatcher(
           printMountItem(mountItem, "dispatchMountItems: Executing mountItem")
         }
 
+        val command = mountItem as? DispatchCommandMountItem
+        if (command != null) {
+          dispatchViewCommand(command)
+          continue
+        }
+
         try {
           executeOrEnqueue(mountItem)
         } catch (e: Throwable) {

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

@@ -19,8 +19,6 @@ import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.RetryableMountingLayerException
 import com.facebook.react.bridge.UiThreadUtil.assertOnUiThread
 import com.facebook.react.bridge.WritableMap
-import com.facebook.react.common.annotations.UnstableReactNativeAPI
-import com.facebook.react.common.mapbuffer.MapBuffer
 import com.facebook.react.fabric.events.EventEmitterWrapper
 import com.facebook.react.fabric.mounting.mountitems.MountItem
 import com.facebook.react.touch.JSResponderHandler
@@ -53,7 +51,7 @@ internal class MountingManager(
   private val rootViewManager = RootViewManager()
 
   internal fun interface MountItemExecutor {
-    @UiThread @ThreadConfined(ThreadConfined.UI) fun executeItems(items: Queue<MountItem?>?)
+    @UiThread @ThreadConfined(ThreadConfined.UI) fun executeItems(items: Queue<MountItem>)
   }
 
   /**
@@ -267,13 +265,23 @@ internal class MountingManager(
   }
 
   @UiThread
-  fun updateProps(reactTag: Int, props: ReadableMap?) {
+  fun storeSynchronousMountPropsOverride(reactTag: Int, props: ReadableMap?) {
     assertOnUiThread()
     if (props == null) {
       return
     }
 
-    getSurfaceManagerForViewEnforced(reactTag).updateProps(reactTag, props)
+    getSurfaceManagerForViewEnforced(reactTag).storeSynchronousMountPropsOverride(reactTag, props)
+  }
+
+  @UiThread
+  fun updatePropsSynchronously(reactTag: Int, props: ReadableMap?) {
+    assertOnUiThread()
+    if (props == null) {
+      return
+    }
+
+    getSurfaceManagerForViewEnforced(reactTag).updatePropsSynchronously(reactTag, props)
   }
 
   /**
@@ -325,27 +333,6 @@ internal class MountingManager(
               attachmentsPositions,
           )
 
-  /**
-   * This prefetch method is experimental, do not use it for production code. it will most likely
-   * change or be removed in the future.
-   *
-   * @param reactContext
-   * @param componentName
-   * @param params prefetch request params defined in C++
-   */
-  @Suppress("FunctionName")
-  @AnyThread
-  @UnstableReactNativeAPI
-  fun experimental_prefetchResources(
-      reactContext: ReactContext?,
-      componentName: String?,
-      params: MapBuffer?,
-  ) {
-    viewManagerRegistry
-        .get(checkNotNull(componentName))
-        .experimental_prefetchResources(reactContext, params)
-  }
-
   fun enqueuePendingEvent(
       surfaceId: Int,
       reactTag: Int,