react-native-tvos 0.84.1-0 → 0.85.0-0

package/React/CoreModules/RCTActionSheetManager.mm

@@ -7,17 +7,20 @@
 
 #import <React/RCTActionSheetManager.h>
 
+#import <FBReactNativeSpec/FBReactNativeSpec.h>
+
+#import "CoreModulesPlugins.h"
+
+#if !TARGET_OS_TV
+
 #import <React/RCTBridge.h>
 #import <React/RCTConvert.h>
 #import <React/RCTLog.h>
 #import <React/RCTUIManager.h>
 #import <React/RCTUtils.h>
 
-#import <FBReactNativeSpec/FBReactNativeSpec.h>
 #import <RCTTypeSafety/RCTConvertHelpers.h>
 
-#import "CoreModulesPlugins.h"
-
 using namespace facebook::react;
 
 #if TARGET_OS_TV
@@ -321,6 +324,28 @@ RCT_EXPORT_METHOD(
 
 @end
 
+#else
+
+using namespace facebook::react;
+
+@implementation RCTActionSheetManager
+
+RCT_EXPORT_MODULE()
+
++ (BOOL)requiresMainQueueSetup
+{
+  return NO;
+}
+
+- (std::shared_ptr<TurboModule>)getTurboModule:(const ObjCTurboModule::InitParams &)params
+{
+  return std::make_shared<NativeActionSheetManagerSpecJSI>(params);
+}
+
+@end
+
+#endif
+
 Class RCTActionSheetManagerCls(void)
 {
   return RCTActionSheetManager.class;

package/React/CoreModules/RCTClipboard.mm

@@ -30,17 +30,17 @@ RCT_EXPORT_METHOD(setString : (NSString *)content)
 {
 #if !TARGET_OS_TV
   UIPasteboard *clipboard = [UIPasteboard generalPasteboard];
-  clipboard.string = (content ? : @"");
+  clipboard.string = (content ?: @"");
 #endif
 }
 
 RCT_EXPORT_METHOD(getString : (RCTPromiseResolveBlock)resolve reject : (__unused RCTPromiseRejectBlock)reject)
 {
-#if TARGET_OS_TV
-    resolve(@"");
-#else
+#if !TARGET_OS_TV
   UIPasteboard *clipboard = [UIPasteboard generalPasteboard];
-  resolve((clipboard.string ? : @""));
+  resolve((clipboard.string ?: @""));
+#else
+  resolve(@"");
 #endif
 }
 

package/React/CoreModules/RCTDevLoadingView.mm

@@ -158,7 +158,7 @@ RCT_EXPORT_MODULE()
       buttonConfig.background.cornerRadius = 10;
       buttonConfig.baseForegroundColor = color;
 
-      // Button is a visual cue to tap anywhere on the banner to dismiss so no seperate action is needed
+      // Button is a visual cue to tap anywhere on the banner to dismiss so no separate action is needed
       self->_dismissButton = [UIButton buttonWithConfiguration:buttonConfig primaryAction:nil];
       self->_dismissButton.userInteractionEnabled = NO;
       self->_dismissButton.translatesAutoresizingMaskIntoConstraints = NO;

package/React/CoreModules/RCTDevSettings.mm

@@ -36,6 +36,14 @@ static NSString *const kRCTDevSettingsUserDefaultsKey = @"RCTDevMenu";
 #import <React/RCTPackagerConnection.h>
 #endif
 
+#ifndef RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
+#if RCT_DEV && (__has_include("RCTPackagerConnection.h") || __has_include(<React/RCTPackagerConnection.h>))
+#define RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION 1
+#else
+#define RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION 0
+#endif
+#endif
+
 #if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
 #import <React/RCTPackagerClient.h>
 #endif

package/React/CoreModules/RCTDeviceInfo.mm

@@ -25,7 +25,7 @@ using namespace facebook::react;
 @end
 
 @implementation RCTDeviceInfo {
-#if !TARGET_OS_TV
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
   UIInterfaceOrientation _currentInterfaceOrientation;
 #endif
   NSDictionary *_currentInterfaceDimensions;
@@ -109,10 +109,11 @@ RCT_EXPORT_MODULE()
                                              object:nil];
 #endif
 
-#if TARGET_OS_IOS
-
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
   _currentInterfaceOrientation = RCTKeyWindow().windowScene.interfaceOrientation;
+#endif
 
+#if TARGET_OS_IOS
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(interfaceFrameDidChange)
                                                name:UIDeviceOrientationDidChangeNotification

package/React/CoreModules/RCTKeyboardObserver.mm

@@ -25,7 +25,6 @@ RCT_EXPORT_MODULE()
 - (void)startObserving
 {
 #if !TARGET_OS_TV
-
   NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
 
 #define ADD_KEYBOARD_HANDLER(NAME, SELECTOR) [nc addObserver:self selector:@selector(SELECTOR:) name:NAME object:nil]
@@ -38,7 +37,6 @@ RCT_EXPORT_MODULE()
   ADD_KEYBOARD_HANDLER(UIKeyboardDidChangeFrameNotification, keyboardDidChangeFrame);
 
 #undef ADD_KEYBOARD_HANDLER
-
 #endif
 }
 
@@ -86,6 +84,7 @@ IMPLEMENT_KEYBOARD_HANDLER(keyboardDidChangeFrame)
 
 @end
 
+#if !TARGET_OS_TV
 NS_INLINE NSDictionary *RCTRectDictionaryValue(CGRect rect)
 {
   return @{
@@ -140,6 +139,14 @@ static NSDictionary *RCTParseKeyboardNotification(NSNotification *notification)
 #endif
 }
 
+#else
+static NSDictionary *RCTParseKeyboardNotification(NSNotification *notification)
+{
+  return @{};
+}
+
+#endif
+
 Class RCTKeyboardObserverCls(void)
 {
   return RCTKeyboardObserver.class;

package/React/CoreModules/RCTLogBoxView.mm

@@ -20,12 +20,10 @@
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if ((self = [super initWithFrame:frame]) != nullptr) {
-#if TARGET_OS_TV
-      self.windowLevel = UIWindowLevelNormal;
-#else
-      self.windowLevel = UIWindowLevelStatusBar - 1;
+#if !TARGET_OS_TV
+    self.windowLevel = UIWindowLevelStatusBar - 1;
 #endif
-      self.backgroundColor = [UIColor clearColor];
+    self.backgroundColor = [UIColor clearColor];
   }
   return self;
 }
@@ -44,9 +42,7 @@
 {
   self = [super initWithWindowScene:window.windowScene];
 
-#if TARGET_OS_TV
-  self.windowLevel = UIWindowLevelNormal;
-#else
+#if !TARGET_OS_TV
   self.windowLevel = UIWindowLevelStatusBar - 1;
 #endif
   self.backgroundColor = [UIColor clearColor];

package/React/CoreModules/RCTPerfMonitor.mm

@@ -180,6 +180,11 @@ RCT_EXPORT_MODULE()
     [_container addGestureRecognizer:self.gestureRecognizer];
     [_container addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tap)]];
 
+#if TARGET_OS_TV
+    _container.backgroundColor = [UIColor whiteColor];
+#else
+    _container.backgroundColor = [UIColor systemBackgroundColor];
+#endif
   }
 
   return _container;

package/React/CoreModules/RCTStatusBarManager.h

@@ -10,6 +10,7 @@
 #import <React/RCTConvert.h>
 #import <React/RCTEventEmitter.h>
 
+#if !TARGET_OS_TV
 @interface RCTConvert (UIStatusBar)
 
 #if !TARGET_OS_TV
@@ -18,6 +19,7 @@
 #endif
 
 @end
+#endif
 
 @interface RCTStatusBarManager : RCTEventEmitter
 

package/React/CoreModules/RCTWebSocketModule.h

@@ -18,6 +18,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@class SRWebSocket;
+
+typedef SRWebSocket * (^SRWebSocketProvider)(NSURLRequest *request);
+
+RCT_EXTERN void RCTSetCustomSRWebSocketProvider(SRWebSocketProvider provider);
+
 @interface RCTWebSocketModule : RCTEventEmitter
 
 // Register a custom handler for a specific websocket. The handler will be strongly held by the WebSocketModule.

package/React/CoreModules/RCTWebSocketModule.mm

@@ -34,6 +34,13 @@
 
 @end
 
+static SRWebSocketProvider srWebSocketProvider;
+
+void RCTSetCustomSRWebSocketProvider(SRWebSocketProvider provider)
+{
+  srWebSocketProvider = provider;
+}
+
 @implementation RCTWebSocketModule {
   NSMutableDictionary<NSNumber *, SRWebSocket *> *_sockets;
   NSMutableDictionary<NSNumber *, id<RCTWebSocketContentHandler>> *_contentHandlers;
@@ -88,7 +95,13 @@ RCT_EXPORT_METHOD(
     }];
   }
 
