react-native 0.70.3 → 0.71.0-rc.0

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

@@ -7,6 +7,7 @@
 
 package com.facebook.react.uimanager.events;
 
+import android.view.InputDevice;
 import android.view.MotionEvent;
 import android.view.View;
 import androidx.annotation.Nullable;
@@ -22,8 +23,6 @@ public class PointerEventHelper {
   public static final String POINTER_TYPE_MOUSE = "mouse";
   public static final String POINTER_TYPE_UNKNOWN = "";
 
-  private static final int X_FLAG_SUPPORTS_HOVER = 0x01000000;
-
   public static enum EVENT {
     CANCEL,
     CANCEL_CAPTURE,
@@ -37,6 +36,10 @@ public class PointerEventHelper {
     MOVE_CAPTURE,
     UP,
     UP_CAPTURE,
+    OUT,
+    OUT_CAPTURE,
+    OVER,
+    OVER_CAPTURE,
   };
 
   public static final String POINTER_CANCEL = "topPointerCancel";
@@ -45,6 +48,8 @@ public class PointerEventHelper {
   public static final String POINTER_LEAVE = "topPointerLeave";
   public static final String POINTER_MOVE = "topPointerMove";
   public static final String POINTER_UP = "topPointerUp";
+  public static final String POINTER_OVER = "topPointerOver";
+  public static final String POINTER_OUT = "topPointerOut";
 
   /** We don't dispatch capture events from native; that's currently handled by JS. */
   public static @Nullable String getDispatchableEventName(EVENT event) {
@@ -61,12 +66,64 @@ public class PointerEventHelper {
         return PointerEventHelper.POINTER_CANCEL;
       case UP:
         return PointerEventHelper.POINTER_UP;
+      case OVER:
+        return PointerEventHelper.POINTER_OVER;
+      case OUT:
+        return PointerEventHelper.POINTER_OUT;
       default:
         FLog.e(ReactConstants.TAG, "No dispatchable event name for type: " + event);
         return null;
     }
   }
 
+  // https://w3c.github.io/pointerevents/#the-buttons-property
+  public static int getButtons(String eventName, String pointerType, int buttonState) {
+    if (isExitEvent(eventName)) {
+      return 0;
+    }
+    if (POINTER_TYPE_TOUCH.equals(pointerType)) {
+      return 1;
+    }
+    return buttonState;
+  }
+
+  // https://w3c.github.io/pointerevents/#the-button-property
+  public static int getButtonChange(
+      String pointerType, int lastButtonState, int currentButtonState) {
+    // Always return 0 for touch
+    if (POINTER_TYPE_TOUCH.equals(pointerType)) {
+      return 0;
+    }
+
+    int changedMask = currentButtonState ^ lastButtonState;
+    if (changedMask == 0) {
+      return -1;
+    }
+
+    switch (changedMask) {
+      case MotionEvent.BUTTON_PRIMARY: // left button, touch/pen contact
+        return 0;
+      case MotionEvent.BUTTON_TERTIARY: // middle mouse
+        return 1;
+      case MotionEvent.BUTTON_SECONDARY: // rightbutton, Pen barrel button
+        return 2;
+      case MotionEvent.BUTTON_BACK:
+        return 3;
+      case MotionEvent.BUTTON_FORWARD:
+        return 4;
+        // TOD0 - Pen eraser button maps to what?
+    }
+    return -1;
+  }
+
+  public static boolean isPrimary(int pointerId, int primaryPointerId, MotionEvent event) {
+    if (supportsHover(event)) {
+      return true;
+    }
+
+    return pointerId == primaryPointerId;
+  }
+
   public static String getW3CPointerType(final int toolType) {
     // https://www.w3.org/TR/pointerevents3/#dom-pointerevent-pointertype
     switch (toolType) {
@@ -87,7 +144,6 @@ public class PointerEventHelper {
       return false;
     }
 
-    Object value = null;
     switch (event) {
       case DOWN:
       case DOWN_CAPTURE:
@@ -96,32 +152,11 @@ public class PointerEventHelper {
       case CANCEL:
       case CANCEL_CAPTURE:
         return true;
-      case ENTER:
-        value = view.getTag(R.id.pointer_enter);
-        break;
-      case ENTER_CAPTURE:
-        value = view.getTag(R.id.pointer_enter_capture);
-        break;
-      case LEAVE:
-        value = view.getTag(R.id.pointer_leave);
-        break;
-      case LEAVE_CAPTURE:
-        value = view.getTag(R.id.pointer_leave_capture);
-        break;
-      case MOVE:
-        value = view.getTag(R.id.pointer_move);
-        break;
-      case MOVE_CAPTURE:
-        value = view.getTag(R.id.pointer_move_capture);
-        break;
-    }
-
-    if (value == null) {
-      return false;
     }
 
-    if (value instanceof Boolean) {
-      return (Boolean) value;
+    Integer pointerEvents = (Integer) view.getTag(R.id.pointer_events);
+    if (pointerEvents != null) {
+      return (pointerEvents.intValue() & (1 << event.ordinal())) != 0;
     }
     return false;
   }
@@ -140,6 +175,8 @@ public class PointerEventHelper {
       case POINTER_MOVE:
       case POINTER_ENTER:
       case POINTER_LEAVE:
+      case POINTER_OVER:
+      case POINTER_OUT:
         return EventCategoryDef.CONTINUOUS;
     }
 
@@ -147,26 +184,46 @@ public class PointerEventHelper {
   }
 
   public static boolean supportsHover(MotionEvent motionEvent) {
-    // A flag has been set on the MotionEvent to indicate it supports hover
-    // See D36958947 on justifications for this.
-    // TODO(luwe): Leverage previous events to determine if MotionEvent
-    //  is from an input device that supports hover
-    boolean supportsHoverFlag = (motionEvent.getFlags() & X_FLAG_SUPPORTS_HOVER) != 0;
-    if (supportsHoverFlag) {
-      return true;
-    }
+    int source = motionEvent.getSource();
+    return source == InputDevice.SOURCE_MOUSE || source == InputDevice.SOURCE_CLASS_POINTER;
+  }
 
-    int toolType = motionEvent.getToolType(motionEvent.getActionIndex());
-    String pointerType = getW3CPointerType(toolType);
+  public static boolean isExitEvent(String eventName) {
+    switch (eventName) {
+      case POINTER_UP:
+      case POINTER_LEAVE:
+      case POINTER_OUT:
+        return true;
+      default:
+        return false;
+    }
+  }
 
-    if (pointerType.equals(POINTER_TYPE_MOUSE)) {
-      return true;
-    } else if (pointerType.equals(POINTER_TYPE_PEN)) {
-      return true; // true?
-    } else if (pointerType.equals(POINTER_TYPE_TOUCH)) {
-      return false;
+  // https://w3c.github.io/pointerevents/#dom-pointerevent-pressure
+  public static double getPressure(int buttonState, String eventName) {
+    if (isExitEvent(eventName)) {
+      return 0;
     }
 
-    return false;
+    // Assume  we don't support pressure on our platform for now
+    //  For hardware and platforms that do not support pressure,
+    //  the value MUST be 0.5 when in the active buttons state
+    //  and 0 otherwise.
+    boolean inActiveButtonState = buttonState != 0;
+    return inActiveButtonState ? 0.5 : 0;
+  }
+
+  public static boolean isBubblingEvent(String eventName) {
+    switch (eventName) {
+      case POINTER_UP:
+      case POINTER_DOWN:
+      case POINTER_OVER:
+      case POINTER_OUT:
+      case POINTER_MOVE:
+      case POINTER_CANCEL:
+        return true;
+      default:
+        return false;
+    }
   }
 }

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

@@ -4,10 +4,8 @@ rn_android_library(
     name = "util",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [

package/ReactAndroid/src/main/java/com/facebook/react/util/BUCK

@@ -6,7 +6,6 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [

package/ReactAndroid/src/main/java/com/facebook/react/util/RNLog.java

@@ -61,7 +61,7 @@ public class RNLog {
    * @param message The message to log.
    */
   public static void w(ReactContext context, String message) {
-    RNLog.logInternal(context, message, WARN);
+    logInternal(context, message, WARN);
     FLog.w(ReactConstants.TAG, message);
   }
 
@@ -72,7 +72,7 @@ public class RNLog {
    * @param message The message to log.
    */
   public static void e(ReactContext context, String message) {
-    RNLog.logInternal(context, message, ERROR);
+    logInternal(context, message, ERROR);
     FLog.e(ReactConstants.TAG, message);
   }
 
@@ -88,7 +88,7 @@ public class RNLog {
 
   private static void logInternal(ReactContext context, String message, int level) {
     if (level >= MINIMUM_LEVEL_FOR_UI) {
-      if (context != null && message != null) {
+      if (context != null && context.hasActiveReactInstance() && message != null) {
         context.getJSModule(RCTLog.class).logIfNoNativeHook(levelToString(level), message);
       }
     }

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

@@ -4,10 +4,8 @@ rn_android_library(
     name = "common",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [

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

@@ -4,10 +4,8 @@ rn_android_library(
     name = "drawer",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [

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

@@ -25,6 +25,7 @@ import com.facebook.react.uimanager.events.NativeGestureUtil;
   public static final int DEFAULT_DRAWER_WIDTH = LayoutParams.MATCH_PARENT;
   private int mDrawerPosition = Gravity.START;
   private int mDrawerWidth = DEFAULT_DRAWER_WIDTH;
+  private boolean mDragging = false;
 
   public ReactDrawerLayout(ReactContext reactContext) {
     super(reactContext);
@@ -35,6 +36,7 @@ import com.facebook.react.uimanager.events.NativeGestureUtil;
     try {
       if (super.onInterceptTouchEvent(ev)) {
         NativeGestureUtil.notifyNativeGestureStarted(this, ev);
+        mDragging = true;
         return true;
       }
     } catch (IllegalArgumentException e) {
@@ -47,6 +49,16 @@ import com.facebook.react.uimanager.events.NativeGestureUtil;
     return false;
   }
 
+  @Override
+  public boolean onTouchEvent(MotionEvent ev) {
+    int action = ev.getActionMasked();
+    if (action == MotionEvent.ACTION_UP && mDragging) {
+      NativeGestureUtil.notifyNativeGestureEnded(this, ev);
+      mDragging = false;
+    }
+    return super.onTouchEvent(ev);
+  }
+
   /* package */ void openDrawer() {
     openDrawer(mDrawerPosition);
   }

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

@@ -8,10 +8,8 @@ rn_android_library(
     name = "imageevents",
     srcs = IMAGE_EVENT_FILES,
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
@@ -37,10 +35,8 @@ rn_android_library(
         exclude = IMAGE_EVENT_FILES,
     ),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
@@ -65,6 +61,7 @@ rn_android_library(
         react_native_target("java/com/facebook/react/common:common"),
         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/util:util"),
         react_native_target("java/com/facebook/react/modules/fresco:fresco"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
         react_native_target("java/com/facebook/react/views/imagehelper:withmultisource"),

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

@@ -19,7 +19,6 @@ import android.graphics.Shader;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.widget.Toast;
 import androidx.annotation.Nullable;
 import com.facebook.common.internal.Objects;
 import com.facebook.common.references.CloseableReference;
@@ -51,6 +50,7 @@ import com.facebook.react.uimanager.FloatUtil;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.events.EventDispatcher;
+import com.facebook.react.util.RNLog;
 import com.facebook.react.views.imagehelper.ImageSource;
 import com.facebook.react.views.imagehelper.MultiSourceHelper;
 import com.facebook.react.views.imagehelper.MultiSourceHelper.MultiSourceResult;
@@ -67,8 +67,6 @@ import java.util.List;
 public class ReactImageView extends GenericDraweeView {
 
   public static final int REMOTE_IMAGE_FADE_DURATION_MS = 300;
-  public static final String REMOTE_TRANSPARENT_BITMAP_URI =
-      "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=";
 
   private static float[] sComputedCornerRadii = new float[4];
 
@@ -309,30 +307,30 @@ public class ReactImageView extends GenericDraweeView {
     List<ImageSource> tmpSources = new LinkedList<>();
 
     if (sources == null || sources.size() == 0) {
-      ImageSource imageSource = new ImageSource(getContext(), REMOTE_TRANSPARENT_BITMAP_URI);
+      tmpSources.add(ImageSource.getTransparentBitmapImageSource(getContext()));
+    } else if (sources.size() == 1) {
+      // Optimize for the case where we have just one uri, case in which we don't need the sizes
+      ReadableMap source = sources.getMap(0);
+      ImageSource imageSource = new ImageSource(getContext(), source.getString("uri"));
+      if (Uri.EMPTY.equals(imageSource.getUri())) {
+        warnImageSource(source.getString("uri"));
+        imageSource = ImageSource.getTransparentBitmapImageSource(getContext());
+      }
       tmpSources.add(imageSource);
     } else {
-      // Optimize for the case where we have just one uri, case in which we don't need the sizes
-      if (sources.size() == 1) {
-        ReadableMap source = sources.getMap(0);
-        String uri = source.getString("uri");
-        ImageSource imageSource = new ImageSource(getContext(), uri);
-        tmpSources.add(imageSource);
+      for (int idx = 0; idx < sources.size(); idx++) {
+        ReadableMap source = sources.getMap(idx);
+        ImageSource imageSource =
+            new ImageSource(
+                getContext(),
+                source.getString("uri"),
+                source.getDouble("width"),
+                source.getDouble("height"));
         if (Uri.EMPTY.equals(imageSource.getUri())) {
-          warnImageSource(uri);
-        }
-      } else {
-        for (int idx = 0; idx < sources.size(); idx++) {
-          ReadableMap source = sources.getMap(idx);
-          String uri = source.getString("uri");
-          ImageSource imageSource =
-              new ImageSource(
-                  getContext(), uri, source.getDouble("width"), source.getDouble("height"));
-          tmpSources.add(imageSource);
-          if (Uri.EMPTY.equals(imageSource.getUri())) {
-            warnImageSource(uri);
-          }
+          warnImageSource(source.getString("uri"));
+          imageSource = ImageSource.getTransparentBitmapImageSource(getContext());
         }
+        tmpSources.add(imageSource);
       }
     }
 
@@ -542,6 +540,11 @@ public class ReactImageView extends GenericDraweeView {
     maybeUpdateView();
   }
 
+  // VisibleForTesting
+  public @Nullable ImageSource getImageSource() {
+    return mImageSource;
+  }
+
   @Override
   protected void onSizeChanged(int w, int h, int oldw, int oldh) {
     super.onSizeChanged(w, h, oldw, oldh);
@@ -568,8 +571,7 @@ public class ReactImageView extends GenericDraweeView {
   private void setSourceImage() {
     mImageSource = null;
     if (mSources.isEmpty()) {
-      ImageSource imageSource = new ImageSource(getContext(), REMOTE_TRANSPARENT_BITMAP_URI);
-      mSources.add(imageSource);
+      mSources.add(ImageSource.getTransparentBitmapImageSource(getContext()));
     } else if (hasMultipleSources()) {
       MultiSourceResult multiSource =
           MultiSourceHelper.getBestSourceForSize(getWidth(), getHeight(), mSources);
@@ -597,11 +599,9 @@ public class ReactImageView extends GenericDraweeView {
 
   private void warnImageSource(String uri) {
     if (ReactBuildConfig.DEBUG) {
-      Toast.makeText(
-              getContext(),
-              "Warning: Image source \"" + uri + "\" doesn't exist",
-              Toast.LENGTH_SHORT)
-          .show();
+      RNLog.w(
+          (ReactContext) getContext(),
+          "ReactImageView: Image source \"" + uri + "\" doesn't exist");
     }
   }
 }

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

@@ -7,10 +7,8 @@ rn_android_library(
         exclude = ["MultiSourceHelper.java"],
     ),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
@@ -27,10 +25,8 @@ rn_android_library(
     name = "withmultisource",
     srcs = ["MultiSourceHelper.java"],
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [

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

@@ -9,14 +9,15 @@ package com.facebook.react.views.imagehelper;
 
 import android.content.Context;
 import android.net.Uri;
-import androidx.annotation.Nullable;
-import com.facebook.infer.annotation.Assertions;
 import java.util.Objects;
 
 /** Class describing an image source (network URI or resource) and size. */
 public class ImageSource {
 
-  private @Nullable Uri mUri;
+  private static final String TRANSPARENT_BITMAP_URI =
+      "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=";
+
+  private Uri mUri;
   private String mSource;
   private double mSize;
   private boolean isResource;
@@ -30,6 +31,10 @@ public class ImageSource {
     mUri = computeUri(context);
   }
 
+  public static ImageSource getTransparentBitmapImageSource(Context context) {
+    return new ImageSource(context, TRANSPARENT_BITMAP_URI);
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;
@@ -57,7 +62,7 @@ public class ImageSource {
 
   /** Get the URI for this image - can be either a parsed network URI or a resource URI. */
   public Uri getUri() {
-    return Assertions.assertNotNull(mUri);
+    return mUri;
   }
 
   /** Get the area of this image. */

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

@@ -4,10 +4,8 @@ rn_android_library(
     name = "modal",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [

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

@@ -12,6 +12,7 @@ import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.os.Build;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
@@ -326,11 +327,17 @@ public class ReactModalHostView extends ViewGroup
     if (currentActivity != null && !currentActivity.isFinishing()) {
       mDialog.show();
       if (context instanceof Activity) {
-        mDialog
-            .getWindow()
-            .getDecorView()
-            .setSystemUiVisibility(
-                ((Activity) context).getWindow().getDecorView().getSystemUiVisibility());
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.R) {
+          int appearance =
+              ((Activity) context).getWindow().getInsetsController().getSystemBarsAppearance();
+          mDialog.getWindow().getInsetsController().setSystemBarsAppearance(appearance, appearance);
+        } else {
+          mDialog
+              .getWindow()
+              .getDecorView()
+              .setSystemUiVisibility(
+                  ((Activity) context).getWindow().getDecorView().getSystemUiVisibility());
+        }
       }
       mDialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE);
     }

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

@@ -4,10 +4,8 @@ rn_android_library(
     name = "progressbar",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [

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

@@ -4,10 +4,8 @@ rn_android_library(
     name = "scroll",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [

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

@@ -532,6 +532,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
       float velocityX = mVelocityHelper.getXVelocity();
       float velocityY = mVelocityHelper.getYVelocity();
       ReactScrollViewHelper.emitScrollEndDragEvent(this, velocityX, velocityY);
+      NativeGestureUtil.notifyNativeGestureEnded(this, ev);
       mDragging = false;
       // After the touch finishes, we may need to do some scrolling afterwards either as a result
       // of a fling or because we need to page align the content

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

@@ -20,6 +20,7 @@ import android.graphics.Color;
 import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
@@ -404,6 +405,7 @@ public class ReactScrollView extends ScrollView
       float velocityX = mVelocityHelper.getXVelocity();
       float velocityY = mVelocityHelper.getYVelocity();
       ReactScrollViewHelper.emitScrollEndDragEvent(this, velocityX, velocityY);
+      NativeGestureUtil.notifyNativeGestureEnded(this, ev);
       mDragging = false;
       // After the touch finishes, we may need to do some scrolling afterwards either as a result
       // of a fling or because we need to page align the content
@@ -479,18 +481,7 @@ public class ReactScrollView extends ScrollView
 
   @Override
   public void fling(int velocityY) {
-    // Workaround.
-    // On Android P if a ScrollView is inverted, we will get a wrong sign for
-    // velocityY (see https://issuetracker.google.com/issues/112385925).
-    // At the same time, mOnScrollDispatchHelper tracks the correct velocity direction.
-    //
-    // Hence, we can use the absolute value from whatever the OS gives
-    // us and use the sign of what mOnScrollDispatchHelper has tracked.
-    float signum = Math.signum(mOnScrollDispatchHelper.getYFlingVelocity());
-    if (signum == 0) {
-      signum = Math.signum(velocityY);
-    }
-    final int correctedVelocityY = (int) (Math.abs(velocityY) * signum);
+    final int correctedVelocityY = correctFlingVelocityY(velocityY);
 
     if (mPagingEnabled) {
       flingAndSnap(correctedVelocityY);
@@ -529,6 +520,25 @@ public class ReactScrollView extends ScrollView
     handlePostTouchScrolling(0, correctedVelocityY);
   }
 
+  private int correctFlingVelocityY(int velocityY) {
+    if (Build.VERSION.SDK_INT != Build.VERSION_CODES.P) {
+      return velocityY;
+    }
+
+    // Workaround.
+    // On Android P if a ScrollView is inverted, we will get a wrong sign for
+    // velocityY (see https://issuetracker.google.com/issues/112385925).
+    // At the same time, mOnScrollDispatchHelper tracks the correct velocity direction.
+    //
+    // Hence, we can use the absolute value from whatever the OS gives
+    // us and use the sign of what mOnScrollDispatchHelper has tracked.
+    float signum = Math.signum(mOnScrollDispatchHelper.getYFlingVelocity());
+    if (signum == 0) {
+      signum = Math.signum(velocityY);
+    }
+    return (int) (Math.abs(velocityY) * signum);
+  }
+
   private void enableFpsListener() {
     if (isScrollPerfLoggingEnabled()) {
       Assertions.assertNotNull(mFpsListener);