@office-iss/react-native-win32 0.78.4 → 0.79.0-preview.2

package/Libraries/Image/ImageProps.js

@@ -17,23 +17,42 @@ import type {
   ImageStyleProp,
   ViewStyleProp,
 } from '../StyleSheet/StyleSheet';
-import type {LayoutEvent, SyntheticEvent} from '../Types/CoreEventTypes';
+import type {
+  LayoutChangeEvent,
+  NativeSyntheticEvent,
+} from '../Types/CoreEventTypes';
 import typeof Image from './Image';
 import type {ImageResizeMode} from './ImageResizeMode';
-import type {ImageSource} from './ImageSource';
+import type {ImageSource, ImageURISource} from './ImageSource';
 import type {ElementRef, Node, RefSetter} from 'react';
 
-export type ImageLoadEvent = SyntheticEvent<
-  $ReadOnly<{|
-    source: $ReadOnly<{|
-      width: number,
-      height: number,
-      uri: string,
-    |}>,
-  |}>,
+export type ImageSourcePropType = ImageSource;
+
+/**
+ * @see ImagePropsIOS.onProgress
+ */
+export type ImageProgressEventDataIOS = {
+  loaded: number,
+  total: number,
+};
+
+export type ImageErrorEventData = {
+  error: string,
+};
+
+export type ImageLoadEventData = {
+  source: {
+    height: number,
+    width: number,
+    uri: string,
+  },
+};
+
+export type ImageLoadEvent = NativeSyntheticEvent<
+  $ReadOnly<ImageLoadEventData>,
 >;
 
-type IOSImageProps = $ReadOnly<{|
+export type ImagePropsIOS = $ReadOnly<{
   /**
    * A static image to display while loading the image source.
    *
@@ -52,19 +71,42 @@ type IOSImageProps = $ReadOnly<{|
    * See https://reactnative.dev/docs/image#onprogress
    */
   onProgress?: ?(
-    event: SyntheticEvent<$ReadOnly<{|loaded: number, total: number|}>>,
+    event: NativeSyntheticEvent<$ReadOnly<ImageProgressEventDataIOS>>,
   ) => void,
-|}>;
+}>;
 
