react-native-tvos 0.81.1-2 → 0.82.0-0rc0

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

@@ -14,6 +14,7 @@ import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.ReadableType
 import com.facebook.react.bridge.RetryableMountingLayerException
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.BackgroundStyleApplicator.setBorderColor
 import com.facebook.react.uimanager.BackgroundStyleApplicator.setBorderRadius
@@ -55,6 +56,23 @@ public open class ReactHorizontalScrollViewManager
 @JvmOverloads
 constructor(private val fpsListener: FpsListener? = null) :
     ViewGroupManager<ReactHorizontalScrollView>(), ScrollCommandHandler<ReactHorizontalScrollView> {
+  init {
+    if (ReactNativeFeatureFlags.enableViewRecyclingForScrollView()) {
+      setupViewRecycling()
+    }
+  }
+
+  override fun prepareToRecycleView(
+      reactContext: ThemedReactContext,
+      view: ReactHorizontalScrollView,
+  ): ReactHorizontalScrollView? {
+    // BaseViewManager
+    val preparedView = super.prepareToRecycleView(reactContext, view)
+    if (preparedView != null) {
+      preparedView.recycleView()
+    }
+    return preparedView
+  }
 
   override fun getName(): String = REACT_CLASS
 
@@ -64,7 +82,7 @@ constructor(private val fpsListener: FpsListener? = null) :
   override fun updateState(
       view: ReactHorizontalScrollView,
       props: ReactStylesDiffMap,
-      stateWrapper: StateWrapper
+      stateWrapper: StateWrapper,
   ): Any? {
     view.setStateWrapper(stateWrapper)
     return null
@@ -91,7 +109,7 @@ constructor(private val fpsListener: FpsListener? = null) :
   @ReactProp(name = "disableIntervalMomentum")
   public fun setDisableIntervalMomentum(
       view: ReactHorizontalScrollView,
-      disableIntervalMomentum: Boolean
+      disableIntervalMomentum: Boolean,
   ) {
     view.setDisableIntervalMomentum(disableIntervalMomentum)
   }
@@ -136,7 +154,7 @@ constructor(private val fpsListener: FpsListener? = null) :
   @ReactProp(name = ReactClippingViewGroupHelper.PROP_REMOVE_CLIPPED_SUBVIEWS)
   public fun setRemoveClippedSubviews(
       view: ReactHorizontalScrollView,
-      removeClippedSubviews: Boolean
+      removeClippedSubviews: Boolean,
   ) {
     view.removeClippedSubviews = removeClippedSubviews
   }
@@ -186,11 +204,12 @@ constructor(private val fpsListener: FpsListener? = null) :
 
   @Deprecated(
       "Use receiveCommand with String commandId instead",
-      ReplaceWith("receiveCommand(scrollView, commandId, args)"))
+      ReplaceWith("receiveCommand(scrollView, commandId, args)"),
+  )
   override fun receiveCommand(
       scrollView: ReactHorizontalScrollView,
       commandId: Int,
-      args: ReadableArray?
+      args: ReadableArray?,
   ) {
     receiveCommand<ReactHorizontalScrollView>(this, scrollView, commandId, args)
   }
@@ -198,7 +217,7 @@ constructor(private val fpsListener: FpsListener? = null) :
   override fun receiveCommand(
       scrollView: ReactHorizontalScrollView,
       commandId: String,
-      args: ReadableArray?
+      args: ReadableArray?,
   ) {
     receiveCommand<ReactHorizontalScrollView>(this, scrollView, commandId, args)
   }
@@ -223,7 +242,8 @@ 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()
     if (data.mAnimated) {
@@ -252,8 +272,10 @@ constructor(private val fpsListener: FpsListener? = null) :
               ViewProps.BORDER_TOP_LEFT_RADIUS,
               ViewProps.BORDER_TOP_RIGHT_RADIUS,
               ViewProps.BORDER_BOTTOM_RIGHT_RADIUS,
-              ViewProps.BORDER_BOTTOM_LEFT_RADIUS],
-      defaultFloat = Float.NaN)
+              ViewProps.BORDER_BOTTOM_LEFT_RADIUS,
+          ],
+      defaultFloat = Float.NaN,
+  )
   public fun setBorderRadius(view: ReactHorizontalScrollView?, index: Int, borderRadius: Float) {
     if (view != null) {
       val radius =
@@ -278,8 +300,10 @@ constructor(private val fpsListener: FpsListener? = null) :
               ViewProps.BORDER_LEFT_WIDTH,
               ViewProps.BORDER_RIGHT_WIDTH,
               ViewProps.BORDER_TOP_WIDTH,
-              ViewProps.BORDER_BOTTOM_WIDTH],
-      defaultFloat = Float.NaN)
+              ViewProps.BORDER_BOTTOM_WIDTH,
+          ],
+      defaultFloat = Float.NaN,
+  )
   public fun setBorderWidth(view: ReactHorizontalScrollView?, index: Int, width: Float) {
     if (view != null) {
       setBorderWidth(view, LogicalEdge.entries[index], width)
@@ -293,12 +317,14 @@ constructor(private val fpsListener: FpsListener? = null) :
               "borderLeftColor",
               "borderRightColor",
               "borderTopColor",
-              "borderBottomColor"],
-      customType = "Color")
+              "borderBottomColor",
+          ],
+      customType = "Color",
+  )
   public fun setBorderColor(
       view: ReactHorizontalScrollView,
       @Suppress("UNUSED_PARAMETER") index: Int,
-      color: Int?
+      color: Int?,
   ) {
     setBorderColor(view, LogicalEdge.ALL, color)
   }
