react-native-tvos 0.87.1-1 → 0.88.0-0rc2

package/ReactAndroid/src/main/java/com/facebook/react/views/debuggingoverlay/DebuggingOverlayManager.kt

@@ -41,7 +41,7 @@ internal class DebuggingOverlayManager :
         ReactSoftExceptionLogger.logSoftException(
             REACT_CLASS,
             ReactNoCrashSoftException(
-                "Unexpected payload for highlighting trace updates: rectangle field is null"
+                "Unexpected payload for highlighting trace updates: rectangle field is null",
             ),
         )
         successfullyParsedPayload = false
@@ -68,7 +68,7 @@ internal class DebuggingOverlayManager :
                 REACT_CLASS,
                 ReactNoCrashSoftException(
                     "Unexpected payload for highlighting trace updates: rectangle field should" +
-                        " have x, y, width, height fields"
+                        " have x, y, width, height fields",
                 ),
             )
             successfullyParsedPayload = false
@@ -105,7 +105,7 @@ internal class DebuggingOverlayManager :
                 REACT_CLASS,
                 ReactNoCrashSoftException(
                     "Unexpected payload for highlighting elements: every element should have x," +
-                        " y, width, height fields"
+                        " y, width, height fields",
                 ),
             )
             successfullyParsedPayload = false

package/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.kt

@@ -150,11 +150,10 @@ public class ReactDrawerLayoutManager :
     return true
   }
 
-  public override fun getCommandsMap(): Map<String, Int> =
-      mapOf(
-          COMMAND_OPEN_DRAWER to OPEN_DRAWER,
-          COMMAND_CLOSE_DRAWER to CLOSE_DRAWER,
-      )
+  public override fun getCommandsMap(): Map<String, Int> = mapOf(
+      COMMAND_OPEN_DRAWER to OPEN_DRAWER,
+      COMMAND_CLOSE_DRAWER to CLOSE_DRAWER,
+  )
 
   @Deprecated(
       message =
@@ -172,14 +171,13 @@ public class ReactDrawerLayoutManager :
     }
   }
 
-  public override fun getExportedViewConstants(): Map<String, Any> =
-      mapOf(
-          DRAWER_POSITION to
-              mapOf(
-                  DRAWER_POSITION_LEFT to Gravity.START,
-                  DRAWER_POSITION_RIGHT to Gravity.END,
-              )
-      )
+  public override fun getExportedViewConstants(): Map<String, Any> = mapOf(
+      DRAWER_POSITION to
+          mapOf(
+              DRAWER_POSITION_LEFT to Gravity.START,
+              DRAWER_POSITION_RIGHT to Gravity.END,
+          ),
+  )
 
   public override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any> {
     val eventTypeConstants = super.getExportedCustomDirectEventTypeConstants() ?: mutableMapOf()
@@ -202,7 +200,7 @@ public class ReactDrawerLayoutManager :
     }
     if (index != 0 && index != 1) {
       throw JSApplicationIllegalArgumentException(
-          "The only valid indices for drawer's child are 0 or 1. Got $index instead."
+          "The only valid indices for drawer's child are 0 or 1. Got $index instead.",
       )
     }
     parent.addView(child, index)
@@ -217,25 +215,25 @@ public class ReactDrawerLayoutManager :
   ) : DrawerListener {
     override fun onDrawerSlide(view: View, v: Float) {
       eventDispatcher.dispatchEvent(
-          DrawerSlideEvent(UIManagerHelper.getSurfaceId(drawerLayout), drawerLayout.id, v)
+          DrawerSlideEvent(UIManagerHelper.getSurfaceId(drawerLayout), drawerLayout.id, v),
       )
     }
 
     override fun onDrawerOpened(view: View) {
       eventDispatcher.dispatchEvent(
-          DrawerOpenedEvent(UIManagerHelper.getSurfaceId(drawerLayout), drawerLayout.id)
+          DrawerOpenedEvent(UIManagerHelper.getSurfaceId(drawerLayout), drawerLayout.id),
       )
     }
 
     override fun onDrawerClosed(view: View) {
       eventDispatcher.dispatchEvent(
-          DrawerClosedEvent(UIManagerHelper.getSurfaceId(drawerLayout), drawerLayout.id)
+          DrawerClosedEvent(UIManagerHelper.getSurfaceId(drawerLayout), drawerLayout.id),
       )
     }
 
     override fun onDrawerStateChanged(i: Int) {
       eventDispatcher.dispatchEvent(
-          DrawerStateChangedEvent(UIManagerHelper.getSurfaceId(drawerLayout), drawerLayout.id, i)
+          DrawerStateChangedEvent(UIManagerHelper.getSurfaceId(drawerLayout), drawerLayout.id, i),
       )
     }
   }

