react-native-tvos 0.81.4-0 → 0.82.0-0

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

@@ -38,37 +38,34 @@ internal class ReactModalHostManager :
   }
 
   @ReactProp(name = "animationType")
-  override fun setAnimationType(view: ReactModalHostView, animationType: String?) {
-    if (animationType != null) {
-      view.animationType = animationType
+  override fun setAnimationType(view: ReactModalHostView, value: String?) {
+    if (value != null) {
+      view.animationType = value
     }
   }
 
   @ReactProp(name = "transparent")
-  override fun setTransparent(view: ReactModalHostView, transparent: Boolean) {
-    view.transparent = transparent
+  override fun setTransparent(view: ReactModalHostView, value: Boolean) {
+    view.transparent = value
   }
 
   @ReactProp(name = "statusBarTranslucent")
-  override fun setStatusBarTranslucent(view: ReactModalHostView, statusBarTranslucent: Boolean) {
-    view.statusBarTranslucent = statusBarTranslucent
+  override fun setStatusBarTranslucent(view: ReactModalHostView, value: Boolean) {
+    view.statusBarTranslucent = value
   }
 
   @ReactProp(name = "navigationBarTranslucent")
-  override fun setNavigationBarTranslucent(
-      view: ReactModalHostView,
-      navigationBarTranslucent: Boolean
-  ) {
-    // view.navigationBarTranslucent = navigationBarTranslucent
+  override fun setNavigationBarTranslucent(view: ReactModalHostView, value: Boolean) {
+    // view.navigationBarTranslucent = value
   }
 
   @ReactProp(name = "hardwareAccelerated")
-  override fun setHardwareAccelerated(view: ReactModalHostView, hardwareAccelerated: Boolean) {
-    view.hardwareAccelerated = hardwareAccelerated
+  override fun setHardwareAccelerated(view: ReactModalHostView, value: Boolean) {
+    view.hardwareAccelerated = value
   }
 
   @ReactProp(name = "visible")
-  override fun setVisible(view: ReactModalHostView, visible: Boolean) {
+  override fun setVisible(view: ReactModalHostView, value: Boolean) {
     // iOS only
   }
 
@@ -98,7 +95,8 @@ 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 {
         dispatcher.dispatchEvent(ShowEvent(UIManagerHelper.getSurfaceId(reactContext), view.id))
@@ -123,7 +121,7 @@ internal class ReactModalHostManager :
   override fun updateState(
       view: ReactModalHostView,
       props: ReactStylesDiffMap,
-      stateWrapper: StateWrapper
+      stateWrapper: StateWrapper,
   ): Any? {
     view.stateWrapper = stateWrapper
     return null

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

@@ -39,12 +39,11 @@ import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
+import com.facebook.react.common.annotations.UnstableReactNativeAPI
 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.DisplayMetricsHolder
-import com.facebook.react.uimanager.DisplayMetricsHolder.getStatusBarHeightPx
 import com.facebook.react.uimanager.JSPointerDispatcher
 import com.facebook.react.uimanager.JSTouchDispatcher
 import com.facebook.react.uimanager.PixelUtil.pxToDp
@@ -54,13 +53,11 @@ 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.modal.ReactModalHostView.DialogRootViewGroup
 import com.facebook.react.views.view.ReactViewGroup
 import com.facebook.react.views.view.disableEdgeToEdge
 import com.facebook.react.views.view.enableEdgeToEdge
 import com.facebook.react.views.view.isEdgeToEdgeFeatureFlagOn
 import com.facebook.react.views.view.setStatusBarTranslucency
-import com.facebook.yoga.annotations.DoNotStrip
 import java.util.Objects
 
 /**
@@ -76,7 +73,6 @@ import java.util.Objects
  *    addition and removal of views to the DialogRootViewGroup.
  */
 @SuppressLint("ViewConstructor")
-@DoNotStrip
 public class ReactModalHostView(context: ThemedReactContext) :
     ViewGroup(context), LifecycleEventListener {
 
@@ -136,7 +132,6 @@ public class ReactModalHostView(context: ThemedReactContext) :
 
   init {
     context.addLifecycleEventListener(this)
-    initStatusBarHeight(context)
     dialogRootViewGroup = DialogRootViewGroup(context)
   }
 
@@ -256,8 +251,13 @@ public class ReactModalHostView(context: ThemedReactContext) :
     if (createNewDialog) {
       dismiss()
     } else {
-      updateProperties()
-      return
+      // With Props 2.0 the view creation could include initial props. This means the dialog might
+      // still have to be created before the properties can be set. We only update properties if the
+      // dialog was already initialized.
+      dialog?.let {
+        updateProperties()
+        return
+      }
     }
 
     // Reset the flag since we are going to create a new dialog
@@ -275,7 +275,8 @@ public class ReactModalHostView(context: ThemedReactContext) :
     val window = requireNotNull(newDialog.window)
     window.setFlags(
         WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
-        WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)
+        WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
+    )
 
     newDialog.setContentView(contentView)
     updateProperties()
@@ -344,7 +345,8 @@ public class ReactModalHostView(context: ThemedReactContext) :
 
             return false
           }
-        })
+        }
+    )
 
     window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
     if (hardwareAccelerated) {
@@ -353,7 +355,9 @@ public class ReactModalHostView(context: ThemedReactContext) :
     val flagSecureSet = isFlagSecureSet(currentActivity)
     if (flagSecureSet) {
       window.setFlags(
-          WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
+          WindowManager.LayoutParams.FLAG_SECURE,
+          WindowManager.LayoutParams.FLAG_SECURE,
+      )
     }
     if (currentActivity?.isFinishing == false) {
       newDialog.show()
@@ -417,7 +421,9 @@ public class ReactModalHostView(context: ThemedReactContext) :
       } else {
         dialogWindow.setDimAmount(0.5f)
         dialogWindow.setFlags(
-            WindowManager.LayoutParams.FLAG_DIM_BEHIND, WindowManager.LayoutParams.FLAG_DIM_BEHIND)
+            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:
@@ -501,26 +507,6 @@ public class ReactModalHostView(context: ThemedReactContext) :
 
   private companion object {
     private const val TAG = "ReactModalHost"
-
-    // We store the status bar height to be able to properly position
-    // the modal on the first render.
-    private var statusBarHeight = 0
-
-    private fun initStatusBarHeight(reactContext: ReactContext) {
-      statusBarHeight = getStatusBarHeightPx(reactContext.currentActivity)
-    }
-
-    @JvmStatic
-    @DoNotStrip
-    private fun getScreenDisplayMetricsWithoutInsets(): Long {
-      val displayMetrics = DisplayMetricsHolder.getScreenDisplayMetrics()
-      return encodeFloatsToLong(
-          displayMetrics.widthPixels.toFloat().pxToDp(),
-          (displayMetrics.heightPixels - statusBarHeight).toFloat().pxToDp())
-    }
-
-    private fun encodeFloatsToLong(width: Float, height: Float): Long =
-        (width.toRawBits().toLong()) shl 32 or (height.toRawBits().toLong())
   }
 
   /**
@@ -574,15 +560,6 @@ public class ReactModalHostView(context: ThemedReactContext) :
       updateState(viewWidth, viewHeight)
     }
 
-    protected override fun onFocusChanged(
-      gainFocus: Boolean,
-      direction: Int,
-      previouslyFocusedRect: Rect?
-    ) {
-      androidHWInputDeviceHelper.clearFocus(reactContext)
-      super.onFocusChanged(gainFocus, direction, previouslyFocusedRect)
-    }
-
     /*
     public override fun requestChildFocus(child: View?, focused: View?) {
       androidHWInputDeviceHelper.onFocusChanged(focused, reactContext)
@@ -637,7 +614,8 @@ public class ReactModalHostView(context: ThemedReactContext) :
                       .getNativeModule(UIManagerModule::class.java)
                       ?.updateNodeSize(id, viewWidth, viewHeight)
                 }
-              })
+              }
+          )
         }
       }
     }
@@ -676,9 +654,10 @@ public class ReactModalHostView(context: ThemedReactContext) :
       return super.onHoverEvent(event)
     }
 
+    @OptIn(UnstableReactNativeAPI::class)
     override fun onChildStartedNativeGesture(childView: View?, ev: MotionEvent) {
       eventDispatcher?.let { eventDispatcher ->
-        jSTouchDispatcher.onChildStartedNativeGesture(ev, eventDispatcher)
+        jSTouchDispatcher.onChildStartedNativeGesture(ev, eventDispatcher, reactContext)
         jSPointerDispatcher?.onChildStartedNativeGesture(childView, ev, eventDispatcher)
       }
     }

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

@@ -18,7 +18,8 @@ internal class RequestCloseEvent(surfaceId: Int, viewTag: Int) :
 
   @Deprecated(
       "Do not use this constructor, use the one with explicit surfaceId",
-      ReplaceWith("RequestCloseEvent(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

@@ -17,7 +17,8 @@ internal class ShowEvent(surfaceId: Int, viewTag: Int) : Event<ShowEvent>(surfac
 
   @Deprecated(
       "Do not use this constructor, use the one with explicit surfaceId",
-      ReplaceWith("ShowEvent(surfaceId, viewTag)"))
+      ReplaceWith("ShowEvent(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/progressbar/ProgressBarContainerView.kt

@@ -55,7 +55,10 @@ internal class ProgressBarContainerView(context: Context) : FrameLayout(context)
     addView(
         progressBar,
         ViewGroup.LayoutParams(
-            ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT))
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.MATCH_PARENT,
+        ),
+    )
   }
 
   private fun setColor(progressBar: ProgressBar) {

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

@@ -14,7 +14,6 @@ import com.facebook.react.common.annotations.LegacyArchitectureShadowNodeWithCxx
 import com.facebook.react.common.annotations.internal.LegacyArchitecture
 import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel
 import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger
-import com.facebook.react.uimanager.LayoutShadowNode
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.yoga.YogaMeasureFunction
 import com.facebook.yoga.YogaMeasureMode
@@ -25,9 +24,15 @@ 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.
  */
+@Suppress("DEPRECATION")
 @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR)
 @LegacyArchitectureShadowNodeWithCxxImpl
-internal class ProgressBarShadowNode : LayoutShadowNode(), YogaMeasureFunction {
+@Deprecated(
+    message = "This class is part of Legacy Architecture and will be removed in a future release",
+    level = DeprecationLevel.WARNING,
+)
+internal class ProgressBarShadowNode :
+    com.facebook.react.uimanager.LayoutShadowNode(), YogaMeasureFunction {
   private val height: SparseIntArray = SparseIntArray()
   private val width: SparseIntArray = SparseIntArray()
   private val measured: MutableSet<Int> = HashSet()
@@ -47,14 +52,16 @@ internal class ProgressBarShadowNode : LayoutShadowNode(), YogaMeasureFunction {
       width: Float,
       widthMode: YogaMeasureMode,
       height: Float,
-      heightMode: YogaMeasureMode
+      heightMode: YogaMeasureMode,
   ): Long {
     val style = ReactProgressBarViewManager.getStyleFromString(style)
     if (!measured.contains(style)) {
       val progressBar = ReactProgressBarViewManager.createProgressBar(themedContext, style)
       val spec =
           View.MeasureSpec.makeMeasureSpec(
-              ViewGroup.LayoutParams.WRAP_CONTENT, View.MeasureSpec.UNSPECIFIED)
+              ViewGroup.LayoutParams.WRAP_CONTENT,
+              View.MeasureSpec.UNSPECIFIED,
+          )
       progressBar.measure(spec, spec)
       this.height.put(style, progressBar.measuredHeight)
       this.width.put(style, progressBar.measuredWidth)
@@ -66,7 +73,9 @@ internal class ProgressBarShadowNode : LayoutShadowNode(), YogaMeasureFunction {
   companion object {
     init {
       LegacyArchitectureLogger.assertLegacyArchitecture(
-          "ProgressBarShadowNode", LegacyArchitectureLogLevel.ERROR)
+          "ProgressBarShadowNode",
+          LegacyArchitectureLogLevel.ERROR,
+      )
     }
   }
 }

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

@@ -33,10 +33,12 @@ import java.util.WeakHashMap
  * a [ProgressBar] changes, we have to drop the existing [ProgressBar] (if there is one) and create
  * a new one with the style given.
  */
+@Suppress("DEPRECATION")
 @ReactModule(name = ReactProgressBarViewManager.REACT_CLASS)
 internal class ReactProgressBarViewManager :
     BaseViewManager<ProgressBarContainerView, ProgressBarShadowNode>(),
     AndroidProgressBarManagerInterface<ProgressBarContainerView> {
+  @Suppress("IDENTITY_SENSITIVE_OPERATIONS_WITH_VALUE_TYPE")
   private val measuredStyles = WeakHashMap<Int, Pair<Int, Int>>()
 
   private val delegate: ViewManagerDelegate<ProgressBarContainerView> =
@@ -49,28 +51,28 @@ internal class ReactProgressBarViewManager :
   }
 
   @ReactProp(name = PROP_STYLE)
-  override fun setStyleAttr(view: ProgressBarContainerView, styleName: String?) {
-    view.setStyle(styleName)
+  override fun setStyleAttr(view: ProgressBarContainerView, value: String?) {
+    view.setStyle(value)
   }
 
   @ReactProp(name = ViewProps.COLOR, customType = "Color")
-  override fun setColor(view: ProgressBarContainerView, color: Int?) {
-    view.color = color
+  override fun setColor(view: ProgressBarContainerView, value: Int?) {
+    view.color = value
   }
 
   @ReactProp(name = PROP_INDETERMINATE)
-  override fun setIndeterminate(view: ProgressBarContainerView, indeterminate: Boolean) {
-    view.indeterminate = indeterminate
+  override fun setIndeterminate(view: ProgressBarContainerView, value: Boolean) {
+    view.indeterminate = value
   }
 
   @ReactProp(name = PROP_PROGRESS)
-  override fun setProgress(view: ProgressBarContainerView, progress: Double) {
-    view.progress = progress
+  override fun setProgress(view: ProgressBarContainerView, value: Double) {
+    view.progress = value
   }
 
   @ReactProp(name = PROP_ANIMATING)
-  override fun setAnimating(view: ProgressBarContainerView, animating: Boolean) {
-    view.animating = animating
+  override fun setAnimating(view: ProgressBarContainerView, value: Boolean) {
+    view.animating = value
   }
 
   override fun setTestID(view: ProgressBarContainerView, value: String?) {
@@ -104,7 +106,7 @@ internal class ReactProgressBarViewManager :
       widthMode: YogaMeasureMode,
       height: Float,
       heightMode: YogaMeasureMode,
-      attachmentsPositions: FloatArray?
+      attachmentsPositions: FloatArray?,
   ): Long {
     val style = getStyleFromString(props.getString(PROP_STYLE))
     val value =
@@ -116,7 +118,9 @@ internal class ReactProgressBarViewManager :
         }
 
     return YogaMeasureOutput.make(
-        toDIPFromPixel(value.first.toFloat()), toDIPFromPixel(value.second.toFloat()))
+        toDIPFromPixel(value.first.toFloat()),
+        toDIPFromPixel(value.second.toFloat()),
+    )
   }
 
   companion object {

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

@@ -19,7 +19,6 @@ 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
-import com.facebook.react.uimanager.UIManagerModule
 
 internal class ReactSafeAreaView(val reactContext: ThemedReactContext) : ViewGroup(reactContext) {
   internal var stateWrapper: StateWrapper? = null
@@ -30,7 +29,8 @@ 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
     }
@@ -39,6 +39,7 @@ internal class ReactSafeAreaView(val reactContext: ThemedReactContext) : ViewGro
 
   override fun onLayout(p0: Boolean, p1: Int, p2: Int, p3: Int, p4: Int): Unit = Unit
 
+  @Suppress("DEPRECATION")
   @UiThread
   private fun updateState(insets: Insets) {
     val sw = stateWrapper
@@ -57,10 +58,11 @@ internal class ReactSafeAreaView(val reactContext: ThemedReactContext) : ViewGro
           object : GuardedRunnable(reactContext) {
             override fun runGuarded() {
               this@ReactSafeAreaView.reactContext.reactApplicationContext
-                  .getNativeModule(UIManagerModule::class.java)
+                  .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/safeareaview/ReactSafeAreaViewManager.kt

@@ -8,7 +8,6 @@
 package com.facebook.react.views.safeareaview
 
 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
@@ -31,15 +30,18 @@ internal class ReactSafeAreaViewManager :
 
   override fun getName(): String = REACT_CLASS
 
-  override fun createShadowNodeInstance(): LayoutShadowNode = ReactSafeAreaViewShadowNode()
+  @Suppress("DEPRECATION")
+  override fun createShadowNodeInstance(): com.facebook.react.uimanager.LayoutShadowNode =
+      com.facebook.react.uimanager.LayoutShadowNode()
 
-  override fun getShadowNodeClass(): Class<out LayoutShadowNode> =
-      ReactSafeAreaViewShadowNode::class.java
+  @Suppress("DEPRECATION")
+  override fun getShadowNodeClass(): Class<out com.facebook.react.uimanager.LayoutShadowNode> =
+      com.facebook.react.uimanager.LayoutShadowNode::class.java
 
   override fun updateState(
       view: ReactSafeAreaView,
       props: ReactStylesDiffMap,
-      stateWrapper: StateWrapper
+      stateWrapper: StateWrapper,
   ): Any? {
     view.stateWrapper = stateWrapper
     return null

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

@@ -31,7 +31,7 @@ import java.lang.ref.WeakReference
 @OptIn(UnstableReactNativeAPI::class)
 internal class MaintainVisibleScrollPositionHelper<ScrollViewT>(
     private val scrollView: ScrollViewT,
-    private val horizontal: Boolean
+    private val horizontal: Boolean,
 ) : UIManagerListener where ScrollViewT : HasSmoothScroll?, ScrollViewT : ViewGroup? {
 
   var config: Config? = null
@@ -47,7 +47,9 @@ internal class MaintainVisibleScrollPositionHelper<ScrollViewT>(
         checkNotNull(
             UIManagerHelper.getUIManager(
                 checkNotNull(scrollView?.context as ReactContext?),
-                getUIManagerType(scrollView?.id ?: 0)))
+                getUIManagerType(scrollView?.id ?: 0),
+            )
+        )
 
   class Config
   internal constructor(val minIndexForVisible: Int, val autoScrollToTopThreshold: Int?) {

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

@@ -25,7 +25,7 @@ public class ReactHorizontalScrollContainerViewManager : ReactViewManager() {
       reactTag: Int,
       context: ThemedReactContext,
       initialProps: ReactStylesDiffMap?,
-      stateWrapper: StateWrapper?
+      stateWrapper: StateWrapper?,
   ): ReactViewGroup {
     check(uiManagerType == null)
     uiManagerType = ViewUtil.getUIManagerType(reactTag)

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

@@ -37,8 +37,6 @@ import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.R;
-import com.facebook.react.animated.NativeAnimatedModule;
-import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
@@ -98,8 +96,10 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
   private final OnScrollDispatchHelper mOnScrollDispatchHelper = new OnScrollDispatchHelper();
   private final @Nullable OverScroller mScroller;
   private final VelocityHelper mVelocityHelper = new VelocityHelper();
-  private final Rect mOverflowInset = new Rect();
+  private final Rect mTempRect = new Rect();
+  private final ValueAnimator DEFAULT_FLING_ANIMATOR = ObjectAnimator.ofInt(this, "scrollX", 0, 0);
 
+  private Rect mOverflowInset = new Rect();
   private boolean mActivelyScrolling;
   private @Nullable Rect mClippingRect;
   private Overflow mOverflow = Overflow.SCROLL;
@@ -120,11 +120,10 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
   private boolean mSnapToEnd = true;
   private int mSnapToAlignment = SNAP_ALIGNMENT_DISABLED;
   private boolean mPagedArrowScrolling = false;
-  private int pendingContentOffsetX = UNSET_CONTENT_OFFSET;
-  private int pendingContentOffsetY = UNSET_CONTENT_OFFSET;
+  private int mPendingContentOffsetX = UNSET_CONTENT_OFFSET;
+  private int mPendingContentOffsetY = UNSET_CONTENT_OFFSET;
   private @Nullable StateWrapper mStateWrapper = null;
-  private final ReactScrollViewScrollState mReactScrollViewScrollState;
-  private final ValueAnimator DEFAULT_FLING_ANIMATOR = ObjectAnimator.ofInt(this, "scrollX", 0, 0);
+  private ReactScrollViewScrollState mReactScrollViewScrollState;
   private PointerEvents mPointerEvents = PointerEvents.AUTO;
   private long mLastScrollDispatchTime = 0;
   private int mScrollEventThrottle = 0;
@@ -133,8 +132,6 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
   private int mFadingEdgeLengthStart = 0;
   private int mFadingEdgeLengthEnd = 0;
 
-  private final Rect mTempRect = new Rect();
-
   public ReactHorizontalScrollView(Context context) {
     this(context, null);
   }
@@ -146,12 +143,67 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
     ViewCompat.setAccessibilityDelegate(this, new ReactScrollViewAccessibilityDelegate());
 
     mScroller = getOverScrollerFromParent();
-    mReactScrollViewScrollState = new ReactScrollViewScrollState();
 
     setOnHierarchyChangeListener(this);
     setClipChildren(false);
+    initView();
   }
 
+  /**
+   * Set all default values here as opposed to in the constructor or field defaults. It is important
+   * that these properties are set during the constructor, but also on-demand whenever an existing
+   * ReactTextView is recycled.
+   */
+  private void initView() {
+    mOverflowInset = new Rect();
+    mActivelyScrolling = false;
+    mClippingRect = null;
+    mOverflow = Overflow.SCROLL;
+    mDragging = false;
+    mPagingEnabled = false;
+    mPostTouchRunnable = null;
+    mRemoveClippedSubviews = false;
+    mScrollEnabled = true;
+    mSendMomentumEvents = false;
+    mFpsListener = null;
+    mScrollPerfTag = null;
+    mEndBackground = null;
+    mEndFillColor = Color.TRANSPARENT;
+    mDisableIntervalMomentum = false;
+    mSnapInterval = 0;
+    mSnapOffsets = null;
+    mSnapToStart = true;
+    mSnapToEnd = true;
+    mSnapToAlignment = SNAP_ALIGNMENT_DISABLED;
+    mPagedArrowScrolling = false;
+    mPendingContentOffsetX = UNSET_CONTENT_OFFSET;
+    mPendingContentOffsetY = UNSET_CONTENT_OFFSET;
+    mStateWrapper = null;
+    mReactScrollViewScrollState = new ReactScrollViewScrollState();
+
+    mPointerEvents = PointerEvents.AUTO;
+    mLastScrollDispatchTime = 0;
+    mScrollEventThrottle = 0;
+    mContentView = null;
+    mMaintainVisibleContentPositionHelper = null;
+    mFadingEdgeLengthStart = 0;
+    mFadingEdgeLengthEnd = 0;
+  }
+
+  /* package */ void recycleView() {
+    // Set default field values
+    initView();
+
+    // If the view is still attached to a parent, we need to remove it from the parent
+    // before we can recycle it.
+    if (getParent() != null) {
+      ((ViewGroup) getParent()).removeView(this);
+    }
+    updateView();
+  }
+
+  private void updateView() {}
+
   @Override
   public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
     super.onInitializeAccessibilityNodeInfo(info);
@@ -451,9 +503,9 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
       // If a "pending" content offset value has been set, we restore that value.
       // Upon call to scrollTo, the "pending" values will be re-set.
       int scrollToX =
-          pendingContentOffsetX != UNSET_CONTENT_OFFSET ? pendingContentOffsetX : getScrollX();
+          mPendingContentOffsetX != UNSET_CONTENT_OFFSET ? mPendingContentOffsetX : getScrollX();
       int scrollToY =
-          pendingContentOffsetY != UNSET_CONTENT_OFFSET ? pendingContentOffsetY : getScrollY();
+          mPendingContentOffsetY != UNSET_CONTENT_OFFSET ? mPendingContentOffsetY : getScrollY();
       scrollTo(scrollToX, scrollToY);
     }
 
@@ -1036,16 +1088,8 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
                 if (mSendMomentumEvents) {
                   ReactScrollViewHelper.emitScrollMomentumEndEvent(ReactHorizontalScrollView.this);
                 }
-
-                ReactContext context = (ReactContext) getContext();
-                if (context != null) {
-                  NativeAnimatedModule nativeAnimated =
-                      context.getNativeModule(NativeAnimatedModule.class);
-                  if (nativeAnimated != null) {
-                    nativeAnimated.userDrivenScrollEnded(ReactHorizontalScrollView.this.getId());
-                  }
-                }
-                disableFpsListener();
+                ReactScrollViewHelper.notifyUserDrivenScrollEnded_internal(
+                    ReactHorizontalScrollView.this);
               } else {
                 if (mPagingEnabled && !mSnappingToPage) {
                   // If we have pagingEnabled and we have not snapped to the page
@@ -1477,11 +1521,11 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
     }
 
     if (isContentReady()) {
-      pendingContentOffsetX = UNSET_CONTENT_OFFSET;
-      pendingContentOffsetY = UNSET_CONTENT_OFFSET;
+      mPendingContentOffsetX = UNSET_CONTENT_OFFSET;
+      mPendingContentOffsetY = UNSET_CONTENT_OFFSET;
     } else {
-      pendingContentOffsetX = x;
-      pendingContentOffsetY = y;
+      mPendingContentOffsetX = x;
+      mPendingContentOffsetY = y;
     }
   }