react-native-tvos 0.87.1-1 → 0.88.0-0

package/Libraries/Image/Image.android.js

@@ -139,7 +139,6 @@ const EMPTY_IMAGE_SOURCE = {
 let BaseImage: AbstractImageAndroid = ({
   ref: forwardedRef,
   alt,
-  accessible,
   'aria-labelledby': ariaLabelledBy,
   'aria-busy': ariaBusy,
   'aria-checked': ariaChecked,
@@ -148,8 +147,6 @@ let BaseImage: AbstractImageAndroid = ({
   'aria-hidden': ariaHidden,
   'aria-label': ariaLabel,
   'aria-selected': ariaSelected,
-  accessibilityLabel,
-  accessibilityLabelledBy,
   accessibilityState,
   defaultSource,
   loadingIndicatorSource,
@@ -172,7 +169,7 @@ let BaseImage: AbstractImageAndroid = ({
   ref?: React.RefSetter<ImageInstance>,
   ...ImageProps,
 }) => {
-  let source_ =
+  let resolvedSource =
     getImageSourcesFromImageProps({
       crossOrigin,
       referrerPolicy,
@@ -201,29 +198,29 @@ let BaseImage: AbstractImageAndroid = ({
     ...React.PropsOf<ImageViewNativeComponent>,
   };
 
-  if (Array.isArray(source_)) {
+  if (Array.isArray(resolvedSource)) {
     const {
       headers: sourceHeaders,
       width: sourceWidth,
       height: sourceHeight,
-    } = source_[0];
+    } = resolvedSource[0];
     if (sourceHeaders != null) {
       nativeProps.headers = sourceHeaders;
     }
     // Default to the first source's width and height if only one is provided
     nativeProps.style = [
-      source_.length === 1 && {width: sourceWidth, height: sourceHeight},
+      resolvedSource.length === 1 && {width: sourceWidth, height: sourceHeight},
       styles.base,
       style,
     ];
-    nativeProps.source = source_;
+    nativeProps.source = resolvedSource;
   } else {
     const {
       uri,
       width: sourceWidth,
       height: sourceHeight,
       headers: sourceHeaders,
-    } = source_;
+    } = resolvedSource;
     if (uri === '') {
       console.warn('source.uri should not be an empty string');
     }
@@ -235,7 +232,7 @@ let BaseImage: AbstractImageAndroid = ({
       styles.base,
       style,
     ];
-    nativeProps.source = [source_];
+    nativeProps.source = [resolvedSource];
   }
 
   if (onLoadStart != null) {
@@ -266,24 +263,19 @@ let BaseImage: AbstractImageAndroid = ({
     nativeProps.loadingIndicatorSrc = loadingIndicatorSource_.uri;
   }
 
+  // Maintain pre-existing order, accessibilityLabel takes priority over alt
   if (ariaLabel != null) {
     nativeProps.accessibilityLabel = ariaLabel;
-  } else if (accessibilityLabel != null) {
-    nativeProps.accessibilityLabel = accessibilityLabel;
-  } else if (alt != null) {
+  } else if (alt != null && nativeProps.accessibilityLabel == null) {
     nativeProps.accessibilityLabel = alt;
   }
 
   if (ariaLabelledBy != null) {
     nativeProps.accessibilityLabelledBy = ariaLabelledBy;
-  } else if (accessibilityLabelledBy != null) {
-    nativeProps.accessibilityLabelledBy = accessibilityLabelledBy;
   }
 
   if (alt != null) {
     nativeProps.accessible = true;
-  } else if (accessible != null) {
-    nativeProps.accessible = accessible;
   }
 
   if (

package/Libraries/Image/Image.ios.js

@@ -29,6 +29,7 @@ import ImageViewNativeComponent from './ImageViewNativeComponent';
 import NativeImageLoaderIOS from './NativeImageLoaderIOS';
 import resolveAssetSource from './resolveAssetSource';
 import * as React from 'react';
+import {use} from 'react';
 
 export type ImageInstance = HostInstance;
 
@@ -102,6 +103,12 @@ async function queryCache(
   return NativeImageLoaderIOS.queryCache(urls);
 }
 
+const EMPTY_IMAGE_SOURCE = {
+  uri: undefined,
+  width: undefined,
+  height: undefined,
+};
+
 /**
  * A React component for displaying different types of images,
  * including network images, static resources, temporary local images, and
@@ -111,90 +118,127 @@ async function queryCache(
  */
 let BaseImage: AbstractImageIOS = ({
   ref: forwardedRef,
-  ...props
+  'aria-labelledby': ariaLabelledBy,
+  'aria-busy': ariaBusy,
+  'aria-checked': ariaChecked,
+  'aria-disabled': ariaDisabled,
+  'aria-expanded': ariaExpanded,
+  'aria-hidden': ariaHidden,
+  'aria-label': ariaLabel,
+  'aria-selected': ariaSelected,
+  accessibilityState,
+  alt,
+  children,
+  crossOrigin,
+  height,
+  referrerPolicy,
+  resizeMode,
+  source,
+  src,
+  srcSet,
+  style,
+  tintColor,
+  width,
+  ...restProps
 }: {
   ref?: React.RefSetter<ImageInstance>,
   ...ImageProps,
 }) => {
-  const source = getImageSourcesFromImageProps(props) || {
-    uri: undefined,
-    width: undefined,
-    height: undefined,
+  const nativeProps = restProps as {
+    ...React.PropsOf<ImageViewNativeComponent>,
   };
 
-  let style: ImageStyleProp;
+  const resolvedSource =
+    getImageSourcesFromImageProps({
+      crossOrigin,
+      height,
+      referrerPolicy,
+      source,
+      src,
+      srcSet,
+      width,
+    }) || EMPTY_IMAGE_SOURCE;
+
+  let resolvedStyle: ImageStyleProp;
   let sources;
-  if (Array.isArray(source)) {
-    style = [styles.base, props.style];
-    sources = source;
+  if (Array.isArray(resolvedSource)) {
+    resolvedStyle = [styles.base, style];
+    sources = resolvedSource;
   } else {
-    const {uri} = source;
+    const {uri} = resolvedSource;
     if (uri === '') {
       console.warn('source.uri should not be an empty string');
     }
-    const width = source.width ?? props.width;
-    const height = source.height ?? props.height;
-    style = [{width, height}, styles.base, props.style];
-    sources = [source];
+    resolvedStyle = [
+      {
+        width: resolvedSource.width ?? width,
+        height: resolvedSource.height ?? height,
+      },
+      styles.base,
+      style,
+    ];
+    sources = [resolvedSource];
   }
 
-  const flattenedStyle = flattenStyle<ImageStyleProp>(style);
-  const objectFit = convertObjectFitToResizeMode(flattenedStyle?.objectFit);
-  const resizeMode =
-    objectFit || props.resizeMode || flattenedStyle?.resizeMode || 'cover';
-  const tintColor = props.tintColor ?? flattenedStyle?.tintColor;
-
-  if (props.children != null) {
+  if (children != null) {
     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.',
     );
   }
-  const {
-    'aria-busy': ariaBusy,
-    'aria-checked': ariaChecked,
-    'aria-disabled': ariaDisabled,
-    'aria-expanded': ariaExpanded,
-    'aria-selected': ariaSelected,
-    'aria-hidden': ariaHidden,
-    src,
-    ...restProps
-  } = props;
-
-  const _accessibilityState = {
-    busy: ariaBusy ?? props.accessibilityState?.busy,
-    checked: ariaChecked ?? props.accessibilityState?.checked,
-    disabled: ariaDisabled ?? props.accessibilityState?.disabled,
-    expanded: ariaExpanded ?? props.accessibilityState?.expanded,
-    selected: ariaSelected ?? props.accessibilityState?.selected,
-  };
 
-  // In order for `aria-hidden` to work on iOS we must set `accessible` to false (`accessibilityElementsHidden` is not enough).
-  const accessible =
-    ariaHidden !== true && (props.alt !== undefined ? true : props.accessible);
-  const accessibilityLabel = props['aria-label'] ?? props.accessibilityLabel;
+  nativeProps.style = resolvedStyle;
+  nativeProps.source = sources;
+
+  const flattenedStyle = flattenStyle<ImageStyleProp>(resolvedStyle);
+  const objectFit = convertObjectFitToResizeMode(flattenedStyle?.objectFit);
+  nativeProps.resizeMode =
+    objectFit || resizeMode || flattenedStyle?.resizeMode || 'cover';
+  nativeProps.tintColor = tintColor ?? flattenedStyle?.tintColor;
+
+  // Maintain pre-existing order, accessibilityLabel takes priority over alt
+  if (ariaLabel != null) {
+    nativeProps.accessibilityLabel = ariaLabel;
+  } else if (alt != null && nativeProps.accessibilityLabel == null) {
+    nativeProps.accessibilityLabel = alt;
+  }
+
+  if (ariaLabelledBy != null) {
+    nativeProps.accessibilityLabelledBy = ariaLabelledBy;
+  }
+
+  if (ariaHidden === true) {
+    // In order for `aria-hidden` to work on iOS we must set `accessible` to
+    // false (`accessibilityElementsHidden` is not enough).
+    nativeProps.accessible = false;
+  } else if (alt != null) {
+    nativeProps.accessible = true;
+  }
+
+  if (
+    accessibilityState != null ||
+    ariaBusy != null ||
+    ariaChecked != null ||
+    ariaDisabled != null ||
+    ariaExpanded != null ||
+    ariaSelected != null
+  ) {
+    nativeProps.accessibilityState = {
+      busy: ariaBusy ?? accessibilityState?.busy,
+      checked: ariaChecked ?? accessibilityState?.checked,
+      disabled: ariaDisabled ?? accessibilityState?.disabled,
+      expanded: ariaExpanded ?? accessibilityState?.expanded,
+      selected: ariaSelected ?? accessibilityState?.selected,
+    };
+  }
 
   const actualRef = useWrapRefWithImageAttachedCallbacks(forwardedRef);
 
-  return (
-    <ImageAnalyticsTagContext.Consumer>
-      {analyticTag => {
-        return (
-          <ImageViewNativeComponent
-            accessibilityState={_accessibilityState}
-            {...restProps}
-            accessible={accessible}
-            accessibilityLabel={accessibilityLabel ?? props.alt}
-            ref={actualRef}
-            style={style}
-            resizeMode={resizeMode}
-            tintColor={tintColor}
-            source={sources}
-            internal_analyticTag={analyticTag}
-          />
-        );
-      }}
-    </ImageAnalyticsTagContext.Consumer>
-  );
+  const analyticTag = use(ImageAnalyticsTagContext);
+  if (analyticTag != null) {
+    nativeProps.internal_analyticTag = analyticTag;
+  }
+
+  return <ImageViewNativeComponent {...nativeProps} ref={actualRef} />;
 };
 
 const imageComponentDecorator = unstable_getImageComponentDecorator();

package/Libraries/Image/ImageProps.js

@@ -147,10 +147,7 @@ export type ImagePropsAndroid = Readonly<{
   resizeMultiplier?: ?number,
 }>;
 
-/** @build-types emit-as-interface Expo compatibility */
-export type ImagePropsBase = Readonly<{
-  ...Omit<ViewProps, 'style'>,
-
+type ImagePropsBaseCore = Readonly<{
   /**
    * When `true`, indicates the image is an accessibility element.
    */
@@ -327,26 +324,38 @@ export type ImagePropsBase = Readonly<{
   children?: empty,
 }>;
 
-export type ImageProps = Readonly<{
-  ...ImagePropsIOS,
-  ...ImagePropsAndroid,
-  ...ImagePropsBase,
+/** @build-types emit-as-interface Expo compatibility */
+export type ImagePropsBase = Readonly<{
+  ...Omit<
+    ViewProps,
+    | 'accessibilityLabel'
+    | 'accessible'
+    | 'aria-label'
+    | 'aria-labelledby'
+    | 'children'
+    | 'onLayout'
+    | 'style'
+    | 'testID',
+  >,
+  ...ImagePropsBaseCore,
+}>;
 
+type ImagePropsCore = Readonly<{
   /**
    * Style applied to the `Image` component.
    */
   style?: ?ImageStyleProp,
 }>;
 
-/**
- * ImageBackground is deprecated and will be removed in a future release.
- * Use a `View` with an absolutely positioned `Image` instead.
- * @see https://reactnative.dev/docs/imagebackground
- * @deprecated
- * @build-types emit-as-interface Uniwind compatibility
- */
-export type ImageBackgroundProps = Readonly<{
-  ...ImageProps,
+/** @build-types emit-as-interface react-native-web compatibility */
+export type ImageProps = Readonly<{
+  ...ImagePropsIOS,
+  ...ImagePropsAndroid,
+  ...ImagePropsBase,
+  ...ImagePropsCore,
+}>;
+
+type ImageBackgroundPropsCore = Readonly<{
   children?: React.Node,
 
   /**
@@ -366,3 +375,15 @@ export type ImageBackgroundProps = Readonly<{
    */
   imageRef?: React.RefSetter<React.ElementRef<ImageType>>,
 }>;
+
+/**
+ * ImageBackground is deprecated and will be removed in a future release.
+ * Use a `View` with an absolutely positioned `Image` instead.
+ * @see https://reactnative.dev/docs/imagebackground
+ * @deprecated
+ * @build-types emit-as-interface Uniwind compatibility
+ */
+export type ImageBackgroundProps = Readonly<{
+  ...Omit<ImageProps, 'children' | 'style'>,
+  ...ImageBackgroundPropsCore,
+}>;

package/Libraries/Image/ImageSource.js

@@ -85,9 +85,7 @@ export interface ImageURISource {
 export type ImageRequireSource = number;
 
 export type ImageSource =
-  | ImageRequireSource
-  | ImageURISource
-  | ReadonlyArray<ImageURISource>;
+  ImageRequireSource | ImageURISource | ReadonlyArray<ImageURISource>;
 
 type ImageSourceProperties = {
   body?: ?string,

package/Libraries/Image/ImageSourceUtils.js

@@ -12,6 +12,7 @@
 
 import type {ResolvedAssetSource} from './AssetSourceResolver';
 import type {ImageProps} from './ImageProps';
+import type {ImageURISource} from './ImageSource';
 
 import resolveAssetSource from './resolveAssetSource';
 
@@ -87,7 +88,14 @@ export function getImageSourcesFromImageProps(imageProps: ImageProps):
   } else if (src != null) {
     sources = [{uri: src, headers: headers, width, height}];
   } else if (source != null && source.uri && Object.keys(headers).length > 0) {
-    sources = [{...source, headers}];
+    const sourceHeaders = (source as ImageURISource).headers;
+    sources = [
+      {
+        ...source,
+        headers:
+          sourceHeaders != null ? {...headers, ...sourceHeaders} : headers,
+      },
+    ];
   } else {
     sources = source;
   }

package/Libraries/Image/RCTImageEditingManager.mm

@@ -38,20 +38,22 @@ RCT_EXPORT_MODULE()
  *        be scaled down to `displaySize` rather than `size`.
  *        All units are in px (not points).
  */
-RCT_EXPORT_METHOD(
-    cropImage : (NSURLRequest *)imageRequest cropData : (JS::NativeImageEditor::Options &)cropData successCallback : (
-        RCTResponseSenderBlock)successCallback errorCallback : (RCTResponseSenderBlock)errorCallback)
+- (void)cropImage:(NSString *)imageRequestString
+           cropData:(JS::NativeImageEditor::Options &)cropData
+    successCallback:(RCTResponseSenderBlock)successCallback
+      errorCallback:(RCTResponseSenderBlock)errorCallback
 {
+  NSURLRequest *imageRequest = [RCTConvert NSURLRequest:imageRequestString];
+
   CGRect rect = {
-    [RCTConvert CGPoint:@{
-      @"x" : @(cropData.offset().x()),
-      @"y" : @(cropData.offset().y()),
-    }],
-    [RCTConvert CGSize:@{
-      @"width" : @(cropData.size().width()),
-      @"height" : @(cropData.size().height()),
-    }]
-  };
+      [RCTConvert CGPoint:@{
+        @"x" : @(cropData.offset().x()),
+        @"y" : @(cropData.offset().y()),
+      }],
+      [RCTConvert CGSize:@{
+        @"width" : @(cropData.size().width()),
+        @"height" : @(cropData.size().height()),
+      }]};
 
   // We must keep a copy of cropData so that we can access data from it at a later time
   JS::NativeImageEditor::Options cropDataCopy = cropData;

package/Libraries/Image/RCTImageLoader.mm

@@ -1228,8 +1228,7 @@ static RCTImageLoaderCancellationBlock RCTLoadImageURLFromLoader(
   return std::make_shared<facebook::react::NativeImageLoaderIOSSpecJSI>(params);
 }
 
-RCT_EXPORT_METHOD(
-    getSize : (NSString *)uri resolve : (RCTPromiseResolveBlock)resolve reject : (RCTPromiseRejectBlock)reject)
+- (void)getSize:(NSString *)uri resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject
 {
   NSURLRequest *request = [RCTConvert NSURLRequest:uri];
   [self getImageSizeForURLRequest:request
@@ -1245,9 +1244,10 @@ RCT_EXPORT_METHOD(
                             }];
 }
 
-RCT_EXPORT_METHOD(
-    getSizeWithHeaders : (NSString *)uri headers : (NSDictionary *)headers resolve : (RCTPromiseResolveBlock)
-        resolve reject : (RCTPromiseRejectBlock)reject)
+- (void)getSizeWithHeaders:(NSString *)uri
+                   headers:(NSDictionary *)headers
+                   resolve:(RCTPromiseResolveBlock)resolve
+                    reject:(RCTPromiseRejectBlock)reject
 {
   NSURL *URL = [RCTConvert NSURL:uri];
   NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:URL];
@@ -1264,15 +1264,16 @@ RCT_EXPORT_METHOD(
                             }];
 }
 
-RCT_EXPORT_METHOD(
-    prefetchImage : (NSString *)uri resolve : (RCTPromiseResolveBlock)resolve reject : (RCTPromiseRejectBlock)reject)
+- (void)prefetchImage:(NSString *)uri resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject
 {
   [self prefetchImageWithMetadata:uri queryRootName:nil rootTag:0 resolve:resolve reject:reject];
 }
 
-RCT_EXPORT_METHOD(
-    prefetchImageWithMetadata : (NSString *)uri queryRootName : (NSString *)queryRootName rootTag : (double)
-        rootTag resolve : (RCTPromiseResolveBlock)resolve reject : (RCTPromiseRejectBlock)reject)
+- (void)prefetchImageWithMetadata:(NSString *)uri
+                    queryRootName:(NSString *)queryRootName
+                          rootTag:(double)rootTag
+                          resolve:(RCTPromiseResolveBlock)resolve
+                           reject:(RCTPromiseRejectBlock)reject
 {
   NSURLRequest *request = [RCTConvert NSURLRequest:uri];
   [self loadImageWithURLRequest:request
@@ -1284,7 +1285,7 @@ RCT_EXPORT_METHOD(
                     attribution:{
                                     .queryRootName = queryRootName ? [queryRootName UTF8String] : "",
                                     .surfaceId = (int)rootTag,
-                                }
+  }
                   progressBlock:nil
                partialLoadBlock:nil
                 completionBlock:^(NSError *error, UIImage *image, id completionMetadata) {
@@ -1296,8 +1297,7 @@ RCT_EXPORT_METHOD(
                 }];
 }
 
-RCT_EXPORT_METHOD(
-    queryCache : (NSArray *)uris resolve : (RCTPromiseResolveBlock)resolve reject : (RCTPromiseRejectBlock)reject)
+- (void)queryCache:(NSArray *)uris resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject
 {
   resolve([self getImageCacheStatus:uris]);
 }

package/Libraries/Image/RCTImageStoreManager.mm

@@ -95,20 +95,20 @@ RCT_EXPORT_MODULE()
   });
 }
 
-RCT_EXPORT_METHOD(removeImageForTag : (NSString *)imageTag)
+- (void)removeImageForTag:(NSString *)imageTag
 {
   [_store removeObjectForKey:imageTag];
 }
 
-RCT_EXPORT_METHOD(hasImageForTag : (NSString *)imageTag callback : (RCTResponseSenderBlock)callback)
+- (void)hasImageForTag:(NSString *)imageTag callback:(RCTResponseSenderBlock)callback
 {
   callback(@[ @(_store[imageTag] != nil) ]);
 }
 
 // TODO (#5906496): Name could be more explicit - something like getBase64EncodedDataForTag:?
-RCT_EXPORT_METHOD(
-    getBase64ForTag : (NSString *)imageTag successCallback : (RCTResponseSenderBlock)
-        successCallback errorCallback : (RCTResponseSenderBlock)errorCallback)
+- (void)getBase64ForTag:(NSString *)imageTag
+        successCallback:(RCTResponseSenderBlock)successCallback
+          errorCallback:(RCTResponseSenderBlock)errorCallback
 {
   NSData *imageData = _store[imageTag];
   if (imageData == nullptr) {
@@ -122,9 +122,9 @@ RCT_EXPORT_METHOD(
   });
 }
 
-RCT_EXPORT_METHOD(
-    addImageFromBase64 : (NSString *)base64String successCallback : (RCTResponseSenderBlock)
-        successCallback errorCallback : (RCTResponseSenderBlock)errorCallback)
+- (void)addImageFromBase64:(NSString *)base64String
+           successCallback:(RCTResponseSenderBlock)successCallback
+             errorCallback:(RCTResponseSenderBlock)errorCallback
 
 {
   // Dispatching to a background thread to perform base64 decoding

package/Libraries/Image/React-RCTImage.podspec

@@ -54,4 +54,6 @@ Pod::Spec.new do |s|
 
   add_rn_third_party_dependencies(s)
   add_rncore_dependency(s)
+
+  mark_as_react_native_build(s)
 end

package/Libraries/Interaction/PanResponder.js

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  */
 

package/Libraries/LinkingIOS/RCTLinkingManager.h

@@ -11,17 +11,42 @@
 
 @interface RCTLinkingManager : RCTEventEmitter
 
+/**
+ * Deep linking integration supports two iOS lifecycle paths:
+ * - **AppDelegate methods** (below): use when the app does not declare `UIApplicationSceneManifest` in Info.plist.
+ * - **SceneDelegate methods** (below): use when the app uses the UIScene lifecycle. Forward these from your
+ *   app-owned `SceneDelegate`.
+ */
+
+#pragma mark - AppDelegate methods
+
+/// Lifecycle method informing of a URL being opened with the app.
+/// Invoke from AppDelegate for non-scene apps (no `UIApplicationSceneManifest` in Info.plist).
+/// Note: this is an implementation using the iOS 9.0-26.0 API
 + (BOOL)application:(nonnull UIApplication *)app
             openURL:(nonnull NSURL *)URL
             options:(nonnull NSDictionary<UIApplicationOpenURLOptionsKey, id> *)options;
 
+/// Lifecycle method handling a URL being opened with the app.
+/// Invoke from AppDelegate for non-scene apps.
+/// Note: this is an implementation using the iOS 4.2-9.0 API
 + (BOOL)application:(nonnull UIApplication *)application
               openURL:(nonnull NSURL *)URL
     sourceApplication:(nullable NSString *)sourceApplication
            annotation:(nonnull id)annotation;
 
+/// Lifecycle method handling user activity being performed.
+/// Invoke from AppDelegate for non-scene apps.
 + (BOOL)application:(nonnull UIApplication *)application
     continueUserActivity:(nonnull NSUserActivity *)userActivity
       restorationHandler:(nonnull void (^)(NSArray<id<UIUserActivityRestoring>> *_Nullable))restorationHandler;
 
+#pragma mark - SceneDelegate methods
+
+/// Handles user activity for scene-based apps. Invoke from your SceneDelegate.
++ (void)scene:(nonnull UIScene *)scene continueUserActivity:(nonnull NSUserActivity *)userActivity;
+
+/// Handles URLs opened while the app is running for scene-based apps. Invoke from your SceneDelegate.
++ (void)scene:(nonnull UIScene *)scene openURLContexts:(nonnull NSSet<UIOpenURLContext *> *)URLContexts;
+
 @end