Merge from upstream through 2020-05-09

.ado/templates/apple-job-javascript.yml

@@ -12,10 +12,6 @@ steps:
       slice_name: ${{ parameters.slice_name }}
       xcode_version: ${{ parameters.xcode_version }}
 
-  - template: apple-droid-node-patching.yml
-    parameters:
-      apply_office_patches: $(apply_office_patches)
-
   - script: 'yarn install'
     displayName: 'yarn install'
 

.ado/templates/apple-job-react-native.yml

@@ -24,10 +24,6 @@ steps:
       slice_name: ${{ parameters.slice_name }}
       xcode_version: ${{ parameters.xcode_version }}
 
-  - template: apple-droid-node-patching.yml
-    parameters:
-      apply_office_patches: $(apply_office_patches)
-
   - task: CmdLine@2
     displayName: yarn install
     inputs:

.eslintignore

@@ -14,3 +14,4 @@ pr-inactivity-bookmarklet.js
 question-bookmarklet.js
 bots/node_modules
 android-patches/
+packages/react-native-codegen/lib

.flowconfig

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

.flowconfig.android

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

.flowconfig.macos

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

.gitignore

@@ -102,9 +102,14 @@ RNTester/Pods/*
 !RNTester/Pods/__offline_mirrors
 
 # react-native-codegen
+/packages/react-native-codegen/lib
 /ReactCommon/fabric/components/rncore/
+/schema-native-modules.json
 /schema-rncore.json
 
 # Visual studio
 .vscode
 .vs
+
+# Android memory profiler files
+*.hprof

Libraries/ART/ARTGroup.m

@@ -11,13 +11,19 @@ @implementation ARTGroup
 
 - (void)renderLayerTo:(CGContextRef)context
 {
-
   if (!CGRectIsEmpty(self.clipping)) {
     CGContextClipToRect(context, self.clipping);
   }
 
-  for (ARTNode *node in self.subviews) {
-    [node renderTo:context];
+  for (RCTPlatformView *subview in self.subviews) { // TODO(macOS GH#774)
+    if ([subview respondsToSelector:@selector(renderTo:)]) {
+      [(ARTNode *)subview renderTo:context];
+    } else {
+      // This is needed for legacy interop layer. Legacy interop layer
+      // is superview of the view that it is bridging, that's why we need
+      // to grab its first subview.
+      [(ARTNode *)subview.subviews.firstObject renderTo:context];
+    }
   }
 }
 

Libraries/ART/ARTNode.m

@@ -43,8 +43,10 @@ - (void)setTransform:(CGAffineTransform)transform
 
 - (void)invalidate
 {
-  id<ARTContainer> container = (id<ARTContainer>)self.superview;
-  [container invalidate];
+  if ([self.superview respondsToSelector:@selector(invalidate)]) {
+    id<ARTContainer> container = (id<ARTContainer>)self.superview;
+    [container invalidate];
+  }
 }
 
 - (void)renderTo:(CGContextRef)context

Libraries/ART/ARTSurfaceView.m

@@ -49,8 +49,15 @@ - (void)drawRect:(CGRect)rect
 {
   [super drawRect:rect];
   CGContextRef context = UIGraphicsGetCurrentContext();
-  for (ARTNode *node in self.subviews) {
-    [node renderTo:context];
+  for (RCTPlatformView *subview in self.subviews) { 
+    if ([subview respondsToSelector:@selector(renderTo:)]) {
+      [(ARTNode *)subview renderTo:context];
+    } else {
+      // This is needed for legacy interop layer. Legacy interop layer
+      // is superview of the view that it is bridging, that's why we need
+      // to grab its first subview.
+      [(ARTNode *)subview.subviews.firstObject renderTo:context];
+    }
   }
 }
 

Libraries/Animated/src/Animated.js

@@ -11,38 +11,37 @@
 'use strict';
 
 import Platform from '../../Utilities/Platform';
-const View = require('../../Components/View/View');
-const React = require('react');
-import type {AnimatedComponentType} from './createAnimatedComponent';
+import typeof AnimatedFlatList from './components/AnimatedFlatList';
+import typeof AnimatedImage from './components/AnimatedImage';
+import typeof AnimatedScrollView from './components/AnimatedScrollView';
+import typeof AnimatedSectionList from './components/AnimatedSectionList';
+import typeof AnimatedText from './components/AnimatedText';
+import typeof AnimatedView from './components/AnimatedView';
 
 const AnimatedMock = require('./AnimatedMock');
 const AnimatedImplementation = require('./AnimatedImplementation');
 
-//TODO(T57411659): Remove the bridgeless check when Animated perf regressions are fixed.
-const Animated = ((Platform.isTesting || global.RN$Bridgeless
+const Animated = ((Platform.isTesting
   ? AnimatedMock
   : AnimatedImplementation): typeof AnimatedMock);
 
 module.exports = {
-  get FlatList(): any {
+  get FlatList(): AnimatedFlatList {
     return require('./components/AnimatedFlatList');
   },
-  get Image(): any {
+  get Image(): AnimatedImage {
     return require('./components/AnimatedImage');
   },
-  get ScrollView(): any {
+  get ScrollView(): AnimatedScrollView {
     return require('./components/AnimatedScrollView');
   },
-  get SectionList(): any {
+  get SectionList(): AnimatedSectionList {
     return require('./components/AnimatedSectionList');
   },
-  get Text(): any {
+  get Text(): AnimatedText {
     return require('./components/AnimatedText');
   },
-  get View(): AnimatedComponentType<
-    React.ElementConfig<typeof View>,
-    React.ElementRef<typeof View>,
-  > {
+  get View(): AnimatedView {
     return require('./components/AnimatedView');
   },
   ...Animated,

Libraries/Components/DatePicker/RCTDatePickerNativeComponent.js

@@ -56,5 +56,5 @@ export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
 
 export default (codegenNativeComponent<NativeProps>('DatePicker', {
   paperComponentName: 'RCTDatePicker',
-  excludedPlatform: 'android',
+  excludedPlatforms: ['android'],
 }): HostComponent<NativeProps>);

Libraries/Components/RefreshControl/PullToRefreshViewNativeComponent.js

@@ -61,5 +61,5 @@ export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
 
 export default (codegenNativeComponent<NativeProps>('PullToRefreshView', {
   paperComponentName: 'RCTRefreshControl',
-  excludedPlatform: 'android',
+  excludedPlatforms: ['android'],
 }): HostComponent<NativeProps>);

Libraries/Components/Switch/SwitchNativeComponent.js

@@ -55,5 +55,5 @@ export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
 
 export default (codegenNativeComponent<NativeProps>('Switch', {
   paperComponentName: 'RCTSwitch',
-  excludedPlatform: 'android',
+  excludedPlatforms: ['android'],
 }): ComponentType);

Libraries/Components/TextInput/TextInput.js

@@ -1092,6 +1092,10 @@ function InternalTextInput(props: Props): React.Node {
     // This is a hack to let Flow know we want an exact object
   |} = {...null};
 
+  // The default value for `blurOnSubmit` is true for single-line fields and
+  // false for multi-line fields.
+  const blurOnSubmit = props.blurOnSubmit ?? !props.multiline;
+
   if (
     Platform.OS === 'ios' ||
     Platform.OS === 'macos' /* TODO(macOS GH#774) */