-  SRWebSocket *webSocket = [[SRWebSocket alloc] initWithURLRequest:request protocols:protocols];
+  SRWebSocket *webSocket;
+  if (srWebSocketProvider != nullptr) {
+    webSocket = srWebSocketProvider(request);
+  }
+  if (webSocket == nil) {
+    webSocket = [[SRWebSocket alloc] initWithURLRequest:request protocols:protocols];
+  }
   [webSocket setDelegateDispatchQueue:[self methodQueue]];
   webSocket.delegate = self;
   webSocket.reactTag = @(socketID);

package/React/DevSupport/RCTInspectorDevServerHelper.mm

@@ -14,33 +14,39 @@
 
 #import <React/RCTCxxInspectorPackagerConnection.h>
 #import <React/RCTDefines.h>
+#import <React/RCTDevSupportHttpHeaders.h>
 
 #import <CommonCrypto/CommonCrypto.h>
 #import <jsinspector-modern/InspectorFlags.h>
 
 static NSString *const kDebuggerMsgDisable = @"{ \"id\":1,\"method\":\"Debugger.disable\" }";
+static const int kDefaultMetroPort = 8081;
 
 static NSString *getServerHost(NSURL *bundleURL)
 {
-  NSNumber *port = @8081;
-  NSString *portStr = [[[NSProcessInfo processInfo] environment] objectForKey:@"RCT_METRO_PORT"];
-  if ((portStr != nullptr) && [portStr length] > 0) {
-    port = [NSNumber numberWithInt:[portStr intValue]];
-  }
-  if ([bundleURL port] != nullptr) {
-    port = [bundleURL port];
-  }
   NSString *host = [bundleURL host];
   if (host == nullptr) {
     host = @"localhost";
   }
 
-  // this is consistent with the Android implementation, where http:// is the
-  // hardcoded implicit scheme for the debug server. Note, packagerURL
-  // technically looks like it could handle schemes/protocols other than HTTP,
-  // so rather than force HTTP, leave it be for now, in case someone is relying
-  // on that ability when developing against iOS.
-  return [NSString stringWithFormat:@"%@:%@", host, port];
+  // Use explicit port from URL if available
+  if ([bundleURL port] != nullptr) {
+    return [NSString stringWithFormat:@"%@:%@", host, [bundleURL port]];
+  }
+
+  // Check environment variable
+  NSString *portStr = [[[NSProcessInfo processInfo] environment] objectForKey:@"RCT_METRO_PORT"];
+  if ((portStr != nullptr) && [portStr length] > 0) {
+    return [NSString stringWithFormat:@"%@:%@", host, portStr];
+  }
+
+  // For https, omit port — the scheme implies 443
+  if ([[bundleURL scheme] isEqualToString:@"https"]) {
+    return host;
+  }
+
+  // Default to 8081 for local development (Metro's default port)
+  return [NSString stringWithFormat:@"%@:%d", host, kDefaultMetroPort];
 }
 
 static NSString *getSHA256(NSString *string)
