Merge from upstream through 2020-09-30

.circleci/Dockerfiles/scripts/run-ci-e2e-tests.sh

@@ -67,11 +67,6 @@ while :; do
       shift
       ;;
 
-    --tvos)
-      RUN_IOS=1
-      shift
-      ;;
-
     *)
       break
   esac

.eslintrc

@@ -5,15 +5,20 @@
     "./packages/eslint-config-react-native-community/index.js"
   ],
 
+  "plugins": [
+    "@react-native/eslint-plugin-codegen"
+  ],
+
   "overrides": [
     {
       "files": [
         "Libraries/**/*.js",
       ],
-      rules: {
-        '@react-native-community/no-haste-imports': 2,
-        '@react-native-community/error-subclass-name': 2,
-        '@react-native-community/platform-colors': 2,
+      "rules": {
+        "@react-native-community/no-haste-imports": 2,
+        "@react-native-community/error-subclass-name": 2,
+        "@react-native-community/platform-colors": 2,
+        "@react-native/codegen/react-native-modules": 2
       }
     },
     {
@@ -40,8 +45,8 @@
       ],
       "env": {
         "jasmine": true,
-        "jest": true,
-      },
-    },
-  ],
+        "jest": true
+      }
+    }
+  ]
 }

.flowconfig

@@ -80,4 +80,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.133.0
+^0.135.0

.flowconfig.android

@@ -83,4 +83,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.133.0
+^0.135.0

.flowconfig.macos

@@ -81,4 +81,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.133.0
+^0.135.0

.gitignore

@@ -28,6 +28,7 @@ project.xcworkspace/*
 /build/
 /packages/react-native-codegen/android/build/
 /packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/build
+/packages/rn-tester/android/app/.cxx/
 /packages/rn-tester/android/app/build/
 /packages/rn-tester/android/app/gradle/
 /packages/rn-tester/android/app/gradlew

Libraries/ActionSheetIOS/NativeActionSheetManager.js

@@ -17,6 +17,8 @@ import type {ProcessedColorValue} from '../StyleSheet/processColor'; // TODO(mac
 export interface Spec extends TurboModule {
   +getConstants: () => {||};
   +showActionSheetWithOptions: (
+    // TODO(macOS GH#774)
+    // eslint-disable-next-line @react-native/codegen/react-native-modules
     options: {|
       +title?: ?string,
       +message?: ?string,

Libraries/ActionSheetIOS/React-RCTActionSheet.podspec

@@ -24,10 +24,10 @@ Pod::Spec.new do |s|
   s.documentation_url      = "https://reactnative.dev/docs/actionsheetios"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
+  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
   s.source                 = source
   s.source_files           = "*.{m}"
-  s.preserve_paths          = "package.json", "LICENSE", "LICENSE-docs"
+  s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
   s.header_dir             = "RCTActionSheet"
 
   s.dependency "React-Core/RCTActionSheetHeaders", version

Libraries/Alert/NativeAlertManager.js

@@ -32,6 +32,7 @@ export type Args = {|
 
 export interface Spec extends TurboModule {
   +alertWithArgs: (
+    // eslint-disable-next-line @react-native/codegen/react-native-modules
     args: Args,
     callback: (id: number, value: string) => void,
   ) => void;

Libraries/Animated/NativeAnimatedModule.js

@@ -30,7 +30,7 @@ export type AnimatingNodeConfig = Object;
 export interface Spec extends TurboModule {
   +startOperationBatch: () => void;
   +finishOperationBatch: () => void;
-
+  // eslint-disable-next-line @react-native/codegen/react-native-modules
   +createAnimatedNode: (tag: number, config: AnimatedNodeConfig) => void;
   +getValue: (tag: number, saveValueCallback: SaveValueCallback) => void;
   +startListeningToAnimatedNodeValue: (tag: number) => void;

Libraries/Animated/NativeAnimatedTurboModule.js

@@ -30,7 +30,7 @@ export type AnimatingNodeConfig = Object;
 export interface Spec extends TurboModule {
   +startOperationBatch: () => void;
   +finishOperationBatch: () => void;
-
+  // eslint-disable-next-line @react-native/codegen/react-native-modules
   +createAnimatedNode: (tag: number, config: AnimatedNodeConfig) => void;
   +getValue: (tag: number, saveValueCallback: SaveValueCallback) => void;
   +startListeningToAnimatedNodeValue: (tag: number) => void;

Libraries/Animated/createAnimatedComponent.js

@@ -224,7 +224,8 @@ function createAnimatedComponent<Props: {+[string]: mixed, ...}, Instance>(
           style={mergedStyle}
           ref={this._setComponentRef}
           nativeID={
-            this._isFabric() ? 'animatedComponent' : undefined
+            props.nativeID ??
+            (this._isFabric() ? 'animatedComponent' : undefined)
           } /* TODO: T68258846. */
           // The native driver updates views directly through the UI thread so we
           // have to make sure the view doesn't get optimized away because it cannot

Libraries/Animated/nodes/AnimatedDivision.js

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

Libraries/Blob/React-RCTBlob.podspec

@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
+  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "*.{h,m,mm}"

