Merge from upstream through 2020-04-24

.flowconfig

@@ -90,4 +90,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.122.0
+^0.123.0

.flowconfig.android

@@ -93,4 +93,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.122.0
+^0.123.0

.flowconfig.macos

@@ -89,4 +89,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.122.0
+^0.123.0

.github/label-actions.yml

@@ -10,6 +10,10 @@
   comment: >
     Please report documentation issues in the [`react-native-website`](https://github.com/facebook/react-native-website/issues) repository.
   close: true
+"Type: Upgrade Issue":
+  comment: >
+    Do you need help upgrading to a newer React Native version? Visit the [Upgrade Support repository](https://github.com/react-native-community/upgrade-support) or use the [upgrade helper](https://react-native-community.github.io/upgrade-helper/) to see the changes that need to be made to upgrade your app.
+  close: true
 "Resolution: For Stack Overflow":
   comment: >
     We are using GitHub issues exclusively to track bugs in the core React Native library. Please try asking over on [Stack Overflow](http://stackoverflow.com/questions/tagged/react-native) as it is better suited for this type of question.

Libraries/ActionSheetIOS/ActionSheetIOS.js

@@ -14,7 +14,7 @@ import RCTActionSheetManager from './NativeActionSheetManager';
 
 const invariant = require('invariant');
 const processColor = require('../StyleSheet/processColor');
-import type {ColorValue} from '../StyleSheet/StyleSheetTypes';
+import type {ColorValue} from '../StyleSheet/StyleSheet';
 import type {ProcessedColorValue} from '../StyleSheet/processColor';
 
 /**

Libraries/Animated/src/nodes/AnimatedDivision.js

@@ -23,6 +23,9 @@ class AnimatedDivision extends AnimatedWithChildren {
 
   constructor(a: AnimatedNode | number, b: AnimatedNode | number) {
     super();
+    if (b === 0) {
+      console.error('Detected potential division by zero in AnimatedDivision');
+    }
     this._a = typeof a === 'number' ? new AnimatedValue(a) : a;
     this._b = typeof b === 'number' ? new AnimatedValue(b) : b;
   }

Libraries/Blob/RCTBlobManager.mm

@@ -310,12 +310,9 @@ - (id)processWebsocketMessage:(id)message
   };
 }
 
-- (std::shared_ptr<facebook::react::TurboModule>)
-    getTurboModuleWithJsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
-                  nativeInvoker:(std::shared_ptr<facebook::react::CallInvoker>)nativeInvoker
-                     perfLogger:(id<RCTTurboModulePerformanceLogger>)perfLogger
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
 {
-  return std::make_shared<facebook::react::NativeBlobModuleSpecJSI>(self, jsInvoker, nativeInvoker, perfLogger);
+  return std::make_shared<facebook::react::NativeBlobModuleSpecJSI>(params);
 }
 
 @end

Libraries/Blob/RCTFileReaderModule.mm

@@ -71,12 +71,9 @@ @implementation RCTFileReaderModule
   }
 }
 
-- (std::shared_ptr<facebook::react::TurboModule>)
-    getTurboModuleWithJsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
-                  nativeInvoker:(std::shared_ptr<facebook::react::CallInvoker>)nativeInvoker
-                     perfLogger:(id<RCTTurboModulePerformanceLogger>)perfLogger
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
 {
-  return std::make_shared<facebook::react::NativeFileReaderModuleSpecJSI>(self, jsInvoker, nativeInvoker, perfLogger);
+  return std::make_shared<facebook::react::NativeFileReaderModuleSpecJSI>(params);
 }
 
 @end

Libraries/Components/ActivityIndicator/ActivityIndicator.js

@@ -16,7 +16,7 @@ const StyleSheet = require('../../StyleSheet/StyleSheet');
 const View = require('../View/View');
 import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 import type {ViewProps} from '../View/ViewPropTypes';
-import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 
 const PlatformActivityIndicator =
   Platform.OS === 'android'

Libraries/Components/ActivityIndicator/ActivityIndicatorViewNativeComponent.js

@@ -12,7 +12,7 @@
 
 import type {WithDefault} from '../../Types/CodegenTypes';
 
-import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {ViewProps} from '../View/ViewPropTypes';
 
 import codegenNativeComponent from '../../Utilities/codegenNativeComponent';

Libraries/Components/ActivityIndicator/__tests__/__snapshots__/ActivityIndicator-test.js.snap

@@ -34,7 +34,7 @@ exports[`<ActivityIndicator /> should render as expected: should deep render whe
 `;
 
 exports[`<ActivityIndicator /> should render as expected: should shallow render as <ActivityIndicator /> when mocked 1`] = `
-<ForwardRef(ActivityIndicator)
+<ActivityIndicator
   animating={true}
   color="#0000ff"
   hidesWhenStopped={true}
@@ -43,7 +43,7 @@ exports[`<ActivityIndicator /> should render as expected: should shallow render
 `;
 
 exports[`<ActivityIndicator /> should render as expected: should shallow render as <ActivityIndicator /> when not mocked 1`] = `
-<ForwardRef(ActivityIndicator)
+<ActivityIndicator
   animating={true}
   color="#0000ff"
   hidesWhenStopped={true}

Libraries/Components/Button.js

@@ -22,7 +22,7 @@ const invariant = require('invariant');
 
 import type {PressEvent, KeyEvent} from '../Types/CoreEventTypes';
 import type {FocusEvent, BlurEvent} from './TextInput/TextInput'; // TODO(OSS Candidate ISS#2710739)
-import type {ColorValue} from '../StyleSheet/StyleSheetTypes';
+import type {ColorValue} from '../StyleSheet/StyleSheet';
 import type {
   AccessibilityActionEvent,
   AccessibilityActionInfo,

Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js

@@ -11,7 +11,7 @@
 'use strict';
 
 import type {ViewProps} from 'react-native/Libraries/Components/View/ViewPropTypes';
-import type {ColorValue} from 'react-native/Libraries/StyleSheet/StyleSheetTypes';
+import type {ColorValue} from 'react-native/Libraries/StyleSheet/StyleSheet';
 import type {
   WithDefault,
   DirectEventHandler,

Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js

@@ -25,8 +25,7 @@ import AndroidDrawerLayoutNativeComponent, {
 
 const DRAWER_STATES = ['Idle', 'Dragging', 'Settling'];
 
-import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
-import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
+import type {ColorValue, ViewStyleProp} from '../../StyleSheet/StyleSheet';
 import type {DirectEventHandler} from '../../Types/CodegenTypes';
 import type {
   MeasureOnSuccessCallback,

Libraries/Components/Picker/AndroidDialogPickerNativeComponent.js

@@ -22,7 +22,7 @@ import type {
 } from '../../Types/CodegenTypes';
 import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 import type {TextStyleProp} from '../../StyleSheet/StyleSheet';
-import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {ProcessedColorValue} from '../../StyleSheet/processColor';
 import type {ViewProps} from '../../Components/View/ViewPropTypes';
 

Libraries/Components/Picker/AndroidDropdownPickerNativeComponent.js

@@ -22,7 +22,7 @@ import type {
 } from '../../Types/CodegenTypes';
 import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 import type {TextStyleProp} from '../../StyleSheet/StyleSheet';
-import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {ProcessedColorValue} from '../../StyleSheet/processColor';
 import type {ViewProps} from '../../Components/View/ViewPropTypes';
 

Libraries/Components/Picker/Picker.js

@@ -17,7 +17,7 @@ const React = require('react');
 const UnimplementedView = require('../UnimplementedViews/UnimplementedView');
 
 import type {TextStyleProp} from '../../StyleSheet/StyleSheet';
-import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 
 const MODE_DIALOG = 'dialog';
 const MODE_DROPDOWN = 'dropdown';

Libraries/Components/Picker/PickerAndroid.android.js

@@ -21,9 +21,8 @@ import StyleSheet from '../../StyleSheet/StyleSheet';
 import invariant from 'invariant';
 import processColor from '../../StyleSheet/processColor';
 
-import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
 import type {SyntheticEvent} from '../../Types/CoreEventTypes';
-import type {TextStyleProp} from '../../StyleSheet/StyleSheet';
+import type {ColorValue, TextStyleProp} from '../../StyleSheet/StyleSheet';
 
 type PickerItemSelectSyntheticEvent = SyntheticEvent<
   $ReadOnly<{|

Libraries/Components/Picker/PickerIOS.ios.js

@@ -24,7 +24,7 @@ import RCTPickerNativeComponent, {
   Commands as PickerCommands,
 } from './RCTPickerNativeComponent';
 import type {TextStyleProp} from '../../StyleSheet/StyleSheet';
-import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {ProcessedColorValue} from '../../StyleSheet/processColor';
 import type {SyntheticEvent} from '../../Types/CoreEventTypes';
 import type {ViewProps} from '../View/ViewPropTypes';

Libraries/Components/Pressable/Pressable.js

@@ -25,7 +25,7 @@ import type {
 import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
 import usePressability from '../../Pressability/usePressability';
 import {normalizeRect, type RectOrSize} from '../../StyleSheet/Rect';
-import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {
   LayoutEvent,
   MouseEvent, // TODO(macOS GH#774)

Libraries/Components/Pressable/useAndroidRippleForView.js

@@ -12,7 +12,7 @@
 
 import invariant from 'invariant';
 import {Commands} from '../View/ViewNativeComponent';
-import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {PressEvent} from '../../Types/CoreEventTypes';
 import {Platform, View, processColor} from 'react-native';
 import * as React from 'react';
@@ -26,9 +26,9 @@ type NativeBackgroundProp = $ReadOnly<{|
 |}>;
 
 export type RippleConfig = {|
-  color?: ?ColorValue,
-  borderless?: ?boolean,
-  radius?: ?number,
+  color?: ColorValue,
+  borderless?: boolean,
+  radius?: number,
 |};
 
 /**
@@ -47,13 +47,12 @@ export default function useAndroidRippleForView(
   |}>,
 |}> {
   const {color, borderless, radius} = rippleConfig ?? {};
-  const normalizedBorderless = borderless === true;
 
   return useMemo(() => {
     if (
       Platform.OS === 'android' &&
       Platform.Version >= 21 &&
-      (color != null || normalizedBorderless || radius != null)
+      (color != null || borderless != null || radius != null)
     ) {
       const processedColor = processColor(color);
       invariant(
@@ -67,7 +66,7 @@ export default function useAndroidRippleForView(
           nativeBackgroundAndroid: {
             type: 'RippleAndroid',
             color: processedColor,
-            borderless: normalizedBorderless,
+            borderless: borderless === true,
             rippleRadius: radius,
           },
         },
@@ -101,5 +100,5 @@ export default function useAndroidRippleForView(
       };
     }
     return null;
-  }, [color, normalizedBorderless, radius, viewRef]);
+  }, [color, borderless, radius, viewRef]);
 }

Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js

@@ -15,7 +15,7 @@ const React = require('react');
 import ProgressBarAndroidNativeComponent from './ProgressBarAndroidNativeComponent';
 
 import type {ViewProps} from '../View/ViewPropTypes';
-import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 
 export type ProgressBarAndroidProps = $ReadOnly<{|
   ...ViewProps,

Libraries/Components/ProgressBarAndroid/ProgressBarAndroidNativeComponent.js

@@ -10,7 +10,7 @@
 
 'use strict';
 
-import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {ViewProps} from '../View/ViewPropTypes';
 import type {Double, WithDefault} from '../../Types/CodegenTypes';
 

Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js

@@ -15,7 +15,7 @@ const StyleSheet = require('../../StyleSheet/StyleSheet');
 
 import RCTProgressViewNativeComponent from './RCTProgressViewNativeComponent';
 import type {ImageSource} from '../../Image/ImageSource';
-import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {ViewProps} from '../View/ViewPropTypes';
 
 type Props = $ReadOnly<{|

Libraries/Components/ProgressViewIOS/RCTProgressViewNativeComponent.js

@@ -12,7 +12,7 @@
 
 import type {Float, WithDefault} from '../../Types/CodegenTypes';
 import type {ImageSource} from '../../Image/ImageSource';
-import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {ViewProps} from '../View/ViewPropTypes';
 
 import codegenNativeComponent from '../../Utilities/codegenNativeComponent';

Libraries/Components/RefreshControl/AndroidSwipeRefreshLayoutNativeComponent.js

@@ -22,7 +22,7 @@ import type {
   Int32,
   WithDefault,
 } from '../../Types/CodegenTypes';
-import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {ViewProps} from '../View/ViewPropTypes';
 
 type NativeProps = $ReadOnly<{|

Libraries/Components/RefreshControl/PullToRefreshViewNativeComponent.js

@@ -11,7 +11,7 @@
 'use strict';
 
 import type {DirectEventHandler, WithDefault} from '../../Types/CodegenTypes';
-import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {ViewProps} from '../View/ViewPropTypes';
 import * as React from 'react';
 

Libraries/Components/RefreshControl/RefreshControl.js

@@ -13,7 +13,7 @@
 const Platform = require('../../Utilities/Platform');
 const React = require('react');
 
-import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {ViewProps} from '../View/ViewPropTypes';
 import AndroidSwipeRefreshLayoutNativeComponent, {
   Commands as AndroidSwipeRefreshLayoutCommands,

Libraries/Components/ScrollView/AndroidHorizontalScrollViewNativeComponent.js

@@ -37,6 +37,7 @@ const AndroidHorizontalScrollViewViewConfig = {
     snapToInterval: true,
     snapToStart: true,
     snapToOffsets: true,
+    contentOffset: true,
   },
 };
 

Libraries/Components/ScrollView/ScrollView.js

@@ -31,7 +31,7 @@ const setAndForwardRef = require('../../Utilities/setAndForwardRef');
 import type {EdgeInsetsProp} from '../../StyleSheet/EdgeInsetsPropType';
 import type {PointProp} from '../../StyleSheet/PointPropType';
 import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
-import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {
   PressEvent,
   ScrollEvent,

Libraries/Components/ScrollView/ScrollViewNativeComponentType.js

@@ -16,7 +16,7 @@ import type {
   ViewStyleProp,
   DangerouslyImpreciseStyle,
 } from '../../StyleSheet/StyleSheet';
-import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {EdgeInsetsProp} from '../../StyleSheet/EdgeInsetsPropType';
 import type {ScrollEvent} from '../../Types/CoreEventTypes';
 import type {PointProp} from '../../StyleSheet/PointPropType';

Libraries/Components/ScrollView/__tests__/__snapshots__/ScrollView-test.js.snap

@@ -73,21 +73,21 @@ exports[`<ScrollView /> should render as expected: should deep render when not m
 `;
 
 exports[`<ScrollView /> should render as expected: should shallow render as <ScrollView /> when mocked 1`] = `
-<ForwardRef(ScrollView)>
+<ScrollView>
   <View>
     <Text>
       Hello World!
     </Text>
   </View>
-</ForwardRef(ScrollView)>
+</ScrollView>
 `;
 
 exports[`<ScrollView /> should render as expected: should shallow render as <ScrollView /> when not mocked 1`] = `
-<ForwardRef(ScrollView)>
+<ScrollView>
   <View>
     <Text>
       Hello World!
     </Text>
   </View>
-</ForwardRef(ScrollView)>
+</ScrollView>
 `;

Libraries/Components/SegmentedControlIOS/RCTSegmentedControlNativeComponent.js

@@ -18,7 +18,7 @@ import type {
   WithDefault,
   Int32,
 } from '../../Types/CodegenTypes';
-import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 
 export type OnChangeEvent = $ReadOnly<{|
   value: Int32,

Libraries/Components/Slider/Slider.js

@@ -17,7 +17,7 @@ const StyleSheet = require('../../StyleSheet/StyleSheet');
 
 import type {ImageSource} from '../../Image/ImageSource';
 import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
-import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {ViewProps} from '../View/ViewPropTypes';
 import type {SyntheticEvent} from '../../Types/CoreEventTypes';
 

Libraries/Components/Slider/SliderNativeComponent.js

@@ -20,7 +20,7 @@ import type {
 import codegenNativeComponent from '../../Utilities/codegenNativeComponent';
 import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 
-import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {ImageSource} from '../../Image/ImageSource';
 import type {ViewProps} from '../View/ViewPropTypes';