@@ -1111,6 +1115,7 @@ function InternalTextInput(props: Props): React.Node {
       <RCTTextInputView
         ref={_setNativeRef}
         {...props}
+        blurOnSubmit={blurOnSubmit}
         dataDetectorTypes={props.dataDetectorTypes}
         mostRecentEventCount={mostRecentEventCount}
         onBlur={_onBlur}
@@ -1146,6 +1151,7 @@ function InternalTextInput(props: Props): React.Node {
         ref={_setNativeRef}
         {...props}
         autoCapitalize={autoCapitalize}
+        blurOnSubmit={blurOnSubmit}
         children={children}
         disableFullscreenUI={props.disableFullscreenUI}
         mostRecentEventCount={mostRecentEventCount}

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

@@ -5,6 +5,7 @@ exports[`TextInput tests should render as expected: should deep render when mock
   acceptsFirstMouse={true}
   accessible={true}
   allowFontScaling={true}
+  blurOnSubmit={true}
   enableFocusRing={true}
   focusable={true}
   forwardedRef={null}
@@ -36,6 +37,7 @@ exports[`TextInput tests should render as expected: should deep render when not
   acceptsFirstMouse={true}
   accessible={true}
   allowFontScaling={true}
+  blurOnSubmit={true}
   enableFocusRing={true}
   focusable={true}
   forwardedRef={null}

Libraries/Components/Touchable/Touchable.js

@@ -701,7 +701,7 @@ const TouchableMixin = {
     globalY: number,
   ) {
     //don't do anything UIManager failed to measure node
-    if (!l && !t && !w && !h && !globalX && !globalY) {
+    if (!(l > 0 || t > 0 || w > 0 || h > 0 || globalX > 0 || globalY > 0)) {
       return;
     }
     this.state.touchable.positionOnActivate &&

Libraries/Components/Touchable/TouchableBounce.js

@@ -246,4 +246,4 @@ class TouchableBounce extends React.Component<Props, State> {
 
 module.exports = (React.forwardRef((props, hostRef) => (
   <TouchableBounce {...props} hostRef={hostRef} />
-)): React.ComponentType<$ReadOnly<$Diff<Props, {|hostRef: mixed|}>>>);
+)): React.AbstractComponent<$ReadOnly<$Diff<Props, {|hostRef: mixed|}>>>);

Libraries/Components/Touchable/TouchableHighlight.js

@@ -413,4 +413,4 @@ class TouchableHighlight extends React.Component<Props, State> {
 
 module.exports = (React.forwardRef((props, hostRef) => (
   <TouchableHighlight {...props} hostRef={hostRef} />
-)): React.ComponentType<$ReadOnly<$Diff<Props, {|hostRef: mixed|}>>>);
+)): React.AbstractComponent<$ReadOnly<$Diff<Props, {|hostRef: mixed|}>>>);

Libraries/Components/Touchable/TouchableOpacity.js

@@ -359,4 +359,4 @@ class TouchableOpacity extends React.Component<Props, State> {
 
 module.exports = (React.forwardRef((props, hostRef) => (
   <TouchableOpacity {...props} hostRef={hostRef} />
-)): React.ComponentType<$ReadOnly<$Diff<Props, {|hostRef: mixed|}>>>);
+)): React.AbstractComponent<$ReadOnly<$Diff<Props, {|hostRef: mixed|}>>>);

