react-native-tvos 0.83.1-1 → 0.84.0-0

package/React/Base/RCTBundleURLProvider.h

@@ -7,6 +7,7 @@
 
 #import <Foundation/Foundation.h>
 
+#import "RCTBundleManager.h"
 #import "RCTDefines.h"
 
 RCT_EXTERN NSString *_Nonnull const RCTBundleURLProviderUpdatedNotification;
@@ -88,6 +89,16 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (NSURL *__nullable)jsBundleURLForFallbackExtension:(NSString *__nullable)extension;
 
+/**
+ * Returns the jsBundleURL for a given bundle entrypoint,
+ * the packager scheme, server host and options updater
+ * for modifying default packager options.
+ */
+- (NSURL *__nullable)jsBundleURLForBundleRoot:(NSString *)bundleRoot
+                         packagerServerScheme:(NSString *)packagerServerScheme
+                           packagerServerHost:(NSString *)packagerServerHost
+                       packagerOptionsUpdater:(RCTPackagerOptionsUpdater)packagerOptionsUpdater;
+
 /**
  * Returns the resourceURL for a given bundle entrypoint and
  * the fallback offline resource file if the packager is not running.
@@ -97,6 +108,19 @@ NS_ASSUME_NONNULL_BEGIN
                               resourceExtension:(NSString *)extension
                                   offlineBundle:(NSBundle *)offlineBundle;
 
+/**
+ * Returns the query items for given options used to create the jsBundleURL.
+ */
++ (NSArray<NSURLQueryItem *> *)createJSBundleURLQuery:(NSString *)packagerHost
+                                       packagerScheme:(NSString *__nullable)scheme
+                                            enableDev:(BOOL)enableDev
+                                   enableMinification:(BOOL)enableMinification
+                                      inlineSourceMap:(BOOL)inlineSourceMap
+                                          modulesOnly:(BOOL)modulesOnly
+                                            runModule:(BOOL)runModule
+                                    additionalOptions:
+                                        (NSDictionary<NSString *, NSString *> *__nullable)additionalOptions;
+
 /**
  * The IP address or hostname of the packager.
  */

package/React/Base/RCTBundleURLProvider.mm

@@ -313,6 +313,54 @@ static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme)
                             additionalOptions:(NSDictionary<NSString *, NSString *> *__nullable)additionalOptions
 {
   NSString *path = [NSString stringWithFormat:@"/%@.bundle", bundleRoot];
+  NSArray<NSURLQueryItem *> *queryItems = [self createJSBundleURLQuery:packagerHost
+                                                        packagerScheme:scheme
+                                                             enableDev:enableDev
+                                                    enableMinification:enableMinification
+                                                       inlineSourceMap:inlineSourceMap
+                                                           modulesOnly:modulesOnly
+                                                             runModule:runModule
+                                                     additionalOptions:additionalOptions];
+
+  return [RCTBundleURLProvider resourceURLForResourcePath:path
+                                             packagerHost:packagerHost
+                                                   scheme:scheme
+                                               queryItems:[queryItems copy]];
+}
+
+- (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
+               packagerServerScheme:(NSString *)packagerServerScheme
+                 packagerServerHost:(NSString *)packagerServerHost
+             packagerOptionsUpdater:(RCTPackagerOptionsUpdater)packagerOptionsUpdater
+{
+  NSArray<NSURLQueryItem *> *queryItems = [RCTBundleURLProvider createJSBundleURLQuery:packagerServerHost
+                                                                        packagerScheme:packagerServerScheme
+                                                                             enableDev:[self enableDev]
+                                                                    enableMinification:[self enableMinification]
+                                                                       inlineSourceMap:[self inlineSourceMap]
+                                                                           modulesOnly:NO
+                                                                             runModule:YES
+                                                                     additionalOptions:nil];
+
+  NSArray<NSURLQueryItem *> *updatedQueryItems = packagerOptionsUpdater((NSMutableArray *)queryItems);
+  NSString *path = [NSString stringWithFormat:@"/%@.bundle", bundleRoot];
+
+  return [RCTBundleURLProvider resourceURLForResourcePath:path
+                                             packagerHost:packagerServerHost
+                                                   scheme:packagerServerScheme
+                                               queryItems:updatedQueryItems];
+}
+
++ (NSArray<NSURLQueryItem *> *)createJSBundleURLQuery:(NSString *)packagerHost
+                                       packagerScheme:(NSString *__nullable)scheme
+                                            enableDev:(BOOL)enableDev
+                                   enableMinification:(BOOL)enableMinification
+                                      inlineSourceMap:(BOOL)inlineSourceMap
+                                          modulesOnly:(BOOL)modulesOnly
+                                            runModule:(BOOL)runModule
+                                    additionalOptions:
+                                        (NSDictionary<NSString *, NSString *> *__nullable)additionalOptions
+{
   BOOL lazy = enableDev;
   NSMutableArray<NSURLQueryItem *> *queryItems = [[NSMutableArray alloc] initWithArray:@[
     [[NSURLQueryItem alloc] initWithName:@"platform" value:RCTPlatformName],
@@ -345,10 +393,7 @@ static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme)
     }
   }
 
-  return [[self class] resourceURLForResourcePath:path
-                                     packagerHost:packagerHost
-                                           scheme:scheme
-                                       queryItems:[queryItems copy]];
+  return queryItems;
 }
 
 + (NSURL *)resourceURLForResourcePath:(NSString *)path

