react-native-tvos 0.75.2-0rc0 → 0.76.0-0rc0

package/React/CoreModules/RCTPerfMonitor.mm

@@ -171,23 +171,15 @@ RCT_EXPORT_MODULE()
 - (UIView *)container
 {
   if (!_container) {
-#if TARGET_OS_TV
-    int statusBarHeight = 0;
-#else
-    CGSize statusBarSize = RCTSharedApplication().statusBarFrame.size;
-    CGFloat statusBarHeight = statusBarSize.height;
-#endif
-    _container = [[UIView alloc] initWithFrame:CGRectMake(10, statusBarHeight, 180, RCTPerfMonitorBarHeight)];
+    UIEdgeInsets safeInsets = RCTKeyWindow().safeAreaInsets;
+
+    _container =
+        [[UIView alloc] initWithFrame:CGRectMake(safeInsets.left, safeInsets.top, 180, RCTPerfMonitorBarHeight)];
     _container.layer.borderWidth = 2;
     _container.layer.borderColor = [UIColor lightGrayColor].CGColor;
     [_container addGestureRecognizer:self.gestureRecognizer];
     [_container addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tap)]];
 
-    _container.backgroundColor = [UIColor whiteColor];
-
-#if !TARGET_OS_TV
-    _container.backgroundColor = [UIColor systemBackgroundColor];
-#endif
   }
 
   return _container;
@@ -455,7 +447,9 @@ RCT_EXPORT_MODULE()
 {
   [self loadPerformanceLoggerData];
   if (CGRectIsEmpty(_storedMonitorFrame)) {
-    _storedMonitorFrame = CGRectMake(0, 20, self.container.window.frame.size.width, RCTPerfMonitorExpandHeight);
+    UIEdgeInsets safeInsets = RCTKeyWindow().safeAreaInsets;
+    _storedMonitorFrame =
+        CGRectMake(safeInsets.left, safeInsets.top, self.container.window.frame.size.width, RCTPerfMonitorExpandHeight);
     [self.container addSubview:self.metrics];
   } else {
     [_metrics reloadData];

package/React/CoreModules/RCTRedBox.mm

@@ -221,7 +221,11 @@
 
 - (NSInteger)bottomSafeViewHeight
 {
+#if TARGET_OS_MACCATALYST
+  return 0;
+#else
   return RCTSharedApplication().delegate.window.safeAreaInsets.bottom;
+#endif
 }
 
 RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)

package/React/CoreModules/RCTStatusBarManager.mm

@@ -143,7 +143,7 @@ RCT_EXPORT_METHOD(getHeight : (RCTResponseSenderBlock)callback)
 RCT_EXPORT_METHOD(getHeight : (RCTResponseSenderBlock)callback)
 {
   callback(@[ @{
-    @"height" : @(RCTSharedApplication().statusBarFrame.size.height),
+    @"height" : @(RCTUIStatusBarManager().statusBarFrame.size.height),
   } ]);
 }
 
@@ -182,7 +182,11 @@ RCT_EXPORT_METHOD(setHidden : (BOOL)hidden withAnimation : (NSString *)withAnima
 RCT_EXPORT_METHOD(setNetworkActivityIndicatorVisible : (BOOL)visible)
 {
   dispatch_async(dispatch_get_main_queue(), ^{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+    // This is no longer supported in iOS 13 and later. We will remove this method in a future release.
     RCTSharedApplication().networkActivityIndicatorVisible = visible;
+#pragma clang diagnostic pop
   });
 }
 

package/React/CoreModules/React-CoreModules.podspec

@@ -19,7 +19,9 @@ end
 folly_config = get_folly_config()
 folly_compiler_flags = folly_config[:compiler_flags]
 folly_version = folly_config[:version]
-socket_rocket_version = '0.7.0'
+
+socket_rocket_config = get_socket_rocket_config()
+socket_rocket_version = socket_rocket_config[:version] 
 
 header_search_paths = [
   "\"$(PODS_ROOT)/boost\"",

package/React/CxxBridge/NSDataBigString.mm

@@ -9,33 +9,10 @@
 
 namespace facebook::react {
 
-static NSData *ensureNullTerminated(NSData *source)
-{
-  if (!source || source.length == 0) {
-    return nil;
-  }
-
-  NSUInteger sourceLength = source.length;
-  unsigned char lastByte;
-  [source getBytes:&lastByte range:NSMakeRange(sourceLength - 1, 1)];
-
-  // TODO: bundles from the packager should always include a NULL byte
-  // or we should we relax this requirement and only read as much from the
-  // buffer as length indicates
-  if (lastByte == '\0') {
-    return source;
-  } else {
-    NSMutableData *data = [source mutableCopy];
-    unsigned char nullByte = '\0';
-    [data appendBytes:&nullByte length:1];
-    return data;
-  }
-}
-
 NSDataBigString::NSDataBigString(NSData *data)
 {
-  m_data = ensureNullTerminated(data);
-  m_length = MAX([m_data length], 1) - 1;
+  m_data = data;
+  m_length = [m_data length];
 }
 
 } // namespace facebook::react

package/React/CxxBridge/RCTCxxBridge.mm

@@ -162,11 +162,13 @@ static void mapReactMarkerToPerformanceLogger(
 
 static void registerPerformanceLoggerHooks(RCTPerformanceLogger *performanceLogger)
 {
+  std::unique_lock lock(ReactMarker::logTaggedMarkerImplMutex);
   __weak RCTPerformanceLogger *weakPerformanceLogger = performanceLogger;
-  ReactMarker::logTaggedMarkerImpl = [weakPerformanceLogger](
-                                         const ReactMarker::ReactMarkerId markerId, const char *tag) {
+  ReactMarker::LogTaggedMarker newMarker = [weakPerformanceLogger](
+                                               const ReactMarker::ReactMarkerId markerId, const char *tag) {
     mapReactMarkerToPerformanceLogger(markerId, weakPerformanceLogger, tag);
   };
+  ReactMarker::logTaggedMarkerImpl = newMarker;
 }
 
 @interface RCTCxxBridge () <RCTModuleDataCallInvokerProvider>
@@ -193,7 +195,7 @@ struct RCTInstanceCallback : public InstanceCallback {
 
 @implementation RCTCxxBridge {
   BOOL _didInvalidate;
-  BOOL _moduleRegistryCreated;
+  std::atomic<BOOL> _moduleRegistryCreated;
 
   NSMutableArray<RCTPendingCall> *_pendingCalls;
   std::atomic<NSInteger> _pendingCount;
@@ -220,12 +222,32 @@ struct RCTInstanceCallback : public InstanceCallback {
   RCTViewRegistry *_viewRegistry_DEPRECATED;
   RCTBundleManager *_bundleManager;
   RCTCallableJSModules *_callableJSModules;
+  std::atomic<BOOL> _loading;
+  std::atomic<BOOL> _valid;
 }
 
 @synthesize bridgeDescription = _bridgeDescription;
-@synthesize loading = _loading;
 @synthesize performanceLogger = _performanceLogger;
-@synthesize valid = _valid;
+
+- (BOOL)isLoading
+{
+  return _loading;
+}
+
+- (void)setLoading:(BOOL)newValue
+{
+  _loading = newValue;
+}
+
+- (BOOL)isValid
+{
+  return _valid;
+}
+
+- (void)setValid:(BOOL)newValue
+{
+  _valid = newValue;
+}
 
 - (RCTModuleRegistry *)moduleRegistry
 {

package/React/DevSupport/RCTInspectorDevServerHelper.mm

@@ -80,8 +80,14 @@ static NSString *getInspectorDeviceId()
   // A bundle ID uniquely identifies a single app throughout the system. [Source: Apple docs]
   NSString *bundleId = [[NSBundle mainBundle] bundleIdentifier];
 
+#if TARGET_OS_IPHONE
   // An alphanumeric string that uniquely identifies a device to the app's vendor. [Source: Apple docs]
   NSString *identifierForVendor = [[UIDevice currentDevice] identifierForVendor].UUIDString;
+#else
+  // macOS does not support UIDevice. Use an empty string, with the assumption
+  // that we are only building to the current system.
+  NSString *identifierForVendor = @"";
+#endif
 
   auto &inspectorFlags = facebook::react::jsinspector_modern::InspectorFlags::getInstance();
 

package/React/DevSupport/RCTInspectorNetworkHelper.h

@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+#import <Foundation/Foundation.h>
+
+#ifdef __cplusplus
+
+#import <jsinspector-modern/ReactCdp.h>
+
+typedef facebook::react::jsinspector_modern::NetworkRequestListener RCTInspectorNetworkListener;
+
+typedef facebook::react::jsinspector_modern::ScopedExecutor<RCTInspectorNetworkListener> RCTInspectorNetworkExecutor;
+
+typedef facebook::react::jsinspector_modern::LoadNetworkResourceRequest RCTInspectorLoadNetworkResourceRequest;
+
+/**
+ * A helper class that wraps around NSURLSession to make network requests.
+ */
+@interface RCTInspectorNetworkHelper : NSObject
+- (instancetype)init;
+- (void)loadNetworkResourceWithParams:(const RCTInspectorLoadNetworkResourceRequest &)params
+                             executor:(RCTInspectorNetworkExecutor)executor;
+@end
+
+#endif

package/React/DevSupport/RCTInspectorNetworkHelper.mm

@@ -0,0 +1,115 @@
+/*
+ * 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.
+ */
+
+#import "RCTInspectorNetworkHelper.h"
+#import <React/RCTLog.h>
+
+typedef void (^ListenerBlock)(RCTInspectorNetworkListener *);
+
+@interface RCTInspectorNetworkHelper () <NSURLSessionDataDelegate>
+@property (nonatomic, strong) NSURLSession *session;
+@property (nonatomic, strong) NSMutableDictionary<NSNumber *, void (^)(ListenerBlock)> *executorsByTaskId;
+- (void)withListenerForTask:(NSURLSessionTask *)task execute:(ListenerBlock)block;
+@end
+
+@implementation RCTInspectorNetworkHelper
+
+- (instancetype)init
+{
+  self = [super init];
+  if (self) {
+    NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
+    self.session = [NSURLSession sessionWithConfiguration:configuration delegate:self delegateQueue:nil];
+    self.executorsByTaskId = [NSMutableDictionary new];
+  }
+  return self;
+}
+
+- (void)loadNetworkResourceWithParams:(const RCTInspectorLoadNetworkResourceRequest &)params
+                             executor:(RCTInspectorNetworkExecutor)executor
+{
+  NSString *urlString = [NSString stringWithCString:params.url.c_str() encoding:NSUTF8StringEncoding];
+  NSURL *url = [NSURL URLWithString:urlString];
+  auto executorBlock = ^(ListenerBlock func) {
+    executor([=](RCTInspectorNetworkListener &listener) { func(&listener); });
+  };
+
+  if (url == nil) {
+    executorBlock(^(RCTInspectorNetworkListener *listener) {
+      listener->onError([NSString stringWithFormat:@"Not a valid URL: %@", urlString].UTF8String);
+    });
+    return;
+  }
+
+  NSMutableURLRequest *urlRequest = [NSMutableURLRequest requestWithURL:url];
+  [urlRequest setHTTPMethod:@"GET"];
+  NSURLSessionDataTask *dataTask = [self.session dataTaskWithRequest:urlRequest];
+  __weak NSURLSessionDataTask *weakDataTask = dataTask;
+
+  executorBlock(^(RCTInspectorNetworkListener *listener) {
+    listener->setCancelFunction([weakDataTask]() { [weakDataTask cancel]; });
+  });
+
+  // Store the executor as a block per task.
+  self.executorsByTaskId[@(dataTask.taskIdentifier)] = executorBlock;
+
+  [dataTask resume];
+}
+
+- (void)withListenerForTask:(NSURLSessionTask *)task execute:(ListenerBlock)block
+{
+  void (^executor)(ListenerBlock) = self.executorsByTaskId[@(task.taskIdentifier)];
+  if (executor) {
+    executor(block);
+  }
+}
+
+#pragma mark - NSURLSessionDataDelegate
+
+- (void)URLSession:(NSURLSession *)session
+              dataTask:(NSURLSessionDataTask *)dataTask
+    didReceiveResponse:(NSURLResponse *)response
+     completionHandler:(void (^)(NSURLSessionResponseDisposition disposition))completionHandler
+{
+  auto callbackWithHeadersOrError = (^(RCTInspectorNetworkListener *listener) {
+    if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
+      NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response;
+      std::map<std::string, std::string> headersMap;
+      for (NSString *key in httpResponse.allHeaderFields) {
+        headersMap[[key UTF8String]] = [[httpResponse.allHeaderFields objectForKey:key] UTF8String];
+      }
+      completionHandler(NSURLSessionResponseAllow);
+      listener->onHeaders(httpResponse.statusCode, headersMap);
+    } else {
+      listener->onError("Unsupported response type");
+      completionHandler(NSURLSessionResponseCancel);
+    }
+  });
+  [self withListenerForTask:dataTask execute:callbackWithHeadersOrError];
+}
+
+- (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask didReceiveData:(NSData *)data
+{
+  auto callbackWithData = ^(RCTInspectorNetworkListener *listener) {
+    listener->onData(std::string_view(static_cast<const char *>(data.bytes), data.length));
+  };
+  [self withListenerForTask:dataTask execute:callbackWithData];
+}
+
+- (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCompleteWithError:(NSError *)error
+{
+  auto callbackWithCompletionOrError = ^(RCTInspectorNetworkListener *listener) {
+    if (error != nil) {
+      listener->onError(error.localizedDescription.UTF8String);
+    } else {
+      listener->onCompletion();
+    }
+  };
+  [self withListenerForTask:task execute:callbackWithCompletionOrError];
+}
+
+@end

package/React/DevSupport/RCTInspectorUtils.h

@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+#import <Foundation/Foundation.h>
+
+// This is a subset of jsinspector_modern::HostTargetMetadata with ObjC types,
+// containing the members implemented by getHostMetadata.
+@interface CommonHostMetadata : NSObject
+
+@property (nonatomic, strong) NSString *appDisplayName;
+@property (nonatomic, strong) NSString *appIdentifier;
+@property (nonatomic, strong) NSString *deviceName;
+@property (nonatomic, strong) NSString *platform;
+@property (nonatomic, strong) NSString *reactNativeVersion;
+
+@end
+
+@interface RCTInspectorUtils : NSObject
+
++ (CommonHostMetadata *)getHostMetadata;
+
+@end

package/React/DevSupport/RCTInspectorUtils.mm

@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+
+#import "RCTInspectorUtils.h"
+
+#import <React/RCTConstants.h>
+#import <React/RCTVersion.h>
+#import <UIKit/UIKit.h>
+
+@implementation CommonHostMetadata
+@end
+
+@implementation RCTInspectorUtils
+
++ (CommonHostMetadata *)getHostMetadata
+{
+#if TARGET_OS_IPHONE
+  UIDevice *device = [UIDevice currentDevice];
+  NSString *deviceName = [device name];
+#else
+  // macOS does not support UIDevice. Use System Configuration. This API
+  // returns a nullable value, but is non-blocking (compared with
+  // `[NSHost currentHost]`) and is ideal since deviceName is optional.
+  NSString *deviceName = (__bridge NSString *)SCDynamicStoreCopyComputerName(nil, nil);
+#endif // TARGET_OS_IPHONE
+
+  auto version = RCTGetReactNativeVersion();
+
+  CommonHostMetadata *metadata = [[CommonHostMetadata alloc] init];
+
+  metadata.appDisplayName = [[[NSBundle mainBundle] infoDictionary] objectForKey:(NSString *)kCFBundleNameKey];
+  metadata.appIdentifier = [[NSBundle mainBundle] bundleIdentifier];
+  metadata.platform = RCTPlatformName;
+  metadata.deviceName = deviceName;
+  metadata.reactNativeVersion = [NSString stringWithFormat:@"%i.%i.%i%@",
+                                                           [version[@"major"] intValue],
+                                                           [version[@"minor"] intValue],
+                                                           [version[@"patch"] intValue],
+                                                           [version[@"prerelease"] isKindOfClass:[NSNull class]]
+                                                               ? @""
+                                                               : [@"-" stringByAppendingString:version[@"prerelease"]]];
+
+  return metadata;
+}
+
+@end

package/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm

@@ -136,7 +136,10 @@ using namespace facebook::react;
     return;
   }
 
-  static_cast<const ImageEventEmitter &>(*_eventEmitter).onLoad(_state->getData().getImageSource());
+  auto imageSource = _state->getData().getImageSource();
+  imageSource.size = {image.size.width, image.size.height};
+
+  static_cast<const ImageEventEmitter &>(*_eventEmitter).onLoad(imageSource);
   static_cast<const ImageEventEmitter &>(*_eventEmitter).onLoadEnd();
 
   const auto &imageProps = static_cast<const ImageProps &>(*_props);

package/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm

@@ -38,7 +38,7 @@
 
 - (void)loadView
 {
-  [super loadView];
+  self.view = [UIView new];
   [_touchHandler attachToView:self.view];
 }
 
@@ -73,7 +73,7 @@
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations
 {
   UIInterfaceOrientationMask appSupportedOrientationsMask =
-      [RCTSharedApplication() supportedInterfaceOrientationsForWindow:[RCTSharedApplication() keyWindow]];
+      [RCTSharedApplication() supportedInterfaceOrientationsForWindow:RCTKeyWindow()];
   if (!(_supportedInterfaceOrientations & appSupportedOrientationsMask)) {
     RCTLogError(
         @"Modal was presented with 0x%x orientations mask but the application only supports 0x%x."

package/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm

@@ -189,7 +189,9 @@ static ModalHostViewEventEmitter::OnOrientationChange onOrientationChangeStruct(
                    completion:(void (^)(void))completion
 {
   UIViewController *controller = [self reactViewController];
-  [controller presentViewController:modalViewController animated:animated completion:completion];
+  [[self _topMostViewControllerFrom:controller] presentViewController:modalViewController
+                                                             animated:animated
+                                                           completion:completion];
 }
 
 - (void)dismissViewController:(UIViewController *)modalViewController
@@ -329,6 +331,26 @@ static ModalHostViewEventEmitter::OnOrientationChange onOrientationChangeStruct(
   [childComponentView removeFromSuperview];
 }
 
+#pragma mark - Private
+
+- (UIViewController *)_topMostViewControllerFrom:(UIViewController *)rootViewController
+{
+  UIViewController *topController = rootViewController;
+  while (topController.presentedViewController) {
+    topController = topController.presentedViewController;
+  }
+  if ([topController isKindOfClass:[UINavigationController class]]) {
+    UINavigationController *navigationController = (UINavigationController *)topController;
+    topController = navigationController.visibleViewController;
+    return [self _topMostViewControllerFrom:topController];
+  } else if ([topController isKindOfClass:[UITabBarController class]]) {
+    UITabBarController *tabBarController = (UITabBarController *)topController;
+    topController = tabBarController.selectedViewController;
+    return [self _topMostViewControllerFrom:topController];
+  }
+  return topController;
+}
+
 @end
 
 #ifdef __cplusplus

package/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h

@@ -35,6 +35,9 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, strong, readonly) UIScrollView *scrollView;
 
+/** Focus area of newly-activated text input relative to the window to compare against UIKeyboardFrameBegin/End */
+@property (nonatomic, assign) CGRect firstResponderFocus;
+
 /*
  * Returns the subview of the scroll view that the component uses to mount all subcomponents into. That's useful to
  * separate component views from auxiliary views to be able to reliably implement pull-to-refresh- and RTL-related
@@ -59,4 +62,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@interface UIView (RCTScrollViewComponentView)
+
+- (void)reactUpdateResponderOffsetForScrollView:(RCTScrollViewComponentView *)scrollView;
+
+@end
+
 NS_ASSUME_NONNULL_END