react-native 0.70.4 → 0.71.0-rc.0

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/FBLazyVector/BUCK

@@ -13,8 +13,9 @@ fb_apple_library(
     extension_api_only = True,
     frameworks = [],
     labels = [
+        "fbios_link_group:xplat/default/public.react_native.infra",
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
+        "talkios_link_group:xplat/default/public.react_native.infra",
     ],
     link_whole = False,
     visibility = ["PUBLIC"],

package/Libraries/FBLazyVector/FBLazyVector/FBLazyIterator.h

@@ -27,7 +27,7 @@ class LazyIterator {
   LazyIterator() = default;
 
   LazyIterator(U vector, convert_type convert, size_type i)
-  : _v(vector), _i(i), _convert(std::move(convert)) {}
+      : _v(vector), _i(i), _convert(std::move(convert)) {}
 
   bool operator==(const LazyIterator &other) const {
     return _i == other._i && _v == other._v;
@@ -98,33 +98,30 @@ class LazyIterator {
 };
 
 template <typename T, typename U>
-LazyIterator<T, U> operator+(typename LazyIterator<T, U>::difference_type n,
-          const LazyIterator<T, U> &i) {
+LazyIterator<T, U> operator+(
+    typename LazyIterator<T, U>::difference_type n,
+    const LazyIterator<T, U> &i) {
   return i + n;
 }
 
 template <typename T, typename U>
-bool operator!=(const LazyIterator<T, U> &a,
-                const LazyIterator<T, U> &b) {
+bool operator!=(const LazyIterator<T, U> &a, const LazyIterator<T, U> &b) {
   return !(a == b);
 }
 
 template <typename T, typename U>
-bool operator<=(const LazyIterator<T, U> &a,
-                const LazyIterator<T, U> &b) {
+bool operator<=(const LazyIterator<T, U> &a, const LazyIterator<T, U> &b) {
   return a < b || a == b;
 }
 
 template <typename T, typename U>
-bool operator>(const LazyIterator<T, U> &a,
-               const LazyIterator<T, U> &b) {
+bool operator>(const LazyIterator<T, U> &a, const LazyIterator<T, U> &b) {
   return b < a;
 }
 
 template <typename T, typename U>
-bool operator>=(const LazyIterator<T, U> &a,
-                const LazyIterator<T, U> &b) {
+bool operator>=(const LazyIterator<T, U> &a, const LazyIterator<T, U> &b) {
   return a > b || a == b;
 }
 
-}
+} // namespace FB

package/Libraries/FBLazyVector/FBLazyVector/FBLazyVector.h

@@ -16,8 +16,9 @@
 namespace FB {
 
 /**
- * Presents a type-safe wrapper around an arbitrary object that represents an _immutable_ array of objects.
- * Each item is constructed lazily on demand and reconstructed on each access; there is no caching.
+ * Presents a type-safe wrapper around an arbitrary object that represents an
+ * _immutable_ array of objects. Each item is constructed lazily on demand and
+ * reconstructed on each access; there is no caching.
  */
 template <typename T, typename U>
 class LazyVector {
@@ -30,7 +31,8 @@ class LazyVector {
   using size_type = std::int32_t;
   using convert_type = std::function<T(U)>;
 
-  static LazyVector<T, U> fromUnsafeRawValue(U v, size_type size, convert_type convert) {
+  static LazyVector<T, U>
+  fromUnsafeRawValue(U v, size_type size, convert_type convert) {
     return {v, size, convert};
   }
 
@@ -48,7 +50,8 @@ class LazyVector {
 
   const_reference at(size_type pos) const {
 #ifndef _LIBCPP_NO_EXCEPTIONS
-    if (!(pos < _size)) throw std::out_of_range("out of range");
+    if (!(pos < _size))
+      throw std::out_of_range("out of range");
 #else
     assert(pos < _size || !"out of range");
 #endif
@@ -89,11 +92,11 @@ class LazyVector {
  private:
   /** Wrapped vector */
   LazyVector(U vector, size_type size, convert_type convert)
-  : _v(vector), _size(size), _convert(convert) {}
+      : _v(vector), _size(size), _convert(convert) {}
 
   U _v;
   size_type _size;
   convert_type _convert;
 };
 
-}
+} // namespace FB

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);