react-native 0.0.0-263478b91 → 0.0.0-268efb102

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.java

@@ -11,6 +11,7 @@ import android.view.MotionEvent;
 import androidx.annotation.Nullable;
 import androidx.core.util.Pools;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.SoftAssertions;
 
 /**
@@ -22,6 +23,7 @@ import com.facebook.react.bridge.SoftAssertions;
  * these coalescing keys are determined.
  */
 public class TouchEvent extends Event<TouchEvent> {
+  private static final String TAG = TouchEvent.class.getSimpleName();
 
   private static final int TOUCH_EVENTS_POOL_SIZE = 3;
 
@@ -43,7 +45,7 @@ public class TouchEvent extends Event<TouchEvent> {
         -1,
         viewTag,
         touchEventType,
-        motionEventToCopy,
+        Assertions.assertNotNull(motionEventToCopy),
         gestureStartTime,
         viewX,
         viewY,
@@ -67,7 +69,7 @@ public class TouchEvent extends Event<TouchEvent> {
         surfaceId,
         viewTag,
         touchEventType,
-        motionEventToCopy,
+        Assertions.assertNotNull(motionEventToCopy),
         gestureStartTime,
         viewX,
         viewY,
@@ -94,7 +96,7 @@ public class TouchEvent extends Event<TouchEvent> {
       float viewX,
       float viewY,
       TouchEventCoalescingKeyHelper touchEventCoalescingKeyHelper) {
-    super.init(surfaceId, viewTag);
+    super.init(surfaceId, viewTag, motionEventToCopy.getEventTime());
 
     SoftAssertions.assertCondition(
         gestureStartTime != UNSET, "Gesture start time must be initialized");
@@ -129,9 +131,25 @@ public class TouchEvent extends Event<TouchEvent> {
 
   @Override
   public void onDispose() {
-    Assertions.assertNotNull(mMotionEvent).recycle();
+    MotionEvent motionEvent = mMotionEvent;
     mMotionEvent = null;
-    EVENTS_POOL.release(this);
+    if (motionEvent != null) {
+      motionEvent.recycle();
+    }
+
+    // Either `this` is in the event pool, or motionEvent
+    // is null. It is in theory not possible for a TouchEvent to
+    // be in the EVENTS_POOL but for motionEvent to be null. However,
+    // out of an abundance of caution and to avoid memory leaks or
+    // other crashes at all costs, we attempt to release here and log
+    // a soft exception here if release throws an IllegalStateException
+    // due to `this` being over-released. This may indicate that there is
+    // a logic error in our events system or pooling mechanism.
+    try {
+      EVENTS_POOL.release(this);
+    } catch (IllegalStateException e) {
+      ReactSoftExceptionLogger.logSoftException(TAG, e);
+    }
   }
 
   @Override
@@ -163,6 +181,13 @@ public class TouchEvent extends Event<TouchEvent> {
 
   @Override
   public void dispatch(RCTEventEmitter rctEventEmitter) {
+    if (!hasMotionEvent()) {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new IllegalStateException(
+              "Cannot dispatch a TouchEvent that has no MotionEvent; the TouchEvent has been recycled"));
+      return;
+    }
     TouchesHelper.sendTouchEvent(
         rctEventEmitter,
         Assertions.assertNotNull(mTouchEventType),
@@ -181,6 +206,10 @@ public class TouchEvent extends Event<TouchEvent> {
     return mMotionEvent;
   }
 
+  private boolean hasMotionEvent() {
+    return mMotionEvent != null;
+  }
+
   public float getViewX() {
     return mViewX;
   }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.java

@@ -64,7 +64,7 @@ public class TouchesHelper {
       touch.putDouble(LOCATION_Y_KEY, PixelUtil.toDIPFromPixel(locationY));
       touch.putInt(TARGET_SURFACE_KEY, surfaceId);
       touch.putInt(TARGET_KEY, reactTarget);
-      touch.putDouble(TIMESTAMP_KEY, event.getUnixTimestampMs());
+      touch.putDouble(TIMESTAMP_KEY, event.getTimestampMs());
       touch.putDouble(POINTER_IDENTIFIER_KEY, motionEvent.getPointerId(index));
       touches.pushMap(touch);
     }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/interfaces/ViewProps.java

@@ -9,6 +9,7 @@ package com.facebook.react.uimanager;
 
 import android.graphics.Color;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableType;
 import java.util.Arrays;
 import java.util.HashSet;
 
@@ -258,10 +259,14 @@ public class ViewProps {
         // Ignore if explicitly set to default opacity.
         return map.isNull(OPACITY) || map.getDouble(OPACITY) == 1d;
       case BORDER_RADIUS: // Without a background color or border width set, a border won't show.
-        if (map.hasKey(BACKGROUND_COLOR)
-            && !map.isNull(BACKGROUND_COLOR)
-            && map.getInt(BACKGROUND_COLOR) != Color.TRANSPARENT) {
-          return false;
+        if (map.hasKey(BACKGROUND_COLOR)) {
+          ReadableType valueType = map.getType(BACKGROUND_COLOR);
+          if (valueType == ReadableType.Number
+              && map.getInt(BACKGROUND_COLOR) != Color.TRANSPARENT) {
+            return false;
+          } else if (valueType != ReadableType.Null) {
+            return false;
+          }
         }
         if (map.hasKey(BORDER_WIDTH)
             && !map.isNull(BORDER_WIDTH)

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/BUCK

@@ -19,7 +19,7 @@ rn_xplat_cxx_library(
     ],
     fbandroid_allow_jni_merging = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
-    platforms = (ANDROID),
+    platforms = ANDROID,
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.cpp

@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <memory>
 #include <string>
 
 #include <fbjni/fbjni.h>
@@ -18,6 +17,8 @@
 namespace facebook {
 namespace react {
 
+using namespace facebook::jni;
+
 ComponentNameResolverManager::ComponentNameResolverManager(
     jni::alias_ref<ComponentNameResolverManager::javaobject> jThis,
     RuntimeExecutor runtimeExecutor,

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.h

@@ -10,20 +10,14 @@
 #include <ReactCommon/CallInvokerHolder.h>
 #include <ReactCommon/RuntimeExecutor.h>
 #include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
 #include <react/jni/JRuntimeExecutor.h>
-#include <memory>
 #include <set>
-#include <unordered_map>
-
-using namespace facebook::jni;
-using namespace facebook::jsi;
 
 namespace facebook {
 namespace react {
 
 class ComponentNameResolverManager
-    : public jni::HybridClass<ComponentNameResolverManager> {
+    : public facebook::jni::HybridClass<ComponentNameResolverManager> {
  public:
   static auto constexpr kJavaDescriptor =
       "Lcom/facebook/react/uimanager/ComponentNameResolverManager;";
@@ -31,28 +25,29 @@ class ComponentNameResolverManager
   constexpr static auto ComponentNameResolverJavaDescriptor =
       "com/facebook/react/uimanager/ComponentNameResolver";
 
-  static jni::local_ref<jhybriddata> initHybrid(
-      jni::alias_ref<jhybridobject> jThis,
-      jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutor,
-      jni::alias_ref<jobject> componentNameResolver);
+  static facebook::jni::local_ref<jhybriddata> initHybrid(
+      facebook::jni::alias_ref<jhybridobject> jThis,
+      facebook::jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutor,
+      facebook::jni::alias_ref<jobject> componentNameResolver);
 
   static void registerNatives();
 
  private:
   friend HybridBase;
-  jni::global_ref<ComponentNameResolverManager::javaobject> javaPart_;
+  facebook::jni::global_ref<ComponentNameResolverManager::javaobject> javaPart_;
   RuntimeExecutor runtimeExecutor_;
 
-  jni::global_ref<jobject> componentNameResolver_;
+  facebook::jni::global_ref<jobject> componentNameResolver_;
 
   std::set<std::string> componentNames_;
 
   void installJSIBindings();
 
   explicit ComponentNameResolverManager(
-      jni::alias_ref<ComponentNameResolverManager::jhybridobject> jThis,
+      facebook::jni::alias_ref<ComponentNameResolverManager::jhybridobject>
+          jThis,
       RuntimeExecutor runtimeExecutor,
-      jni::alias_ref<jobject> componentNameResolver);
+      facebook::jni::alias_ref<jobject> componentNameResolver);
 };
 
 } // namespace react

package/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK

@@ -26,6 +26,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
         react_native_target("java/com/facebook/react/views/scroll:scroll"),
-        react_native_root_target("Libraries:generated_components_java-FBReactNativeComponentSpec"),
+        react_native_root_target(":generated_components_java-FBReactNativeComponentSpec"),
     ],
 )

package/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerClosedEvent.java

@@ -33,10 +33,4 @@ public class DrawerClosedEvent extends Event<DrawerClosedEvent> {
   protected WritableMap getEventData() {
     return Arguments.createMap();
   }
-
-  @Override
-  public short getCoalescingKey() {
-    // All events for a given view can be coalesced.
-    return 0;
-  }
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerOpenedEvent.java

@@ -33,10 +33,4 @@ public class DrawerOpenedEvent extends Event<DrawerOpenedEvent> {
   protected WritableMap getEventData() {
     return Arguments.createMap();
   }
-
-  @Override
-  public short getCoalescingKey() {
-    // All events for a given view can be coalesced.
-    return 0;
-  }
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.java

@@ -37,12 +37,6 @@ public class DrawerSlideEvent extends Event<DrawerSlideEvent> {
     return EVENT_NAME;
   }
 
-  @Override
-  public short getCoalescingKey() {
-    // All slide events for a given view can be coalesced.
-    return 0;
-  }
-
   @Override
   protected WritableMap getEventData() {
     WritableMap eventData = Arguments.createMap();

package/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerStateChangedEvent.java

@@ -36,12 +36,6 @@ public class DrawerStateChangedEvent extends Event<DrawerStateChangedEvent> {
     return EVENT_NAME;
   }
 
-  @Override
-  public short getCoalescingKey() {
-    // All events for a given view can be coalesced.
-    return 0;
-  }
-
   @Override
   protected WritableMap getEventData() {
     WritableMap eventData = Arguments.createMap();

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

@@ -31,11 +31,6 @@ public class ReactImageManager extends SimpleViewManager<ReactImageView> {
 
   public static final String REACT_CLASS = "RCTImageView";
 
-  @Override
-  public String getName() {
-    return REACT_CLASS;
-  }
-
   private @Nullable AbstractDraweeControllerBuilder mDraweeControllerBuilder;
   private @Nullable GlobalImageLoadListener mGlobalImageLoadListener;
   private final @Nullable Object mCallerContext;
@@ -113,6 +108,11 @@ public class ReactImageManager extends SimpleViewManager<ReactImageView> {
         context, getDraweeControllerBuilder(), mGlobalImageLoadListener, callerContext);
   }
 
+  @Override
+  public String getName() {
+    return REACT_CLASS;
+  }
+
   @ReactProp(name = "accessible")
   public void setAccessible(ReactImageView view, boolean accessible) {
     view.setFocusable(accessible);

package/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK

@@ -18,7 +18,7 @@ rn_android_library(
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
-        react_native_root_target("Libraries:generated_components_java-FBReactNativeComponentSpec"),
+        react_native_root_target(":generated_components_java-FBReactNativeComponentSpec"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),

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

@@ -293,14 +293,11 @@ public class ReactModalHostView extends ViewGroup
           @Override
           public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
             if (event.getAction() == KeyEvent.ACTION_UP) {
-              // We need to stop the BACK button from closing the dialog by default so we capture
-              // that
-              // event and instead inform JS so that it can make the decision as to whether or not
-              // to
-              // allow the back button to close the dialog.  If it chooses to, it can just set
-              // visible
-              // to false on the Modal and the Modal will go away
-              if (keyCode == KeyEvent.KEYCODE_BACK) {
+              // 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
+              // to whether or not to allow the back/escape key to close the dialog. If it chooses
+              // to, it can just set visible to false on the Modal and the Modal will go away
+              if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_ESCAPE) {
                 Assertions.assertNotNull(
                     mOnRequestCloseListener,
                     "setOnRequestCloseListener must be called by the manager");
@@ -308,9 +305,8 @@ public class ReactModalHostView extends ViewGroup
                 return true;
               } else {
                 // We redirect the rest of the key events to the current activity, since the
-                // activity
-                // expects to receive those events and react to them, ie. in the case of the dev
-                // menu
+                // activity expects to receive those events and react to them, ie. in the case of
+                // the dev menu
                 Activity currentActivity = ((ReactContext) getContext()).getCurrentActivity();
                 if (currentActivity != null) {
                   return currentActivity.onKeyUp(keyCode, event);

package/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/BUCK

@@ -19,6 +19,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
-        react_native_root_target("Libraries:generated_components_java-FBReactNativeComponentSpec"),
+        react_native_root_target(":generated_components_java-FBReactNativeComponentSpec"),
     ],
 )

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK

@@ -30,5 +30,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
         react_native_target("java/com/facebook/react/views/view:view"),
+        react_native_target("res:uimanager"),
     ],
 )

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

@@ -40,6 +40,7 @@ import com.facebook.react.uimanager.MeasureSpecAssertions;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ReactClippingViewGroup;
 import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
+import com.facebook.react.uimanager.ReactOverflowView;
 import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.uimanager.events.NativeGestureUtil;
 import com.facebook.react.views.view.ReactViewBackgroundManager;
@@ -49,7 +50,9 @@ import java.util.List;
 
 /** Similar to {@link ReactScrollView} but only supports horizontal scrolling. */
 public class ReactHorizontalScrollView extends HorizontalScrollView
-    implements ReactClippingViewGroup, FabricViewStateManager.HasFabricViewStateManager {
+    implements ReactClippingViewGroup,
+        FabricViewStateManager.HasFabricViewStateManager,
+        ReactOverflowView {
 
   private static boolean DEBUG_MODE = false && ReactBuildConfig.DEBUG;
   private static String TAG = ReactHorizontalScrollView.class.getSimpleName();
@@ -245,6 +248,11 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
     invalidate();
   }
 
+  @Override
+  public @Nullable String getOverflow() {
+    return mOverflow;
+  }
+
   @Override
   protected void onDraw(Canvas canvas) {
     if (DEBUG_MODE) {
@@ -417,6 +425,12 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
         updateClippingRect();
       }
 
+      // Race an UpdateState with every onScroll. This makes it more likely that, in Fabric,
+      // when JS processes the scroll event, the C++ ShadowNode representation will have a
+      // "more correct" scroll position. It will frequently be /incorrect/ but this decreases
+      // the error as much as possible.
+      updateStateOnScroll();
+
       ReactScrollViewHelper.emitScrollEvent(
           this,
           mOnScrollDispatchHelper.getXFlingVelocity(),

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

@@ -105,6 +105,11 @@ public class ReactHorizontalScrollViewManager extends ViewGroupManager<ReactHori
   @ReactProp(name = "snapToOffsets")
   public void setSnapToOffsets(
       ReactHorizontalScrollView view, @Nullable ReadableArray snapToOffsets) {
+    if (snapToOffsets == null) {
+      view.setSnapOffsets(null);
+      return;
+    }
+
     DisplayMetrics screenDisplayMetrics = DisplayMetricsHolder.getScreenDisplayMetrics();
     List<Integer> offsets = new ArrayList<Integer>();
     for (int i = 0; i < snapToOffsets.size(); i++) {

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

@@ -20,12 +20,14 @@ import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.OverScroller;
 import android.widget.ScrollView;
 import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.R;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
@@ -35,7 +37,10 @@ import com.facebook.react.uimanager.MeasureSpecAssertions;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ReactClippingViewGroup;
 import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
+import com.facebook.react.uimanager.ReactOverflowView;
 import com.facebook.react.uimanager.ViewProps;
+import com.facebook.react.uimanager.common.UIManagerType;
+import com.facebook.react.uimanager.common.ViewUtil;
 import com.facebook.react.uimanager.events.NativeGestureUtil;
 import com.facebook.react.views.view.ReactViewBackgroundManager;
 import java.lang.reflect.Field;
@@ -52,7 +57,8 @@ public class ReactScrollView extends ScrollView
     implements ReactClippingViewGroup,
         ViewGroup.OnHierarchyChangeListener,
         View.OnLayoutChangeListener,
-        FabricViewStateManager.HasFabricViewStateManager {
+        FabricViewStateManager.HasFabricViewStateManager,
+        ReactOverflowView {
 
   private static @Nullable Field sScrollerField;
   private static boolean sTriedToGetScrollerField = false;
@@ -115,6 +121,20 @@ public class ReactScrollView extends ScrollView
     setScrollBarStyle(SCROLLBARS_OUTSIDE_OVERLAY);
   }
 
+  @Override
+  public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
+    super.onInitializeAccessibilityNodeInfo(info);
+
+    // Expose the testID prop as the resource-id name of the view. Black-box E2E/UI testing
+    // frameworks, which interact with the UI through the accessibility framework, do not have
+    // access to view tags. This allows developers/testers to avoid polluting the
+    // content-description with test identifiers.
+    final String testId = (String) this.getTag(R.id.react_test_id);
+    if (testId != null) {
+      info.setViewIdResourceName(testId);
+    }
+  }
+
   @Nullable
   private OverScroller getOverScrollerFromParent() {
     OverScroller scroller;
@@ -207,6 +227,11 @@ public class ReactScrollView extends ScrollView
     invalidate();
   }
 
+  @Override
+  public @Nullable String getOverflow() {
+    return mOverflow;
+  }
+
   @Override
   protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
     MeasureSpecAssertions.assertExplicitMeasureSpec(widthMeasureSpec, heightMeasureSpec);
@@ -284,6 +309,12 @@ public class ReactScrollView extends ScrollView
         updateClippingRect();
       }
 
+      // Race an UpdateState with every onScroll. This makes it more likely that, in Fabric,
+      // when JS processes the scroll event, the C++ ShadowNode representation will have a
+      // "more correct" scroll position. It will frequently be /incorrect/ but this decreases
+      // the error as much as possible.
+      updateStateOnScroll();
+
       ReactScrollViewHelper.emitScrollEvent(
           this,
           mOnScrollDispatchHelper.getXFlingVelocity(),
@@ -1000,20 +1031,26 @@ public class ReactScrollView extends ScrollView
   /**
    * Called on any stabilized onScroll change to propagate content offset value to a Shadow Node.
    */
-  private void updateStateOnScroll(final int scrollX, final int scrollY) {
+  private boolean updateStateOnScroll(final int scrollX, final int scrollY) {
+    if (ViewUtil.getUIManagerType(getId()) == UIManagerType.DEFAULT) {
+      return false;
+    }
+
     // Dedupe events to reduce JNI traffic
     if (scrollX == mLastStateUpdateScrollX && scrollY == mLastStateUpdateScrollY) {
-      return;
+      return false;
     }
 
     mLastStateUpdateScrollX = scrollX;
     mLastStateUpdateScrollY = scrollY;
 
     forceUpdateState();
+
+    return true;
   }
 
-  private void updateStateOnScroll() {
-    updateStateOnScroll(getScrollX(), getScrollY());
+  private boolean updateStateOnScroll() {
+    return updateStateOnScroll(getScrollX(), getScrollY());
   }
 
   private void updateScrollAwayState(int scrollAwayPaddingTop) {

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

@@ -14,8 +14,9 @@ import android.widget.OverScroller;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.uimanager.UIManagerHelper;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Collections;
+import java.util.Set;
+import java.util.WeakHashMap;
 
 /** Helper class that deals with emitting Scroll Events. */
 public class ReactScrollViewHelper {
@@ -33,7 +34,8 @@ public class ReactScrollViewHelper {
   }
 
   // Support global native listeners for scroll events
-  private static List<ScrollListener> sScrollListeners = new ArrayList<>();
+  private static Set<ScrollListener> sScrollListeners =
+      Collections.newSetFromMap(new WeakHashMap<ScrollListener, Boolean>());
 
   // If all else fails, this is the hardcoded value in OverScroller.java, in AOSP.
   // The default is defined here (as of this diff):
@@ -156,6 +158,19 @@ public class ReactScrollViewHelper {
     }
   }
 
+  /**
+   * Adds a scroll listener.
+   *
+   * <p>Note that you must keep a reference to this scroll listener because this class only keeps a
+   * weak reference to it (to prevent memory leaks). This means that code like <code>
+   * addScrollListener(new ScrollListener() {...})</code> won't work, you need to do this instead:
+   * <code>
+   *   mScrollListener = new ScrollListener() {...};
+   *   ReactScrollViewHelper.addScrollListener(mScrollListener);
+   * </code> instead.
+   *
+   * @param listener
+   */
   public static void addScrollListener(ScrollListener listener) {
     sScrollListeners.add(listener);
   }

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

@@ -102,6 +102,11 @@ public class ReactScrollViewManager extends ViewGroupManager<ReactScrollView>
 
   @ReactProp(name = "snapToOffsets")
   public void setSnapToOffsets(ReactScrollView view, @Nullable ReadableArray snapToOffsets) {
+    if (snapToOffsets == null) {
+      view.setSnapOffsets(null);
+      return;
+    }
+
     DisplayMetrics screenDisplayMetrics = DisplayMetricsHolder.getScreenDisplayMetrics();
     List<Integer> offsets = new ArrayList<Integer>();
     for (int i = 0; i < snapToOffsets.size(); i++) {

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

@@ -11,12 +11,14 @@ import androidx.annotation.Nullable;
 import androidx.core.util.Pools;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.events.Event;
 
 /** A event dispatched from a ScrollView scrolling. */
 public class ScrollEvent extends Event<ScrollEvent> {
+  private static String TAG = ScrollEvent.class.getSimpleName();
 
   private static final Pools.SynchronizedPool<ScrollEvent> EVENTS_POOL =
       new Pools.SynchronizedPool<>(3);
@@ -90,7 +92,13 @@ public class ScrollEvent extends Event<ScrollEvent> {
 
   @Override
   public void onDispose() {
-    EVENTS_POOL.release(this);
+    try {
+      EVENTS_POOL.release(this);
+    } catch (IllegalStateException e) {
+      // This exception can be thrown when an event is double-released.
+      // This is a problem but won't cause user-visible impact, so it's okay to fail silently.
+      ReactSoftExceptionLogger.logSoftException(TAG, e);
+    }
   }
 
   private ScrollEvent() {}
@@ -124,12 +132,6 @@ public class ScrollEvent extends Event<ScrollEvent> {
     return ScrollEventType.getJSEventName(Assertions.assertNotNull(mScrollEventType));
   }
 
-  @Override
-  public short getCoalescingKey() {
-    // All scroll events for a given view can be coalesced
-    return 0;
-  }
-
   @Override
   public boolean canCoalesce() {
     // Only SCROLL events can be coalesced, all others can not be

package/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK

@@ -22,6 +22,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
-        react_native_root_target("Libraries:generated_components_java-FBReactNativeComponentSpec"),
+        react_native_root_target(":generated_components_java-FBReactNativeComponentSpec"),
     ],
 )

package/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderEvent.java

@@ -39,11 +39,6 @@ public class ReactSliderEvent extends Event<ReactSliderEvent> {
     return EVENT_NAME;
   }
 
-  @Override
-  public short getCoalescingKey() {
-    return 0;
-  }
-
   @Override
   public void dispatch(RCTEventEmitter rctEventEmitter) {
     rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData());