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

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

package/Libraries/LinkingIOS/RCTLinkingManager.mm

@@ -9,6 +9,7 @@
 
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
 #import <React/RCTBridge.h>
+#import <React/RCTConvert.h>
 #import <React/RCTLog.h>
 #import <React/RCTUtils.h>
 
@@ -16,24 +17,38 @@
 
 static NSString *const kOpenURLNotification = @"RCTOpenURLNotification";
 
-static void postNotificationWithURL(NSURL *URL, id sender)
-{
-  NSDictionary<NSString *, id> *payload = @{@"url" : URL.absoluteString};
-  [[NSNotificationCenter defaultCenter] postNotificationName:kOpenURLNotification object:sender userInfo:payload];
-}
-
 @interface RCTLinkingManager () <NativeLinkingManagerSpec>
+
+/// Common logic for handling user activities originating from both AppDelegate- and SceneDelegate- lifecycle methods
++ (void)handleUserActivity:(NSUserActivity *)userActivity window:(UIWindow *)window;
+
+/// Common logic for handling user activities from AppDelegate-lifecycle methods.
++ (BOOL)handleAppDelegateURL:(NSURL *)URL app:(UIApplication *)app;
+
+/// Posts a URL notification that will be handled by the emitter to JS; this method is used to invoke instance methods
+/// of RCTLinkingManager from class methods via NSNotificationCenter.
+/// @param URL The URL to be emitted.
++ (void)postNotificationWithURL:(NSURL *)URL;
+
 @end
 
 @implementation RCTLinkingManager
 
 RCT_EXPORT_MODULE()
 
++ (void)postNotificationWithURL:(NSURL *)URL
+{
+  NSDictionary<NSString *, id> *payload = @{@"url" : URL.absoluteString};
+  [[NSNotificationCenter defaultCenter] postNotificationName:kOpenURLNotification object:nil userInfo:payload];
+}
+
 - (dispatch_queue_t)methodQueue
 {
   return dispatch_get_main_queue();
 }
 
+#pragma mark - RCTEventEmitter methods
+
 - (void)startObserving
 {
   [[NSNotificationCenter defaultCenter] addObserver:self
@@ -52,33 +67,72 @@ RCT_EXPORT_MODULE()
   return @[ @"url" ];
 }
 
+#pragma mark - JS methods
+
 + (BOOL)application:(UIApplication *)app
             openURL:(NSURL *)URL
             options:(NSDictionary<UIApplicationOpenURLOptionsKey, id> *)options
 {
-  postNotificationWithURL(URL, self);
-  return YES;
+  return [self handleAppDelegateURL:URL app:app];
 }
 
-// Corresponding api deprecated in iOS 9
 + (BOOL)application:(UIApplication *)application
               openURL:(NSURL *)URL
     sourceApplication:(NSString *)sourceApplication
            annotation:(id)annotation
 {
-  postNotificationWithURL(URL, self);
-  return YES;
+  return [self handleAppDelegateURL:URL app:application];
 }
 
 + (BOOL)application:(UIApplication *)application
     continueUserActivity:(NSUserActivity *)userActivity
       restorationHandler:(nonnull void (^)(NSArray<id<UIUserActivityRestoring>> *_Nullable))restorationHandler
+{
+  if (RCTIsSceneDelegateApp()) {
+    return NO;
+  }
+
+  [RCTLinkingManager handleUserActivity:userActivity window:RCTKeyWindow()];
+  return YES;
+}
+
+#pragma mark - SceneDelegate methods
+
++ (void)scene:(UIScene *)scene continueUserActivity:(NSUserActivity *)userActivity
+{
+  [RCTLinkingManager handleUserActivity:userActivity window:RCTKeyWindow()];
+}
+
++ (void)scene:(UIScene *)scene openURLContexts:(NSSet<UIOpenURLContext *> *)URLContexts
+{
+  if (URLContexts.count == 0) {
+    return;
+  }
+
+  NSURL *URL = URLContexts.allObjects.firstObject.URL;
+  if (URL == nil) {
+    return;
+  }
+  [RCTLinkingManager postNotificationWithURL:URL];
+}
+
+#pragma mark - Common logic methods
+
++ (void)handleUserActivity:(NSUserActivity *)userActivity window:(UIWindow *)window
 {
   // This can be nullish when launching an App Clip.
   if ([userActivity.activityType isEqualToString:NSUserActivityTypeBrowsingWeb] && userActivity.webpageURL != nil) {
-    NSDictionary *payload = @{@"url" : userActivity.webpageURL.absoluteString};
-    [[NSNotificationCenter defaultCenter] postNotificationName:kOpenURLNotification object:self userInfo:payload];
+    [RCTLinkingManager postNotificationWithURL:userActivity.webpageURL];
+  }
+}
+
++ (BOOL)handleAppDelegateURL:(NSURL *)URL app:(UIApplication *)app
+{
+  if (RCTIsSceneDelegateApp()) {
+    return NO;
   }
+
+  [RCTLinkingManager postNotificationWithURL:URL];
   return YES;
 }
 
@@ -87,34 +141,36 @@ RCT_EXPORT_MODULE()
   [self sendEventWithName:@"url" body:notification.userInfo];
 }
 
-RCT_EXPORT_METHOD(
-    openURL : (NSURL *)URL resolve : (RCTPromiseResolveBlock)resolve reject : (RCTPromiseRejectBlock)reject)
+- (void)openURL:(NSString *)urlString resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject
 {
+  NSURL *URL = [RCTConvert NSURL:urlString];
   [RCTSharedApplication() openURL:URL
-      options:@{}
-      completionHandler:^(BOOL success) {
-        if (success) {
-          resolve(@YES);
-        } else {
+                          options:@{}
+                completionHandler:^(BOOL success) {
+                  if (success) {
+                    resolve(@YES);
+                  } else {
 #if TARGET_OS_SIMULATOR
-          // Simulator-specific code
-          if ([URL.absoluteString hasPrefix:@"tel:"]) {
-            RCTLogWarn(@"Unable to open the Phone app in the simulator for telephone URLs. URL:  %@", URL);
-            resolve(@NO);
-          } else {
-            reject(RCTErrorUnspecified, [NSString stringWithFormat:@"Unable to open URL: %@", URL], nil);
-          }
+                    // Simulator-specific code
+                    if ([URL.absoluteString hasPrefix:@"tel:"]) {
+                      RCTLogWarn(@"Unable to open the Phone app in the simulator for telephone URLs. URL:  %@", URL);
+                      resolve(@NO);
+                    } else {
+                      reject(RCTErrorUnspecified, [NSString stringWithFormat:@"Unable to open URL: %@", URL], nil);
+                    }
 #else
           // Device-specific code
           reject(RCTErrorUnspecified, [NSString stringWithFormat:@"Unable to open URL: %@", URL], nil);
 #endif
-        }
-      }];
+                  }
+                }];
 }
 
