@office-iss/react-native-win32 0.70.2 → 0.71.0-preview.1

package/Libraries/Core/ReactNativeVersionCheck.js

@@ -9,6 +9,7 @@
  */
 
 import Platform from '../Utilities/Platform';
+
 const ReactNativeVersion = require('./ReactNativeVersion');
 
 /**

package/Libraries/Core/ReactNativeVersionCheck.win32.js

@@ -9,6 +9,7 @@
  */
 
 import Platform from '../Utilities/Platform';
+
 const ReactNativeVersion = require('./ReactNativeVersion');
 
 /**

package/Libraries/Core/SegmentFetcher/NativeSegmentFetcher.js

@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {

package/Libraries/Core/Timers/JSTimers.js

@@ -8,13 +8,12 @@
  * @flow
  */
 
+import NativeTiming from './NativeTiming';
+
 const BatchedBridge = require('../../BatchedBridge/BatchedBridge');
 const Systrace = require('../../Performance/Systrace');
-
 const invariant = require('invariant');
 
-import NativeTiming from './NativeTiming';
-
 /**
  * JS implementation of timer functions. Must be completely driven by an
  * external clock signal, all that's stored here is timerID, timer type, and
@@ -243,7 +242,7 @@ const JSTimers = {
    * @param {function} func Callback to be invoked before the end of the
    * current JavaScript execution loop.
    */
