react-native 0.0.0-201c10733 → 0.0.0-268efb102

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,12 +57,14 @@ 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;
   private static final String CONTENT_OFFSET_LEFT = "contentOffsetLeft";
   private static final String CONTENT_OFFSET_TOP = "contentOffsetTop";
+  private static final String SCROLL_AWAY_PADDING_TOP = "scrollAwayPaddingTop";
 
   private static final int UNSET_CONTENT_OFFSET = -1;
 
@@ -95,6 +102,8 @@ public class ReactScrollView extends ScrollView
   private int mFinalAnimatedPositionScrollX;
   private int mFinalAnimatedPositionScrollY;
 
+  private int mScrollAwayPaddingTop = 0;
+
   private int mLastStateUpdateScrollX = -1;
   private int mLastStateUpdateScrollY = -1;
 
@@ -112,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;
@@ -204,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);
@@ -221,7 +249,7 @@ public class ReactScrollView extends ScrollView
         pendingContentOffsetX != UNSET_CONTENT_OFFSET ? pendingContentOffsetX : getScrollX();
     int scrollToY =
         pendingContentOffsetY != UNSET_CONTENT_OFFSET ? pendingContentOffsetY : getScrollY();
-    reactScrollTo(scrollToX, scrollToY);
+    scrollTo(scrollToX, scrollToY);
     ReactScrollViewHelper.emitLayoutEvent(this);
   }
 
@@ -281,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(),
@@ -878,9 +912,13 @@ public class ReactScrollView extends ScrollView
    *
    * <p>`reactScrollTo` changes `contentOffset` and we need to keep `contentOffset` in sync between
    * scroll view and state. Calling raw `reactScrollTo` doesn't update state.
+   *
+   * <p>Note that while we can override scrollTo, we *cannot* override `smoothScrollTo` because it
+   * is final. See `reactSmoothScrollTo`.
    */
-  public void reactScrollTo(int x, int y) {
-    scrollTo(x, y);
+  @Override
+  public void scrollTo(int x, int y) {
+    super.scrollTo(x, y);
     updateStateOnScroll(x, y);
     setPendingContentOffsets(x, y);
   }
@@ -926,7 +964,7 @@ public class ReactScrollView extends ScrollView
     int currentScrollY = getScrollY();
     int maxScrollY = getMaxScrollY();
     if (currentScrollY > maxScrollY) {
-      reactScrollTo(getScrollX(), maxScrollY);
+      scrollTo(getScrollX(), maxScrollY);
     }
   }
 
@@ -955,35 +993,94 @@ public class ReactScrollView extends ScrollView
     mReactBackgroundManager.setBorderStyle(style);
   }
 