-RCT_EXPORT_METHOD(
-    canOpenURL : (NSURL *)URL resolve : (RCTPromiseResolveBlock)resolve reject : (__unused RCTPromiseRejectBlock)reject)
+- (void)canOpenURL:(NSString *)urlString
+           resolve:(RCTPromiseResolveBlock)resolve
+            reject:(__unused RCTPromiseRejectBlock)reject
 {
+  NSURL *URL = [RCTConvert NSURL:urlString];
   if (RCTRunningInAppExtension()) {
     // Technically Today widgets can open urls, but supporting that would require
     // a reference to the NSExtensionContext
@@ -148,7 +204,7 @@ RCT_EXPORT_METHOD(
   }
 }
 
-RCT_EXPORT_METHOD(getInitialURL : (RCTPromiseResolveBlock)resolve reject : (__unused RCTPromiseRejectBlock)reject)
+- (void)getInitialURL:(RCTPromiseResolveBlock)resolve reject:(__unused RCTPromiseRejectBlock)reject
 {
   NSURL *initialURL = nil;
   if (self.bridge.launchOptions[UIApplicationLaunchOptionsURLKey] != nullptr) {
@@ -163,25 +219,18 @@ RCT_EXPORT_METHOD(getInitialURL : (RCTPromiseResolveBlock)resolve reject : (__un
   resolve(RCTNullIfNil(initialURL.absoluteString));
 }
 
-RCT_EXPORT_METHOD(openSettings : (RCTPromiseResolveBlock)resolve reject : (__unused RCTPromiseRejectBlock)reject)
+- (void)openSettings:(RCTPromiseResolveBlock)resolve reject:(__unused RCTPromiseRejectBlock)reject
 {
   NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
   [RCTSharedApplication() openURL:url
-      options:@{}
-      completionHandler:^(BOOL success) {
-        if (success) {
-          resolve(nil);
-        } else {
-          reject(RCTErrorUnspecified, @"Unable to open app settings", nil);
-        }
-      }];
-}
-
-RCT_EXPORT_METHOD(
-    sendIntent : (NSString *)action extras : (NSArray *_Nullable)extras resolve : (RCTPromiseResolveBlock)
-        resolve reject : (RCTPromiseRejectBlock)reject)
-{
-  RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
+                          options:@{}
+                completionHandler:^(BOOL success) {
+                  if (success) {
+                    resolve(nil);
+                  } else {
+                    reject(RCTErrorUnspecified, @"Unable to open app settings", nil);
+                  }
+                }];
 }
 
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:

package/Libraries/LinkingIOS/React-RCTLinking.podspec

@@ -48,4 +48,6 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-RCTFBReactNativeSpec")
   add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"])
   add_dependency(s, "React-NativeModulesApple", :additional_framework_paths => ["build/generated/ios"])
+
+  mark_as_react_native_build(s)
 end

package/Libraries/Modal/Modal.js

@@ -13,10 +13,7 @@ import type {ViewProps} from '../Components/View/ViewPropTypes';
 import type {RootTag} from '../ReactNative/RootTag';
 import type {DirectEventHandler} from '../Types/CodegenTypes';
 
-import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
 import {type ColorValue} from '../StyleSheet/StyleSheet';
-import {type EventSubscription} from '../vendor/emitter/EventEmitter';
-import NativeModalManager from './NativeModalManager';
 import RCTModalHostView from './RCTModalHostViewNativeComponent';
 import VirtualizedLists from '@react-native-tvos/virtualized-lists';
 import * as React from 'react';
@@ -32,21 +29,8 @@ const Platform = require('../Utilities/Platform').default;
 const VirtualizedListContextResetter =
   VirtualizedLists.VirtualizedListContextResetter;
 
-type ModalEventDefinitions = {
-  modalDismissed: [{modalID: number}],
-};
-
 export type ModalInstance = HostInstance;
 
-const ModalEventEmitter =
-  Platform.OS === 'ios' && NativeModalManager != null
-    ? new NativeEventEmitter<ModalEventDefinitions>(
-        // T88715063: NativeEventEmitter only used this parameter on iOS. Now it uses it on all platforms, so this code was modified automatically to preserve its behavior
-        // If you want to use the native module on other platforms, please remove this condition and test its behavior
-        Platform.OS !== 'ios' ? null : NativeModalManager,
-      )
-    : null;
-
 // In order to route onDismiss callbacks, we need to uniquely identifier each
 // <Modal> on screen. There can be different ones, either nested or as siblings.
 // We cannot pass the onDismiss callback to native as the view will be
@@ -117,10 +101,7 @@ export type ModalPropsIOS = {
    * @platform ios
    */
   presentationStyle?: ?(
-    | 'fullScreen'
-    | 'pageSheet'
-    | 'formSheet'
-    | 'overFullScreen'
+    'fullScreen' | 'pageSheet' | 'formSheet' | 'overFullScreen'
   ),
 
   /**
@@ -260,7 +241,6 @@ class Modal extends React.Component<ModalProps, ModalState> {
   static contextType: React.Context<RootTag> = RootTagContext;
 
   _identifier: number;
-  _eventSubscription: ?EventSubscription;
 
   constructor(props: ModalProps) {
     super(props);
@@ -273,29 +253,10 @@ class Modal extends React.Component<ModalProps, ModalState> {
     };
   }
 
-  componentDidMount() {
-    // 'modalDismissed' is for the old renderer in iOS only
-    if (ModalEventEmitter) {
-      this._eventSubscription = ModalEventEmitter.addListener(
-        'modalDismissed',
-        event => {
-          this.setState({isRendered: false}, () => {
-            if (event.modalID === this._identifier && this.props.onDismiss) {
-              this.props.onDismiss();
-            }
-          });
-        },
-      );
-    }
-  }
-
   componentWillUnmount() {
     if (Platform.OS === 'ios') {
       this.setState({isRendered: false});
     }
-    if (this._eventSubscription) {
-      this._eventSubscription.remove();
-    }
   }
 
   componentDidUpdate(prevProps: ModalProps) {
@@ -378,6 +339,8 @@ class Modal extends React.Component<ModalProps, ModalState> {
         identifier={this._identifier}
         style={styles.modal}
         // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+        /* $FlowFixMe[incompatible-type] Error exposed after fixing this typing
+         * unsoundness in flow */
         onStartShouldSetResponder={this._shouldSetResponder}
         supportedOrientations={this.props.supportedOrientations}
         onOrientationChange={this.props.onOrientationChange}