package/React/Base/RCTConvert.mm

@@ -517,6 +517,7 @@ RCT_ENUM_CONVERTER(
     }),
     UIUserInterfaceStyleUnspecified,
     integerValue)
+
 #if !TARGET_OS_TV
 RCT_ENUM_CONVERTER(
     UIInterfaceOrientationMask,
@@ -530,6 +531,7 @@ RCT_ENUM_CONVERTER(
     NSNotFound,
     unsignedIntegerValue)
 #endif
+
 RCT_ENUM_CONVERTER(
     UIModalPresentationStyle,
     (@{

package/React/Base/RCTModuleData.mm

@@ -241,7 +241,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init);
     RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"[RCTModuleData setBridgeForInstance]", nil);
     @try {
       [(id)_instance setValue:_bridge forKey:@"bridge"];
-    } @catch (NSException *exception) {
+    } @catch (NSException *) {
       RCTLogError(
           @"%@ has no setter or ivar for its bridge, which is not "
            "permitted. You must either @synthesize the bridge property, "
@@ -291,7 +291,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init);
       if (implementsMethodQueue) {
         @try {
           [(id)_instance setValue:_methodQueue forKey:@"methodQueue"];
-        } @catch (NSException *exception) {
+        } @catch (NSException *) {
           RCTLogError(
               @"%@ is returning nil for its methodQueue, which is not "
                "permitted. You must either return a pre-initialized "

package/React/Base/RCTUtils.h

@@ -134,6 +134,10 @@ RCT_EXTERN NSURL *RCTDataURL(NSString *mimeType, NSData *data);
 // Gzip functionality - compression level in range 0 - 1 (-1 for default)
 RCT_EXTERN NSData *__nullable RCTGzipData(NSData *__nullable data, float level);
 
+// Gzip decompression - maxDecompressedSize of 0 means no limit, returns nil if
+// limit exceeded or decompression fails
+RCT_EXTERN NSData *__nullable RCTDecompressGzipData(NSData *__nullable data, NSUInteger maxDecompressedSize);
+
 // Returns the relative path within the main bundle for an absolute URL
 // (or nil, if the URL does not specify a path within the main bundle)
 RCT_EXTERN NSString *__nullable RCTBundlePathForURL(NSURL *__nullable URL);

package/React/Base/RCTUtils.mm

@@ -722,13 +722,15 @@ NSURL *RCTDataURL(NSString *mimeType, NSData *data)
                                                [data base64EncodedStringWithOptions:(NSDataBase64EncodingOptions)0]]];
 }
 
-BOOL RCTIsGzippedData(NSData *__nullable /*data*/); // exposed for unit testing purposes
+extern "C" BOOL RCTIsGzippedData(NSData *__nullable /*data*/); // exposed for unit testing purposes
 BOOL RCTIsGzippedData(NSData *__nullable data)
 {
   UInt8 *bytes = (UInt8 *)data.bytes;
   return (data.length >= 2 && bytes[0] == 0x1f && bytes[1] == 0x8b);
 }
 
+static const NSUInteger RCTGZipChunkSize = 16384;
+
 NSData *__nullable RCTGzipData(NSData *__nullable input, float level)
 {
   if (input.length == 0 || RCTIsGzippedData(input)) {
@@ -755,8 +757,6 @@ NSData *__nullable RCTGzipData(NSData *__nullable input, float level)
   stream.total_out = 0;
   stream.avail_out = 0;
 
-  static const NSUInteger RCTGZipChunkSize = 16384;
-
   NSMutableData *output = nil;
   int compression = (level < 0.0f) ? Z_DEFAULT_COMPRESSION : (int)(roundf(level * 9));
   if (deflateInit2(&stream, compression, Z_DEFLATED, 31, 8, Z_DEFAULT_STRATEGY) == Z_OK) {
@@ -778,6 +778,63 @@ NSData *__nullable RCTGzipData(NSData *__nullable input, float level)
   return output;
 }
 
+NSData *__nullable RCTDecompressGzipData(NSData *__nullable data, NSUInteger maxDecompressedSize)
+{
+  if (data.length == 0 || !RCTIsGzippedData(data)) {
+    return data;
+  }
+
+  void *libz = dlopen("/usr/lib/libz.dylib", RTLD_LAZY);
+
+  using InflateInit2_ = int (*)(z_streamp, int, const char *, int);
+  InflateInit2_ inflateInit2_ = (InflateInit2_)dlsym(libz, "inflateInit2_");
+
+  using Inflate = int (*)(z_streamp, int);
+  Inflate inflate = (Inflate)dlsym(libz, "inflate");
+
+  using InflateEnd = int (*)(z_streamp);
+  InflateEnd inflateEnd = (InflateEnd)dlsym(libz, "inflateEnd");
+
+  z_stream stream;
+  stream.zalloc = Z_NULL;
+  stream.zfree = Z_NULL;
+  stream.opaque = Z_NULL;
+  stream.avail_in = (uint)data.length;
+  stream.next_in = (Bytef *)data.bytes;
+  stream.total_out = 0;
+  stream.avail_out = 0;
+
+  NSMutableData *output = nil;
+  // Use 31 for windowBits to enable gzip decoding (15 + 16)
+  if (inflateInit2(&stream, 31) == Z_OK) {
+    output = [NSMutableData dataWithLength:RCTGZipChunkSize];
+    int status = Z_OK;
+    while (status == Z_OK) {
+      if (stream.total_out >= output.length) {
+        output.length += RCTGZipChunkSize;
+      }
+      if (maxDecompressedSize > 0 && stream.total_out >= maxDecompressedSize) {
+        inflateEnd(&stream);
+        dlclose(libz);
+        return nil;
+      }
+      stream.next_out = (uint8_t *)output.mutableBytes + stream.total_out;
+      stream.avail_out = (uInt)(output.length - stream.total_out);
+      status = inflate(&stream, Z_SYNC_FLUSH);
+    }
+    inflateEnd(&stream);
+    if (status != Z_STREAM_END) {
+      dlclose(libz);
+      return nil;
+    }
+    output.length = stream.total_out;
+  }
+
+  dlclose(libz);
+
+  return output;
+}
+
 static NSString *RCTRelativePathForURL(NSString *basePath, NSURL *__nullable URL)
 {
   if (!URL.fileURL) {

package/React/Base/RCTVersion.m

@@ -22,9 +22,9 @@ NSDictionary* RCTGetReactNativeVersion(void)
   dispatch_once(&onceToken, ^(void){
     __rnVersion = @{
                   RCTVersionMajor: @(0),
-                  RCTVersionMinor: @(83),
-                  RCTVersionPatch: @(1),
-                  RCTVersionPrerelease: @"1",
+                  RCTVersionMinor: @(84),
+                  RCTVersionPatch: @(0),
+                  RCTVersionPrerelease: @"0",
                   };
   });
   return __rnVersion;

package/React/CoreModules/CoreModulesPlugins.mm

@@ -13,45 +13,107 @@
 
 #import "CoreModulesPlugins.h"
 
-#import <string>
-#import <unordered_map>
+#import <string_view>
+
+using namespace std::literals;
+
+Class RCTCoreModulesClassProvider(const char *name)
+{
+
+  if (name == "AccessibilityManager"sv) {
+    return RCTAccessibilityManagerCls();
+  }
 
-Class RCTCoreModulesClassProvider(const char *name) {
-  // Intentionally leak to avoid crashing after static destructors are run.
-  static const auto sCoreModuleClassMap = new const std::unordered_map<std::string, Class (*)(void)>{
-    {"AccessibilityManager", RCTAccessibilityManagerCls},
 #if !TARGET_OS_TV
-    {"ActionSheetManager", RCTActionSheetManagerCls},
+  if (name == "ActionSheetManager"sv) {
+    return RCTActionSheetManagerCls();
+  }
 #endif
-    {"AlertManager", RCTAlertManagerCls},
-    {"AppState", RCTAppStateCls},
-    {"Appearance", RCTAppearanceCls},
-    {"Clipboard", RCTClipboardCls},
-    {"DevLoadingView", RCTDevLoadingViewCls},
-    {"DevMenu", RCTDevMenuCls},
-    {"DevSettings", RCTDevSettingsCls},
-    {"DeviceInfo", RCTDeviceInfoCls},
-    {"EventDispatcher", RCTEventDispatcherCls},
-    {"ExceptionsManager", RCTExceptionsManagerCls},
-    {"I18nManager", RCTI18nManagerCls},
-    {"KeyboardObserver", RCTKeyboardObserverCls},
-    {"LogBox", RCTLogBoxCls},
-    {"PerfMonitor", RCTPerfMonitorCls},
-    {"PlatformConstants", RCTPlatformCls},
-    {"RedBox", RCTRedBoxCls},
-    {"SourceCode", RCTSourceCodeCls},
-    {"StatusBarManager", RCTStatusBarManagerCls},
-    {"Timing", RCTTimingCls},
-    {"TVNavigationEventEmitter", RCTTVNavigationEventEmitterCls},
-    {"WebSocketModule", RCTWebSocketModuleCls},
-    {"BlobModule", RCTBlobManagerCls},
-  };
-
-  auto p = sCoreModuleClassMap->find(name);
-  if (p != sCoreModuleClassMap->end()) {
-    auto classFunc = p->second;
-    return classFunc();
+
+  if (name == "AlertManager"sv) {
+    return RCTAlertManagerCls();
+  }
+
+  if (name == "AppState"sv) {
+    return RCTAppStateCls();
+  }
+
+  if (name == "Appearance"sv) {
+    return RCTAppearanceCls();
+  }
+
+  if (name == "Clipboard"sv) {
+    return RCTClipboardCls();
+  }
+
+  if (name == "DevLoadingView"sv) {
+    return RCTDevLoadingViewCls();
+  }
+
+  if (name == "DevMenu"sv) {
+    return RCTDevMenuCls();
+  }
+
+  if (name == "DevSettings"sv) {
+    return RCTDevSettingsCls();
+  }
+
+  if (name == "DeviceInfo"sv) {
+    return RCTDeviceInfoCls();
+  }
+
+  if (name == "EventDispatcher"sv) {
+    return RCTEventDispatcherCls();
+  }
+
+  if (name == "ExceptionsManager"sv) {
+    return RCTExceptionsManagerCls();
   }
+
+  if (name == "I18nManager"sv) {
+    return RCTI18nManagerCls();
+  }
+
+  if (name == "KeyboardObserver"sv) {
+    return RCTKeyboardObserverCls();
+  }
+
+  if (name == "LogBox"sv) {
+    return RCTLogBoxCls();
+  }
+
+  if (name == "PerfMonitor"sv) {
+    return RCTPerfMonitorCls();
+  }
+
+  if (name == "PlatformConstants"sv) {
+    return RCTPlatformCls();
+  }
+
+  if (name == "RedBox"sv) {
+    return RCTRedBoxCls();
+  }
+
+  if (name == "SourceCode"sv) {
+    return RCTSourceCodeCls();
+  }
+
+  if (name == "StatusBarManager"sv) {
+    return RCTStatusBarManagerCls();
+  }
+
+  if (name == "Timing"sv) {
+    return RCTTimingCls();
+  }
+
+  if (name == "WebSocketModule"sv) {
+    return RCTWebSocketModuleCls();
+  }
+
+  if (name == "BlobModule"sv) {
+    return RCTBlobManagerCls();
+  }
+
   return nil;
 }
 

package/React/CoreModules/PlatformStubs/RCTStatusBarManager.mm

@@ -35,7 +35,7 @@ RCT_EXPORT_METHOD(setNetworkActivityIndicatorVisible : (BOOL)visible) {}
 
 - (facebook::react::ModuleConstants<JS::NativeStatusBarManagerIOS::Constants>)constantsToExport
 {
-  return (facebook::react::ModuleConstants<JS::NativeStatusBarManagerIOS::Constants>)[self getConstants];
+  return [self getConstants];
 }
 
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:

package/React/CoreModules/RCTAccessibilityManager.mm

@@ -325,11 +325,28 @@ RCT_EXPORT_METHOD(
     announceForAccessibilityWithOptions : (NSString *)announcement options : (
         JS::NativeAccessibilityManager::SpecAnnounceForAccessibilityWithOptionsOptions &)options)
 {
-  NSMutableDictionary<NSString *, NSNumber *> *attrsDictionary = [NSMutableDictionary new];
+  NSMutableDictionary<NSString *, id> *attrsDictionary = [NSMutableDictionary new];
   if (options.queue()) {
     attrsDictionary[UIAccessibilitySpeechAttributeQueueAnnouncement] = @(*(options.queue()) ? YES : NO);
   }
 
+  if (options.priority() != nil) {
+    NSString *priorityString = options.priority();
+    if (@available(iOS 17.0, *)) {
+      NSString *priorityValue = nil;
+      if ([priorityString isEqualToString:@"low"]) {
+        priorityValue = UIAccessibilityPriorityLow;
+      } else if ([priorityString isEqualToString:@"default"]) {
+        priorityValue = UIAccessibilityPriorityDefault;
+      } else if ([priorityString isEqualToString:@"high"]) {
+        priorityValue = UIAccessibilityPriorityHigh;
+      }
+      if (priorityValue != nil) {
+        attrsDictionary[UIAccessibilitySpeechAttributeAnnouncementPriority] = priorityValue;
+      }
+    }
+  }
+
   if (attrsDictionary.count > 0) {
     NSAttributedString *announcementWithAttrs = [[NSAttributedString alloc] initWithString:announcement
                                                                                 attributes:attrsDictionary];

package/React/CoreModules/RCTAppState.mm

@@ -64,7 +64,7 @@ RCT_EXPORT_MODULE()
 
 - (facebook::react::ModuleConstants<JS::NativeAppState::Constants>)constantsToExport
 {
-  return (facebook::react::ModuleConstants<JS::NativeAppState::Constants>)[self getConstants];
+  return [self getConstants];
 }
 
 - (facebook::react::ModuleConstants<JS::NativeAppState::Constants>)getConstants