+  /**
+   * ScrollAway: This enables a natively-controlled navbar that optionally obscures the top content
+   * of the ScrollView. Whether or not the navbar is obscuring the React Native surface is
+   * determined outside of React Native.
+   *
+   * <p>Note: all ScrollViews and HorizontalScrollViews in React have exactly one child: the
+   * "content" View (see ScrollView.js). That View is non-collapsable so it will never be
+   * View-flattened away. However, it is possible to pass custom styles into that View.
+   *
+   * <p>If you are using this feature it is assumed that you have full control over this ScrollView
+   * and that you are **not** overriding the ScrollView content view to pass in a `translateY`
+   * style. `translateY` must never be set from ReactJS while using this feature!
+   */
+  public void setScrollAwayTopPaddingEnabledUnstable(int topPadding) {
+    int count = getChildCount();
+
+    Assertions.assertCondition(
+        count == 1, "React Native ScrollView always has exactly 1 child; a content View");
+
+    if (count > 0) {
+      for (int i = 0; i < count; i++) {
+        View childView = getChildAt(i);
+        childView.setTranslationY(topPadding);
+      }
+
+      // Add the topPadding value as the bottom padding for the ScrollView.
+      // Otherwise, we'll push down the contents of the scroll view down too
+      // far off screen.
+      setPadding(0, 0, 0, topPadding);
+    }
+
+    updateScrollAwayState(topPadding);
+    setRemoveClippedSubviews(mRemoveClippedSubviews);
+  }
+
   /**
    * 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 boolean updateStateOnScroll() {
+    return updateStateOnScroll(getScrollX(), getScrollY());
+  }
+
+  private void updateScrollAwayState(int scrollAwayPaddingTop) {
+    if (mScrollAwayPaddingTop == scrollAwayPaddingTop) {
+      return;
+    }
+
+    mScrollAwayPaddingTop = scrollAwayPaddingTop;
+
+    forceUpdateState();
+  }
+
+  private void forceUpdateState() {
+    final int scrollX = mLastStateUpdateScrollX;
+    final int scrollY = mLastStateUpdateScrollY;
+    final int scrollAwayPaddingTop = mScrollAwayPaddingTop;
+
     mFabricViewStateManager.setState(
         new FabricViewStateManager.StateUpdateCallback() {
           @Override
           public WritableMap getStateUpdate() {
-
             WritableMap map = new WritableNativeMap();
             map.putDouble(CONTENT_OFFSET_LEFT, PixelUtil.toDIPFromPixel(scrollX));
             map.putDouble(CONTENT_OFFSET_TOP, PixelUtil.toDIPFromPixel(scrollY));
+            map.putDouble(SCROLL_AWAY_PADDING_TOP, PixelUtil.toDIPFromPixel(scrollAwayPaddingTop));
             return map;
           }
         });
   }
 
-  private void updateStateOnScroll() {
-    updateStateOnScroll(getScrollX(), getScrollY());
-  }
-
   @Override
   public FabricViewStateManager getFabricViewStateManager() {
     return mFabricViewStateManager;

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++) {
@@ -206,7 +211,7 @@ public class ReactScrollViewManager extends ViewGroupManager<ReactScrollView>
     if (data.mAnimated) {
       scrollView.reactSmoothScrollTo(data.mDestX, data.mDestY);
     } else {
-      scrollView.reactScrollTo(data.mDestX, data.mDestY);
+      scrollView.scrollTo(data.mDestX, data.mDestY);
     }
   }
 
@@ -285,7 +290,7 @@ public class ReactScrollViewManager extends ViewGroupManager<ReactScrollView>
     if (data.mAnimated) {
       scrollView.reactSmoothScrollTo(scrollView.getScrollX(), bottom);
     } else {
-      scrollView.reactScrollTo(scrollView.getScrollX(), bottom);
+      scrollView.scrollTo(scrollView.getScrollX(), bottom);
     }
   }
 
@@ -310,9 +315,9 @@ public class ReactScrollViewManager extends ViewGroupManager<ReactScrollView>
     if (value != null) {
       double x = value.hasKey("x") ? value.getDouble("x") : 0;
       double y = value.hasKey("y") ? value.getDouble("y") : 0;
-      view.reactScrollTo((int) PixelUtil.toPixelFromDIP(x), (int) PixelUtil.toPixelFromDIP(y));
+      view.scrollTo((int) PixelUtil.toPixelFromDIP(x), (int) PixelUtil.toPixelFromDIP(y));
     } else {
-      view.reactScrollTo(0, 0);
+      view.scrollTo(0, 0);
     }
   }
 

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

@@ -11,14 +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;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-import com.facebook.react.uimanager.events.RCTModernEventEmitter;
 
 /** 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);
@@ -33,6 +33,32 @@ public class ScrollEvent extends Event<ScrollEvent> {
   private int mScrollViewHeight;
   private @Nullable ScrollEventType mScrollEventType;
 
+  @Deprecated
+  public static ScrollEvent obtain(
+      int viewTag,
+      ScrollEventType scrollEventType,
+      int scrollX,
+      int scrollY,
+      float xVelocity,
+      float yVelocity,
+      int contentWidth,
+      int contentHeight,
+      int scrollViewWidth,
+      int scrollViewHeight) {
+    return obtain(
+        -1,
+        viewTag,
+        scrollEventType,
+        scrollX,
+        scrollY,
+        xVelocity,
+        yVelocity,
+        contentWidth,
+        contentHeight,
+        scrollViewWidth,
+        scrollViewHeight);
+  }
+
   public static ScrollEvent obtain(
       int surfaceId,
       int viewTag,
@@ -66,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() {}
@@ -100,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
@@ -115,18 +141,9 @@ public class ScrollEvent extends Event<ScrollEvent> {
     return false;
   }
 
+  @Nullable
   @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData());
-  }
-
-  @Override
-  public void dispatchModern(RCTModernEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(
-        getSurfaceId(), getViewTag(), getEventName(), serializeEventData());
-  }
-
-  private WritableMap serializeEventData() {
+  protected WritableMap getEventData() {
     WritableMap contentInset = Arguments.createMap();
     contentInset.putDouble("top", 0);
     contentInset.putDouble("bottom", 0);

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());

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

@@ -16,7 +16,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.SeekBar;
 import androidx.annotation.Nullable;
-import androidx.core.view.AccessibilityDelegateCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat;
 import com.facebook.react.bridge.ReactContext;
@@ -24,6 +23,7 @@ import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.PixelUtil;
+import com.facebook.react.uimanager.ReactAccessibilityDelegate;
 import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.UIManagerHelper;
@@ -118,6 +118,7 @@ public class ReactSliderManager extends SimpleViewManager<ReactSlider>
           if (eventDispatcher != null) {
             eventDispatcher.dispatchEvent(
                 new ReactSlidingCompleteEvent(
+                    UIManagerHelper.getSurfaceId(seekbar),
                     seekbar.getId(),
                     ((ReactSlider) seekbar).toRealProgress(seekbar.getProgress())));
           }
@@ -148,7 +149,7 @@ public class ReactSliderManager extends SimpleViewManager<ReactSlider>
   @Override
   protected ReactSlider createViewInstance(ThemedReactContext context) {
     final ReactSlider slider = new ReactSlider(context, null, STYLE);
-    ViewCompat.setAccessibilityDelegate(slider, sAccessibilityDelegate);
+    ViewCompat.setAccessibilityDelegate(slider, new ReactSliderAccessibilityDelegate());
     return slider;
   }
 
@@ -277,8 +278,8 @@ public class ReactSliderManager extends SimpleViewManager<ReactSlider>
     return mDelegate;
   }
 
-  protected static class ReactSliderAccessibilityDelegate extends AccessibilityDelegateCompat {
-    private static boolean isSliderAction(int action) {
+  protected class ReactSliderAccessibilityDelegate extends ReactAccessibilityDelegate {
+    private boolean isSliderAction(int action) {
       return (action == AccessibilityActionCompat.ACTION_SCROLL_FORWARD.getId())
           || (action == AccessibilityActionCompat.ACTION_SCROLL_BACKWARD.getId())
           || (action == AccessibilityActionCompat.ACTION_SET_PROGRESS.getId());
@@ -296,7 +297,4 @@ public class ReactSliderManager extends SimpleViewManager<ReactSlider>
       return rv;
     }
   };
-
-  protected static ReactSliderAccessibilityDelegate sAccessibilityDelegate =
-      new ReactSliderAccessibilityDelegate();
 }

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

@@ -7,10 +7,10 @@
 
 package com.facebook.react.views.slider;
 
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 /** Event emitted when the user finishes dragging the slider. */
 public class ReactSlidingCompleteEvent extends Event<ReactSlidingCompleteEvent> {
@@ -19,8 +19,13 @@ public class ReactSlidingCompleteEvent extends Event<ReactSlidingCompleteEvent>
 
   private final double mValue;
 
+  @Deprecated
   public ReactSlidingCompleteEvent(int viewId, double value) {
-    super(viewId);
+    this(-1, viewId, value);
+  }
+
+  public ReactSlidingCompleteEvent(int surfaceId, int viewId, double value) {
+    super(surfaceId, viewId);
     mValue = value;
   }
 
@@ -33,25 +38,17 @@ public class ReactSlidingCompleteEvent extends Event<ReactSlidingCompleteEvent>
     return EVENT_NAME;
   }
 