package/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.kt

@@ -12,8 +12,10 @@ import android.graphics.PorterDuff
 import com.facebook.common.logging.FLog
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.drawee.controller.AbstractDraweeControllerBuilder
+import com.facebook.react.bridge.Dynamic
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.ReadableType
 import com.facebook.react.common.ReactConstants
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.BackgroundStyleApplicator
@@ -53,7 +55,7 @@ public constructor(
       replaceWith =
           ReplaceWith(
               expression =
-                  "ReactImageManager(draweeControllerBuilder, globalImageLoadListener, callerContextFactory)"
+                  "ReactImageManager(draweeControllerBuilder, globalImageLoadListener, callerContextFactory)",
           ),
   )
   public constructor(
@@ -73,7 +75,7 @@ public constructor(
       replaceWith =
           ReplaceWith(
               expression =
-                  "ReactImageManager(draweeControllerBuilder, globalImageLoadListener, callerContextFactory)"
+                  "ReactImageManager(draweeControllerBuilder, globalImageLoadListener, callerContextFactory)",
           ),
   )
   public constructor(
@@ -127,22 +129,50 @@ public constructor(
           callerContextFactory.getOrCreateCallerContext(
               (view.context as ThemedReactContext).moduleName,
               analyticTag,
-          )
+          ),
       )
     }
   }
 
   @ReactProp(name = "defaultSource")
+  public fun setDefaultSource(view: ReactImageView, source: Dynamic) {
+    view.setDefaultSource(imageSourceUri(source))
+  }
+
+  @Deprecated(
+      "Retained only for binary/source compatibility; the defaultSource prop is now delivered " +
+          "through the Dynamic overload.",
+  )
   public fun setDefaultSource(view: ReactImageView, source: String?) {
     view.setDefaultSource(source)
   }
 
   // In JS this is Image.props.loadingIndicatorSource.uri
   @ReactProp(name = "loadingIndicatorSrc")
+  public fun setLoadingIndicatorSource(view: ReactImageView, source: Dynamic) {
+    view.setLoadingIndicatorSource(imageSourceUri(source))
+  }
+
+  @Deprecated(
+      "Retained only for binary/source compatibility; the loadingIndicatorSrc prop is now " +
+          "delivered through the Dynamic overload.",
+  )
   public fun setLoadingIndicatorSource(view: ReactImageView, source: String?) {
     view.setLoadingIndicatorSource(source)
   }
 
+  /**
+   * The legacy raw-props path delivers these props as a plain uri string, but the Props 2.0 diffing
+   * path (`ImageProps::getDiffProps`) serializes the full ImageSource object. Accept both formats
+   * so either pipeline (and either side of a JS/native version skew) keeps working.
+   */
+  private fun imageSourceUri(source: Dynamic): String? =
+      when (source.type) {
+        ReadableType.String -> source.asString()
+        ReadableType.Map -> source.asMap()?.getString("uri")
+        else -> null
+      }
+
   @ReactProp(name = "borderColor", customType = "Color")
   public fun setBorderColor(view: ReactImageView, borderColor: Int?) {
     BackgroundStyleApplicator.setBorderColor(view, LogicalEdge.ALL, borderColor)
@@ -171,9 +201,20 @@ public constructor(
               ViewProps.BORDER_BOTTOM_RIGHT_RADIUS,
               ViewProps.BORDER_BOTTOM_LEFT_RADIUS,
           ],
-      defaultFloat = Float.NaN,
+  )
+  public fun setBorderRadius(view: ReactImageView, index: Int, rawBorderRadius: Dynamic) {
+    val borderRadius = LengthPercentage.setFromDynamic(rawBorderRadius)
+    BackgroundStyleApplicator.setBorderRadius(view, BorderRadiusProp.values()[index], borderRadius)
+  }
+
+  @Deprecated(
+      "Don't use setBorderRadius(view, index, Float) as it was deprecated in React Native 0.88.0.",
   )
   public fun setBorderRadius(view: ReactImageView, index: Int, borderRadius: Float) {
+    // Keep a direct body rather than routing a Float through DynamicFromObject:
+    // DynamicFromObject(Float).asDouble() throws (boxed Float cannot cast to
+    // Double), and setFromDynamic would not map NaN back to null the way the
+    // original Float path did.
     val radius =
         if (borderRadius.isNaN()) null
         else LengthPercentage(borderRadius, LengthPercentageType.POINT)

package/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.kt

@@ -145,7 +145,7 @@ public class ReactImageView(
                       imageSource?.source,
                       loaded,
                       total,
-                  )
+                  ),
               )
             }
 