@@ -338,13 +364,13 @@ constructor(private val fpsListener: FpsListener? = null) :
         // no-op
       }
     }
-    if (view.getFadingEdgeLengthStart() > 0 || view.getFadingEdgeLengthEnd() > 0) {
-      view.setHorizontalFadingEdgeEnabled(true)
+    if (view.fadingEdgeLengthStart > 0 || view.fadingEdgeLengthEnd > 0) {
+      view.isHorizontalFadingEdgeEnabled = true
       view.setFadingEdgeLength(
-          Math.round(
-              Math.max(view.getFadingEdgeLengthStart(), view.getFadingEdgeLengthEnd()).dpToPx()))
+          Math.round(Math.max(view.fadingEdgeLengthStart, view.fadingEdgeLengthEnd).dpToPx())
+      )
     } else {
-      view.setHorizontalFadingEdgeEnabled(false)
+      view.isHorizontalFadingEdgeEnabled = false
       view.setFadingEdgeLength(0)
     }
   }
@@ -363,7 +389,7 @@ constructor(private val fpsListener: FpsListener? = null) :
   @ReactProp(name = "maintainVisibleContentPosition")
   public fun setMaintainVisibleContentPosition(
       view: ReactHorizontalScrollView,
-      value: ReadableMap?
+      value: ReadableMap?,
   ) {
     if (value != null) {
       view.setMaintainVisibleContentPosition(fromReadableMap(value))
@@ -385,7 +411,7 @@ constructor(private val fpsListener: FpsListener? = null) :
   @ReactProp(name = "horizontal")
   public fun setHorizontal(
       @Suppress("UNUSED_PARAMETER") view: ReactHorizontalScrollView?,
-      @Suppress("UNUSED_PARAMETER") horizontal: Boolean
+      @Suppress("UNUSED_PARAMETER") horizontal: Boolean,
   ) {
     // Do Nothing: Align with static ViewConfigs
   }

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.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.bridge.ReadableMap;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
@@ -86,7 +84,8 @@ public class ReactScrollView extends ScrollView
         HasStateWrapper,
         HasFlingAnimator,
         HasScrollEventThrottle,
-        HasSmoothScroll {
+        HasSmoothScroll,
+        VirtualViewContainer {
 
   private static @Nullable Field sScrollerField;
   private static boolean sTriedToGetScrollerField = false;
@@ -97,42 +96,41 @@ public class ReactScrollView extends ScrollView
   private final @Nullable OverScroller mScroller;
   private final VelocityHelper mVelocityHelper = new VelocityHelper();
   private final Rect mTempRect = new Rect();
-  private final Rect mOverflowInset = new Rect();
+  private final ValueAnimator DEFAULT_FLING_ANIMATOR = ObjectAnimator.ofInt(this, "scrollY", 0, 0);
 
+  private Rect mOverflowInset;
+  private @Nullable VirtualViewContainerState mVirtualViewContainerState;
   private boolean mActivelyScrolling;
   private @Nullable Rect mClippingRect;
-  private Overflow mOverflow = Overflow.SCROLL;
+  private Overflow mOverflow;
   private boolean mDragging;
-  private boolean mPagingEnabled = false;
+  private boolean mPagingEnabled;
   private @Nullable Runnable mPostTouchRunnable;
   private boolean mRemoveClippedSubviews;
-  private boolean mScrollEnabled = true;
+  private boolean mScrollEnabled;
   private boolean mSendMomentumEvents;
-  private @Nullable FpsListener mFpsListener = null;
+  private @Nullable FpsListener mFpsListener;
   private @Nullable String mScrollPerfTag;
   private @Nullable Drawable mEndBackground;
-  private int mEndFillColor = Color.TRANSPARENT;
-  private boolean mDisableIntervalMomentum = false;
-  private int mSnapInterval = 0;
+  private int mEndFillColor;
+  private boolean mDisableIntervalMomentum;
+  private int mSnapInterval;
   private @Nullable List<Integer> mSnapOffsets;
-  private boolean mSnapToStart = true;
-  private boolean mSnapToEnd = true;
-  private int mSnapToAlignment = SNAP_ALIGNMENT_DISABLED;
+  private boolean mSnapToStart;
+  private boolean mSnapToEnd;
+  private int mSnapToAlignment;
   private @Nullable View mContentView;
-  private @Nullable ReadableMap mCurrentContentOffset = null;
-  private int pendingContentOffsetX = UNSET_CONTENT_OFFSET;
-  private int pendingContentOffsetY = UNSET_CONTENT_OFFSET;
-  private @Nullable StateWrapper mStateWrapper = null;
-  private final ReactScrollViewScrollState mReactScrollViewScrollState =
-      new ReactScrollViewScrollState();
-  private final ValueAnimator DEFAULT_FLING_ANIMATOR = ObjectAnimator.ofInt(this, "scrollY", 0, 0);
-  private PointerEvents mPointerEvents = PointerEvents.AUTO;
-  private long mLastScrollDispatchTime = 0;
-  private int mScrollEventThrottle = 0;
-  private @Nullable MaintainVisibleScrollPositionHelper mMaintainVisibleContentPositionHelper =
-      null;
-  private int mFadingEdgeLengthStart = 0;
-  private int mFadingEdgeLengthEnd = 0;
+  private @Nullable ReadableMap mCurrentContentOffset;
+  private int mPendingContentOffsetX;
+  private int mPendingContentOffsetY;
+  private @Nullable StateWrapper mStateWrapper;
+  private ReactScrollViewScrollState mReactScrollViewScrollState;
+  private PointerEvents mPointerEvents;
+  private long mLastScrollDispatchTime;
+  private int mScrollEventThrottle;
+  private @Nullable MaintainVisibleScrollPositionHelper mMaintainVisibleContentPositionHelper;
+  private int mFadingEdgeLengthStart;
+  private int mFadingEdgeLengthEnd;
 
   public ReactScrollView(Context context) {
     this(context, null);
@@ -148,6 +146,71 @@ public class ReactScrollView extends ScrollView
     setClipChildren(false);
 
     ViewCompat.setAccessibilityDelegate(this, new ReactScrollViewAccessibilityDelegate());
+    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();
+    mVirtualViewContainerState = null;
+    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;
+    mContentView = null;
+    mCurrentContentOffset = null;
+    mPendingContentOffsetX = UNSET_CONTENT_OFFSET;
+    mPendingContentOffsetY = UNSET_CONTENT_OFFSET;
+    mStateWrapper = null;
+    mReactScrollViewScrollState = new ReactScrollViewScrollState();
+    mPointerEvents = PointerEvents.AUTO;
+    mLastScrollDispatchTime = 0;
+    mScrollEventThrottle = 0;
+    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 VirtualViewContainerState getVirtualViewContainerState() {
+    if (mVirtualViewContainerState == null) {
+      mVirtualViewContainerState = new VirtualViewContainerState(this);
+    }
+
+    return mVirtualViewContainerState;
   }
 
   @Override
@@ -359,13 +422,16 @@ public class ReactScrollView extends ScrollView
       // 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);
     }
 
     ReactScrollViewHelper.emitLayoutEvent(this);
+    if (mVirtualViewContainerState != null) {
+      mVirtualViewContainerState.updateState();
+    }
   }
 
   @Override
@@ -374,6 +440,9 @@ public class ReactScrollView extends ScrollView
     if (mRemoveClippedSubviews) {
       updateClippingRect();
     }
+    if (mVirtualViewContainerState != null) {
+      mVirtualViewContainerState.updateState();
+    }
   }
 
   @Override
@@ -393,6 +462,9 @@ public class ReactScrollView extends ScrollView
     if (mMaintainVisibleContentPositionHelper != null) {
       mMaintainVisibleContentPositionHelper.stop();
     }
+    if (mVirtualViewContainerState != null) {
+      mVirtualViewContainerState.cleanup();
+    }
   }
 
   @Override
@@ -483,6 +555,9 @@ public class ReactScrollView extends ScrollView
             this,
             mOnScrollDispatchHelper.getXFlingVelocity(),
             mOnScrollDispatchHelper.getYFlingVelocity());
