Simplify definition of Image component decorator (facebook#40730)

Summary:
Pull Request resolved: facebook#40730

This way of injecting the decorator is safer and more convenient to have the proper types inferred by Flow in the injected function.

Changelog: [internal]

Reviewed By: NickGerleman

Differential Revision: D50011840

fbshipit-source-id: 760812fc407d3e39fc7601d17488e3f2032a7065

Author: rubennorte

packages/react-native/Libraries/Image/Image.android.js

@@ -16,7 +16,7 @@ import flattenStyle from '../StyleSheet/flattenStyle';
 import StyleSheet from '../StyleSheet/StyleSheet';
 import TextAncestor from '../Text/TextAncestor';
 import ImageAnalyticsTagContext from './ImageAnalyticsTagContext';
-import ImageInjection from './ImageInjection';
+import {unstable_getImageComponentDecorator} from './ImageInjection';
 import {getImageSourcesFromImageProps} from './ImageSourceUtils';
 import {convertObjectFitToResizeMode} from './ImageUtils';
 import ImageViewNativeComponent from './ImageViewNativeComponent';
@@ -238,8 +238,9 @@ let BaseImage: AbstractImageAndroid = React.forwardRef(
   },
 );
 
-if (ImageInjection.unstable_createImageComponent != null) {
-  BaseImage = ImageInjection.unstable_createImageComponent(BaseImage);
+const imageComponentDecorator = unstable_getImageComponentDecorator();
+if (imageComponentDecorator != null) {
+  BaseImage = imageComponentDecorator(BaseImage);
 }
 
 // $FlowExpectedError[incompatible-type] Eventually we need to move these functions from statics of the component to exports in the module.

packages/react-native/Libraries/Image/Image.ios.js

@@ -16,7 +16,7 @@ import {createRootTag} from '../ReactNative/RootTag';
 import flattenStyle from '../StyleSheet/flattenStyle';
 import StyleSheet from '../StyleSheet/StyleSheet';
 import ImageAnalyticsTagContext from './ImageAnalyticsTagContext';
-import ImageInjection from './ImageInjection';
+import {unstable_getImageComponentDecorator} from './ImageInjection';
 import {getImageSourcesFromImageProps} from './ImageSourceUtils';
 import {convertObjectFitToResizeMode} from './ImageUtils';
 import ImageViewNativeComponent from './ImageViewNativeComponent';
@@ -180,8 +180,9 @@ let BaseImage: AbstractImageIOS = React.forwardRef((props, forwardedRef) => {
   );
 });
 
-if (ImageInjection.unstable_createImageComponent != null) {
-  BaseImage = ImageInjection.unstable_createImageComponent(BaseImage);
+const imageComponentDecorator = unstable_getImageComponentDecorator();
+if (imageComponentDecorator != null) {
+  BaseImage = imageComponentDecorator(BaseImage);
 }
 
 // $FlowExpectedError[incompatible-type] Eventually we need to move these functions from statics of the component to exports in the module.

packages/react-native/Libraries/Image/ImageInjection.js

@@ -4,26 +4,23 @@
  * 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
+ * @format
+ * @flow strict-local
  */
 
-import type {ImageProps as ImagePropsType} from './ImageProps';
+import type {AbstractImageAndroid, AbstractImageIOS} from './ImageTypes.flow';
 
-import ImageViewNativeComponent from './ImageViewNativeComponent';
-import TextInlineImageNativeComponent from './TextInlineImageNativeComponent';
-import * as React from 'react';
+type ImageComponentDecorator = (AbstractImageAndroid => AbstractImageAndroid) &
+  (AbstractImageIOS => AbstractImageIOS);
 
-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>,
-  >),
-};
+let injectedImageComponentDecorator: ?ImageComponentDecorator;
+
+export function unstable_setImageComponentDecorator(
+  imageComponentDecorator: ?ImageComponentDecorator,
+): void {
+  injectedImageComponentDecorator = imageComponentDecorator;
+}
+
+export function unstable_getImageComponentDecorator(): ?ImageComponentDecorator {
+  return injectedImageComponentDecorator;
+}