@@ -154,7 +154,7 @@ public class ReactImageView(
                 return
               }
               eventDispatcher.dispatchEvent(
-                  createLoadStartEvent(UIManagerHelper.getSurfaceId(this@ReactImageView), getId())
+                  createLoadStartEvent(UIManagerHelper.getSurfaceId(this@ReactImageView), getId()),
               )
             }
 
@@ -171,10 +171,10 @@ public class ReactImageView(
                         imageSource?.source,
                         imageInfo.width,
                         imageInfo.height,
-                    )
+                    ),
                 )
                 eventDispatcher.dispatchEvent(
-                    createLoadEndEvent(UIManagerHelper.getSurfaceId(this@ReactImageView), getId())
+                    createLoadEndEvent(UIManagerHelper.getSurfaceId(this@ReactImageView), getId()),
                 )
               }
             }
@@ -188,7 +188,7 @@ public class ReactImageView(
                       UIManagerHelper.getSurfaceId(this@ReactImageView),
                       getId(),
                       throwable,
-                  )
+                  ),
               )
             }
           }
@@ -290,14 +290,13 @@ public class ReactImageView(
       for (idx in 0 until sources.size()) {
         val source = sources.getMap(idx) ?: continue
         val cacheControl = computeCacheControl(source.getString("cache"))
-        var imageSource =
-            ImageSource(
-                context,
-                source.getString("uri"),
-                source.getDouble("width"),
-                source.getDouble("height"),
-                cacheControl,
-            )
+        var imageSource = ImageSource(
+            context,
+            source.getString("uri"),
+            source.getDouble("width"),
+            source.getDouble("height"),
+            cacheControl,
+        )
         if (Uri.EMPTY == imageSource.uri) {
           warnImageSource(source.getString("uri"))
           imageSource = getTransparentBitmapImageSource(context)
@@ -378,7 +377,7 @@ public class ReactImageView(
         if (downloadListener != null) {
           val eventDispatcher = UIManagerHelper.getEventDispatcher(context as ReactContext)
           eventDispatcher?.dispatchEvent(
-              createErrorEvent(UIManagerHelper.getSurfaceId(this), id, e)
+              createErrorEvent(UIManagerHelper.getSurfaceId(this), id, e),
           )
         }
       }
@@ -642,7 +641,7 @@ public class ReactImageView(
     private fun buildHierarchy(context: Context) =
         GenericDraweeHierarchyBuilder(context.resources)
             .setRoundingParams(
-                RoundingParams.fromCornersRadius(0f).apply { setPaintFilterBitmap(true) }
+                RoundingParams.fromCornersRadius(0f).apply { setPaintFilterBitmap(true) },
             )
             .build()
   }

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

@@ -79,7 +79,7 @@ public object ResourceDrawableIdHelper {
    */
   @Deprecated("Use .instance instead, this API is for backward compat", ReplaceWith("instance"))
   @JvmName(
-      "DEPRECATED\$getInstance"
+      "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

@@ -92,7 +92,7 @@ internal class ReactModalHostManager :
     if (dispatcher != null) {
       view.onRequestCloseListener = OnRequestCloseListener {
         dispatcher.dispatchEvent(
-            RequestCloseEvent(UIManagerHelper.getSurfaceId(reactContext), view.id)
+            RequestCloseEvent(UIManagerHelper.getSurfaceId(reactContext), view.id),
         )
       }
       view.onShowListener = OnShowListener {

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

@@ -350,7 +350,7 @@ public class ReactModalHostView(context: ThemedReactContext) :
 
             return false
           }
-        }
+        },
     )
 
     window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
@@ -620,7 +620,7 @@ public class ReactModalHostView(context: ThemedReactContext) :
                       .getNativeModule(UIManagerModule::class.java)
                       ?.updateNodeSize(id, viewWidth, viewHeight)
                 }
-              }
+              },
           )
         }
       }

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