Libraries/Image/NativeImageEditor.js

@@ -0,0 +1,51 @@
+/**
+ * (c) Facebook, Inc. and its affiliates. Confidential and proprietary.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+'use strict';
+
+import type {TurboModule} from '../TurboModule/RCTExport';
+import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
+
+type Options = {|
+  +offset: {|
+    +x: number,
+    +y: number,
+  |},
+  +size: {|
+    +width: number,
+    +height: number,
+  |},
+  +displaySize?: ?{|
+    +width: number,
+    +height: number,
+  |},
+  /**
+   * Enum with potential values:
+   *  - cover
+   *  - contain
+   *  - stretch
+   *  - center
+   *  - repeat
+   */
+  +resizeMode?: ?string,
+  +allowExternalStorage?: boolean,
+|};
+
+export interface Spec extends TurboModule {
+  +getConstants: () => {||};
+  +cropImage: (
+    uri: string,
+    // eslint-disable-next-line lint/react-native-modules
+    cropData: Options,
+    successCallback: (uri: string) => void,
+    errorCallback: (error: string) => void,
+  ) => void;
+}
+
+export default (TurboModuleRegistry.getEnforcing<Spec>(
+  'ImageEditingManager',
+): Spec);

Libraries/Image/NativeImageStore.js

@@ -0,0 +1,41 @@
+/**
+ * (c) Facebook, Inc. and its affiliates. Confidential and proprietary.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+'use strict';
+
+import type {TurboModule} from '../TurboModule/RCTExport';
+import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
+
+export interface Spec extends TurboModule {
+  +getConstants: () => {||};
+  // Common
+  +getBase64ForTag: (
+    uri: string,
+    successCallback: (base64ImageData: string) => void,
+
+    /**
+     * On Android, the failure callback is called with a string.
+     * On iOS, the failure callback is called with an error object.
+     *
+     * TODO(T47527939) Unify this inconsistency
+     */
+    errorCallback: (error: {|message: string|} | string) => void,
+  ) => void;
+
+  // iOS-only
+  +hasImageForTag: (uri: string, callback: (hasImage: boolean) => void) => void;
+  +removeImageForTag: (uri: string) => void;
+  +addImageFromBase64: (
+    base64ImageData: string,
+    successCallback: (uri: string) => void,
+    errorCallback: (error: {|message: string|}) => void,
+  ) => void;
+}
+
+export default (TurboModuleRegistry.getEnforcing<Spec>(
+  'ImageStoreManager',
+): Spec);

Libraries/Image/RCTImageLoader.mm

@@ -635,7 +635,7 @@ - (RCTImageURLLoaderRequest *)_loadImageOrDataWithURLRequest:(NSURLRequest *)req
       }
     }
   });
-
+  
   return [[RCTImageURLLoaderRequest alloc] initWithRequestId:requestId imageURL:request.URL cancellationBlock:^{
     BOOL alreadyCancelled = atomic_fetch_or(cancelled.get(), 1);
     if (alreadyCancelled) {
@@ -856,6 +856,7 @@ - (void)trackURLImageContentDidSetForRequest:(RCTImageURLLoaderRequest *)loaderR
     return;
   }
 
+  // This delegate method is Fabric-only
   id<RCTImageURLLoader> loadHandler = [self imageURLLoaderForURL:loaderRequest.imageURL];
   if ([loadHandler respondsToSelector:@selector(trackURLImageContentDidSetForRequest:)]) {
     [(id<RCTImageURLLoaderWithAttribution>)loadHandler trackURLImageContentDidSetForRequest:loaderRequest];
@@ -879,6 +880,7 @@ - (void)trackURLImageDidDestroy:(RCTImageURLLoaderRequest *)loaderRequest
   if (!loaderRequest) {
     return;
   }
+
   id<RCTImageURLLoader> loadHandler = [self imageURLLoaderForURL:loaderRequest.imageURL];
   if ([loadHandler respondsToSelector:@selector(trackURLImageDidDestroy:)]) {
     [(id<RCTImageURLLoaderWithAttribution>)loadHandler trackURLImageDidDestroy:loaderRequest];