react-native-tvos 0.75.4-0 → 0.76.0-0

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

@@ -12,7 +12,7 @@ import android.net.Uri
 import java.util.Objects
 
 /** Class describing an image source (network URI or resource) and size. */
-public class ImageSource
+public open class ImageSource
 @JvmOverloads
 constructor(
     context: Context,

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

@@ -8,10 +8,12 @@
 package com.facebook.react.views.imagehelper
 
 import android.content.Context
+import android.content.res.Resources
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import androidx.core.content.res.ResourcesCompat
 import javax.annotation.concurrent.ThreadSafe
+import org.xmlpull.v1.XmlPullParser
 
 /** Helper class for obtaining information about local images. */
 @ThreadSafe
@@ -61,6 +63,39 @@ public class ResourceDrawableIdHelper private constructor() {
     }
   }
 
+  public fun isVectorDrawable(context: Context, name: String): Boolean {
+    return getOpeningXmlTag(context, name) == "vector"
+  }
+
+  /**
+   * If the provided resource name is a valid drawable resource and is an XML file, returns the root
+   * XML tag. Skips over the versioning/encoding header. Non-XML files and malformed XML files
+   * return null.
+   *
+   * For example, a vector drawable file would return "vector".
+   */
+  private fun getOpeningXmlTag(context: Context, name: String): String? {
+    val resId = getResourceDrawableId(context, name).takeIf { it > 0 } ?: return null
+    return try {
+      val xmlParser = context.resources.getXml(resId)
+      xmlParser.use {
+        var parentTag: String? = null
+        var eventType = xmlParser.eventType
+        while (eventType != XmlPullParser.END_DOCUMENT) {
+          if (eventType == XmlPullParser.START_TAG) {
+            parentTag = xmlParser.name
+            break
+          }
+          eventType = xmlParser.next()
+        }
+        parentTag
+      }
+    } catch (e: Resources.NotFoundException) {
+      // Drawable image is not an XML file
+      null
+    }
+  }
+
   public companion object {
     private const val LOCAL_RESOURCE_SCHEME = "res"
     private val resourceDrawableIdHelper: ResourceDrawableIdHelper = ResourceDrawableIdHelper()

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

@@ -13,6 +13,7 @@ import android.graphics.Point
 import android.view.WindowManager
 
 /** Helper class for Modals. */
+@Deprecated("This class is no longer used and will be removed soon.")
 internal object ModalHostHelper {
   private val MIN_POINT = Point()
   private val MAX_POINT = Point()

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

@@ -9,7 +9,6 @@ package com.facebook.react.views.modal
 
 import com.facebook.react.uimanager.LayoutShadowNode
 import com.facebook.react.uimanager.ReactShadowNodeImpl
-import com.facebook.react.views.modal.ModalHostHelper.getModalHostSize
 
 /**
  * We implement the Modal by using an Android Dialog. That will fill the entire window of the
@@ -19,6 +18,7 @@ import com.facebook.react.views.modal.ModalHostHelper.getModalHostSize
  * to be the window size. This will then cause the children of the Modal to layout as if they can
  * fill the window.
  */
+@Deprecated("This class is no longer used and will be removed soon.") 
 internal class ModalHostShadowNode : LayoutShadowNode() {
   /**
    * We need to set the styleWidth and styleHeight of the one child (represented by the
@@ -27,8 +27,5 @@ internal class ModalHostShadowNode : LayoutShadowNode() {
    */
   override fun addChildAt(child: ReactShadowNodeImpl, i: Int) {
     super.addChildAt(child, i)
-    val modalSize = getModalHostSize(themedContext)
-    child.setStyleWidth(modalSize.x.toFloat())
-    child.setStyleHeight(modalSize.y.toFloat())
   }
 }

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

@@ -9,9 +9,7 @@ package com.facebook.react.views.modal
 
 import android.content.DialogInterface.OnShowListener
 import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.common.MapBuilder
 import com.facebook.react.module.annotations.ReactModule
-import com.facebook.react.uimanager.LayoutShadowNode
 import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
@@ -21,7 +19,6 @@ import com.facebook.react.uimanager.ViewManagerDelegate
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.ModalHostViewManagerDelegate
 import com.facebook.react.viewmanagers.ModalHostViewManagerInterface
-import com.facebook.react.views.modal.ModalHostHelper.getModalHostSize
 import com.facebook.react.views.modal.ReactModalHostView.OnRequestCloseListener
 
 /** View manager for [ReactModalHostView] components. */
@@ -35,11 +32,6 @@ public class ReactModalHostManager :
   protected override fun createViewInstance(reactContext: ThemedReactContext): ReactModalHostView =
       ReactModalHostView(reactContext)
 
-  public override fun createShadowNodeInstance(): LayoutShadowNode = ModalHostShadowNode()
-
-  public override fun getShadowNodeClass(): Class<out LayoutShadowNode> =
-      ModalHostShadowNode::class.java
-
   public override fun onDropViewInstance(view: ReactModalHostView) {
     super.onDropViewInstance(view)
     view.onDropInstance()
@@ -59,16 +51,16 @@ public class ReactModalHostManager :
 
   @ReactProp(name = "statusBarTranslucent")
   public override fun setStatusBarTranslucent(
-    view: ReactModalHostView,
-    statusBarTranslucent: Boolean
+      view: ReactModalHostView,
+      statusBarTranslucent: Boolean
   ) {
     view.statusBarTranslucent = statusBarTranslucent
   }
 
   @ReactProp(name = "hardwareAccelerated")
   public override fun setHardwareAccelerated(
-    view: ReactModalHostView,
-    hardwareAccelerated: Boolean
+      view: ReactModalHostView,
+      hardwareAccelerated: Boolean
   ) {
     view.hardwareAccelerated = hardwareAccelerated
   }
@@ -86,8 +78,8 @@ public class ReactModalHostManager :
 
   @ReactProp(name = "supportedOrientations")
   public override fun setSupportedOrientations(
-    view: ReactModalHostView,
-    value: ReadableArray?
+      view: ReactModalHostView,
+      value: ReadableArray?
   ): Unit = Unit
 
   @ReactProp(name = "identifier")
@@ -112,17 +104,10 @@ public class ReactModalHostManager :
 
   public override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any> =
       (super.getExportedCustomDirectEventTypeConstants() ?: mutableMapOf()).apply {
-        putAll(
-            MapBuilder.builder<String, Any>()
-                .put(
-                    RequestCloseEvent.EVENT_NAME,
-                    MapBuilder.of("registrationName", "onRequestClose"))
-                .put(ShowEvent.EVENT_NAME, MapBuilder.of("registrationName", "onShow")) // iOS only
-                .put("topDismiss", MapBuilder.of("registrationName", "onDismiss")) // iOS only
-                .put(
-                    "topOrientationChange",
-                    MapBuilder.of("registrationName", "onOrientationChange"))
-                .build())
+        put(RequestCloseEvent.EVENT_NAME, mapOf("registrationName" to "onRequestClose"))
+        put(ShowEvent.EVENT_NAME, mapOf("registrationName" to "onShow")) // iOS only
+        put("topDismiss", mapOf("registrationName" to "onDismiss")) // iOS only
+        put("topOrientationChange", mapOf("registrationName" to "onOrientationChange"))
       }
 
   protected override fun onAfterUpdateTransaction(view: ReactModalHostView) {
@@ -131,13 +116,11 @@ public class ReactModalHostManager :
   }
 
   public override fun updateState(
-    view: ReactModalHostView,
-    props: ReactStylesDiffMap,
-    stateWrapper: StateWrapper
+      view: ReactModalHostView,
+      props: ReactStylesDiffMap,
+      stateWrapper: StateWrapper
   ): Any? {
     view.stateWrapper = stateWrapper
-    val modalSize = getModalHostSize(view.context)
-    view.updateState(modalSize.x, modalSize.y)
     return null
   }
 

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

@@ -27,30 +27,31 @@ import android.view.WindowManager
 import android.view.accessibility.AccessibilityEvent
 import android.widget.FrameLayout
 import androidx.annotation.UiThread
+import com.facebook.common.logging.FLog
 import com.facebook.react.R
 import com.facebook.react.bridge.GuardedRunnable
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.ReactContext
-import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.UiThreadUtil
 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.config.ReactFeatureFlags
 import com.facebook.react.modules.core.ReactAndroidHWInputDeviceHelper
 import com.facebook.react.uimanager.JSPointerDispatcher
 import com.facebook.react.uimanager.JSTouchDispatcher
-import com.facebook.react.uimanager.PixelUtil
+import com.facebook.react.uimanager.PixelUtil.pxToDp
 import com.facebook.react.uimanager.RootView
 import com.facebook.react.uimanager.StateWrapper
 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 java.util.Objects
-import kotlin.math.abs
 
 
 /**
@@ -95,18 +96,18 @@ public class ReactModalHostView(context: ThemedReactContext) :
     }
 
   public var stateWrapper: StateWrapper?
-    get() = hostView.stateWrapper
+    get() = dialogRootViewGroup.stateWrapper
     public set(stateWrapper) {
-      hostView.stateWrapper = stateWrapper
+      dialogRootViewGroup.stateWrapper = stateWrapper
     }
 
   public var eventDispatcher: EventDispatcher?
-    get() = hostView.eventDispatcher
+    get() = dialogRootViewGroup.eventDispatcher
     public set(eventDispatcher) {
-      hostView.eventDispatcher = eventDispatcher
+      dialogRootViewGroup.eventDispatcher = eventDispatcher
     }
 
-  private var hostView: DialogRootViewGroup
+  private val dialogRootViewGroup: DialogRootViewGroup
 
   // Set this flag to true if changing a particular property on the view requires a new Dialog to
   // be created or Dialog was destroyed. For instance, animation does since it affects Dialog
@@ -116,17 +117,24 @@ public class ReactModalHostView(context: ThemedReactContext) :
 
   init {
     context.addLifecycleEventListener(this)
-    hostView = DialogRootViewGroup(context)
+    dialogRootViewGroup = DialogRootViewGroup(context)
   }
 
   public override fun dispatchProvideStructure(structure: ViewStructure) {
-    hostView.dispatchProvideStructure(structure)
+    dialogRootViewGroup.dispatchProvideStructure(structure)
   }
 
   protected override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
     // Do nothing as we are laid out by UIManager
   }
 
+  override fun setId(id: Int) {
+    super.setId(id)
+
+    // Forward the ID to our content view, so event dispatching behaves correctly
+    dialogRootViewGroup.id = id
+  }
+
   protected override fun onDetachedFromWindow() {
     super.onDetachedFromWindow()
     dismiss()
@@ -134,25 +142,25 @@ public class ReactModalHostView(context: ThemedReactContext) :
 
   public override fun addView(child: View?, index: Int) {
     UiThreadUtil.assertOnUiThread()
-    hostView.addView(child, index)
+    dialogRootViewGroup.addView(child, index)
   }
 
-  public override fun getChildCount(): Int = hostView.childCount
+  public override fun getChildCount(): Int = dialogRootViewGroup.childCount
 
-  public override fun getChildAt(index: Int): View? = hostView.getChildAt(index)
+  public override fun getChildAt(index: Int): View? = dialogRootViewGroup.getChildAt(index)
 
   public override fun removeView(child: View?) {
     UiThreadUtil.assertOnUiThread()
 
     if (child != null) {
-      hostView.removeView(child)
+      dialogRootViewGroup.removeView(child)
     }
   }
 
   public override fun removeViewAt(index: Int) {
     UiThreadUtil.assertOnUiThread()
     val child = getChildAt(index)
-    hostView.removeView(child)
+    dialogRootViewGroup.removeView(child)
   }
 
   public override fun addChildrenForAccessibility(outChildren: ArrayList<View>) {
@@ -185,7 +193,7 @@ public class ReactModalHostView(context: ThemedReactContext) :
 
       // We need to remove the mHostView from the parent
       // It is possible we are dismissing this dialog and reattaching the hostView to another
-      (hostView.parent as? ViewGroup)?.removeViewAt(0)
+      (dialogRootViewGroup.parent as? ViewGroup)?.removeViewAt(0)
     }
   }
 
@@ -249,7 +257,7 @@ public class ReactModalHostView(context: ThemedReactContext) :
           override fun onKey(dialog: DialogInterface, keyCode: Int, event: KeyEvent): Boolean {
             // Modal needs to send the key event to its own TV event handler
             // https://github.com/react-native-tvos/react-native-tvos/issues/609
-            hostView.androidHWInputDeviceHelper.handleKeyEvent(event, hostView.reactContext)
+            dialogRootViewGroup.androidHWInputDeviceHelper.handleKeyEvent(event, dialogRootViewGroup.reactContext)
             if (event.action == KeyEvent.ACTION_UP) {
               // We need to stop the BACK button and ESCAPE key from closing the dialog by default
               // so we capture that event and instead inform JS so that it can make the decision as
@@ -295,16 +303,7 @@ public class ReactModalHostView(context: ThemedReactContext) :
      * changed. This has the pleasant side-effect of us not having to preface all Modals with "top:
      * statusBarHeight", since that margin will be included in the FrameLayout.
      */
-    get() {
-      val frameLayout = FrameLayout(context)
-      frameLayout.addView(hostView)
-      if (statusBarTranslucent) {
-        frameLayout.systemUiVisibility = SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-      } else {
-        frameLayout.fitsSystemWindows = true
-      }
-      return frameLayout
-    }
+    get() = FrameLayout(context).apply { addView(dialogRootViewGroup) }
 
   /**
    * updateProperties will update the properties that do not require us to recreate the dialog
@@ -313,61 +312,64 @@ public class ReactModalHostView(context: ThemedReactContext) :
    */
   private fun updateProperties() {
     val dialog = checkNotNull(dialog) { "dialog must exist when we call updateProperties" }
-    val currentActivity = getCurrentActivity()
-    val window =
+    val dialogWindow =
         checkNotNull(dialog.window) { "dialog must have window when we call updateProperties" }
-    if (currentActivity == null || currentActivity.isFinishing || !window.isActive) {
+    val currentActivity = getCurrentActivity()
+    if (currentActivity == null || currentActivity.isFinishing || currentActivity.isDestroyed) {
       // If the activity has disappeared, then we shouldn't update the window associated to the
       // Dialog.
       return
     }
-    val activityWindow = currentActivity.window
-    if (activityWindow != null) {
-      val activityWindowFlags = activityWindow.attributes.flags
-      if ((activityWindowFlags and WindowManager.LayoutParams.FLAG_FULLSCREEN) != 0) {
-        window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
-      } else {
-        window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
+    try {
+      val activityWindow = currentActivity.window
+      if (activityWindow != null) {
+        val activityWindowFlags = activityWindow.attributes.flags
+        if ((activityWindowFlags and WindowManager.LayoutParams.FLAG_FULLSCREEN) != 0) {
+          dialogWindow.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
+        } else {
+          dialogWindow.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
+        }
       }
-    }
 
-    if (transparent) {
-      window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
-    } else {
-      window.setDimAmount(0.5f)
-      window.setFlags(
-          WindowManager.LayoutParams.FLAG_DIM_BEHIND, WindowManager.LayoutParams.FLAG_DIM_BEHIND)
+      dialogWindow.setStatusBarTranslucency(statusBarTranslucent)
+
+      if (transparent) {
+        dialogWindow.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
+      } else {
+        dialogWindow.setDimAmount(0.5f)
+        dialogWindow.setFlags(
+            WindowManager.LayoutParams.FLAG_DIM_BEHIND, WindowManager.LayoutParams.FLAG_DIM_BEHIND)
+      }
+    } catch (e: IllegalArgumentException) {
+      // This is to prevent a crash from the following error, without a clear repro steps:
+      // java.lang.IllegalArgumentException: View=DecorView@c94931b[XxxActivity] not attached to
+      // window manager
+      FLog.e(
+          ReactConstants.TAG, "ReactModalHostView: error while setting window flags: ", e.message)
     }
   }
 
   private fun updateSystemAppearance() {
     val currentActivity = getCurrentActivity() ?: return
     val dialog = checkNotNull(dialog) { "dialog must exist when we call updateProperties" }
-    val window =
+    val dialogWindow =
         checkNotNull(dialog.window) { "dialog must have window when we call updateProperties" }
+    val activityWindow = currentActivity.window
     // Modeled after the version check in StatusBarModule.setStyle
     if (Build.VERSION.SDK_INT > Build.VERSION_CODES.R) {
-      val currentActivityWindow = currentActivity.window
-      val insetsController: WindowInsetsController =
-          checkNotNull(currentActivityWindow.insetsController)
+      val insetsController: WindowInsetsController = checkNotNull(activityWindow.insetsController)
       val activityAppearance: Int = insetsController.systemBarsAppearance
 
       val activityLightStatusBars =
           activityAppearance and WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS
 
-      window.insetsController?.setSystemBarsAppearance(
+      dialogWindow.insetsController?.setSystemBarsAppearance(
           activityLightStatusBars, WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS)
     } else {
-      val currentActivityWindow = checkNotNull(currentActivity.window)
-      val decorView = currentActivityWindow.decorView
-      decorView.setSystemUiVisibility(decorView.systemUiVisibility)
+      dialogWindow.decorView.systemUiVisibility = activityWindow.decorView.systemUiVisibility
     }
   }
 
-  public fun updateState(width: Int, height: Int) {
-    hostView.updateState(width, height)
-  }
-
   // This listener is called when the user presses KeyEvent.KEYCODE_BACK
   // An event is then passed to JS which can either close or not close the Modal by setting the
   // visible property
@@ -390,15 +392,15 @@ public class ReactModalHostView(context: ThemedReactContext) :
    * styleHeight on the LayoutShadowNode to be the window size. This is done through the
    * UIManagerModule, and will then cause the children to layout as if they can fill the window.
    */
-  public inner class DialogRootViewGroup(context: Context?) : ReactViewGroup(context), RootView {
+  public class DialogRootViewGroup internal constructor(context: Context?) :
+      ReactViewGroup(context), RootView {
     internal var stateWrapper: StateWrapper? = null
+    internal var eventDispatcher: EventDispatcher? = null
 
-    private var hasAdjustedSize = false
     private var viewWidth = 0
     private var viewHeight = 0
     private val jSTouchDispatcher: JSTouchDispatcher = JSTouchDispatcher(this)
     private var jSPointerDispatcher: JSPointerDispatcher? = null
-    internal var eventDispatcher: EventDispatcher? = null
     internal val androidHWInputDeviceHelper: ReactAndroidHWInputDeviceHelper
       get() = ReactAndroidHWInputDeviceHelper()
 
@@ -415,7 +417,8 @@ public class ReactModalHostView(context: ThemedReactContext) :
       super.onSizeChanged(w, h, oldw, oldh)
       viewWidth = w
       viewHeight = h
-      updateFirstChildView()
+
+      updateState(viewWidth, viewHeight)
     }
 
     protected override fun onFocusChanged(
@@ -434,7 +437,6 @@ public class ReactModalHostView(context: ThemedReactContext) :
 
     private fun updateFirstChildView() {
       if (childCount > 0) {
-        hasAdjustedSize = false
         val viewTag: Int = getChildAt(0).id
         if (stateWrapper != null) {
           // This will only be called under Fabric
@@ -451,53 +453,32 @@ public class ReactModalHostView(context: ThemedReactContext) :
                 }
               })
         }
-      } else {
-        hasAdjustedSize = true
       }
     }
 
     @UiThread
     public fun updateState(width: Int, height: Int) {
-      val realWidth: Float = PixelUtil.toDIPFromPixel(width.toFloat())
-      val realHeight: Float = PixelUtil.toDIPFromPixel(height.toFloat())
-
-      // Check incoming state values. If they're already the correct value, return early to prevent
-      // infinite UpdateState/SetState loop.
-      val currentState: ReadableMap? = stateWrapper?.getStateData()
-      if (currentState != null) {
-        val delta = 0.9f
-        val stateScreenHeight =
-            if (currentState.hasKey("screenHeight")) {
-              currentState.getDouble("screenHeight").toFloat()
-            } else {
-              0f
-            }
-        val stateScreenWidth =
-            if (currentState.hasKey("screenWidth")) {
-              currentState.getDouble("screenWidth").toFloat()
-            } else {
-              0f
-            }
-
-        if (abs((stateScreenWidth - realWidth).toDouble()) < delta &&
-            abs((stateScreenHeight - realHeight).toDouble()) < delta) {
-          return
-        }
-      }
+      val realWidth: Float = width.toFloat().pxToDp()
+      val realHeight: Float = height.toFloat().pxToDp()
 
       stateWrapper?.let { sw ->
+        // new architecture
         val newStateData: WritableMap = WritableNativeMap()
         newStateData.putDouble("screenWidth", realWidth.toDouble())
         newStateData.putDouble("screenHeight", realHeight.toDouble())
         sw.updateState(newStateData)
-      }
-    }
-
-    override fun addView(child: View, index: Int, params: LayoutParams) {
-      super.addView(child, index, params)
-      if (hasAdjustedSize) {
-        updateFirstChildView()
-      }
+      } ?: run {
+          // old architecture
+          // TODO: T44725185 remove after full migration to Fabric
+          reactContext.runOnNativeModulesQueueThread(
+              object : GuardedRunnable(reactContext) {
+                override fun runGuarded() {
+                  reactContext.reactApplicationContext
+                      .getNativeModule(UIManagerModule::class.java)
+                      ?.updateNodeSize(id, viewWidth, viewHeight)
+                }
+              })
+        }
     }
 
     override fun handleException(t: Throwable) {
@@ -506,7 +487,7 @@ public class ReactModalHostView(context: ThemedReactContext) :
 
     override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
       eventDispatcher?.let { eventDispatcher ->
-        jSTouchDispatcher.handleTouchEvent(event, eventDispatcher)
+        jSTouchDispatcher.handleTouchEvent(event, eventDispatcher, reactContext)
         jSPointerDispatcher?.handleMotionEvent(event, eventDispatcher, true)
       }
       return super.onInterceptTouchEvent(event)
@@ -515,7 +496,7 @@ public class ReactModalHostView(context: ThemedReactContext) :
     @SuppressLint("ClickableViewAccessibility")
     override fun onTouchEvent(event: MotionEvent): Boolean {
       eventDispatcher?.let { eventDispatcher ->
-        jSTouchDispatcher.handleTouchEvent(event, eventDispatcher)
+        jSTouchDispatcher.handleTouchEvent(event, eventDispatcher, reactContext)
         jSPointerDispatcher?.handleMotionEvent(event, eventDispatcher, false)
       }
       super.onTouchEvent(event)

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

@@ -0,0 +1,70 @@
+/*
+ * 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.views.progressbar
+
+import android.content.Context
+import android.graphics.PorterDuff
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.ProgressBar
+import com.facebook.react.bridge.JSApplicationIllegalArgumentException
+
+/**
+ * Controls an enclosing [ProgressBar]. Exists so that the [ProgressBar] can be recreated if the
+ * style would change.
+ */
+public class ProgressBarContainerView(context: Context) : FrameLayout(context) {
+
+  internal var color: Int? = null
+  internal var indeterminate = true
+  internal var animating = true
+  internal var progress = 0.0
+
+  private var progressBar: ProgressBar? = null
+
+  internal fun apply() {
+    this.progressBar?.let { progressBar ->
+      progressBar.isIndeterminate = indeterminate
+      setColor(progressBar)
+      progressBar.progress = (progress * MAX_PROGRESS).toInt()
+      progressBar.visibility = if (animating) VISIBLE else INVISIBLE
+    } ?: throw JSApplicationIllegalArgumentException("setStyle() not called")
+  }
+
+  internal fun setStyle(styleName: String?) {
+    val style = ReactProgressBarViewManager.getStyleFromString(styleName)
+    progressBar =
+        ReactProgressBarViewManager.createProgressBar(context, style).apply { max = MAX_PROGRESS }
+    removeAllViews()
+    addView(
+        progressBar,
+        ViewGroup.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT))
+  }
+
+  private fun setColor(progressBar: ProgressBar) {
+    val drawable =
+        if (progressBar.isIndeterminate) {
+          progressBar.indeterminateDrawable
+        } else {
+          progressBar.progressDrawable
+        }
+
+    if (drawable == null) {
+      return
+    }
+
+    @Suppress("DEPRECATION")
+    color?.let { drawable.setColorFilter(it, PorterDuff.Mode.SRC_IN) }
+        ?: drawable.clearColorFilter()
+  }
+
+  private companion object {
+    const val MAX_PROGRESS = 1000
+  }
+}