-type AndroidImageProps = $ReadOnly<{|
-  loadingIndicatorSource?: ?(number | $ReadOnly<{|uri: string|}>),
+export type ImagePropsAndroid = $ReadOnly<{
+  /**
+   * similarly to `source`, this property represents the resource used to render
+   * the loading indicator for the image, displayed until image is ready to be
+   * displayed, typically after when it got downloaded from network.
+   */
+  loadingIndicatorSource?: ?(number | $ReadOnly<ImageURISource>),
   progressiveRenderingEnabled?: ?boolean,
   fadeDuration?: ?number,
 
   /**
-   * 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#resizemethod-android
+   * 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`.
+   *
+   * - `auto`: Use heuristics to pick between `resize` and `scale`.
+   *
+   * - `resize`: A software operation which changes the encoded image in memory before it
+   * gets decoded. This should be used instead of `scale` when the image is much larger
+   * than the view.
+   *
+   * - `scale`: The image gets drawn downscaled or upscaled. Compared to `resize`, `scale` is
+   * faster (usually hardware accelerated) and produces higher quality images. This
+   * should be used if the image is smaller than the view. It should also be used if the
+   * image is slightly bigger than the view.
+   *
+   * - `none`: No sampling is performed and the image is displayed in its full resolution. This
+   * should only be used in rare circumstances because it is considered unsafe as Android will
+   * throw a runtime exception when trying to render images that consume too much memory.
+   *
+   * More details about `resize` and `scale` can be found at http://frescolib.org/docs/resizing-rotating.html.
+   *
+   * @platform android
    */
   resizeMethod?: ?('auto' | 'resize' | 'scale' | 'none'),
 
@@ -76,13 +118,10 @@ type AndroidImageProps = $ReadOnly<{|
    * Defaults to 1.0.
    */
   resizeMultiplier?: ?number,
-|}>;
-
-export type ImageProps = $ReadOnly<{|
-  ...$Diff<ViewProps, $ReadOnly<{|style: ?ViewStyleProp|}>>,
-  ...IOSImageProps,
-  ...AndroidImageProps,
+}>;
 
+export type ImagePropsBase = $ReadOnly<{
+  ...$Diff<ViewProps, $ReadOnly<{style: ?ViewStyleProp}>>,
   /**
    * When true, indicates the image is an accessibility element.
    *
@@ -163,21 +202,20 @@ export type ImageProps = $ReadOnly<{|
    * See https://reactnative.dev/docs/image#onerror
    */
   onError?: ?(
-    event: SyntheticEvent<
-      $ReadOnly<{|
-        error: string,
-      |}>,
-    >,
+    event: NativeSyntheticEvent<$ReadOnly<ImageErrorEventData>>,
   ) => void,
 
   /**
+   * onLayout function
+   *
    * Invoked on mount and layout changes with
-   * `{nativeEvent: {layout: {x, y, width, height}}}`.
+   *
+   * {nativeEvent: { layout: {x, y, width, height} }}.
    *
    * See https://reactnative.dev/docs/image#onlayout
    */
 
-  onLayout?: ?(event: LayoutEvent) => mixed,
+  onLayout?: ?(event: LayoutChangeEvent) => mixed,
 
   /**
    * Invoked when load completes successfully.
@@ -203,15 +241,16 @@ export type ImageProps = $ReadOnly<{|
   /**
    * The image source (either a remote URL or a local file resource).
    *
+   * This prop can also contain several remote URLs, specified together with their width and height and potentially with scale/other URI arguments.
+   * The native side will then choose the best uri to display based on the measured size of the image container.
+   * A cache property can be added to control how networked request interacts with the local cache.
+   *
+   * The currently supported formats are png, jpg, jpeg, bmp, gif, webp (Android only), psd (iOS only).
+   *
    * See https://reactnative.dev/docs/image#source
    */
   source?: ?ImageSource,
 
-  /**
-   * See https://reactnative.dev/docs/image#style
-   */
-  style?: ?ImageStyleProp,
-
   /**
    * A string indicating which referrer to use when fetching the resource.
    * Similar to referrerpolicy from HTML.
@@ -233,6 +272,26 @@ export type ImageProps = $ReadOnly<{|
    * Determines how to resize the image when the frame doesn't match the raw
    * image dimensions.
    *
+   * 'cover': Scale the image uniformly (maintain the image's aspect ratio)
+   * so that both dimensions (width and height) of the image will be equal
+   * to or larger than the corresponding dimension of the view (minus padding).
+   *
+   * 'contain': Scale the image uniformly (maintain the image's aspect ratio)
+   * so that both dimensions (width and height) of the image will be equal to
+   * or less than the corresponding dimension of the view (minus padding).
+   *
+   * 'stretch': Scale width and height independently, This may change the
+   * aspect ratio of the src.
+   *
+   * 'repeat': Repeat the image to cover the frame of the view.
+   * The image will keep it's size and aspect ratio. (iOS only)
+   *
+   * 'center': Scale the image down so that it is completely visible,
+   * if bigger than the area of the view.
+   * The image will not be scaled up.
+   *
+   * 'none': Do not resize the image. The image will be displayed at its intrinsic size.
+   *
    * See https://reactnative.dev/docs/image#resizemode
    */
   resizeMode?: ?ImageResizeMode,
@@ -267,9 +326,20 @@ export type ImageProps = $ReadOnly<{|
    */
   srcSet?: ?string,
   children?: empty,
-|}>;
+}>;
+
+export type ImageProps = $ReadOnly<{
+  ...ImagePropsIOS,
+  ...ImagePropsAndroid,
+  ...ImagePropsBase,
+
+  /**
+   * See https://reactnative.dev/docs/image#style
+   */
+  style?: ?ImageStyleProp,
+}>;
 
-export type ImageBackgroundProps = $ReadOnly<{|
+export type ImageBackgroundProps = $ReadOnly<{
   ...ImageProps,
   children?: Node,
 
@@ -293,4 +363,4 @@ export type ImageBackgroundProps = $ReadOnly<{|
    * See https://reactnative.dev/docs/imagebackground#imageref
    */
   imageRef?: RefSetter<ElementRef<Image>>,
-|}>;
+}>;

package/Libraries/Image/ImageTypes.flow.js

@@ -17,8 +17,15 @@ import typeof TextInlineImageNativeComponent from './TextInlineImageNativeCompon
 
 import * as React from 'react';
 
+export type ImageSize = {
+  width: number,
+  height: number,
+};
+
+export type ImageResolvedAssetSource = ResolvedAssetSource;
+
 type ImageComponentStaticsIOS = $ReadOnly<{
-  getSize(uri: string): Promise<{width: number, height: number}>,
+  getSize(uri: string): Promise<ImageSize>,
   getSize(
     uri: string,
     success: (width: number, height: number) => void,
@@ -28,7 +35,7 @@ type ImageComponentStaticsIOS = $ReadOnly<{
   getSizeWithHeaders(
     uri: string,
     headers: {[string]: string, ...},
-  ): Promise<{width: number, height: number}>,
+  ): Promise<ImageSize>,
   getSizeWithHeaders(
     uri: string,
     headers: {[string]: string, ...},
@@ -46,9 +53,12 @@ type ImageComponentStaticsIOS = $ReadOnly<{
 
   queryCache(
     urls: Array<string>,
-  ): Promise<{[string]: 'memory' | 'disk' | 'disk/memory', ...}>,
+  ): Promise<{[url: string]: 'memory' | 'disk' | 'disk/memory', ...}>,
 
-  resolveAssetSource(source: ImageSource): ?ResolvedAssetSource,
+  /**
+   * @see https://reactnative.dev/docs/image#resolveassetsource
+   */
+  resolveAssetSource(source: ImageSource): ?ImageResolvedAssetSource,
 }>;
 
 type ImageComponentStaticsAndroid = $ReadOnly<{
@@ -57,7 +67,7 @@ type ImageComponentStaticsAndroid = $ReadOnly<{
 }>;
 
 export type AbstractImageAndroid = component(
-  ref: React.RefSetter<
+  ref?: React.RefSetter<
     | React.ElementRef<TextInlineImageNativeComponent>
     | React.ElementRef<ImageViewNativeComponent>,
   >,
@@ -67,7 +77,7 @@ export type AbstractImageAndroid = component(
 export type ImageAndroid = AbstractImageAndroid & ImageComponentStaticsAndroid;
 
 export type AbstractImageIOS = component(
-  ref: React.RefSetter<React.ElementRef<ImageViewNativeComponent>>,
+  ref?: React.RefSetter<React.ElementRef<ImageViewNativeComponent>>,
   ...props: ImagePropsType
 );
 

package/Libraries/Image/ImageViewNativeComponent.js

@@ -8,12 +8,10 @@
  * @format
  */
 
+import type {HostComponent} from '../../src/private/types/HostComponent';
+import type {HostInstance} from '../../src/private/types/HostInstance';
 import type {ViewProps} from '../Components/View/ViewPropTypes';
-import type {
-  HostComponent,
-  HostInstance,
-  PartialViewConfig,
-} from '../Renderer/shims/ReactNativeTypes';
+import type {PartialViewConfig} from '../Renderer/shims/ReactNativeTypes';
 import type {
   ColorValue,
   DangerouslyImpreciseStyle,
@@ -142,10 +140,10 @@ export const __INTERNAL_VIEW_CONFIG: PartialViewConfig =
         validAttributes: {
           blurRadius: true,
           capInsets: {
-            diff: require('../Utilities/differ/insetsDiffer'),
+            diff: require('../Utilities/differ/insetsDiffer').default,
           },
           defaultSource: {
-            process: require('./resolveAssetSource'),
+            process: require('./resolveAssetSource').default,
           },
           internal_analyticTag: true,
           resizeMode: true,

package/Libraries/Image/NativeImageEditor.js

@@ -8,6 +8,6 @@
  * @format
  */
 
-export * from '../../src/private/specs/modules/NativeImageEditor';
-import NativeImageEditor from '../../src/private/specs/modules/NativeImageEditor';
+export * from '../../src/private/specs_DEPRECATED/modules/NativeImageEditor';
+import NativeImageEditor from '../../src/private/specs_DEPRECATED/modules/NativeImageEditor';
 export default NativeImageEditor;

package/Libraries/Image/NativeImageLoaderAndroid.js

@@ -8,6 +8,6 @@
  * @format
  */
 
-export * from '../../src/private/specs/modules/NativeImageLoaderAndroid';
-import NativeImageLoaderAndroid from '../../src/private/specs/modules/NativeImageLoaderAndroid';
+export * from '../../src/private/specs_DEPRECATED/modules/NativeImageLoaderAndroid';
+import NativeImageLoaderAndroid from '../../src/private/specs_DEPRECATED/modules/NativeImageLoaderAndroid';
 export default NativeImageLoaderAndroid;

package/Libraries/Image/NativeImageLoaderIOS.js

@@ -8,6 +8,6 @@
  * @format
  */
 
-export * from '../../src/private/specs/modules/NativeImageLoaderIOS';
-import NativeImageLoaderIOS from '../../src/private/specs/modules/NativeImageLoaderIOS';
+export * from '../../src/private/specs_DEPRECATED/modules/NativeImageLoaderIOS';
+import NativeImageLoaderIOS from '../../src/private/specs_DEPRECATED/modules/NativeImageLoaderIOS';
 export default NativeImageLoaderIOS;

package/Libraries/Image/NativeImageLoaderWin32.js

@@ -8,6 +8,6 @@
  * @format
  */
 
-export * from '../../src/private/specs/modules/NativeImageLoaderWin32';
-import NativeImageLoaderWin32 from '../../src/private/specs/modules/NativeImageLoaderWin32';
+export * from '../../src/private/specs_DEPRECATED/modules/NativeImageLoaderWin32';
+import NativeImageLoaderWin32 from '../../src/private/specs_DEPRECATED/modules/NativeImageLoaderWin32';
 export default NativeImageLoaderWin32;

package/Libraries/Image/NativeImageStoreAndroid.js

@@ -8,6 +8,6 @@
  * @format
  */
 
-export * from '../../src/private/specs/modules/NativeImageStoreAndroid';
-import NativeImageStoreAndroid from '../../src/private/specs/modules/NativeImageStoreAndroid';
+export * from '../../src/private/specs_DEPRECATED/modules/NativeImageStoreAndroid';
+import NativeImageStoreAndroid from '../../src/private/specs_DEPRECATED/modules/NativeImageStoreAndroid';
 export default NativeImageStoreAndroid;

package/Libraries/Image/NativeImageStoreIOS.js

@@ -8,6 +8,6 @@
  * @format
  */
 
-export * from '../../src/private/specs/modules/NativeImageStoreIOS';
-import NativeImageStoreIOS from '../../src/private/specs/modules/NativeImageStoreIOS';
+export * from '../../src/private/specs_DEPRECATED/modules/NativeImageStoreIOS';
+import NativeImageStoreIOS from '../../src/private/specs_DEPRECATED/modules/NativeImageStoreIOS';
 export default NativeImageStoreIOS;

package/Libraries/Image/RelativeImageStub.js

@@ -15,7 +15,7 @@
 
 const AssetRegistry = require('@react-native/assets-registry/registry');
 
-module.exports = (AssetRegistry.registerAsset({
+const RelativeImageStub = (AssetRegistry.registerAsset({
   __packager_asset: true,
   fileSystemLocation: '/full/path/to/directory',
   httpServerLocation: '/assets/full/path/to/directory',
@@ -26,3 +26,5 @@ module.exports = (AssetRegistry.registerAsset({
   name: 'icon',
   type: 'png',
 }): number);
+
+module.exports = RelativeImageStub;

package/Libraries/Image/Tests/ImageWin32Test.d.ts

@@ -1,9 +1,8 @@
-import React from 'react';
 export declare const title = "ImageWin32Test";
 export declare const displayName = "Image Win32 test";
 export declare const description = "Image Win32 test";
 export declare const examples: {
     title: string;
     description: string;
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }[];

package/Libraries/Image/Tests/ImageWin32Test.js.map

@@ -1 +1 @@
-{"version":3,"file":"ImageWin32Test.js","sourceRoot":"","sources":["../../../src-win/Libraries/Image/Tests/ImageWin32Test.tsx"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AACzB,+CAAqC;AAErC,MAAM,SAAS,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAElC,QAAA,KAAK,GAAG,gBAAgB,CAAC;AACzB,QAAA,WAAW,GAAG,kBAAkB,CAAC;AACjC,QAAA,WAAW,GAAG,kBAAkB,CAAC;AACjC,QAAA,QAAQ,GAAG;IACpB;QACE,KAAK,EAAE,0BAA0B;QACjC,WAAW,EAAE,YAAY;QACzB,MAAM;YACJ,OAAO,CACL,8BAAC,oBAAK,IACJ,KAAK,EAAG,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,EACnC,MAAM,EAAG,SAAS,GAClB,CACH,CAAC;QACJ,CAAC;KACF;CACF,CAAC","sourcesContent":["import React from 'react'\nimport { Image } from 'react-native';\n\nconst testImage = require('./img/dpitest.png');\n\nexport const title = 'ImageWin32Test';\nexport const displayName = 'Image Win32 test';\nexport const description = 'Image Win32 test';\nexport const examples = [\n    {\n      title: 'Win32 Image control test',\n      description: 'Test Image',\n      render() {\n        return (\n          <Image\n            style={ { width: 100, height: 100 } }\n            source={ testImage }\n          />\n        );\n      },\n    },\n  ];\n"]}
+{"version":3,"file":"ImageWin32Test.js","sourceRoot":"","sources":["../../../src-win/Libraries/Image/Tests/ImageWin32Test.tsx"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AACzB,+CAAqC;AAErC,MAAM,SAAS,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAElC,QAAA,KAAK,GAAG,gBAAgB,CAAC;AACzB,QAAA,WAAW,GAAG,kBAAkB,CAAC;AACjC,QAAA,WAAW,GAAG,kBAAkB,CAAC;AACjC,QAAA,QAAQ,GAAG;IACpB;QACE,KAAK,EAAE,0BAA0B;QACjC,WAAW,EAAE,YAAY;QACzB,MAAM;YACJ,OAAO,CACL,8BAAC,oBAAK,IACJ,KAAK,EAAG,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,EACnC,MAAM,EAAG,SAAS,GAClB,CACH,CAAC;QACJ,CAAC;KACF;CACF,CAAC","sourcesContent":["import React from 'react'\nimport { Image } from 'react-native';\n\nconst testImage = require('./img/dpitest.png');\n\nexport const title = 'ImageWin32Test';\nexport const displayName = 'Image Win32 test';\nexport const description = 'Image Win32 test';\nexport const examples = [\n    {\n      title: 'Win32 Image control test',\n      description: 'Test Image',\n      render(): JSX.Element {\n        return (\n          <Image\n            style={ { width: 100, height: 100 } }\n            source={ testImage }\n          />\n        );\n      },\n    },\n  ];\n"]}

package/Libraries/Image/TextInlineImageNativeComponent.js

@@ -10,11 +10,9 @@
 
 'use strict';
 
+import type {HostComponent} from '../../src/private/types/HostComponent';
 import type {ViewProps} from '../Components/View/ViewPropTypes';
-import type {
-  HostComponent,
-  PartialViewConfig,
-} from '../Renderer/shims/ReactNativeTypes';
+import type {PartialViewConfig} from '../Renderer/shims/ReactNativeTypes';
 import type {ColorValue} from '../StyleSheet/StyleSheet';
 import type {ImageResizeMode} from './ImageResizeMode';
 

package/Libraries/Image/nativeImageSource.js

@@ -12,7 +12,7 @@ import type {ImageURISource} from './ImageSource';
 
 import Platform from '../Utilities/Platform';
 
-type NativeImageSourceSpec = $ReadOnly<{|
+type NativeImageSourceSpec = $ReadOnly<{
   android?: string,
   ios?: string,
   default?: string,
@@ -21,7 +21,7 @@ type NativeImageSourceSpec = $ReadOnly<{|
   // https://reactnative.dev/docs/images#why-not-automatically-size-everything
   height: number,
   width: number,
-|}>;
+}>;
 
 /**
  * In hybrid apps, use `nativeImageSource` to access images that are already
@@ -61,4 +61,4 @@ function nativeImageSource(spec: NativeImageSourceSpec): ImageURISource {
   };
 }
 
-module.exports = nativeImageSource;
+export default nativeImageSource;

package/Libraries/Image/resolveAssetSource.js

@@ -11,11 +11,13 @@
 // Utilities for resolving an asset into a `source` for e.g. `Image`
 
 import type {ResolvedAssetSource} from './AssetSourceResolver';
+import typeof AssetSourceResolverT from './AssetSourceResolver';
 import type {ImageSource} from './ImageSource';
 
 import SourceCode from '../NativeModules/specs/NativeSourceCode';
 
-const AssetSourceResolver = require('./AssetSourceResolver');
+const AssetSourceResolver: AssetSourceResolverT =
+  require('./AssetSourceResolver').default;
 const {pickScale} = require('./AssetUtils');
 const AssetRegistry = require('@react-native/assets-registry/registry');
 
@@ -140,4 +142,4 @@ function resolveAssetSource(source: ?ImageSource): ?ResolvedAssetSource {
 resolveAssetSource.pickScale = pickScale;
 resolveAssetSource.setCustomSourceTransformer = setCustomSourceTransformer;
 resolveAssetSource.addCustomSourceTransformer = addCustomSourceTransformer;
-module.exports = resolveAssetSource;
+export default resolveAssetSource;

package/Libraries/Image/resolveAssetSource.win32.js

@@ -9,7 +9,7 @@
 'use strict';
 
 const resolveAssetSource = require('./resolveAssetSource.js'); // Get base impl
-const Platform = require('../Utilities/Platform');
+const Platform = require('../Utilities/Platform').default;
 const ensureShortPath = require('./assetPaths.js');
 
 type IPackagerAsset = {

package/Libraries/Interaction/FrameRateLogger.js

@@ -69,4 +69,4 @@ const FrameRateLogger = {
   },
 };
 
-module.exports = FrameRateLogger;
+export default FrameRateLogger;

package/Libraries/Interaction/InteractionManager.js

@@ -12,12 +12,15 @@ import type {Task} from './TaskQueue';
 
 import * as ReactNativeFeatureFlags from '../../src/private/featureflags/ReactNativeFeatureFlags';
 import EventEmitter from '../vendor/emitter/EventEmitter';
+import type {EventSubscription} from '../vendor/emitter/EventEmitter';
 
-const BatchedBridge = require('../BatchedBridge/BatchedBridge');
-const infoLog = require('../Utilities/infoLog');
-const TaskQueue = require('./TaskQueue');
+const BatchedBridge = require('../BatchedBridge/BatchedBridge').default;
+const infoLog = require('../Utilities/infoLog').default;
+const TaskQueue = require('./TaskQueue').default;
 const invariant = require('invariant');
 
+export type {Task, SimpleTask, PromiseTask} from './TaskQueue';
+
 export type Handle = number;
 
 const _emitter = new EventEmitter<{
@@ -77,7 +80,7 @@ const DEBUG: false = false;
  * allowing events such as touches to start interactions and block queued tasks
  * from executing, making apps more responsive.
  */
-const InteractionManager = {
+const InteractionManagerImpl = {
   Events: {
     interactionStart: 'interactionStart',
     interactionComplete: 'interactionComplete',
@@ -138,8 +141,14 @@ const InteractionManager = {
     _deleteInteractionSet.add(handle);
   },
 
+  // $FlowFixMe[unclear-type] unclear type of _emitter
   // $FlowFixMe[method-unbinding] added when improving typing for this parameters
-  addListener: (_emitter.addListener.bind(_emitter): $FlowFixMe),
+  addListener: _emitter.addListener.bind(_emitter) as (
+    eventType: string,
+    // $FlowFixMe[unclear-type] unclear type of arguments
+    listener: (...args: any) => mixed,
+    context: mixed,
+  ) => EventSubscription,
 
   /**
    * A positive number will use setTimeout to schedule any tasks after the
@@ -209,8 +218,10 @@ function _processUpdate() {
   _deleteInteractionSet.clear();
 }
 
-module.exports = (
+const InteractionManager = (
   ReactNativeFeatureFlags.disableInteractionManager()
-    ? require('./InteractionManagerStub')
-    : InteractionManager
-) as typeof InteractionManager;
+    ? require('./InteractionManagerStub').default
+    : InteractionManagerImpl
+) as typeof InteractionManagerImpl;
+
+export default InteractionManager;

package/Libraries/Interaction/InteractionManagerStub.js

@@ -25,6 +25,14 @@ type Task =
     }
   | (() => void);
 
+// NOTE: The original implementation of `InteractionManager` never rejected
+// the returned promise. This preserves that behavior in the stub.
+function reject(error: Error): void {
+  setTimeout(() => {
+    throw error;
+  }, 0);
+}
+
 /**
  * InteractionManager allows long-running work to be scheduled after any
  * interactions/animations have completed. In particular, this allows JavaScript
@@ -97,7 +105,7 @@ const InteractionManagerStub = {
     ...
   } {
     let immediateID: ?$FlowIssue;
-    const promise = new Promise((resolve, reject) => {
+    const promise = new Promise(resolve => {
       immediateID = setImmediate(() => {
         if (typeof task === 'object' && task !== null) {
           if (typeof task.gen === 'function') {
@@ -173,4 +181,4 @@ const InteractionManagerStub = {
   },
 };
 
-module.exports = InteractionManagerStub;
+export default InteractionManagerStub;

package/Libraries/Interaction/JSEventLoopWatchdog.js

@@ -10,7 +10,7 @@
 
 'use strict';
 
-const infoLog = require('../Utilities/infoLog');
+const infoLog = require('../Utilities/infoLog').default;
 
 type Handler = {
   onIterate?: () => void,
@@ -85,4 +85,4 @@ let longestStall = 0;
 let lastInterval = 0;
 const handlers: Array<Handler> = [];
 
-module.exports = JSEventLoopWatchdog;
+export default JSEventLoopWatchdog;

package/Libraries/Interaction/NativeFrameRateLogger.js

@@ -8,6 +8,6 @@
  * @format
  */
 
-export * from '../../src/private/specs/modules/NativeFrameRateLogger';
-import NativeFrameRateLogger from '../../src/private/specs/modules/NativeFrameRateLogger';
+export * from '../../src/private/specs_DEPRECATED/modules/NativeFrameRateLogger';
+import NativeFrameRateLogger from '../../src/private/specs_DEPRECATED/modules/NativeFrameRateLogger';
 export default NativeFrameRateLogger;