+        if (mVirtualViewContainerState != null) {
+          mVirtualViewContainerState.updateState();
+        }
       }
     } finally {
       Systrace.endSection(Systrace.TRACE_TAG_REACT);
@@ -793,14 +868,7 @@ public class ReactScrollView extends ScrollView
                 if (mSendMomentumEvents) {
                   ReactScrollViewHelper.emitScrollMomentumEndEvent(ReactScrollView.this);
                 }
-                ReactContext context = (ReactContext) getContext();
-                if (context != null) {
-                  NativeAnimatedModule nativeAnimated =
-                      context.getNativeModule(NativeAnimatedModule.class);
-                  if (nativeAnimated != null) {
-                    nativeAnimated.userDrivenScrollEnded(ReactScrollView.this.getId());
-                  }
-                }
+                ReactScrollViewHelper.notifyUserDrivenScrollEnded_internal(ReactScrollView.this);
                 disableFpsListener();
               } else {
                 if (mPagingEnabled && !mSnappingToPage) {
@@ -1266,11 +1334,11 @@ public class ReactScrollView extends ScrollView
    */
   private void setPendingContentOffsets(int x, int y) {
     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;
     }
   }
 

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

@@ -31,7 +31,9 @@ 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}"
+          ),
+      )
     }
   }
 