@@ -111,13 +117,15 @@ static NSURL *getInspectorDeviceUrl(NSURL *bundleURL)
   NSString *escapedInspectorDeviceId = [getInspectorDeviceId()
       stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLQueryAllowedCharacterSet];
 
-  return [NSURL
-      URLWithString:[NSString stringWithFormat:@"http://%@/inspector/device?name=%@&app=%@&device=%@&profiling=%@",
-                                               getServerHost(bundleURL),
-                                               escapedDeviceName,
-                                               escapedAppName,
-                                               escapedInspectorDeviceId,
-                                               isProfilingBuild ? @"true" : @"false"]];
+  NSString *scheme = [bundleURL scheme] != nullptr ? [bundleURL scheme] : @"http";
+  return
+      [NSURL URLWithString:[NSString stringWithFormat:@"%@://%@/inspector/device?name=%@&app=%@&device=%@&profiling=%@",
+                                                      scheme,
+                                                      getServerHost(bundleURL),
+                                                      escapedDeviceName,
+                                                      escapedAppName,
+                                                      escapedInspectorDeviceId,
+                                                      isProfilingBuild ? @"true" : @"false"]];
 }
 
 @implementation RCTInspectorDevServerHelper
@@ -149,11 +157,14 @@ static void sendEventToAllConnections(NSString *event)
   NSString *escapedInspectorDeviceId = [getInspectorDeviceId()
       stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLQueryAllowedCharacterSet];
 
-  NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"http://%@/open-debugger?device=%@",
+  NSString *scheme = [bundleURL scheme] != nullptr ? [bundleURL scheme] : @"http";
+  NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"%@://%@/open-debugger?device=%@",
+                                                               scheme,
                                                                getServerHost(bundleURL),
                                                                escapedInspectorDeviceId]];
   NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url];
   [request setHTTPMethod:@"POST"];
+  [[RCTDevSupportHttpHeaders sharedInstance] applyHeadersToRequest:request];
 
   [[[NSURLSession sharedSession]
       dataTaskWithRequest:request

package/React/DevSupport/RCTInspectorNetworkHelper.mm

@@ -6,6 +6,7 @@
  */
 
 #import "RCTInspectorNetworkHelper.h"
+#import <React/RCTDevSupportHttpHeaders.h>
 #import <React/RCTLog.h>
 
 using ListenerBlock = void (^)(RCTInspectorNetworkListener *);
@@ -47,6 +48,7 @@ using ListenerBlock = void (^)(RCTInspectorNetworkListener *);
 
   NSMutableURLRequest *urlRequest = [NSMutableURLRequest requestWithURL:url];
   [urlRequest setHTTPMethod:@"GET"];
+  [[RCTDevSupportHttpHeaders sharedInstance] applyHeadersToRequest:urlRequest];
   NSURLSessionDataTask *dataTask = [self.session dataTaskWithRequest:urlRequest];
   __weak NSURLSessionDataTask *weakDataTask = dataTask;