Libraries/Components/Picker/AndroidDialogPickerNativeComponent.js

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @flow strict-local
+ * @flow
  */
 
 'use strict';
@@ -14,6 +14,8 @@ import * as React from 'react';
 
 import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
 import requireNativeComponent from '../../ReactNative/requireNativeComponent';
+import registerGeneratedViewConfig from '../../Utilities/registerGeneratedViewConfig';
+import AndroidDialogPickerViewConfig from './AndroidDialogPickerViewConfig';
 
 import type {
   DirectEventHandler,
@@ -64,6 +66,17 @@ export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
   supportedCommands: ['setNativeSelectedPosition'],
 });
 
-export default (requireNativeComponent<NativeProps>(
-  'AndroidDialogPicker',
-): NativeType);
+let AndroidDialogPickerNativeComponent;
+if (global.RN$Bridgeless) {
+  registerGeneratedViewConfig(
+    'AndroidDialogPicker',
+    AndroidDialogPickerViewConfig,
+  );
+  AndroidDialogPickerNativeComponent = 'AndroidDialogPicker';
+} else {
+  AndroidDialogPickerNativeComponent = requireNativeComponent<NativeProps>(
+    'AndroidDialogPicker',
+  );
+}
+
+export default ((AndroidDialogPickerNativeComponent: any): NativeType);

Libraries/Components/Picker/AndroidDialogPickerViewConfig.js

@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+'use strict';
+
+import type {GeneratedViewConfig} from '../../Utilities/registerGeneratedViewConfig';
+
+const AndroidDialogPickerViewConfig = {
+  uiViewClassName: 'AndroidDialogPicker',
+  bubblingEventTypes: {},
+  directEventTypes: {},
+  validAttributes: {
+    color: {process: require('../../StyleSheet/processColor')},
+    backgroundColor: {process: require('../../StyleSheet/processColor')},
+    enabled: true,
+    items: true,
+    prompt: true,
+    selected: true,
+    onSelect: true,
+  },
+};
+
+module.exports = (AndroidDialogPickerViewConfig: GeneratedViewConfig);

Libraries/Components/Pressable/Pressable.js

@@ -190,6 +190,16 @@ function Pressable(props: Props, forwardedRef): React.Node {
 
   const hitSlop = normalizeRect(props.hitSlop);
 
+  const restPropsWithDefaults: React.ElementConfig<typeof View> = {
+    ...restProps,
+    ...android_rippleConfig?.viewProps,
+    acceptsFirstMouse: acceptsFirstMouse !== false && !disabled, // [TODO(macOS GH#774)
+    enableFocusRing: enableFocusRing !== false && !disabled, // ]TODO(macOS GH#774)
+    accessible: accessible !== false,
+    focusable: focusable !== false,
+    hitSlop,
+  };
+
   const config = useMemo(
     () => ({
       disabled,
@@ -239,14 +249,8 @@ function Pressable(props: Props, forwardedRef): React.Node {
 
   return (
     <View
-      {...restProps}
+      {...restPropsWithDefaults}
       {...eventHandlers}
-      {...android_rippleConfig?.viewProps}
-      acceptsFirstMouse={acceptsFirstMouse !== false && !disabled} // [TODO(macOS GH#774)
-      enableFocusRing={enableFocusRing !== false && !disabled} // ]TODO(macOS GH#774)
-      accessible={accessible !== false}
-      focusable={focusable !== false}
-      hitSlop={hitSlop}
       ref={viewRef}
       style={typeof style === 'function' ? style({pressed}) : style}
       collapsable={false}>

Libraries/Components/ScrollView/ScrollView.js

@@ -1315,13 +1315,12 @@ class ScrollView extends React.Component<Props, State> {
     if (refreshControl) {
       if (Platform.OS === 'ios') {
         // On iOS the RefreshControl is a child of the ScrollView.
-        // tvOS lacks native support for RefreshControl, so don't include it in that case
         return (
           /* $FlowFixMe(>=0.117.0 site=react_native_fb) This comment suppresses
            * an error found when Flow v0.117 was deployed. To see the error,
            * delete this comment and run Flow. */
           <ScrollViewClass {...props} ref={this._setNativeRef}>
-            {Platform.isTV ? null : refreshControl}
+            {refreshControl}
             {contentContainer}
           </ScrollViewClass>
         );

Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js

@@ -26,6 +26,7 @@ export interface Spec extends TurboModule {
    *    - 'default'
    *    - 'dark-content'
    */
+  // eslint-disable-next-line @react-native/codegen/react-native-modules
   +setStyle: (statusBarStyle?: ?string) => void;
   +setHidden: (hidden: boolean) => void;
 }

Libraries/Components/StatusBar/NativeStatusBarManagerIOS.js

@@ -31,6 +31,7 @@ export interface Spec extends TurboModule {
    *    - 'dark-content'
    *    - 'light-content'
    */
+  // eslint-disable-next-line @react-native/codegen/react-native-modules
   +setStyle: (statusBarStyle?: ?string, animated: boolean) => void;
   /**
    *  - withAnimation can be: 'none' | 'fade' | 'slide'