@@ -29,7 +29,7 @@ internal class ReactSafeAreaView(val reactContext: ThemedReactContext) : ViewGro
     ViewCompat.setOnApplyWindowInsetsListener(this) { _, windowInsets ->
       val insets =
           windowInsets.getInsets(
-              WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
+              WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout(),
           )
       updateState(insets)
       CONSUMED
@@ -63,7 +63,7 @@ internal class ReactSafeAreaView(val reactContext: ThemedReactContext) : ViewGro
                   .getNativeModule(com.facebook.react.uimanager.UIManagerModule::class.java)
                   ?.updateInsetsPadding(id, insets.top, insets.left, insets.bottom, insets.right)
             }
-          }
+          },
       )
     }
   }

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper.kt

@@ -18,6 +18,7 @@ import com.facebook.react.bridge.UiThreadUtil.runOnUiThread
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.common.UIManagerType
+import com.facebook.react.views.scroll.ReactScrollViewHelper.HasScrollEventThrottle
 import com.facebook.react.views.scroll.ReactScrollViewHelper.HasSmoothScroll
 import com.facebook.react.views.view.ReactViewGroup
 import java.lang.ref.WeakReference
@@ -31,7 +32,11 @@ import java.lang.ref.WeakReference
 internal class MaintainVisibleScrollPositionHelper<ScrollViewT>(
     private val scrollView: ScrollViewT,
     private val horizontal: Boolean,
-) : UIManagerListener where ScrollViewT : HasSmoothScroll?, ScrollViewT : ViewGroup? {
+) : UIManagerListener
+    where
+        ScrollViewT : HasScrollEventThrottle?,
+        ScrollViewT : HasSmoothScroll?,
+        ScrollViewT : ViewGroup? {
 
   var config: Config? = null
   private var firstVisibleViewRef: WeakReference<View>? = null
@@ -42,13 +47,12 @@ internal class MaintainVisibleScrollPositionHelper<ScrollViewT>(
     get() = scrollView?.getChildAt(0) as ReactViewGroup?
 
   private val uIManager: UIManager
-    get() =
-        checkNotNull(
-            UIManagerHelper.getUIManager(
-                checkNotNull(scrollView?.context as ReactContext?),
-                UIManagerType.FABRIC,
-            )
-        )
+    get() = checkNotNull(
+        UIManagerHelper.getUIManager(
+            checkNotNull(scrollView?.context as ReactContext?),
+            UIManagerType.FABRIC,
+        ),
+    )
 
   class Config
   internal constructor(val minIndexForVisible: Int, val autoScrollToTopThreshold: Int?) {

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.kt

@@ -65,6 +65,7 @@ import com.facebook.react.views.scroll.ReactScrollViewHelper.SNAP_ALIGNMENT_END
 import com.facebook.react.views.scroll.ReactScrollViewHelper.SNAP_ALIGNMENT_ITEM
 import com.facebook.react.views.scroll.ReactScrollViewHelper.SNAP_ALIGNMENT_START
 import com.facebook.react.views.scroll.ReactScrollViewHelper.findNextFocusableView
+import com.facebook.react.views.view.ImportantForInteractionHelper
 import com.facebook.systrace.Systrace
 import kotlin.math.abs
 import kotlin.math.ceil
@@ -178,6 +179,11 @@ constructor(context: Context, private val fpsListener: FpsListener? = null) :
   private var pendingContentOffsetX = UNSET_CONTENT_OFFSET
   private var pendingContentOffsetY = UNSET_CONTENT_OFFSET
   public open var pointerEvents: PointerEvents = PointerEvents.AUTO
+    set(value) {
+      field = value
+      ImportantForInteractionHelper.setImportantForInteraction(this, value, _overflow)
+    }
+
   private var contentView: View? = null
   private var maintainVisibleContentPositionHelper:
       MaintainVisibleScrollPositionHelper<ReactHorizontalScrollView>? =
@@ -435,16 +441,18 @@ constructor(context: Context, private val fpsListener: FpsListener? = null) :
         if (overflow == null) {
           Overflow.SCROLL
         } else {
-          Overflow.fromString(overflow)
-              ?: if (ReactNativeFeatureFlags.enablePropsUpdateReconciliationAndroid())
-                  Overflow.VISIBLE
-              else Overflow.SCROLL
+          Overflow.fromString(
+              overflow,
+              if (ReactNativeFeatureFlags.enablePropsUpdateReconciliationAndroid()) Overflow.VISIBLE
+              else Overflow.SCROLL,
+          )
         }
+    ImportantForInteractionHelper.setImportantForInteraction(this, pointerEvents, _overflow)
     invalidate()
   }
 
   internal open fun setMaintainVisibleContentPosition(
-      config: MaintainVisibleScrollPositionHelper.Config?
+      config: MaintainVisibleScrollPositionHelper.Config?,
   ) {
     if (config != null && maintainVisibleContentPositionHelper == null) {
       val helper = MaintainVisibleScrollPositionHelper(this, true)

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.kt

@@ -278,7 +278,7 @@ constructor(private val fpsListener: FpsListener? = null) :
     val child =
         scrollView.getChildAt(0)
             ?: throw RetryableMountingLayerException(
-                "scrollToEnd called on HorizontalScrollView without child"
+                "scrollToEnd called on HorizontalScrollView without child",
             )
     val right = child.width + scrollView.paddingRight
     scrollView.abortAnimation()
@@ -403,7 +403,7 @@ constructor(private val fpsListener: FpsListener? = null) :
     if (view.fadingEdgeLengthStart > 0 || view.fadingEdgeLengthEnd > 0) {
       view.isHorizontalFadingEdgeEnabled = true
       view.setFadingEdgeLength(
-          Math.round(Math.max(view.fadingEdgeLengthStart, view.fadingEdgeLengthEnd).dpToPx())
+          Math.round(Math.max(view.fadingEdgeLengthStart, view.fadingEdgeLengthEnd).dpToPx()),
       )
     } else {
       view.isHorizontalFadingEdgeEnabled = false

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactNestedScrollView.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<cf60b52e15df339a179f392723007fab>>
+ * @generated SignedSource<<497c1f334f6b3325e032e09947f6fce4>>
  */
 
 /**
@@ -64,6 +64,7 @@ import com.facebook.react.views.scroll.ReactScrollViewHelper.SNAP_ALIGNMENT_DISA
 import com.facebook.react.views.scroll.ReactScrollViewHelper.SNAP_ALIGNMENT_END
 import com.facebook.react.views.scroll.ReactScrollViewHelper.SNAP_ALIGNMENT_START
 import com.facebook.react.views.scroll.ReactScrollViewHelper.findNextFocusableView
+import com.facebook.react.views.view.ImportantForInteractionHelper
 import com.facebook.systrace.Systrace
 import kotlin.math.abs
 import kotlin.math.ceil
@@ -112,6 +113,10 @@ constructor(context: Context, private val fpsListener: FpsListener? = null) :
   override var hasChildPressedStateDelay: Boolean? = null
 
   public open var pointerEvents: PointerEvents = PointerEvents.AUTO
+    set(value) {
+      field = value
+      ImportantForInteractionHelper.setImportantForInteraction(this, value, _overflow)
+    }
 
   public open var fadingEdgeLengthStart: Int = 0
     set(value) {
@@ -367,16 +372,18 @@ constructor(context: Context, private val fpsListener: FpsListener? = null) :
         if (overflow == null) {
           Overflow.SCROLL
         } else {
-          Overflow.fromString(overflow)
-              ?: if (ReactNativeFeatureFlags.enablePropsUpdateReconciliationAndroid())
-                  Overflow.VISIBLE
-              else Overflow.SCROLL
+          Overflow.fromString(
+              overflow,
+              if (ReactNativeFeatureFlags.enablePropsUpdateReconciliationAndroid()) Overflow.VISIBLE
+              else Overflow.SCROLL,
+          )
         }
+    ImportantForInteractionHelper.setImportantForInteraction(this, pointerEvents, _overflow)
     invalidate()
   }
 
   internal open fun setMaintainVisibleContentPosition(
-      config: MaintainVisibleScrollPositionHelper.Config?
+      config: MaintainVisibleScrollPositionHelper.Config?,
   ) {
     if (config != null && maintainVisibleContentPositionHelper == null) {
       maintainVisibleContentPositionHelper =

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactNestedScrollViewManager.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<d321b1f5f7a34b5717cb7ef5300dda96>>
+ * @generated SignedSource<<1ea0f64fa8acd99b50c7ef54da014b3e>>
  */
 
 /**
@@ -321,7 +321,7 @@ constructor(private val fpsListener: FpsListener? = null) :
     val child =
         scrollView.getChildAt(0)
             ?: throw RetryableMountingLayerException(
-                "scrollToEnd called on ScrollView without child"
+                "scrollToEnd called on ScrollView without child",
             )
 
     // ScrollView always has one child - the scrollable area
@@ -367,7 +367,7 @@ constructor(private val fpsListener: FpsListener? = null) :
     if (view.fadingEdgeLengthStart > 0 || view.fadingEdgeLengthEnd > 0) {
       view.isVerticalFadingEdgeEnabled = true
       view.setFadingEdgeLength(
-          Math.round(Math.max(view.fadingEdgeLengthStart, view.fadingEdgeLengthEnd).dpToPx())
+          Math.round(Math.max(view.fadingEdgeLengthStart, view.fadingEdgeLengthEnd).dpToPx()),
       )
     } else {
       view.isVerticalFadingEdgeEnabled = false
@@ -384,7 +384,7 @@ constructor(private val fpsListener: FpsListener? = null) :
   public fun setMaintainVisibleContentPosition(view: ReactNestedScrollView, value: ReadableMap?) {
     if (value != null) {
       view.setMaintainVisibleContentPosition(
-          MaintainVisibleScrollPositionHelper.Config.fromReadableMap(value)
+          MaintainVisibleScrollPositionHelper.Config.fromReadableMap(value),
       )
     } else {
       view.setMaintainVisibleContentPosition(null)
@@ -450,17 +450,15 @@ constructor(private val fpsListener: FpsListener? = null) :
   public companion object {
     public const val REACT_CLASS: String = "RCTScrollView"
 
-    public fun createExportedCustomDirectEventTypeConstants(): Map<String, Any> =
-        mapOf(
-            getJSEventName(ScrollEventType.SCROLL) to mapOf("registrationName" to "onScroll"),
-            getJSEventName(ScrollEventType.BEGIN_DRAG) to
-                mapOf("registrationName" to "onScrollBeginDrag"),
-            getJSEventName(ScrollEventType.END_DRAG) to
-                mapOf("registrationName" to "onScrollEndDrag"),
-            getJSEventName(ScrollEventType.MOMENTUM_BEGIN) to
-                mapOf("registrationName" to "onMomentumScrollBegin"),
-            getJSEventName(ScrollEventType.MOMENTUM_END) to
-                mapOf("registrationName" to "onMomentumScrollEnd"),
-        )
+    public fun createExportedCustomDirectEventTypeConstants(): Map<String, Any> = mapOf(
+        getJSEventName(ScrollEventType.SCROLL) to mapOf("registrationName" to "onScroll"),
+        getJSEventName(ScrollEventType.BEGIN_DRAG) to
+            mapOf("registrationName" to "onScrollBeginDrag"),
+        getJSEventName(ScrollEventType.END_DRAG) to mapOf("registrationName" to "onScrollEndDrag"),
+        getJSEventName(ScrollEventType.MOMENTUM_BEGIN) to
+            mapOf("registrationName" to "onMomentumScrollBegin"),
+        getJSEventName(ScrollEventType.MOMENTUM_END) to
+            mapOf("registrationName" to "onMomentumScrollEnd"),
+    )
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.kt

@@ -60,6 +60,7 @@ import com.facebook.react.views.scroll.ReactScrollViewHelper.SNAP_ALIGNMENT_END
 import com.facebook.react.views.scroll.ReactScrollViewHelper.SNAP_ALIGNMENT_ITEM
 import com.facebook.react.views.scroll.ReactScrollViewHelper.SNAP_ALIGNMENT_START
 import com.facebook.react.views.scroll.ReactScrollViewHelper.findNextFocusableView
+import com.facebook.react.views.view.ImportantForInteractionHelper
 import com.facebook.systrace.Systrace
 import kotlin.math.abs
 import kotlin.math.ceil
@@ -108,6 +109,10 @@ constructor(context: Context, private val fpsListener: FpsListener? = null) :
   override var hasChildPressedStateDelay: Boolean? = null
 
   public open var pointerEvents: PointerEvents = PointerEvents.AUTO
+    set(value) {
+      field = value
+      ImportantForInteractionHelper.setImportantForInteraction(this, value, _overflow)
+    }
 
   public open var fadingEdgeLengthStart: Int = 0
     set(value) {
@@ -375,16 +380,18 @@ constructor(context: Context, private val fpsListener: FpsListener? = null) :
         if (overflow == null) {
           Overflow.SCROLL
         } else {
-          Overflow.fromString(overflow)
-              ?: if (ReactNativeFeatureFlags.enablePropsUpdateReconciliationAndroid())
-                  Overflow.VISIBLE
-              else Overflow.SCROLL
+          Overflow.fromString(
+              overflow,
+              if (ReactNativeFeatureFlags.enablePropsUpdateReconciliationAndroid()) Overflow.VISIBLE
+              else Overflow.SCROLL,
+          )
         }
+    ImportantForInteractionHelper.setImportantForInteraction(this, pointerEvents, _overflow)
     invalidate()
   }
 
   internal open fun setMaintainVisibleContentPosition(
-      config: MaintainVisibleScrollPositionHelper.Config?
+      config: MaintainVisibleScrollPositionHelper.Config?,
   ) {
     if (config != null && maintainVisibleContentPositionHelper == null) {
       maintainVisibleContentPositionHelper =

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewAccessibilityDelegate.kt

@@ -31,7 +31,7 @@ internal class ReactScrollViewAccessibilityDelegate : AccessibilityDelegateCompa
       ReactSoftExceptionLogger.logSoftException(
           TAG,
           AssertionException(
-              "ReactScrollViewAccessibilityDelegate should only be used with ReactAccessibleScrollView, not with class: ${host.javaClass.simpleName}"
+              "ReactScrollViewAccessibilityDelegate should only be used with ReactAccessibleScrollView, not with class: ${host.javaClass.simpleName}",
           ),
       )
     }
@@ -45,7 +45,7 @@ internal class ReactScrollViewAccessibilityDelegate : AccessibilityDelegateCompa
       ReactSoftExceptionLogger.logSoftException(
           TAG,
           AssertionException(
-              "ReactScrollViewAccessibilityDelegate should only be used with ReactAccessibleScrollView, not with class: ${host.javaClass.simpleName}"
+              "ReactScrollViewAccessibilityDelegate should only be used with ReactAccessibleScrollView, not with class: ${host.javaClass.simpleName}",
           ),
       )
     }

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewCommandHelper.kt

@@ -18,12 +18,11 @@ public class ReactScrollViewCommandHelper {
     public const val COMMAND_FLASH_SCROLL_INDICATORS: Int = 3
 
     @JvmStatic
-    public fun getCommandsMap(): Map<String, Int> =
-        hashMapOf(
-            "scrollTo" to COMMAND_SCROLL_TO,
-            "scrollToEnd" to COMMAND_SCROLL_TO_END,
-            "flashScrollIndicators" to COMMAND_FLASH_SCROLL_INDICATORS,
-        )
+    public fun getCommandsMap(): Map<String, Int> = hashMapOf(
+        "scrollTo" to COMMAND_SCROLL_TO,
+        "scrollToEnd" to COMMAND_SCROLL_TO_END,
+        "flashScrollIndicators" to COMMAND_FLASH_SCROLL_INDICATORS,
+    )
 
     @JvmStatic
     public fun <T> receiveCommand(
@@ -40,7 +39,7 @@ public class ReactScrollViewCommandHelper {
         COMMAND_FLASH_SCROLL_INDICATORS -> viewManager.flashScrollIndicators(scrollView)
         else ->
             throw IllegalArgumentException(
-                "Unsupported command $commandType received by ${viewManager::class.java.simpleName}."
+                "Unsupported command $commandType received by ${viewManager::class.java.simpleName}.",
             )
       }
     }
@@ -60,7 +59,7 @@ public class ReactScrollViewCommandHelper {
         "flashScrollIndicators" -> viewManager.flashScrollIndicators(scrollView)
         else ->
             throw IllegalArgumentException(
-                "Unsupported command $commandType received by ${viewManager::class.java.simpleName}."
+                "Unsupported command $commandType received by ${viewManager::class.java.simpleName}.",
             )
       }
     }