@@ -43,7 +45,9 @@ 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}"
+          ),
+      )
     }
   }
 
@@ -104,7 +108,7 @@ internal class ReactScrollViewAccessibilityDelegate : AccessibilityDelegateCompa
 
   private fun onInitializeAccessibilityNodeInfoInternal(
       view: View,
-      info: AccessibilityNodeInfoCompat
+      info: AccessibilityNodeInfoCompat,
   ) {
     val accessibilityRole = AccessibilityRole.fromViewTag(view)
 
@@ -121,7 +125,10 @@ internal class ReactScrollViewAccessibilityDelegate : AccessibilityDelegateCompa
 
       val collectionInfoCompat =
           AccessibilityNodeInfoCompat.CollectionInfoCompat.obtain(
-              rowCount, columnCount, hierarchical)
+              rowCount,
+              columnCount,
+              hierarchical,
+          )
       info.setCollectionInfo(collectionInfoCompat)
     }
 

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

@@ -22,14 +22,15 @@ public class ReactScrollViewCommandHelper {
         hashMapOf(
             "scrollTo" to COMMAND_SCROLL_TO,
             "scrollToEnd" to COMMAND_SCROLL_TO_END,
-            "flashScrollIndicators" to COMMAND_FLASH_SCROLL_INDICATORS)
+            "flashScrollIndicators" to COMMAND_FLASH_SCROLL_INDICATORS,
+        )
 
     @JvmStatic
     public fun <T> receiveCommand(
         viewManager: ScrollCommandHandler<T>,
         scrollView: T,
         commandType: Int,
-        args: ReadableArray?
+        args: ReadableArray?,
     ) {
       checkNotNull(viewManager)
       checkNotNull(scrollView)
@@ -39,7 +40,8 @@ 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}."
+            )
       }
     }
 
@@ -48,7 +50,7 @@ public class ReactScrollViewCommandHelper {
         viewManager: ScrollCommandHandler<T>,
         scrollView: T,
         commandType: String,
-        args: ReadableArray?
+        args: ReadableArray?,
     ) {
       checkNotNull(viewManager)
       checkNotNull(scrollView)
@@ -58,14 +60,15 @@ 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}."
+            )
       }
     }
 
     private fun <T> scrollTo(
         viewManager: ScrollCommandHandler<T>,
         scrollView: T,
-        args: ReadableArray
+        args: ReadableArray,
     ) {
       val destX = Math.round(PixelUtil.toPixelFromDIP(args.getDouble(0)))
       val destY = Math.round(PixelUtil.toPixelFromDIP(args.getDouble(1)))
@@ -76,7 +79,7 @@ public class ReactScrollViewCommandHelper {
     private fun <T> scrollToEnd(
         viewManager: ScrollCommandHandler<T>,
         scrollView: T,
-        args: ReadableArray
+        args: ReadableArray,
     ) {
       val animated = args.getBoolean(0)
       viewManager.scrollToEnd(scrollView, ScrollToEndCommandData(animated))
@@ -94,7 +97,7 @@ public class ReactScrollViewCommandHelper {
   public class ScrollToCommandData(
       @JvmField public val mDestX: Int,
       @JvmField public val mDestY: Int,
-      @JvmField public val mAnimated: Boolean
+      @JvmField public val mAnimated: Boolean,
   )
 
   public class ScrollToEndCommandData(@JvmField public val mAnimated: Boolean)