react-native-tvos 0.64.2-5 → 0.66.3-2

package/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js

@@ -5,19 +5,42 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @flow
+ * @flow strict-local
  */
 
-'use strict';
-
-import EventEmitter from '../../vendor/emitter/EventEmitter';
+import {
+  type EventSubscription,
+  type IEventEmitter,
+} from '../../vendor/emitter/EventEmitter';
 import RCTDeviceEventEmitter from '../RCTDeviceEventEmitter';
 
 /**
- * Mock the NativeEventEmitter as a normal JS EventEmitter.
+ * Mock `NativeEventEmitter` to ignore Native Modules.
  */
-export default class NativeEventEmitter extends EventEmitter {
-  constructor() {
-    super(RCTDeviceEventEmitter.sharedSubscriber);
+export default class NativeEventEmitter<TEventToArgsMap: {...}>
+  implements IEventEmitter<TEventToArgsMap> {
+  addListener<TEvent: $Keys<TEventToArgsMap>>(
+    eventType: TEvent,
+    listener: (...args: $ElementType<TEventToArgsMap, TEvent>) => mixed,
+    context?: mixed,
+  ): EventSubscription {
+    return RCTDeviceEventEmitter.addListener(eventType, listener, context);
+  }
+
+  emit<TEvent: $Keys<TEventToArgsMap>>(
+    eventType: TEvent,
+    ...args: $ElementType<TEventToArgsMap, TEvent>
+  ): void {
+    RCTDeviceEventEmitter.emit(eventType, ...args);
+  }
+
+  removeAllListeners<TEvent: $Keys<TEventToArgsMap>>(
+    eventType?: ?TEvent,
+  ): void {
+    RCTDeviceEventEmitter.removeAllListeners(eventType);
+  }
+
+  listenerCount<TEvent: $Keys<TEventToArgsMap>>(eventType: TEvent): number {
+    return RCTDeviceEventEmitter.listenerCount(eventType);
   }
 }

package/Libraries/FBLazyVector/BUCK

@@ -2,7 +2,11 @@ load("//tools/build_defs/oss:rn_defs.bzl", "fb_apple_library")
 
 fb_apple_library(
     name = "FBLazyVector",
-    autoglob = True,
+    exported_headers = [
+        "FBLazyVector/FBLazyIterator.h",
+        "FBLazyVector/FBLazyVector.h",
+    ],
+    autoglob = False,
     complete_nullability = True,
     contacts = ["oncall+react_native@xmail.facebook.com"],
     enable_exceptions = False,

package/Libraries/FBLazyVector/FBLazyVector.podspec

@@ -11,7 +11,7 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
@@ -23,7 +23,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" }
+  s.platforms              = { :ios => "11.0", :tvos => "11.0" }
   s.source                 = source
   s.source_files           = "**/*.{c,h,m,mm,cpp}"
   s.header_dir             = "FBLazyVector"

package/Libraries/HeapCapture/HeapCapture.js

@@ -8,8 +8,6 @@
  * @flow strict
  */
 
-'use strict';
-
 import NativeJSCHeapCapture from './NativeJSCHeapCapture';
 
 const HeapCapture = {

package/Libraries/HeapCapture/NativeJSCHeapCapture.js

@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 

package/Libraries/Image/AssetSourceResolver.js

@@ -21,6 +21,7 @@ export type ResolvedAssetSource = {|
 import type {PackagerAsset} from '@react-native/assets/registry';
 
 const PixelRatio = require('../Utilities/PixelRatio');
+const {pickScale} = require('./AssetUtils');
 const Platform = require('../Utilities/Platform');
 
 const invariant = require('invariant');
@@ -35,7 +36,7 @@ const {
  * Returns a path like 'assets/AwesomeModule/icon@2x.png'
  */
 function getScaledAssetPath(asset): string {
-  const scale = AssetSourceResolver.pickScale(asset.scales, PixelRatio.get());
+  const scale = pickScale(asset.scales, PixelRatio.get());
   const scaleSuffix = scale === 1 ? '' : '@' + scale + 'x';
   const assetDir = getBasePath(asset);
   return assetDir + '/' + asset.name + scaleSuffix + '.' + asset.type;
@@ -45,7 +46,7 @@ function getScaledAssetPath(asset): string {
  * Returns a path like 'drawable-mdpi/icon.png'
  */
 function getAssetPathInDrawableFolder(asset): string {
-  const scale = AssetSourceResolver.pickScale(asset.scales, PixelRatio.get());
+  const scale = pickScale(asset.scales, PixelRatio.get());
   const drawbleFolder = getAndroidResourceFolderName(asset, scale);
   const fileName = getAndroidResourceIdentifier(asset);
   return drawbleFolder + '/' + fileName + '.' + asset.type;
@@ -154,23 +155,14 @@ class AssetSourceResolver {
       width: this.asset.width,
       height: this.asset.height,
       uri: source,
-      scale: AssetSourceResolver.pickScale(this.asset.scales, PixelRatio.get()),
+      scale: pickScale(this.asset.scales, PixelRatio.get()),
     };
   }
 
-  static pickScale(scales: Array<number>, deviceScale: number): number {
-    // Packager guarantees that `scales` array is sorted
-    for (let i = 0; i < scales.length; i++) {
-      if (scales[i] >= deviceScale) {
-        return scales[i];
-      }
-    }
-
-    // If nothing matches, device scale is larger than any available
-    // scales, so we return the biggest one. Unless the array is empty,
-    // in which case we default to 1
-    return scales[scales.length - 1] || 1;
-  }
+  static pickScale: (
+    scales: Array<number>,
+    deviceScale?: number,
+  ) => number = pickScale;
 }
 
 module.exports = AssetSourceResolver;

package/Libraries/Image/AssetUtils.js

@@ -0,0 +1,48 @@
+/**
+ * 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
+ * @format
+ */
+
+import PixelRatio from '../Utilities/PixelRatio';
+
+let cacheBreaker;
+let warnIfCacheBreakerUnset = true;
+
+export function pickScale(scales: Array<number>, deviceScale?: number): number {
+  if (deviceScale == null) {
+    deviceScale = PixelRatio.get();
+  }
+  // Packager guarantees that `scales` array is sorted
+  for (let i = 0; i < scales.length; i++) {
+    if (scales[i] >= deviceScale) {
+      return scales[i];
+    }
+  }
+
+  // If nothing matches, device scale is larger than any available
+  // scales, so we return the biggest one. Unless the array is empty,
+  // in which case we default to 1
+  return scales[scales.length - 1] || 1;
+}
+
+export function setUrlCacheBreaker(appendage: string) {
+  cacheBreaker = appendage;
+}
+
+export function getUrlCacheBreaker(): string {
+  if (cacheBreaker == null) {
+    if (__DEV__ && warnIfCacheBreakerUnset) {
+      warnIfCacheBreakerUnset = false;
+      console.warn(
+        'AssetUtils.getUrlCacheBreaker: Cache breaker value is unset',
+      );
+    }
+    return '';
+  }
+  return cacheBreaker;
+}

package/Libraries/Image/Image.android.js

@@ -8,146 +8,28 @@
  * @format
  */
 
-'use strict';
-
-const DeprecatedImageStylePropTypes = require('../DeprecatedPropTypes/DeprecatedImageStylePropTypes');
-const DeprecatedStyleSheetPropType = require('../DeprecatedPropTypes/DeprecatedStyleSheetPropType');
-const DeprecatedViewPropTypes = require('../DeprecatedPropTypes/DeprecatedViewPropTypes');
+import DeprecatedImagePropType from '../DeprecatedPropTypes/DeprecatedImagePropType';
 import ImageViewNativeComponent from './ImageViewNativeComponent';
-const PropTypes = require('prop-types');
-const React = require('react');
-const ReactNative = require('../Renderer/shims/ReactNative'); // eslint-disable-line no-unused-vars
-const StyleSheet = require('../StyleSheet/StyleSheet');
-const TextAncestor = require('../Text/TextAncestor');
-
-const ImageAnalyticsTagContext = require('./ImageAnalyticsTagContext').default;
-const flattenStyle = require('../StyleSheet/flattenStyle');
-const resolveAssetSource = require('./resolveAssetSource');
+import * as React from 'react';
+import StyleSheet from '../StyleSheet/StyleSheet';
+import TextAncestor from '../Text/TextAncestor';
+import ImageInjection from './ImageInjection';
+import ImageAnalyticsTagContext from './ImageAnalyticsTagContext';
+import flattenStyle from '../StyleSheet/flattenStyle';
+import resolveAssetSource from './resolveAssetSource';
 
 import NativeImageLoaderAndroid from './NativeImageLoaderAndroid';
 
-const TextInlineImageNativeComponent = require('./TextInlineImageNativeComponent');
+import TextInlineImageNativeComponent from './TextInlineImageNativeComponent';
 
 import type {ImageProps as ImagePropsType} from './ImageProps';
+import type {RootTag} from '../Types/RootTagTypes';
 
 let _requestId = 1;
 function generateRequestId() {
   return _requestId++;
 }
 
-const ImageProps = {
-  ...DeprecatedViewPropTypes,
-  style: (DeprecatedStyleSheetPropType(
-    DeprecatedImageStylePropTypes,
-  ): ReactPropsCheckType),
-  /**
-   * See https://reactnative.dev/docs/image.html#source
-   */
-  source: (PropTypes.oneOfType([
-    PropTypes.shape({
-      uri: PropTypes.string,
-      headers: PropTypes.objectOf(PropTypes.string),
-    }),
-    // Opaque type returned by require('./image.jpg')
-    PropTypes.number,
-    // Multiple sources
-    PropTypes.arrayOf(
-      PropTypes.shape({
-        uri: PropTypes.string,
-        width: PropTypes.number,
-        height: PropTypes.number,
-        headers: PropTypes.objectOf(PropTypes.string),
-      }),
-    ),
-  ]): React$PropType$Primitive<
-    | {
-        headers?: {[string]: string, ...},
-        uri?: string,
-        ...
-      }
-    | number
-    | Array<{
-        headers?: {[string]: string, ...},
-        height?: number,
-        uri?: string,
-        width?: number,
-        ...
-      }>,
-  >),
-  /**
-   * blurRadius: the blur radius of the blur filter added to the image
-   *
-   * See https://reactnative.dev/docs/image.html#blurradius
-   */
-  blurRadius: PropTypes.number,
-  /**
-   * See https://reactnative.dev/docs/image.html#defaultsource
-   */
-  defaultSource: PropTypes.number,
-  /**
-   * See https://reactnative.dev/docs/image.html#loadingindicatorsource
-   */
-  loadingIndicatorSource: (PropTypes.oneOfType([
-    PropTypes.shape({
-      uri: PropTypes.string,
-    }),
-    // Opaque type returned by require('./image.jpg')
-    PropTypes.number,
-  ]): React$PropType$Primitive<{uri?: string, ...} | number>),
-  progressiveRenderingEnabled: PropTypes.bool,
-  fadeDuration: PropTypes.number,
-  /**
-   * Analytics Tag used by this Image
-   */
-  internal_analyticTag: PropTypes.string,
-  /**
-   * Invoked on load start
-   */
-  onLoadStart: PropTypes.func,
-  /**
-   * Invoked on load error
-   */
-  onError: PropTypes.func,
-  /**
-   * Invoked when load completes successfully
-   */
-  onLoad: PropTypes.func,
-  /**
-   * Invoked when load either succeeds or fails
-   */
-  onLoadEnd: PropTypes.func,
-  /**
-   * Used to locate this view in end-to-end tests.
-   */
-  testID: PropTypes.string,
-  /**
-   * The mechanism that should be used to resize the image when the image's dimensions
-   * differ from the image view's dimensions. Defaults to `auto`.
-   *
-   * See https://reactnative.dev/docs/image.html#resizemethod
-   */
-  resizeMethod: (PropTypes.oneOf([
-    'auto',
-    'resize',
-    'scale',
-  ]): React$PropType$Primitive<'auto' | 'resize' | 'scale'>),
-  /**
-   * Determines how to resize the image when the frame doesn't match the raw
-   * image dimensions.
-   *
-   * See https://reactnative.dev/docs/image.html#resizemode
-   */
-  resizeMode: (PropTypes.oneOf([
-    'cover',
-    'contain',
-    'stretch',
-    'repeat',
-    'center',
-  ]): React$PropType$Primitive<
-    'cover' | 'contain' | 'stretch' | 'repeat' | 'center',
-  >),
-};
-
 /**
  * Retrieve the width and height (in pixels) of an image prior to displaying it
  *
@@ -194,6 +76,16 @@ function getSizeWithHeaders(
     );
 }
 
+function prefetchWithMetadata(
+  url: string,
+  queryRootName: string,
+  rootTag?: ?RootTag,
+  callback: ?Function,
+): any {
+  // TODO: T79192300 Log queryRootName and rootTag
+  prefetch(url, callback);
+}
+
 function prefetch(url: string, callback: ?Function): any {
   const requestId = generateRequestId();
   callback && callback(requestId);
@@ -219,10 +111,11 @@ type ImageComponentStatics = $ReadOnly<{|
   getSize: typeof getSize,
   getSizeWithHeaders: typeof getSizeWithHeaders,
   prefetch: typeof prefetch,
+  prefetchWithMetadata: typeof prefetchWithMetadata,
   abortPrefetch: typeof abortPrefetch,
   queryCache: typeof queryCache,
   resolveAssetSource: typeof resolveAssetSource,
-  propTypes: typeof ImageProps,
+  propTypes: typeof DeprecatedImagePropType,
 |}>;
 
 /**
@@ -239,8 +132,11 @@ let Image = (props: ImagePropsType, forwardedRef) => {
     props.loadingIndicatorSource,
   );
 
-  if (source && source.uri === '') {
-    console.warn('source.uri should not be an empty string');
+  if (source) {
+    const uri = source.uri;
+    if (uri === '') {
+      console.warn('source.uri should not be an empty string');
+    }
   }
 
   if (props.src) {
@@ -324,6 +220,10 @@ Image = React.forwardRef<
   | React.ElementRef<typeof ImageViewNativeComponent>,
 >(Image);
 
+if (ImageInjection.unstable_createImageComponent != null) {
+  Image = ImageInjection.unstable_createImageComponent(Image);
+}
+
 Image.displayName = 'Image';
 
 /**
@@ -358,6 +258,17 @@ Image.getSizeWithHeaders = getSizeWithHeaders;
  * comment and run Flow. */
 Image.prefetch = prefetch;
 
+/**
+ * Prefetches a remote image for later use by downloading it to the disk
+ * cache, and adds metadata for queryRootName and rootTag.
+ *
+ * See https://reactnative.dev/docs/image.html#prefetch
+ */
+/* $FlowFixMe(>=0.89.0 site=react_native_android_fb) This comment suppresses an
+ * error found when Flow v0.89 was deployed. To see the error, delete this
+ * comment and run Flow. */
+Image.prefetchWithMetadata = prefetchWithMetadata;
+
 /**
  * Abort prefetch request.
  *
@@ -391,7 +302,7 @@ Image.resolveAssetSource = resolveAssetSource;
 /* $FlowFixMe(>=0.89.0 site=react_native_android_fb) This comment suppresses an
  * error found when Flow v0.89 was deployed. To see the error, delete this
  * comment and run Flow. */
-Image.propTypes = ImageProps;
+Image.propTypes = DeprecatedImagePropType;
 
 const styles = StyleSheet.create({
   base: {

package/Libraries/Image/Image.ios.js

@@ -8,16 +8,13 @@
  * @format
  */
 
-'use strict';
+import DeprecatedImagePropType from '../DeprecatedPropTypes/DeprecatedImagePropType';
+import * as React from 'react';
+import StyleSheet from '../StyleSheet/StyleSheet';
 
-const DeprecatedImagePropType = require('../DeprecatedPropTypes/DeprecatedImagePropType');
-const React = require('react');
-const ReactNative = require('../Renderer/shims/ReactNative'); // eslint-disable-line no-unused-vars
-const StyleSheet = require('../StyleSheet/StyleSheet');
-
-const ImageAnalyticsTagContext = require('./ImageAnalyticsTagContext').default;
-const flattenStyle = require('../StyleSheet/flattenStyle');
-const resolveAssetSource = require('./resolveAssetSource');
+import ImageAnalyticsTagContext from './ImageAnalyticsTagContext';
+import flattenStyle from '../StyleSheet/flattenStyle';
+import resolveAssetSource from './resolveAssetSource';
 
 import type {ImageProps as ImagePropsType} from './ImageProps';
 
@@ -25,6 +22,7 @@ import type {ImageStyleProp} from '../StyleSheet/StyleSheet';
 import NativeImageLoaderIOS from './NativeImageLoaderIOS';
 
 import ImageViewNativeComponent from './ImageViewNativeComponent';
+import type {RootTag} from 'react-native/Libraries/Types/RootTagTypes';
 
 function getSize(
   uri: string,
@@ -59,6 +57,25 @@ function getSizeWithHeaders(
     );
 }
 
+function prefetchWithMetadata(
+  url: string,
+  queryRootName: string,
+  rootTag?: ?RootTag,
+): any {
+  if (NativeImageLoaderIOS.prefetchImageWithMetadata) {
+    // number params like rootTag cannot be nullable before TurboModules is available
+    return NativeImageLoaderIOS.prefetchImageWithMetadata(
+      url,
+      queryRootName,
+      // NOTE: RootTag type
+      // $FlowFixMe[incompatible-call] RootTag: number is incompatible with RootTag
+      rootTag ? rootTag : 0,
+    );
+  } else {
+    return NativeImageLoaderIOS.prefetchImage(url);
+  }
+}
+
 function prefetch(url: string): any {
   return NativeImageLoaderIOS.prefetchImage(url);
 }
@@ -73,6 +90,7 @@ type ImageComponentStatics = $ReadOnly<{|
   getSize: typeof getSize,
   getSizeWithHeaders: typeof getSizeWithHeaders,
   prefetch: typeof prefetch,
+  prefetchWithMetadata: typeof prefetchWithMetadata,
   queryCache: typeof queryCache,
   resolveAssetSource: typeof resolveAssetSource,
   propTypes: typeof DeprecatedImagePropType,
@@ -95,12 +113,10 @@ let Image = (props: ImagePropsType, forwardedRef) => {
   let sources;
   let style: ImageStyleProp;
   if (Array.isArray(source)) {
-    // $FlowFixMe flattenStyle is not strong enough
     style = flattenStyle([styles.base, props.style]) || {};
     sources = source;
   } else {
     const {width, height, uri} = source;
-    // $FlowFixMe flattenStyle is not strong enough
     style = flattenStyle([{width, height}, styles.base, props.style]) || {};
     sources = [source];
 
@@ -109,7 +125,11 @@ let Image = (props: ImagePropsType, forwardedRef) => {
     }
   }
 
+  // $FlowFixMe[incompatible-use]
+  // $FlowFixMe[incompatible-type]
   const resizeMode = props.resizeMode || style.resizeMode || 'cover';
+  // $FlowFixMe[prop-missing]
+  // $FlowFixMe[incompatible-use]
   const tintColor = style.tintColor;
 
   if (props.src != null) {
@@ -132,6 +152,7 @@ let Image = (props: ImagePropsType, forwardedRef) => {
             {...props}
             ref={forwardedRef}
             style={style}
+            // $FlowFixMe[incompatible-type]
             resizeMode={resizeMode}
             tintColor={tintColor}
             source={sources}
@@ -154,9 +175,9 @@ Image.displayName = 'Image';
  *
  * See https://reactnative.dev/docs/image.html#getsize
  */
-/* $FlowFixMe(>=0.89.0 site=react_native_ios_fb) This comment suppresses an
- * error found when Flow v0.89 was deployed. To see the error, delete this
- * comment and run Flow. */
+/* $FlowFixMe[prop-missing] (>=0.89.0 site=react_native_ios_fb) This comment
+ * suppresses an error found when Flow v0.89 was deployed. To see the error,
+ * delete this comment and run Flow. */
 Image.getSize = getSize;
 
 /**
@@ -165,9 +186,9 @@ Image.getSize = getSize;
  *
  * See https://reactnative.dev/docs/image.html#getsizewithheaders
  */
-/* $FlowFixMe(>=0.89.0 site=react_native_ios_fb) This comment suppresses an
- * error found when Flow v0.89 was deployed. To see the error, delete this
- * comment and run Flow. */
+/* $FlowFixMe[prop-missing] (>=0.89.0 site=react_native_ios_fb) This comment
+ * suppresses an error found when Flow v0.89 was deployed. To see the error,
+ * delete this comment and run Flow. */
 Image.getSizeWithHeaders = getSizeWithHeaders;
 
 /**
@@ -176,19 +197,30 @@ Image.getSizeWithHeaders = getSizeWithHeaders;
  *
  * See https://reactnative.dev/docs/image.html#prefetch
  */
-/* $FlowFixMe(>=0.89.0 site=react_native_ios_fb) This comment suppresses an
- * error found when Flow v0.89 was deployed. To see the error, delete this
- * comment and run Flow. */
+/* $FlowFixMe[prop-missing] (>=0.89.0 site=react_native_ios_fb) This comment
+ * suppresses an error found when Flow v0.89 was deployed. To see the error,
+ * delete this comment and run Flow. */
 Image.prefetch = prefetch;
 
+/**
+ * Prefetches a remote image for later use by downloading it to the disk
+ * cache, and adds metadata for queryRootName and rootTag.
+ *
+ * See https://reactnative.dev/docs/image.html#prefetch
+ */
+/* $FlowFixMe[prop-missing] (>=0.89.0 site=react_native_ios_fb) This comment
+ * suppresses an error found when Flow v0.89 was deployed. To see the error,
+ * delete this comment and run Flow. */
+Image.prefetchWithMetadata = prefetchWithMetadata;
+
 /**
  * Performs cache interrogation.
  *
  *  See https://reactnative.dev/docs/image.html#querycache
  */
-/* $FlowFixMe(>=0.89.0 site=react_native_ios_fb) This comment suppresses an
- * error found when Flow v0.89 was deployed. To see the error, delete this
- * comment and run Flow. */
+/* $FlowFixMe[prop-missing] (>=0.89.0 site=react_native_ios_fb) This comment
+ * suppresses an error found when Flow v0.89 was deployed. To see the error,
+ * delete this comment and run Flow. */
 Image.queryCache = queryCache;
 
 /**
@@ -196,14 +228,11 @@ Image.queryCache = queryCache;
  *
  * See https://reactnative.dev/docs/image.html#resolveassetsource
  */
-/* $FlowFixMe(>=0.89.0 site=react_native_ios_fb) This comment suppresses an
- * error found when Flow v0.89 was deployed. To see the error, delete this
- * comment and run Flow. */
+/* $FlowFixMe[prop-missing] (>=0.89.0 site=react_native_ios_fb) This comment
+ * suppresses an error found when Flow v0.89 was deployed. To see the error,
+ * delete this comment and run Flow. */
 Image.resolveAssetSource = resolveAssetSource;
 
-/* $FlowFixMe(>=0.89.0 site=react_native_ios_fb) This comment suppresses an
- * error found when Flow v0.89 was deployed. To see the error, delete this
- * comment and run Flow. */
 Image.propTypes = DeprecatedImagePropType;
 
 const styles = StyleSheet.create({

package/Libraries/Image/ImageAnalyticsTagContext.js

@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 
 type ContextType = ?string;
@@ -18,4 +16,8 @@ const Context: React.Context<ContextType> = React.createContext<ContextType>(
   null,
 );
 
+if (__DEV__) {
+  Context.displayName = 'ImageAnalyticsTagContext';
+}
+
 export default Context;

package/Libraries/Image/ImageBackground.js

@@ -74,8 +74,8 @@ class ImageBackground extends React.Component<$FlowFixMeProps> {
               // So, we have to proxy/reapply these styles explicitly for actual <Image> component.
               // This workaround should be removed after implementing proper support of
               // intrinsic content size of the <Image>.
-              width: style.width,
-              height: style.height,
+              width: style?.width,
+              height: style?.height,
             },
             imageStyle,
           ]}

package/Libraries/Image/ImageInjection.js

@@ -0,0 +1,28 @@
+/**
+ * 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.
+ *
+ * @format strict-local
+ * @flow
+ */
+
+import * as React from 'react';
+import type {ImageProps as ImagePropsType} from './ImageProps';
+import ImageViewNativeComponent from './ImageViewNativeComponent';
+import TextInlineImageNativeComponent from './TextInlineImageNativeComponent';
+
+export default {
+  unstable_createImageComponent: (null: ?(
+    Image: React.AbstractComponent<
+      ImagePropsType,
+      | React.ElementRef<typeof TextInlineImageNativeComponent>
+      | React.ElementRef<typeof ImageViewNativeComponent>,
+    >,
+  ) => React.AbstractComponent<
+    ImagePropsType,
+    | React.ElementRef<typeof TextInlineImageNativeComponent>
+    | React.ElementRef<typeof ImageViewNativeComponent>,
+  >),
+};