react-native-tvos 0.79.2-0 → 0.80.0-0

package/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/MultiSourceHelper.kt

@@ -11,13 +11,10 @@ import com.facebook.imagepipeline.core.ImagePipelineFactory
 import com.facebook.react.modules.fresco.ImageCacheControl
 
 /** Helper class for dealing with multisource images. */
-public object MultiSourceHelper {
+internal object MultiSourceHelper {
   @JvmStatic
-  public fun getBestSourceForSize(
-      width: Int,
-      height: Int,
-      sources: List<ImageSource>
-  ): MultiSourceResult = getBestSourceForSize(width, height, sources, 1.0)
+  fun getBestSourceForSize(width: Int, height: Int, sources: List<ImageSource>): MultiSourceResult =
+      getBestSourceForSize(width, height, sources, 1.0)
 
   /**
    * Chooses the image source with the size closest to the target image size.
@@ -29,7 +26,7 @@ public object MultiSourceHelper {
    *   best source; this is useful if the image will be displayed bigger than the view (e.g. zoomed)
    */
   @JvmStatic
-  public fun getBestSourceForSize(
+  fun getBestSourceForSize(
       width: Int,
       height: Int,
       sources: List<ImageSource>,
@@ -78,16 +75,16 @@ public object MultiSourceHelper {
     return MultiSourceResult(best, bestCached)
   }
 
-  public class MultiSourceResult(
+  class MultiSourceResult(
       /**
        * Get the best result overall (closest in size to the view's size). Can be null if there were
        * no sources to choose from, or if there were more than 1 sources but width/height were 0.
        */
-      @JvmField public val bestResult: ImageSource?,
+      @JvmField val bestResult: ImageSource?,
       /**
        * Get the best result (closest in size to the view's size) that is also in cache. If this
        * would be the same as the source from [.getBestResult], this will return `null` instead.
        */
-      @JvmField public val bestResultInCache: ImageSource?
+      @JvmField val bestResultInCache: ImageSource?
   )
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ResourceDrawableIdHelper.kt

@@ -15,14 +15,16 @@ import javax.annotation.concurrent.ThreadSafe
 
 /** Helper class for obtaining information about local images. */
 @ThreadSafe
-public class ResourceDrawableIdHelper private constructor() {
+public object ResourceDrawableIdHelper {
   private val resourceDrawableIdMap: MutableMap<String, Int> = HashMap()
 
   @Synchronized
+  @JvmStatic
   public fun clear() {
     resourceDrawableIdMap.clear()
   }
 
+  @JvmStatic
   public fun getResourceDrawableId(context: Context, name: String?): Int {
     if (name.isNullOrEmpty()) {
       return 0
@@ -47,11 +49,13 @@ public class ResourceDrawableIdHelper private constructor() {
     return newId
   }
 
+  @JvmStatic
   public fun getResourceDrawable(context: Context, name: String?): Drawable? {
     val resId = getResourceDrawableId(context, name)
     return if (resId > 0) ResourcesCompat.getDrawable(context.resources, resId, null) else null
   }
 
+  @JvmStatic
   public fun getResourceDrawableUri(context: Context, name: String?): Uri {
     val resId = getResourceDrawableId(context, name)
     return if (resId > 0) {
@@ -61,21 +65,20 @@ public class ResourceDrawableIdHelper private constructor() {
     }
   }
 
-  public companion object {
-    private const val LOCAL_RESOURCE_SCHEME = "res"
-    private val resourceDrawableIdHelper: ResourceDrawableIdHelper = ResourceDrawableIdHelper()
-    @JvmStatic
-    public val instance: ResourceDrawableIdHelper
-      get() = resourceDrawableIdHelper
+  @JvmStatic
+  @Deprecated("Use object methods instead, this API is for backward compat")
+  public val instance: ResourceDrawableIdHelper
+    get() = this
 
-    /**
-     * We're just re-adding this to reduce a breaking change for libraries in React Native 0.75.
-     *
-     * @deprecated Use instance instead
-     */
-    @Deprecated("Use .instance instead, this API is for backward compat", ReplaceWith("instance"))
-    @JvmName(
-        "DEPRECATED\$getInstance") // We intentionally don't want to expose this accessor to Java.
-    public fun getInstance(): ResourceDrawableIdHelper = instance
-  }
+  private const val LOCAL_RESOURCE_SCHEME = "res"
+
+  /**
+   * We're just re-adding this to reduce a breaking change for libraries in React Native 0.75.
+   *
+   * @deprecated Use instance instead
+   */
+  @Deprecated("Use .instance instead, this API is for backward compat", ReplaceWith("instance"))
+  @JvmName(
+      "DEPRECATED\$getInstance") // We intentionally don't want to expose this accessor to Java.
+  public fun getInstance(): ResourceDrawableIdHelper = this
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.kt

@@ -23,42 +23,39 @@ import com.facebook.react.views.modal.ReactModalHostView.OnRequestCloseListener
 
 /** View manager for [ReactModalHostView] components. */
 @ReactModule(name = ReactModalHostManager.REACT_CLASS)
-public class ReactModalHostManager :
+internal class ReactModalHostManager :
     ViewGroupManager<ReactModalHostView>(), ModalHostViewManagerInterface<ReactModalHostView> {
   private val delegate: ViewManagerDelegate<ReactModalHostView> = ModalHostViewManagerDelegate(this)
 
-  public override fun getName(): String = REACT_CLASS
+  override fun getName(): String = REACT_CLASS
 
   protected override fun createViewInstance(reactContext: ThemedReactContext): ReactModalHostView =
       ReactModalHostView(reactContext)
 
-  public override fun onDropViewInstance(view: ReactModalHostView) {
+  override fun onDropViewInstance(view: ReactModalHostView) {
     super.onDropViewInstance(view)
     view.onDropInstance()
   }
 
   @ReactProp(name = "animationType")
-  public override fun setAnimationType(view: ReactModalHostView, animationType: String?) {
+  override fun setAnimationType(view: ReactModalHostView, animationType: String?) {
     if (animationType != null) {
       view.animationType = animationType
     }
   }
 
   @ReactProp(name = "transparent")
-  public override fun setTransparent(view: ReactModalHostView, transparent: Boolean) {
+  override fun setTransparent(view: ReactModalHostView, transparent: Boolean) {
     view.transparent = transparent
   }
 
   @ReactProp(name = "statusBarTranslucent")
-  public override fun setStatusBarTranslucent(
-      view: ReactModalHostView,
-      statusBarTranslucent: Boolean
-  ) {
+  override fun setStatusBarTranslucent(view: ReactModalHostView, statusBarTranslucent: Boolean) {
     view.statusBarTranslucent = statusBarTranslucent
   }
 
   @ReactProp(name = "navigationBarTranslucent")
-  public override fun setNavigationBarTranslucent(
+  override fun setNavigationBarTranslucent(
       view: ReactModalHostView,
       navigationBarTranslucent: Boolean
   ) {
@@ -66,34 +63,29 @@ public class ReactModalHostManager :
   }
 
   @ReactProp(name = "hardwareAccelerated")
-  public override fun setHardwareAccelerated(
-      view: ReactModalHostView,
-      hardwareAccelerated: Boolean
-  ) {
+  override fun setHardwareAccelerated(view: ReactModalHostView, hardwareAccelerated: Boolean) {
     view.hardwareAccelerated = hardwareAccelerated
   }
 
   @ReactProp(name = "visible")
-  public override fun setVisible(view: ReactModalHostView, visible: Boolean) {
+  override fun setVisible(view: ReactModalHostView, visible: Boolean) {
     // iOS only
   }
 
   @ReactProp(name = "presentationStyle")
-  public override fun setPresentationStyle(view: ReactModalHostView, value: String?): Unit = Unit
+  override fun setPresentationStyle(view: ReactModalHostView, value: String?): Unit = Unit
 
   @ReactProp(name = "animated")
-  public override fun setAnimated(view: ReactModalHostView, value: Boolean): Unit = Unit
+  override fun setAnimated(view: ReactModalHostView, value: Boolean): Unit = Unit
 
   @ReactProp(name = "supportedOrientations")
-  public override fun setSupportedOrientations(
-      view: ReactModalHostView,
-      value: ReadableArray?
-  ): Unit = Unit
+  override fun setSupportedOrientations(view: ReactModalHostView, value: ReadableArray?): Unit =
+      Unit
 
   @ReactProp(name = "identifier")
-  public override fun setIdentifier(view: ReactModalHostView, value: Int): Unit = Unit
+  override fun setIdentifier(view: ReactModalHostView, value: Int): Unit = Unit
 
-  public override fun setTestId(view: ReactModalHostView, value: String?) {
+  override fun setTestId(view: ReactModalHostView, value: String?) {
     super.setTestId(view, value)
     view.setDialogRootViewGroupTestId(value)
   }
@@ -115,7 +107,7 @@ public class ReactModalHostManager :
     }
   }
 
-  public override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any> =
+  override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any> =
       (super.getExportedCustomDirectEventTypeConstants() ?: mutableMapOf()).apply {
         put(RequestCloseEvent.EVENT_NAME, mapOf("registrationName" to "onRequestClose"))
         put(ShowEvent.EVENT_NAME, mapOf("registrationName" to "onShow")) // iOS only
@@ -128,7 +120,7 @@ public class ReactModalHostManager :
     view.showOrUpdate()
   }
 
-  public override fun updateState(
+  override fun updateState(
       view: ReactModalHostView,
       props: ReactStylesDiffMap,
       stateWrapper: StateWrapper
@@ -137,9 +129,9 @@ public class ReactModalHostManager :
     return null
   }
 
-  public override fun getDelegate(): ViewManagerDelegate<ReactModalHostView> = delegate
+  override fun getDelegate(): ViewManagerDelegate<ReactModalHostView> = delegate
 
-  public companion object {
-    public const val REACT_CLASS: String = "RCTModalHostView"
+  companion object {
+    const val REACT_CLASS: String = "RCTModalHostView"
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt

@@ -21,17 +21,17 @@ import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewStructure
-import android.view.Window
 import android.view.WindowManager
 import android.view.accessibility.AccessibilityEvent
 import android.view.accessibility.AccessibilityNodeInfo
 import android.widget.FrameLayout
+import androidx.activity.ComponentDialog
+import androidx.activity.OnBackPressedCallback
 import androidx.annotation.UiThread
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import com.facebook.common.logging.FLog
 import com.facebook.react.R
-import com.facebook.react.ReactActivity
 import com.facebook.react.bridge.GuardedRunnable
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.ReactContext
@@ -40,6 +40,7 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.common.ReactConstants
 import com.facebook.react.common.annotations.VisibleForTesting
+import com.facebook.react.common.build.ReactBuildConfig
 import com.facebook.react.config.ReactFeatureFlags
 import com.facebook.react.modules.core.ReactAndroidHWInputDeviceHelper
 import com.facebook.react.uimanager.JSPointerDispatcher
@@ -51,9 +52,10 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerModule
 import com.facebook.react.uimanager.events.EventDispatcher
 import com.facebook.react.views.common.ContextUtils
-import com.facebook.react.views.view.setStatusBarTranslucency
 import com.facebook.react.views.modal.ReactModalHostView.DialogRootViewGroup
 import com.facebook.react.views.view.ReactViewGroup
+import com.facebook.react.views.view.setStatusBarTranslucency
+import com.facebook.react.views.view.setSystemBarsTranslucency
 import java.util.Objects
 
 
@@ -74,7 +76,7 @@ public class ReactModalHostView(context: ThemedReactContext) :
     ViewGroup(context), LifecycleEventListener {
 
   @get:VisibleForTesting
-  public var dialog: Dialog? = null
+  public var dialog: ComponentDialog? = null
     private set
 
   public var transparent: Boolean = false
@@ -253,17 +255,34 @@ public class ReactModalHostView(context: ThemedReactContext) :
         }
 
     val currentActivity = getCurrentActivity()
-    val newDialog = Dialog(currentActivity ?: context, theme)
+    val newDialog = ComponentDialog(currentActivity ?: context, theme)
     dialog = newDialog
-    Objects.requireNonNull<Window>(newDialog.window)
-        .setFlags(
-            WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
-            WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)
+    val window = requireNotNull(newDialog.window)
+    window.setFlags(
+        WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
+        WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)
 
     newDialog.setContentView(contentView)
     updateProperties()
 
     newDialog.setOnShowListener(onShowListener)
+
+    val handleCloseAction: () -> Unit = {
+      val listener =
+          checkNotNull(onRequestCloseListener) {
+            "onRequestClose callback must be set if back key is expected to close the modal"
+          }
+      listener.onRequestClose(newDialog)
+    }
+
+    val backPressedCallback: OnBackPressedCallback =
+        object : OnBackPressedCallback(true) {
+          override fun handleOnBackPressed() {
+            handleCloseAction()
+          }
+        }
+
+    newDialog.onBackPressedDispatcher.addCallback(newDialog, backPressedCallback)
     newDialog.setOnKeyListener(
         object : DialogInterface.OnKeyListener {
           override fun onKey(dialog: DialogInterface, keyCode: Int, event: KeyEvent): Boolean {
@@ -276,59 +295,36 @@ public class ReactModalHostView(context: ThemedReactContext) :
               // to whether or not to allow the back/escape key to close the dialog. If it chooses
               // to, it can just set visible to false on the Modal and the Modal will go away
               if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_ESCAPE) {
-                val listener =
-                    checkNotNull(onRequestCloseListener) {
-                      "onRequestClose callback must be set if back key is expected to close the modal"
-                    }
-                listener.onRequestClose(dialog)
+                handleCloseAction()
                 return true
               } else {
                 // We redirect the rest of the key events to the current activity, since the
                 // activity expects to receive those events and react to them, ie. in the case of
                 // the dev menu
                 val innerCurrentActivity =
-                    (this@ReactModalHostView.context as ReactContext).currentActivity as? ReactActivity
+                    (this@ReactModalHostView.context as ReactContext).currentActivity
                 if (innerCurrentActivity != null) {
-                  return innerCurrentActivity.onDialogKeyUp(keyCode, event)
+                  return innerCurrentActivity.onKeyUp(keyCode, event)
                 }
               }
             }
-
-            // @see https://github.com/react-native-tvos/react-native-tvos/issues/829
-            if (event.action == KeyEvent.ACTION_DOWN) {
-              // Allow BACK and ESCAPE keys to propagate to the dialog's activity.
-              // Returning false ensures these keys are not consumed here, so they
-              // can be processed during the ACTION_UP event where their functionality
-              // is handled by JavaScript.
-              if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_ESCAPE) {
-                return false
-              }
-
-              // Redirect all other key down events to the current activity.
-              val innerCurrentActivity =
-                (this@ReactModalHostView.context as ReactContext).currentActivity as? ReactActivity
-              if (innerCurrentActivity != null) {
-                return innerCurrentActivity.onDialogKeyDown(keyCode, event)
-              }
-            }
-
             return false
           }
         })
 
-    newDialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
+    window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
     if (hardwareAccelerated) {
-      newDialog.window?.addFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED)
+      window.addFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED)
     }
     val flagSecureSet = isFlagSecureSet(currentActivity)
     if (flagSecureSet) {
-      newDialog.window?.setFlags(
+      window.setFlags(
           WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
     }
     if (currentActivity?.isFinishing == false) {
       newDialog.show()
       updateSystemAppearance()
-      newDialog.window?.clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)
+      window.clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)
     }
   }
 
@@ -549,13 +545,18 @@ public class ReactModalHostView(context: ThemedReactContext) :
       val realWidth: Float = width.toFloat().pxToDp()
       val realHeight: Float = height.toFloat().pxToDp()
 
-      stateWrapper?.let { sw ->
+      val sw = stateWrapper
+      if (sw != null) {
         // new architecture
         val newStateData: WritableMap = WritableNativeMap()
         newStateData.putDouble("screenWidth", realWidth.toDouble())
         newStateData.putDouble("screenHeight", realHeight.toDouble())
         sw.updateState(newStateData)
-      } ?: run {
+      } else if (!ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE) {
+        // When UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE = true, means the Legacy Architecture is
+        // fully disabled and can be minified.
+        // The goal is to compile-out UIManagerModule from the following code block:
+        run {
           // old architecture
           // TODO: T44725185 remove after full migration to Fabric
           reactContext.runOnNativeModulesQueueThread(
@@ -567,6 +568,7 @@ public class ReactModalHostView(context: ThemedReactContext) :
                 }
               })
         }
+      }
     }
 
     override fun handleException(t: Throwable) {

package/ReactAndroid/src/main/java/com/facebook/react/views/modal/RequestCloseEvent.kt

@@ -18,7 +18,7 @@ internal class RequestCloseEvent(surfaceId: Int, viewTag: Int) :
 
   @Deprecated(
       "Do not use this constructor, use the one with explicit surfaceId",
-      ReplaceWith("ShowEvent(surfaceId, viewTag)"))
+      ReplaceWith("RequestCloseEvent(surfaceId, viewTag)"))
   constructor(viewTag: Int) : this(ViewUtil.NO_SURFACE_ID, viewTag)
 
   override fun getEventName(): String = EVENT_NAME

package/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.kt

@@ -22,7 +22,7 @@ internal class ShowEvent(surfaceId: Int, viewTag: Int) : Event<ShowEvent>(surfac
 
   override fun getEventName(): String = EVENT_NAME
 
-  override fun getEventData(): WritableMap? = Arguments.createMap()
+  override fun getEventData(): WritableMap = Arguments.createMap()
 
   companion object {
     const val EVENT_NAME: String = "topShow"

package/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.kt

@@ -10,6 +10,8 @@ package com.facebook.react.views.progressbar
 import android.util.SparseIntArray
 import android.view.View
 import android.view.ViewGroup
+import com.facebook.react.common.annotations.LegacyArchitectureShadowNodeWithCxxImpl
+import com.facebook.react.common.annotations.internal.LegacyArchitecture
 import com.facebook.react.uimanager.LayoutShadowNode
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.yoga.YogaMeasureFunction
@@ -21,6 +23,8 @@ import com.facebook.yoga.YogaNode
  * Node responsible for holding the style of the ProgressBar, see under [ ] for possible styles.
  * ReactProgressBarViewManager manages how this style is applied to the ProgressBar.
  */
+@LegacyArchitecture
+@LegacyArchitectureShadowNodeWithCxxImpl
 internal class ProgressBarShadowNode : LayoutShadowNode(), YogaMeasureFunction {
   private val height: SparseIntArray = SparseIntArray()
   private val width: SparseIntArray = SparseIntArray()

package/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaView.kt

@@ -15,6 +15,7 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsCompat.CONSUMED
 import com.facebook.react.bridge.GuardedRunnable
 import com.facebook.react.bridge.WritableNativeMap
+import com.facebook.react.common.build.ReactBuildConfig
 import com.facebook.react.uimanager.PixelUtil.pxToDp
 import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
@@ -40,25 +41,26 @@ internal class ReactSafeAreaView(val reactContext: ThemedReactContext) : ViewGro
 
   @UiThread
   private fun updateState(insets: Insets) {
-    stateWrapper?.let { stateWrapper ->
-      // fabric
+    val sw = stateWrapper
+    if (sw != null) {
       WritableNativeMap().apply {
         putDouble("left", insets.left.toFloat().pxToDp().toDouble())
         putDouble("top", insets.top.toFloat().pxToDp().toDouble())
         putDouble("bottom", insets.bottom.toFloat().pxToDp().toDouble())
         putDouble("right", insets.right.toFloat().pxToDp().toDouble())
 
-        stateWrapper.updateState(this)
+        sw.updateState(this)
       }
+    } else if (!ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE) {
+      // paper
+      reactContext.runOnNativeModulesQueueThread(
+          object : GuardedRunnable(reactContext) {
+            override fun runGuarded() {
+              this@ReactSafeAreaView.reactContext.reactApplicationContext
+                  .getNativeModule(UIManagerModule::class.java)
+                  ?.updateInsetsPadding(id, insets.top, insets.left, insets.bottom, insets.right)
+            }
+          })
     }
-        // paper
-        ?: reactContext.runOnNativeModulesQueueThread(
-            object : GuardedRunnable(reactContext) {
-              override fun runGuarded() {
-                this@ReactSafeAreaView.reactContext.reactApplicationContext
-                    .getNativeModule(UIManagerModule::class.java)
-                    ?.updateInsetsPadding(id, insets.top, insets.left, insets.bottom, insets.right)
-              }
-            })
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaViewManager.kt

@@ -19,7 +19,7 @@ import com.facebook.react.viewmanagers.SafeAreaViewManagerInterface
 
 /** View manager for [ReactSafeAreaView] components. */
 @ReactModule(name = ReactSafeAreaViewManager.REACT_CLASS)
-internal class ReactSafeAreaViewManager() :
+internal class ReactSafeAreaViewManager :
     ViewGroupManager<ReactSafeAreaView>(), SafeAreaViewManagerInterface<ReactSafeAreaView> {
 
   private val delegate: ViewManagerDelegate<ReactSafeAreaView> = SafeAreaViewManagerDelegate(this)

package/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaViewShadowNode.kt

@@ -7,6 +7,7 @@
 
 package com.facebook.react.views.safeareaview
 
+import com.facebook.react.common.annotations.internal.LegacyArchitecture
 import com.facebook.react.uimanager.LayoutShadowNode
 
-internal class ReactSafeAreaViewShadowNode() : LayoutShadowNode() {}
+@LegacyArchitecture internal class ReactSafeAreaViewShadowNode : LayoutShadowNode() {}