-  queueReactNativeMicrotask: function (func: Function, ...args: any) {
+  queueReactNativeMicrotask: function (func: Function, ...args: any): number {
     const id = _allocateCallback(
       () => func.apply(undefined, args),
       'queueReactNativeMicrotask',
@@ -255,7 +254,7 @@ const JSTimers = {
   /**
    * @param {function} func Callback to be invoked every frame.
    */
-  requestAnimationFrame: function (func: Function) {
+  requestAnimationFrame: function (func: Function): any | number {
     const id = _allocateCallback(func, 'requestAnimationFrame');
     createTimer(id, 1, Date.now(), /* recurring */ false);
     return id;
@@ -266,16 +265,19 @@ const JSTimers = {
    * with time remaining in frame.
    * @param {?object} options
    */
-  requestIdleCallback: function (func: Function, options: ?Object) {
+  requestIdleCallback: function (
+    func: Function,
+    options: ?Object,
+  ): any | number {
     if (requestIdleCallbacks.length === 0) {
       setSendIdleEvents(true);
     }
 
     const timeout = options && options.timeout;
-    const id = _allocateCallback(
+    const id: number = _allocateCallback(
       timeout != null
         ? (deadline: any) => {
-            const timeoutId = requestIdleCallbackTimeouts[id];
+            const timeoutId: number = requestIdleCallbackTimeouts[id];
             if (timeoutId) {
               JSTimers.clearTimeout(timeoutId);
               delete requestIdleCallbackTimeouts[id];
@@ -288,8 +290,8 @@ const JSTimers = {
     requestIdleCallbacks.push(id);
 
     if (timeout != null) {
-      const timeoutId = JSTimers.setTimeout(() => {
-        const index = requestIdleCallbacks.indexOf(id);
+      const timeoutId: number = JSTimers.setTimeout(() => {
+        const index: number = requestIdleCallbacks.indexOf(id);
         if (index > -1) {
           requestIdleCallbacks.splice(index, 1);
           _callTimer(id, global.performance.now(), true);
@@ -346,7 +348,7 @@ const JSTimers = {
    * This is called from the native side. We are passed an array of timerIDs,
    * and
    */
-  callTimers: function (timersToCall: Array<number>) {
+  callTimers: function (timersToCall: Array<number>): any | void {
     invariant(
       timersToCall.length !== 0,
       'Cannot call `callTimers` with an empty list of IDs.',

package/Libraries/Core/Timers/NativeTiming.js

@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {

package/Libraries/Core/setUpBatchedBridge.js

@@ -20,7 +20,6 @@ if (global.RN$Bridgeless === true && global.RN$registerCallableModule) {
       | $TEMPORARY$string<'GlobalPerformanceLogger'>
       | $TEMPORARY$string<'HMRClient'>
       | $TEMPORARY$string<'HeapCapture'>
-      | $TEMPORARY$string<'JSDevSupportModule'>
       | $TEMPORARY$string<'JSTimers'>
       | $TEMPORARY$string<'RCTDeviceEventEmitter'>
       | $TEMPORARY$string<'RCTLog'>
@@ -52,11 +51,8 @@ registerModule('RCTNativeAppEventEmitter', () =>
 registerModule('GlobalPerformanceLogger', () =>
   require('../Utilities/GlobalPerformanceLogger'),
 );
-registerModule('JSDevSupportModule', () =>
-  require('../Utilities/JSDevSupportModule'),
-);
 
-if (__DEV__ && !global.__RCTProfileIsProfiling) {
+if (__DEV__) {
   registerModule('HMRClient', () => require('../Utilities/HMRClient'));
 } else {
   registerModule('HMRClient', () => require('../Utilities/HMRClientProdShim'));

package/Libraries/Core/setUpDeveloperTools.js

@@ -17,13 +17,11 @@ declare var console: typeof console & {_isPolyfilled: boolean, ...};
  * You can use this module directly, or just require InitializeCore.
  */
 if (__DEV__) {
-  if (!global.__RCTProfileIsProfiling) {
-    require('./setUpReactDevTools');
+  require('./setUpReactDevTools');
 
-    // Set up inspector
-    const JSInspector = require('../JSInspector/JSInspector');
-    JSInspector.registerAgent(require('../JSInspector/NetworkAgent'));
-  }
+  // Set up inspector
+  const JSInspector = require('../JSInspector/JSInspector');
+  JSInspector.registerAgent(require('../JSInspector/NetworkAgent'));
 
   // Note we can't check if console is "native" because it would appear "native" in JSC and Hermes.
   // We also can't check any properties that don't exist in the Chrome worker environment.

package/Libraries/Core/setUpReactDevTools.js

@@ -39,7 +39,10 @@ if (__DEV__) {
       // Get hostname from development server (packager)
       const devServer = getDevServer();
       const host = devServer.bundleLoadedFromServer
-        ? devServer.url.replace(/https?:\/\//, '').split(':')[0]
+        ? devServer.url
+            .replace(/https?:\/\//, '')
+            .replace(/\/$/, '')
+            .split(':')[0]
         : 'localhost';
 
       // Read the optional global variable for backward compatibility.

package/Libraries/Core/setUpRegeneratorRuntime.js

@@ -10,8 +10,8 @@
 
 'use strict';
 
-const {polyfillGlobal} = require('../Utilities/PolyfillFunctions');
 const {hasNativeConstructor} = require('../Utilities/FeatureDetection');
+const {polyfillGlobal} = require('../Utilities/PolyfillFunctions');
 
 /**
  * Set up regenerator.

package/Libraries/Core/setUpTimers.js

@@ -10,8 +10,8 @@
 
 'use strict';
 
-const {polyfillGlobal} = require('../Utilities/PolyfillFunctions');
 const {isNativeFunction} = require('../Utilities/FeatureDetection');
+const {polyfillGlobal} = require('../Utilities/PolyfillFunctions');
 
 if (__DEV__) {
   if (typeof global.Promise !== 'function') {

package/Libraries/EventEmitter/NativeEventEmitter.d.ts

@@ -0,0 +1,70 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ */
+
+import {
+  EmitterSubscription,
+  EventEmitter,
+} from '../vendor/emitter/EventEmitter';
+
+/**
+ * The React Native implementation of the IOS RCTEventEmitter which is required when creating
+ * a module that communicates with IOS
+ */
+type NativeModule = {
+  /**
+   * Add the provided eventType as an active listener
+   * @param eventType name of the event for which we are registering listener
+   */
+  addListener: (eventType: string) => void;
+
+  /**
+   * Remove a specified number of events.  There are no eventTypes in this case, as
+   * the native side doesn't remove the name, but only manages a counter of total
+   * listeners
+   * @param count number of listeners to remove (of any type)
+   */
+  removeListeners: (count: number) => void;
+};
+
+/**
+ * Abstract base class for implementing event-emitting modules. This implements
+ * a subset of the standard EventEmitter node module API.
+ */
+declare class NativeEventEmitter extends EventEmitter {
+  /**
+   * @param nativeModule the NativeModule implementation.  This is required on IOS and will throw
+   *      an invariant error if undefined.
+   */
+  constructor(nativeModule?: NativeModule);
+
+  /**
+   * Add the specified listener, this call passes through to the NativeModule
+   * addListener
+   *
+   * @param eventType name of the event for which we are registering listener
+   * @param listener the listener function
+   * @param context context of the listener
+   */
+  addListener(
+    eventType: string,
+    listener: (event: any) => void,
+    context?: Object,
+  ): EmitterSubscription;
+
+  /**
+   * @param eventType  name of the event whose registered listeners to remove
+   */
+  removeAllListeners(eventType: string): void;
+
+  /**
+   * Removes a subscription created by the addListener, the EventSubscription#remove()
+   * function actually calls through to this.
+   */
+  removeSubscription(subscription: EmitterSubscription): void;
+}

package/Libraries/EventEmitter/NativeEventEmitter.js

@@ -14,6 +14,7 @@ import type {
   EventSubscription,
   IEventEmitter,
 } from '../vendor/emitter/EventEmitter';
+
 import Platform from '../Utilities/Platform';
 import RCTDeviceEventEmitter from './RCTDeviceEventEmitter';
 import invariant from 'invariant';

package/Libraries/EventEmitter/RCTDeviceEventEmitter.d.ts

@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ */
+
+import {
+  EmitterSubscription,
+  EventEmitter,
+  EventSubscriptionVendor,
+} from '../vendor/emitter/EventEmitter';
+
+/**
+ * Deprecated - subclass NativeEventEmitter to create granular event modules instead of
+ * adding all event listeners directly to RCTDeviceEventEmitter.
+ */
+interface DeviceEventEmitterStatic extends EventEmitter {
+  sharedSubscriber: EventSubscriptionVendor;
+  new (): DeviceEventEmitterStatic;
+  addListener(
+    type: string,
+    listener: (data: any) => void,
+    context?: any,
+  ): EmitterSubscription;
+}
+
+export const DeviceEventEmitter: DeviceEventEmitterStatic;

package/Libraries/EventEmitter/RCTDeviceEventEmitter.js

@@ -8,9 +8,10 @@
  * @format
  */
 
-import EventEmitter from '../vendor/emitter/EventEmitter';
 import type {IEventEmitter} from '../vendor/emitter/EventEmitter';
 
+import EventEmitter from '../vendor/emitter/EventEmitter';
+
 // FIXME: use typed events
 type RCTDeviceEventDefinitions = $FlowFixMe;
 

package/Libraries/EventEmitter/RCTNativeAppEventEmitter.d.ts

@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ */
+
+import {DeviceEventEmitterStatic} from './RCTDeviceEventEmitter';
+
+export interface NativeEventSubscription {
+  /**
+   * Call this method to un-subscribe from a native-event
+   */
+  remove(): void;
+}
+
+/**
+ * Receive events from native-code
+ * Deprecated - subclass NativeEventEmitter to create granular event modules instead of
+ * adding all event listeners directly to RCTNativeAppEventEmitter.
+ * @see https://github.com/facebook/react-native/blob/0.34-stable\Libraries\EventEmitter\RCTNativeAppEventEmitter.js
+ * @see https://reactnative.dev/docs/native-modules-ios#sending-events-to-javascript
+ */
+type RCTNativeAppEventEmitter = DeviceEventEmitterStatic;
+
+/**
+ * Deprecated - subclass NativeEventEmitter to create granular event modules instead of
+ * adding all event listeners directly to RCTNativeAppEventEmitter.
+ */
+export const NativeAppEventEmitter: RCTNativeAppEventEmitter;

package/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js

@@ -12,6 +12,7 @@ import type {
   EventSubscription,
   IEventEmitter,
 } from '../../vendor/emitter/EventEmitter';
+
 import RCTDeviceEventEmitter from '../RCTDeviceEventEmitter';
 
 /**

package/Libraries/Events/EventPolyfill.js

@@ -227,7 +227,7 @@ class EventPolyfill implements IEvent {
 }
 
 // Assertion magic for polyfill follows.
-declare var checkEvent: Event;
+declare var checkEvent: Event; // eslint-disable-line no-unused-vars
 
 /*::
 // This can be a strict mode error at runtime so put it in a Flow comment.

package/Libraries/HeapCapture/NativeJSCHeapCapture.js

@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {

package/Libraries/Image/AssetSourceResolver.js

@@ -21,16 +21,14 @@ 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');
-
+const {pickScale} = require('./AssetUtils');
 const {
   getAndroidResourceFolderName,
   getAndroidResourceIdentifier,
   getBasePath,
 } = require('@react-native/assets/path-support');
+const invariant = require('invariant');
 
 /**
  * Returns a path like 'assets/AwesomeModule/icon@2x.png'
@@ -47,9 +45,9 @@ function getScaledAssetPath(asset: PackagerAsset): string {
  */
 function getAssetPathInDrawableFolder(asset: PackagerAsset): string {
   const scale = pickScale(asset.scales, PixelRatio.get());
-  const drawbleFolder = getAndroidResourceFolderName(asset, scale);
+  const drawableFolder = getAndroidResourceFolderName(asset, scale);
   const fileName = getAndroidResourceIdentifier(asset);
-  return drawbleFolder + '/' + fileName + '.' + asset.type;
+  return drawableFolder + '/' + fileName + '.' + asset.type;
 }
 
 class AssetSourceResolver {

package/Libraries/Image/Image.android.js

@@ -8,21 +8,22 @@
  * @format
  */
 
-import ImageViewNativeComponent from './ImageViewNativeComponent';
-import * as React from 'react';
+import type {RootTag} from '../Types/RootTagTypes';
+import type {ImageAndroid} from './Image.flow';
+import type {ImageProps as ImagePropsType} from './ImageProps';
+
+import flattenStyle from '../StyleSheet/flattenStyle';
 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 ImageInjection from './ImageInjection';
+import {getImageSourcesFromImageProps} from './ImageSourceUtils';
+import {convertObjectFitToResizeMode} from './ImageUtils';
+import ImageViewNativeComponent from './ImageViewNativeComponent';
 import NativeImageLoaderAndroid from './NativeImageLoaderAndroid';
-
+import resolveAssetSource from './resolveAssetSource';
 import TextInlineImageNativeComponent from './TextInlineImageNativeComponent';
-
-import type {ImageProps as ImagePropsType} from './ImageProps';
-import type {RootTag} from '../Types/RootTagTypes';
+import * as React from 'react';
 
 let _requestId = 1;
 function generateRequestId() {
@@ -126,25 +127,16 @@ export type ImageComponentStatics = $ReadOnly<{|
 /* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
  * LTI update could not be added via codemod */
 const BaseImage = (props: ImagePropsType, forwardedRef) => {
-  let source = resolveAssetSource(props.source);
+  let source = getImageSourcesFromImageProps(props) || {
+    uri: undefined,
+    width: undefined,
+    height: undefined,
+  };
   const defaultSource = resolveAssetSource(props.defaultSource);
   const loadingIndicatorSource = resolveAssetSource(
     props.loadingIndicatorSource,
   );
 
-  if (source) {
-    const uri = source.uri;
-    if (uri === '') {
-      console.warn('source.uri should not be an empty string');
-    }
-  }
-
-  if (props.src) {
-    console.warn(
-      'The <Image> component requires a `source` property rather than `src`.',
-    );
-  }
-
   if (props.children) {
     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.',
@@ -157,37 +149,58 @@ const BaseImage = (props: ImagePropsType, forwardedRef) => {
     );
   }
 
-  if (source && !source.uri && !Array.isArray(source)) {
-    source = null;
-  }
-
   let style;
   let sources;
-  if (source?.uri != null) {
-    const {width, height} = source;
-    style = flattenStyle([{width, height}, styles.base, props.style]);
-    sources = [{uri: source.uri}];
-  } else {
+  if (Array.isArray(source)) {
     style = flattenStyle([styles.base, props.style]);
     sources = source;
+  } else {
+    const {width = props.width, height = props.height, uri} = source;
+    style = flattenStyle([{width, height}, styles.base, props.style]);
+    sources = [source];
+
+    if (uri === '') {
+      console.warn('source.uri should not be an empty string');
+    }
   }
 
+  const {height, width, ...restProps} = props;
   const {onLoadStart, onLoad, onLoadEnd, onError} = props;
   const nativeProps = {
-    ...props,
+    ...restProps,
     style,
     shouldNotifyLoadEvents: !!(onLoadStart || onLoad || onLoadEnd || onError),
     src: sources,
     /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
      * when making Flow check .android.js files. */
-    headers: source?.headers,
+    headers: (source?.[0]?.headers || source?.headers: ?{[string]: string}),
     defaultSrc: defaultSource ? defaultSource.uri : null,
     loadingIndicatorSrc: loadingIndicatorSource
       ? loadingIndicatorSource.uri
       : null,
     ref: forwardedRef,
+    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 objectFit =
+    style && style.objectFit
+      ? convertObjectFitToResizeMode(style.objectFit)
+      : null;
+  // $FlowFixMe[prop-missing]
+  const resizeMode =
+    objectFit || props.resizeMode || (style && style.resizeMode) || 'cover';
+
   return (
     <ImageAnalyticsTagContext.Consumer>
       {analyticTag => {
@@ -202,19 +215,23 @@ const BaseImage = (props: ImagePropsType, forwardedRef) => {
           <TextAncestor.Consumer>
             {hasTextAncestor => {
               if (hasTextAncestor) {
-                let src = Array.isArray(sources) ? sources : [sources];
                 return (
                   <TextInlineImageNativeComponent
                     style={style}
-                    resizeMode={props.resizeMode}
+                    resizeMode={resizeMode}
                     headers={nativeProps.headers}
-                    src={src}
+                    src={sources}
                     ref={forwardedRef}
                   />
                 );
               }
 
-              return <ImageViewNativeComponent {...nativePropsWithAnalytics} />;
+              return (
+                <ImageViewNativeComponent
+                  {...nativePropsWithAnalytics}
+                  resizeMode={resizeMode}
+                />
+              );
             }}
           </TextAncestor.Consumer>
         );
@@ -308,15 +325,16 @@ Image.queryCache = queryCache;
  * comment and run Flow. */
 Image.resolveAssetSource = resolveAssetSource;
 
+/**
+ * Switch to `deprecated-react-native-prop-types` for compatibility with future
+ * releases. This is deprecated and will be removed in the future.
+ */
+Image.propTypes = require('deprecated-react-native-prop-types').ImagePropTypes;
+
 const styles = StyleSheet.create({
   base: {
     overflow: 'hidden',
   },
 });
 
-module.exports = ((Image: any): React.AbstractComponent<
-  ImagePropsType,
-  | React.ElementRef<typeof TextInlineImageNativeComponent>
-  | React.ElementRef<typeof ImageViewNativeComponent>,
-> &
-  ImageComponentStatics);
+module.exports = ((Image: any): ImageAndroid);