+  @Nullable
   @Override
-  public short getCoalescingKey() {
-    return 0;
+  protected WritableMap getEventData() {
+    WritableMap eventData = Arguments.createMap();
+    eventData.putInt("target", getViewTag());
+    eventData.putDouble("value", getValue());
+    return eventData;
   }
 
   @Override
   public boolean canCoalesce() {
     return false;
   }
-
-  @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData());
-  }
-
-  private WritableMap serializeEventData() {
-    WritableMap eventData = Arguments.createMap();
-    eventData.putInt("target", getViewTag());
-    eventData.putDouble("value", getValue());
-    return eventData;
-  }
 }

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

@@ -26,6 +26,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/views/scroll:scroll"),
     ],
     exported_deps = [
-        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/swiperefresh/RefreshEvent.java

@@ -7,13 +7,20 @@
 
 package com.facebook.react.views.swiperefresh;
 
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 public class RefreshEvent extends Event<RefreshEvent> {
 
+  @Deprecated
   protected RefreshEvent(int viewTag) {
-    super(viewTag);
+    this(-1, viewTag);
+  }
+
+  protected RefreshEvent(int surfaceId, int viewTag) {
+    super(surfaceId, viewTag);
   }
 
   @Override
@@ -21,8 +28,9 @@ public class RefreshEvent extends Event<RefreshEvent> {
     return "topRefresh";
   }
 
+  @Nullable
   @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), null);
+  protected WritableMap getEventData() {
+    return Arguments.createMap();
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java

@@ -146,7 +146,8 @@ public class SwipeRefreshLayoutManager extends ViewGroupManager<ReactSwipeRefres
             EventDispatcher eventDispatcher =
                 UIManagerHelper.getEventDispatcherForReactTag(reactContext, view.getId());
             if (eventDispatcher != null) {
-              eventDispatcher.dispatchEvent(new RefreshEvent(view.getId()));
+              eventDispatcher.dispatchEvent(
+                  new RefreshEvent(UIManagerHelper.getSurfaceId(view), view.getId()));
             }
           }
         });

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

@@ -24,6 +24,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/switchview/ReactSwitch.java

@@ -8,8 +8,11 @@
 package com.facebook.react.views.switchview;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.RippleDrawable;
+import android.os.Build;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.SwitchCompat;
 
@@ -59,6 +62,16 @@ import androidx.appcompat.widget.SwitchCompat;
 
   public void setThumbColor(@Nullable Integer color) {
     setColor(super.getThumbDrawable(), color);
+
+    // Set the ripple color with thumb color if >= LOLLIPOP
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+      RippleDrawable ripple = (RippleDrawable) super.getBackground();
+      ColorStateList customColorState =
+          new ColorStateList(
+              new int[][] {new int[] {android.R.attr.state_pressed}}, new int[] {color});
+
+      ripple.setColor(customColorState);
+    }
   }
 
   /*package*/ void setOn(boolean on) {