@office-iss/react-native-win32 0.0.0-canary.302 → 0.0.0-canary.303

package/Libraries/Image/Image.android.js

@@ -12,8 +12,10 @@ import type {HostInstance} from '../../src/private/types/HostInstance';
 import type {ImageStyleProp} from '../StyleSheet/StyleSheet';
 import type {RootTag} from '../Types/RootTagTypes';
 import type {ImageProps} from './ImageProps';
+import type {ImageSourceHeaders} from './ImageSourceUtils';
 import type {AbstractImageAndroid, ImageAndroid} from './ImageTypes.flow';
 
+import * as ReactNativeFeatureFlags from '../../src/private/featureflags/ReactNativeFeatureFlags';
 import flattenStyle from '../StyleSheet/flattenStyle';
 import StyleSheet from '../StyleSheet/StyleSheet';
 import TextAncestorContext from '../Text/TextAncestorContext';
@@ -31,6 +33,7 @@ import NativeImageLoaderAndroid, {
 import resolveAssetSource from './resolveAssetSource';
 import TextInlineImageNativeComponent from './TextInlineImageNativeComponent';
 import * as React from 'react';
+import {use} from 'react';
 
 let _requestId = 1;
 function generateRequestId() {
@@ -121,6 +124,12 @@ async function queryCache(
   return NativeImageLoaderAndroid.queryCache(urls);
 }
 
+const EMPTY_IMAGE_SOURCE = {
+  uri: undefined,
+  width: undefined,
+  height: undefined,
+};
+
 /**
  * A React component for displaying different types of images,
  * including network images, static resources, temporary local images, and
@@ -128,137 +137,335 @@ async function queryCache(
  *
  * See https://reactnative.dev/docs/image
  */
-let BaseImage: AbstractImageAndroid = ({
-  ref: forwardedRef,
-  ...props
-}: {
-  ref?: React.RefSetter<HostInstance>,
-  ...ImageProps,
-}) => {
-  let source = getImageSourcesFromImageProps(props) || {
-    uri: undefined,
-    width: undefined,
-    height: undefined,
-  };
-  const defaultSource = resolveAssetSource(props.defaultSource);
-  const loadingIndicatorSource = resolveAssetSource(
-    props.loadingIndicatorSource,
-  );
-
-  if (props.children != null) {
-    throw new Error(
-      'The <Image> component cannot contain children. If you want to render content on top of the image, consider using the <ImageBackground> component or absolute positioning.',
-    );
-  }
+let _BaseImage;
+if (ReactNativeFeatureFlags.reduceDefaultPropsInImage()) {
+  let BaseImage: AbstractImageAndroid = ({
+    ref: forwardedRef,
+    alt,
+    accessible,
+    'aria-labelledby': ariaLabelledBy,
+    'aria-busy': ariaBusy,
+    'aria-checked': ariaChecked,
+    'aria-disabled': ariaDisabled,
+    'aria-expanded': ariaExpanded,
+    'aria-label': ariaLabel,
+    'aria-selected': ariaSelected,
+    accessibilityLabel,
+    accessibilityLabelledBy,
+    accessibilityState,
+    defaultSource,
+    loadingIndicatorSource,
+    children,
+    source,
+    src,
+    style,
+    crossOrigin,
+    referrerPolicy,
+    srcSet,
+    onLoadStart,
+    onLoad,
+    onLoadEnd,
+    onError,
+    width,
+    height,
+    resizeMode,
+    ...restProps
+  }: {
+    ref?: React.RefSetter<HostInstance>,
+    ...ImageProps,
+  }) => {
+    let source_ =
+      getImageSourcesFromImageProps({
+        crossOrigin,
+        referrerPolicy,
+        src,
+        srcSet,
+        width,
+        height,
+        source,
+      }) || EMPTY_IMAGE_SOURCE;
+    const defaultSource_ = resolveAssetSource(defaultSource);
+    const loadingIndicatorSource_ = resolveAssetSource(loadingIndicatorSource);
 
-  if (props.defaultSource != null && props.loadingIndicatorSource != null) {
-    throw new Error(
-      'The <Image> component cannot have defaultSource and loadingIndicatorSource at the same time. Please use either defaultSource or loadingIndicatorSource.',
-    );
-  }
+    if (children != null) {
+      throw new Error(
+        'The <Image> component cannot contain children. If you want to render content on top of the image, consider using the <ImageBackground> component or absolute positioning.',
+      );
+    }
 
-  let style: ImageStyleProp;
-  let sources;
-  if (Array.isArray(source)) {
-    style = [styles.base, props.style];
-    sources = source;
-  } else {
-    const {uri} = source;
-    if (uri === '') {
-      console.warn('source.uri should not be an empty string');
+    if (defaultSource != null && loadingIndicatorSource != null) {
+      throw new Error(
+        'The <Image> component cannot have defaultSource and loadingIndicatorSource at the same time. Please use either defaultSource or loadingIndicatorSource.',
+      );
     }
-    const width = source.width ?? props.width;
-    const height = source.height ?? props.height;
-    style = [{width, height}, styles.base, props.style];
-    sources = [source];
-  }
 
-  const {onLoadStart, onLoad, onLoadEnd, onError} = props;
-  const nativeProps = {
-    ...props,
-    style,
-    shouldNotifyLoadEvents: !!(onLoadStart || onLoad || onLoadEnd || onError),
+    let style_: ImageStyleProp;
+    let sources_;
+    let headers_: ?ImageSourceHeaders;
+    if (Array.isArray(source_)) {
+      style_ = [styles.base, style];
+      sources_ = source_;
+      headers_ = sources_[0].headers;
+    } else {
+      const {uri} = source_;
+      if (uri === '') {
+        console.warn('source.uri should not be an empty string');
+      }
+      const width_ = source_.width ?? width;
+      const height_ = source_.height ?? height;
+      style_ = [{width: width_, height: height_}, styles.base, style];
+      sources_ = [source_];
+    }
+
+    const nativeProps = restProps as {
+      ...React.PropsOf<ImageViewNativeComponent>,
+    };
+
     // Both iOS and C++ sides expect to have "source" prop, whereas on Android it's "src"
     // (for historical reasons). So in the latter case we populate both "src" and "source",
     // in order to have a better alignment between platforms in the future.
-    src: sources,
-    source: sources,
-    /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
-     * when making Flow check .android.js files. */
-    headers: (source?.[0]?.headers || source?.headers: ?{[string]: string}),
-    defaultSource: defaultSource ? defaultSource.uri : null,
-    loadingIndicatorSrc: loadingIndicatorSource
-      ? loadingIndicatorSource.uri
-      : null,
-    accessibilityLabel:
-      props['aria-label'] ?? props.accessibilityLabel ?? props.alt,
-    accessibilityLabelledBy:
-      props?.['aria-labelledby'] ?? props?.accessibilityLabelledBy,
-    accessible: props.alt !== undefined ? true : props.accessible,
-    accessibilityState: {
-      busy: props['aria-busy'] ?? props.accessibilityState?.busy,
-      checked: props['aria-checked'] ?? props.accessibilityState?.checked,
-      disabled: props['aria-disabled'] ?? props.accessibilityState?.disabled,
-      expanded: props['aria-expanded'] ?? props.accessibilityState?.expanded,
-      selected: props['aria-selected'] ?? props.accessibilityState?.selected,
-    },
+    // TODO: `src` should be eventually removed from the API on Android.
+    nativeProps.src = sources_;
+    nativeProps.source = sources_;
+
+    nativeProps.style = style_;
+
+    if (headers_ != null) {
+      nativeProps.headers = headers_;
+    }
+
+    if (onLoadStart != null) {
+      nativeProps.shouldNotifyLoadEvents = true;
+      nativeProps.onLoadStart = onLoadStart;
+    }
+
+    if (onLoad != null) {
+      nativeProps.shouldNotifyLoadEvents = true;
+      nativeProps.onLoad = onLoad;
+    }
+
+    if (onLoadEnd != null) {
+      nativeProps.shouldNotifyLoadEvents = true;
+      nativeProps.onLoadEnd = onLoadEnd;
+    }
+
+    if (onError != null) {
+      nativeProps.shouldNotifyLoadEvents = true;
+      nativeProps.onError = onError;
+    }
+
+    if (defaultSource_ != null && defaultSource_.uri != null) {
+      nativeProps.defaultSource = defaultSource_.uri;
+    }
+
+    if (
+      loadingIndicatorSource_ != null &&
+      loadingIndicatorSource_.uri != null
+    ) {
+      nativeProps.loadingIndicatorSrc = loadingIndicatorSource_.uri;
+    }
+
+    if (ariaLabel != null) {
+      nativeProps.accessibilityLabel = ariaLabel;
+    } else if (accessibilityLabel != null) {
+      nativeProps.accessibilityLabel = accessibilityLabel;
+    } else if (alt != null) {
+      nativeProps.accessibilityLabel = alt;
+    }
+
+    if (ariaLabelledBy != null) {
+      nativeProps.accessibilityLabelledBy = ariaLabelledBy;
+    } else if (accessibilityLabelledBy != null) {
+      nativeProps.accessibilityLabelledBy = accessibilityLabelledBy;
+    }
+
+    if (alt != null) {
+      nativeProps.accessible = true;
+    } else if (accessible != null) {
+      nativeProps.accessible = accessible;
+    }
+
+    if (
+      accessibilityState != null ||
+      ariaBusy != null ||
+      ariaChecked != null ||
+      ariaDisabled != null ||
+      ariaExpanded != null ||
+      ariaSelected != null
+    ) {
+      nativeProps.accessibilityState = {
+        busy: ariaBusy ?? accessibilityState?.busy,
+        checked: ariaChecked ?? accessibilityState?.checked,
+        disabled: ariaDisabled ?? accessibilityState?.disabled,
+        expanded: ariaExpanded ?? accessibilityState?.expanded,
+        selected: ariaSelected ?? accessibilityState?.selected,
+      };
+    }
+
+    const flattenedStyle_ = flattenStyle<ImageStyleProp>(style);
+    const objectFit_ = convertObjectFitToResizeMode(flattenedStyle_?.objectFit);
+    const resizeMode_ =
+      objectFit_ || resizeMode || flattenedStyle_?.resizeMode || 'cover';
+    nativeProps.resizeMode = resizeMode_;
+
+    const actualRef = useWrapRefWithImageAttachedCallbacks(forwardedRef);
+
+    const hasTextAncestor = use(TextAncestorContext);
+    const analyticTag = use(ImageAnalyticsTagContext);
+    if (analyticTag !== null) {
+      nativeProps.internal_analyticTag = analyticTag;
+    }
+
+    return hasTextAncestor ? (
+      <TextInlineImageNativeComponent
+        // $FlowFixMe[incompatible-type]
+        style={style_}
+        resizeMode={resizeMode_}
+        headers={headers_}
+        src={sources_}
+        ref={actualRef}
+      />
+    ) : (
+      <ImageViewNativeComponent {...nativeProps} ref={actualRef} />
+    );
   };
 
-  const flattenedStyle = flattenStyle<ImageStyleProp>(style);
-  const objectFit = convertObjectFitToResizeMode(flattenedStyle?.objectFit);
-  const resizeMode =
-    objectFit || props.resizeMode || flattenedStyle?.resizeMode || 'cover';
-
-  const actualRef = useWrapRefWithImageAttachedCallbacks(forwardedRef);
-
-  return (
-    <ImageAnalyticsTagContext.Consumer>
-      {analyticTag => {
-        const nativePropsWithAnalytics =
-          analyticTag !== null
-            ? {
-                ...nativeProps,
-                internal_analyticTag: analyticTag,
-              }
-            : nativeProps;
-        return (
-          <TextAncestorContext.Consumer>
-            {hasTextAncestor => {
-              if (hasTextAncestor) {
+  _BaseImage = BaseImage;
+} else {
+  let BaseImage: AbstractImageAndroid = ({
+    ref: forwardedRef,
+    ...props
+  }: {
+    ref?: React.RefSetter<HostInstance>,
+    ...ImageProps,
+  }) => {
+    let source = getImageSourcesFromImageProps(props) || {
+      uri: undefined,
+      width: undefined,
+      height: undefined,
+    };
+    const defaultSource = resolveAssetSource(props.defaultSource);
+    const loadingIndicatorSource = resolveAssetSource(
+      props.loadingIndicatorSource,
+    );
+
+    if (props.children != null) {
+      throw new Error(
+        'The <Image> component cannot contain children. If you want to render content on top of the image, consider using the <ImageBackground> component or absolute positioning.',
+      );
+    }
+
+    if (props.defaultSource != null && props.loadingIndicatorSource != null) {
+      throw new Error(
+        'The <Image> component cannot have defaultSource and loadingIndicatorSource at the same time. Please use either defaultSource or loadingIndicatorSource.',
+      );
+    }
+
+    let style: ImageStyleProp;
+    let sources;
+    if (Array.isArray(source)) {
+      style = [styles.base, props.style];
+      sources = source;
+    } else {
+      const {uri} = source;
+      if (uri === '') {
+        console.warn('source.uri should not be an empty string');
+      }
+      const width = source.width ?? props.width;
+      const height = source.height ?? props.height;
+      style = [{width, height}, styles.base, props.style];
+      sources = [source];
+    }
+
+    const {onLoadStart, onLoad, onLoadEnd, onError} = props;
+    const nativeProps = {
+      ...props,
+      style,
+      shouldNotifyLoadEvents: !!(onLoadStart || onLoad || onLoadEnd || onError),
+      // Both iOS and C++ sides expect to have "source" prop, whereas on Android it's "src"
+      // (for historical reasons). So in the latter case we populate both "src" and "source",
+      // in order to have a better alignment between platforms in the future.
+      src: sources,
+      source: sources,
+      /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
+       * when making Flow check .android.js files. */
+      headers: (source?.[0]?.headers || source?.headers: ?{[string]: string}),
+      defaultSource: defaultSource ? defaultSource.uri : null,
+      loadingIndicatorSrc: loadingIndicatorSource
+        ? loadingIndicatorSource.uri
+        : null,
+      accessibilityLabel:
+        props['aria-label'] ?? props.accessibilityLabel ?? props.alt,
+      accessibilityLabelledBy:
+        props?.['aria-labelledby'] ?? props?.accessibilityLabelledBy,
+      accessible: props.alt !== undefined ? true : props.accessible,
+      accessibilityState: {
+        busy: props['aria-busy'] ?? props.accessibilityState?.busy,
+        checked: props['aria-checked'] ?? props.accessibilityState?.checked,
+        disabled: props['aria-disabled'] ?? props.accessibilityState?.disabled,
+        expanded: props['aria-expanded'] ?? props.accessibilityState?.expanded,
+        selected: props['aria-selected'] ?? props.accessibilityState?.selected,
+      },
+    };
+
+    const flattenedStyle = flattenStyle<ImageStyleProp>(style);
+    const objectFit = convertObjectFitToResizeMode(flattenedStyle?.objectFit);
+    const resizeMode =
+      objectFit || props.resizeMode || flattenedStyle?.resizeMode || 'cover';
+
+    const actualRef = useWrapRefWithImageAttachedCallbacks(forwardedRef);
+
+    return (
+      <ImageAnalyticsTagContext.Consumer>
+        {analyticTag => {
+          const nativePropsWithAnalytics =
+            analyticTag !== null
+              ? {
+                  ...nativeProps,
+                  internal_analyticTag: analyticTag,
+                }
+              : nativeProps;
+          return (
+            <TextAncestorContext.Consumer>
+              {hasTextAncestor => {
+                if (hasTextAncestor) {
+                  return (
+                    <TextInlineImageNativeComponent
+                      // $FlowFixMe[incompatible-type]
+                      style={style}
+                      resizeMode={resizeMode}
+                      headers={nativeProps.headers}
+                      src={sources}
+                      ref={actualRef}
+                    />
+                  );
+                }
+
                 return (
-                  <TextInlineImageNativeComponent
-                    // $FlowFixMe[incompatible-type]
-                    style={style}
+                  <ImageViewNativeComponent
+                    {...nativePropsWithAnalytics}
                     resizeMode={resizeMode}
-                    headers={nativeProps.headers}
-                    src={sources}
                     ref={actualRef}
                   />
                 );
-              }
-
-              return (
-                <ImageViewNativeComponent
-                  {...nativePropsWithAnalytics}
-                  resizeMode={resizeMode}
-                  ref={actualRef}
-                />
-              );
-            }}
-          </TextAncestorContext.Consumer>
-        );
-      }}
-    </ImageAnalyticsTagContext.Consumer>
-  );
-};
+              }}
+            </TextAncestorContext.Consumer>
+          );
+        }}
+      </ImageAnalyticsTagContext.Consumer>
+    );
+  };
+
+  _BaseImage = BaseImage;
+}
 
 const imageComponentDecorator = unstable_getImageComponentDecorator();
 if (imageComponentDecorator != null) {
-  BaseImage = imageComponentDecorator(BaseImage);
+  _BaseImage = imageComponentDecorator(_BaseImage);
 }
 
 // $FlowExpectedError[incompatible-type] Eventually we need to move these functions from statics of the component to exports in the module.
-const Image: ImageAndroid = BaseImage;
+const Image: ImageAndroid = _BaseImage;
 
 Image.displayName = 'Image';
 

package/Libraries/Image/ImageSourceUtils.js

@@ -15,20 +15,26 @@ import type {ImageProps} from './ImageProps';
 
 import resolveAssetSource from './resolveAssetSource';
 
+export type ImageSourceHeaders = {
+  [string]: string,
+};
+
 /**
  * A function which returns the appropriate value for image source
  * by resolving the `source`, `src` and `srcSet` props.
  */
 export function getImageSourcesFromImageProps(
   imageProps: ImageProps,
-): ?ResolvedAssetSource | $ReadOnlyArray<{uri: string, ...}> {
+):
+  | ?ResolvedAssetSource
+  | $ReadOnlyArray<{uri: string, headers: ImageSourceHeaders, ...}> {
   let source = resolveAssetSource(imageProps.source);
 
   let sources;
 
   const {crossOrigin, referrerPolicy, src, srcSet, width, height} = imageProps;
 
-  const headers: {[string]: string} = {};
+  const headers: ImageSourceHeaders = {};
   if (crossOrigin === 'use-credentials') {
     headers['Access-Control-Allow-Credentials'] = 'true';
   }

package/Libraries/Image/resolveAssetSource.js

@@ -111,7 +111,7 @@ function addCustomSourceTransformer(
 function resolveAssetSource(source: ?ImageSource): ?ResolvedAssetSource {
   if (source == null || typeof source === 'object') {
     // $FlowFixMe[incompatible-exact] `source` doesn't exactly match `ResolvedAssetSource`
-    // $FlowFixMe[incompatible-return] `source` doesn't exactly match `ResolvedAssetSource`
+    // $FlowFixMe[incompatible-type] `source` doesn't exactly match `ResolvedAssetSource`
     return source;
   }
 

package/Libraries/Interaction/InteractionManager.js

@@ -164,7 +164,7 @@ const InteractionManagerStub = {
    */
   addListener(
     eventType: string,
-    // $FlowIgnore[unclear-type]
+    // $FlowFixMe[unclear-type]
     listener: (...args: any) => mixed,
     context: mixed,
   ): EventSubscription {

package/Libraries/Interaction/PanResponder.js

@@ -422,7 +422,7 @@ const PanResponder = {
       numberActiveTouches: 0,
       _accountsForMovesUpTo: 0,
     };
-    const panHandlers = {
+    const panHandlers: GestureResponderHandlerMethods = {
       onStartShouldSetResponder(event: GestureResponderEvent): boolean {
         return config.onStartShouldSetPanResponder == null
           ? false

package/Libraries/Lists/FlatList.js

@@ -432,7 +432,7 @@ class FlatList<ItemT = any> extends React.PureComponent<FlatListProps<ItemT>> {
         }));
     } else if (this.props.onViewableItemsChanged) {
       this._virtualizedListPairs.push({
-        /* $FlowFixMe[incompatible-call] (>=0.63.0 site=react_native_fb) This
+        /* $FlowFixMe[incompatible-type] (>=0.63.0 site=react_native_fb) This
          * comment suppresses an error found when Flow v0.63 was deployed. To
          * see the error delete this comment and run Flow. */
         viewabilityConfig: this.props.viewabilityConfig,
@@ -569,7 +569,7 @@ class FlatList<ItemT = any> extends React.PureComponent<FlatListProps<ItemT>> {
         .join(':');
     }
 
-    // $FlowFixMe[incompatible-call] Can't call keyExtractor with an array
+    // $FlowFixMe[incompatible-type] Can't call keyExtractor with an array
     return keyExtractor(items, index);
   };
 
@@ -626,11 +626,10 @@ class FlatList<ItemT = any> extends React.PureComponent<FlatListProps<ItemT>> {
     const render = (props: ListRenderItemInfo<ItemT>): React.Node => {
       if (ListItemComponent) {
         // $FlowFixMe[not-a-component] Component isn't valid
-        // $FlowFixMe[incompatible-type-arg] Component isn't valid
-        // $FlowFixMe[incompatible-return] Component isn't valid
+        // $FlowFixMe[incompatible-type] Component isn't valid
         return <ListItemComponent {...props} />;
       } else if (renderItem) {
-        // $FlowFixMe[incompatible-call]
+        // $FlowFixMe[incompatible-type]
         return renderItem(props);
       } else {
         return null;
@@ -648,7 +647,7 @@ class FlatList<ItemT = any> extends React.PureComponent<FlatListProps<ItemT>> {
           <View style={StyleSheet.compose(styles.row, columnWrapperStyle)}>
             {item.map((it, kk) => {
               const element = render({
-                // $FlowFixMe[incompatible-call]
+                // $FlowFixMe[incompatible-type]
                 item: it,
                 index: index * cols + kk,
                 separators: info.separators,

package/Libraries/LogBox/Data/LogBoxData.js

@@ -442,7 +442,7 @@ export function withSubscription(
     componentDidCatch(err: Error, errorInfo: {componentStack: string, ...}) {
       /* $FlowFixMe[class-object-subtyping] added when improving typing for
        * this parameters */
-      // $FlowFixMe[incompatible-call]
+      // $FlowFixMe[incompatible-type]
       reportLogBoxError(err, errorInfo.componentStack);
     }
 

package/Libraries/LogBox/Data/parseLogBoxLog.js

@@ -509,7 +509,7 @@ export function parseLogBoxLog(args: $ReadOnlyArray<mixed>): {
   return {
     ...parseInterpolation(argsWithoutComponentStack),
     componentStack,
-    /* $FlowFixMe[incompatible-return] Natural Inference rollout. See
+    /* $FlowFixMe[incompatible-type] Natural Inference rollout. See
      * https://fburl.com/workplace/6291gfvu */
     componentStackType,
   };

package/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.js

@@ -42,7 +42,7 @@ function LogBoxInspectorSourceMapStatus(props: Props): React.Node {
             useNativeDriver: true,
           }),
         );
-        // $FlowFixMe[incompatible-call]
+        // $FlowFixMe[incompatible-type]
         setState({
           animation,
           rotate: animated.interpolate({

package/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.win32.js

@@ -44,7 +44,7 @@ function LogBoxInspectorSourceMapStatus(props: Props): React.Node {
             useNativeDriver: true,
           }),
         );
-        // $FlowFixMe[incompatible-call]
+        // $FlowFixMe[incompatible-type]
         setState({
           animation,
           rotate: animated.interpolate({

package/Libraries/Modal/Modal.js

@@ -370,13 +370,13 @@ const styles = StyleSheet.create({
   modal: {
     position: 'absolute',
   },
-  /* $FlowFixMe[incompatible-call] Natural Inference rollout. See
+  /* $FlowFixMe[incompatible-type] Natural Inference rollout. See
    * https://fburl.com/workplace/6291gfvu */
   container: {
     /* $FlowFixMe[invalid-computed-prop] (>=0.111.0 site=react_native_fb) This
      * comment suppresses an error found when Flow v0.111 was deployed. To see
      * the error, delete this comment and run Flow. */
-    // $FlowFixMe[incompatible-call]
+    // $FlowFixMe[incompatible-type]
     [side]: 0,
     top: 0,
     flex: 1,

package/Libraries/NativeComponent/NativeComponentRegistry.js

@@ -108,7 +108,7 @@ export function get<Config: {...}>(
     return viewConfig;
   });
 
-  // $FlowFixMe[incompatible-return] `NativeComponent` is actually string!
+  // $FlowFixMe[incompatible-type] `NativeComponent` is actually string!
   return name;
 }
 

package/Libraries/NativeComponent/ViewConfig.js

@@ -32,7 +32,7 @@ export function createViewConfig(
       PlatformBaseViewConfig.directEventTypes,
       partialViewConfig.directEventTypes,
     ),
-    // $FlowFixMe[incompatible-return]
+    // $FlowFixMe[incompatible-type]
     validAttributes: composeIndexers(
       // $FlowFixMe[incompatible-call] `style` property confuses Flow.
       PlatformBaseViewConfig.validAttributes,

package/Libraries/Network/RCTNetworking.android.js

@@ -53,7 +53,7 @@ const RCTNetworking = {
     listener: (...RCTNetworkingEventDefinitions[K]) => mixed,
     context?: mixed,
   ): EventSubscription {
-    // $FlowFixMe[incompatible-call]
+    // $FlowFixMe[incompatible-type]
     return emitter.addListener(eventType, listener, context);
   },