react-native 0.0.0-16bb2ae4f → 0.0.0-18697adec

package/React/CoreModules/RCTAccessibilityManager.mm

@@ -82,7 +82,7 @@ RCT_EXPORT_MODULE()
 
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(voiceVoiceOverStatusDidChange:)
-                                                 name:UIAccessibilityVoiceOverStatusChanged
+                                                 name:UIAccessibilityVoiceOverStatusDidChangeNotification
                                                object:nil];
 
     self.contentSizeCategory = RCTSharedApplication().preferredContentSizeCategory;

package/React/CoreModules/RCTActionSheetManager.mm

@@ -94,6 +94,8 @@ RCT_EXPORT_METHOD(showActionSheetWithOptions
   UIViewController *controller = RCTPresentedViewController();
   NSNumber *anchor = [RCTConvert NSNumber:options.anchor() ? @(*options.anchor()) : nil];
   UIColor *tintColor = [RCTConvert UIColor:options.tintColor() ? @(*options.tintColor()) : nil];
+  UIColor *cancelButtonTintColor =
+      [RCTConvert UIColor:options.cancelButtonTintColor() ? @(*options.cancelButtonTintColor()) : nil];
 
   if (controller == nil) {
     RCTLogError(
@@ -105,6 +107,7 @@ RCT_EXPORT_METHOD(showActionSheetWithOptions
           @"destructiveButtonIndices" : destructiveButtonIndices,
           @"anchor" : anchor,
           @"tintColor" : tintColor,
+          @"cancelButtonTintColor" : cancelButtonTintColor,
           @"disabledButtonIndices" : disabledButtonIndices,
         });
     return;
@@ -122,20 +125,26 @@ RCT_EXPORT_METHOD(showActionSheetWithOptions
                                                                     preferredStyle:UIAlertControllerStyleActionSheet];
 
   NSInteger index = 0;
+  bool isCancelButtonIndex = false;
   for (NSString *option in buttons) {
     UIAlertActionStyle style = UIAlertActionStyleDefault;
     if ([destructiveButtonIndices containsObject:@(index)]) {
       style = UIAlertActionStyleDestructive;
     } else if (index == cancelButtonIndex) {
       style = UIAlertActionStyleCancel;
+      isCancelButtonIndex = true;
     }
 
     NSInteger localIndex = index;
-    [alertController addAction:[UIAlertAction actionWithTitle:option
-                                                        style:style
-                                                      handler:^(__unused UIAlertAction *action) {
-                                                        callback(@[ @(localIndex) ]);
-                                                      }]];
+    UIAlertAction *actionButton = [UIAlertAction actionWithTitle:option
+                                                           style:style
+                                                         handler:^(__unused UIAlertAction *action) {
+                                                           callback(@[ @(localIndex) ]);
+                                                         }];
+    if (isCancelButtonIndex) {
+      [actionButton setValue:cancelButtonTintColor forKey:@"titleTextColor"];
+    }
+    [alertController addAction:actionButton];
 
     index++;
   }

package/React/CoreModules/RCTAsyncLocalStorage.mm

@@ -306,7 +306,11 @@ RCT_EXPORT_MODULE()
   if (errorOut) {
     return errorOut;
   }
+  if (![entry[1] isKindOfClass:[NSString class]]) {
+    return RCTMakeAndLogError(@"Invalid value for entry - must be a string. Got entry: ", entry, nil);
+  }
   NSString *value = entry[1];
+
   NSString *filePath = [self _filePathForKey:key];
   NSError *error;
   if (value.length <= RCTInlineValueThreshold) {

package/React/CoreModules/RCTDevLoadingView.mm

@@ -114,16 +114,11 @@ RCT_EXPORT_MODULE()
     if (!self->_window && !RCTRunningInTestEnvironment()) {
       CGSize screenSize = [UIScreen mainScreen].bounds.size;
 
-      if (@available(iOS 11.0, *)) {
-        UIWindow *window = RCTSharedApplication().keyWindow;
-        self->_window =
-            [[UIWindow alloc] initWithFrame:CGRectMake(0, 0, screenSize.width, window.safeAreaInsets.top + 10)];
-        self->_label =
-            [[UILabel alloc] initWithFrame:CGRectMake(0, window.safeAreaInsets.top - 10, screenSize.width, 20)];
-      } else {
-        self->_window = [[UIWindow alloc] initWithFrame:CGRectMake(0, 0, screenSize.width, 20)];
-        self->_label = [[UILabel alloc] initWithFrame:self->_window.bounds];
-      }
+      UIWindow *window = RCTSharedApplication().keyWindow;
+      self->_window =
+          [[UIWindow alloc] initWithFrame:CGRectMake(0, 0, screenSize.width, window.safeAreaInsets.top + 10)];
+      self->_label =
+          [[UILabel alloc] initWithFrame:CGRectMake(0, window.safeAreaInsets.top - 10, screenSize.width, 20)];
       [self->_window addSubview:self->_label];
 
       self->_window.windowLevel = UIWindowLevelStatusBar + 1;

package/React/CoreModules/RCTDevSettings.mm

@@ -32,7 +32,7 @@ static NSString *const kRCTDevSettingIsPerfMonitorShown = @"RCTPerfMonitorKey";
 
 static NSString *const kRCTDevSettingsUserDefaultsKey = @"RCTDevMenu";
 
-#if ENABLE_PACKAGER_CONNECTION
+#if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
 #import <React/RCTPackagerClient.h>
 #import <React/RCTPackagerConnection.h>
 #endif
@@ -114,14 +114,14 @@ void RCTDevSettingsSetEnabled(BOOL enabled)
 
 @end
 
-#if ENABLE_PACKAGER_CONNECTION
+#if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
 static RCTHandlerToken reloadToken;
 static std::atomic<int> numInitializedModules{0};
 #endif
 
 @interface RCTDevSettings () <RCTBridgeModule, RCTInvalidating, NativeDevSettingsSpec, RCTDevSettingsInspectable> {
   BOOL _isJSLoaded;
-#if ENABLE_PACKAGER_CONNECTION
+#if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
   RCTHandlerToken _bridgeExecutorOverrideToken;
 #endif
 }
@@ -174,7 +174,7 @@ RCT_EXPORT_MODULE()
 
 - (void)initialize
 {
-#if ENABLE_PACKAGER_CONNECTION
+#if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
   if (self.bridge) {
     RCTBridge *__weak weakBridge = self.bridge;
     _bridgeExecutorOverrideToken = [[RCTPackagerConnection sharedPackagerConnection]
@@ -227,7 +227,7 @@ RCT_EXPORT_MODULE()
 - (void)invalidate
 {
   [super invalidate];
-#if ENABLE_PACKAGER_CONNECTION
+#if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
   if (self.bridge) {
     [[RCTPackagerConnection sharedPackagerConnection] removeHandler:_bridgeExecutorOverrideToken];
   }
@@ -440,7 +440,7 @@ RCT_EXPORT_METHOD(addMenuItem : (NSString *)title)
 
 - (void)addHandler:(id<RCTPackagerClientMethod>)handler forPackagerMethod:(NSString *)name
 {
-#if ENABLE_PACKAGER_CONNECTION
+#if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
   [[RCTPackagerConnection sharedPackagerConnection] addHandler:handler forMethod:name];
 #endif
 }
@@ -448,14 +448,16 @@ RCT_EXPORT_METHOD(addMenuItem : (NSString *)title)
 - (void)setupHMRClientWithBundleURL:(NSURL *)bundleURL
 {
   if (bundleURL && !bundleURL.fileURL) {
-    NSString *const path = [bundleURL.path substringFromIndex:1]; // Strip initial slash.
-    NSString *const host = bundleURL.host;
-    NSNumber *const port = bundleURL.port;
+    NSURLComponents *urlComponents = [[NSURLComponents alloc] initWithURL:bundleURL resolvingAgainstBaseURL:NO];
+    NSString *const path = [urlComponents.path substringFromIndex:1]; // Strip initial slash.
+    NSString *const host = urlComponents.host;
+    NSNumber *const port = urlComponents.port;
+    NSString *const scheme = urlComponents.scheme;
     BOOL isHotLoadingEnabled = self.isHotLoadingEnabled;
     if (self.callableJSModules) {
       [self.callableJSModules invokeModule:@"HMRClient"
                                     method:@"setup"
-                                  withArgs:@[ @"ios", path, host, RCTNullIfNil(port), @(isHotLoadingEnabled) ]];
+                                  withArgs:@[ @"ios", path, host, RCTNullIfNil(port), @(isHotLoadingEnabled), scheme ]];
     }
   }
 }

package/React/CoreModules/RCTDevSplitBundleLoader.mm

@@ -22,7 +22,7 @@ using namespace facebook::react;
 @interface RCTDevSplitBundleLoader () <NativeDevSplitBundleLoaderSpec>
 @end
 
-#if RCT_DEV_MENU
+#if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
 
 @implementation RCTDevSplitBundleLoader
 

package/React/CoreModules/RCTDeviceInfo.mm

@@ -12,6 +12,7 @@
 #import <React/RCTAssert.h>
 #import <React/RCTConstants.h>
 #import <React/RCTEventDispatcherProtocol.h>
+#import <React/RCTInitializing.h>
 #import <React/RCTUIUtils.h>
 #import <React/RCTUtils.h>
 
@@ -19,7 +20,7 @@
 
 using namespace facebook::react;
 
-@interface RCTDeviceInfo () <NativeDeviceInfoSpec>
+@interface RCTDeviceInfo () <NativeDeviceInfoSpec, RCTInitializing>
 @end
 
 @implementation RCTDeviceInfo {
@@ -41,13 +42,12 @@ RCT_EXPORT_MODULE()
   return dispatch_get_main_queue();
 }
 
-- (void)setModuleRegistry:(RCTModuleRegistry *)moduleRegistry
+- (void)initialize
 {
-  _moduleRegistry = moduleRegistry;
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(didReceiveNewContentSizeMultiplier)
                                                name:RCTAccessibilityManagerDidUpdateMultiplierNotification
-                                             object:[moduleRegistry moduleForName:"AccessibilityManager"]];
+                                             object:[_moduleRegistry moduleForName:"AccessibilityManager"]];
 
   _currentInterfaceOrientation = [RCTSharedApplication() statusBarOrientation];
 

package/React/CoreModules/RCTEventDispatcher.mm

@@ -56,6 +56,11 @@ RCT_EXPORT_MODULE()
   _observersLock = [NSLock new];
 }
 
+- (void)sendViewEventWithName:(NSString *)name reactTag:(NSNumber *)reactTag
+{
+  [_callableJSModules invokeModule:@"RCTViewEventEmitter" method:@"emit" withArgs:@[ name, RCTNullIfNil(reactTag) ]];
+}
+
 - (void)sendAppEventWithName:(NSString *)name body:(id)body
 {
   [_callableJSModules invokeModule:@"RCTNativeAppEventEmitter"

package/React/CoreModules/RCTLogBox.mm

@@ -43,18 +43,22 @@ RCT_EXPORT_METHOD(show)
       if (!strongSelf) {
         return;
       }
-      if (!strongSelf->_view) {
-        if (self->_bridge) {
-          strongSelf->_view = [[RCTLogBoxView alloc] initWithFrame:[UIScreen mainScreen].bounds bridge:self->_bridge];
-        } else {
-          NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:strongSelf, @"logbox", nil];
-          [[NSNotificationCenter defaultCenter] postNotificationName:@"CreateLogBoxSurface"
-                                                              object:nil
-                                                            userInfo:userInfo];
-          return;
+
+      if (strongSelf->_view) {
+        [strongSelf->_view show];
+        return;
+      }
+
+      if (strongSelf->_bridge) {
+        if (strongSelf->_bridge.valid) {
+          strongSelf->_view = [[RCTLogBoxView alloc] initWithFrame:[UIScreen mainScreen].bounds
+                                                            bridge:strongSelf->_bridge];
+          [strongSelf->_view show];
         }
+      } else {
+        NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:strongSelf, @"logbox", nil];
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"CreateLogBoxSurface" object:nil userInfo:userInfo];
       }
-      [strongSelf->_view show];
     });
   }
 }

package/React/CoreModules/RCTPerfMonitor.mm

@@ -20,6 +20,7 @@
 #import <React/RCTBridge+Private.h>
 #import <React/RCTBridge.h>
 #import <React/RCTFPSGraph.h>
+#import <React/RCTInitializing.h>
 #import <React/RCTInvalidating.h>
 #import <React/RCTJavaScriptExecutor.h>
 #import <React/RCTPerformanceLogger.h>
@@ -84,8 +85,13 @@ static vm_size_t RCTGetResidentMemorySize(void)
   return memoryUsageInByte;
 }
 
-@interface RCTPerfMonitor
-    : NSObject <RCTBridgeModule, RCTTurboModule, RCTInvalidating, UITableViewDataSource, UITableViewDelegate>
+@interface RCTPerfMonitor : NSObject <
+                                RCTBridgeModule,
+                                RCTTurboModule,
+                                RCTInitializing,
+                                RCTInvalidating,
+                                UITableViewDataSource,
+                                UITableViewDelegate>
 
 #if __has_include(<React/RCTDevMenu.h>)
 @property (nonatomic, strong, readonly) RCTDevMenuItem *devMenuItem;
@@ -150,9 +156,8 @@ RCT_EXPORT_MODULE()
   return dispatch_get_main_queue();
 }
 
-- (void)setModuleRegistry:(RCTModuleRegistry *)moduleRegistry
+- (void)initialize
 {
-  _moduleRegistry = moduleRegistry;
 #if __has_include(<React/RCTDevMenu.h>)
   [(RCTDevMenu *)[_moduleRegistry moduleForName:"DevMenu"] addItem:self.devMenuItem];
 #endif

package/React/CoreModules/RCTRedBox.mm

@@ -201,11 +201,7 @@
 
 - (NSInteger)bottomSafeViewHeight
 {
-  if (@available(iOS 11.0, *)) {
-    return RCTSharedApplication().delegate.window.safeAreaInsets.bottom;
-  } else {
-    return 0;
-  }
+  return RCTSharedApplication().delegate.window.safeAreaInsets.bottom;
 }
 
 RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)

package/React/CoreModules/React-CoreModules.podspec

@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.06.28.00'
+folly_version = '2021.06.28.00-v2'
 
 Pod::Spec.new do |s|
   s.name                   = "React-CoreModules"

package/React/CxxBridge/RCTCxxBridge.mm

@@ -244,6 +244,11 @@ struct RCTInstanceCallback : public InstanceCallback {
 @synthesize performanceLogger = _performanceLogger;
 @synthesize valid = _valid;
 
+- (RCTModuleRegistry *)moduleRegistry
+{
+  return _objCModuleRegistry;
+}
+
 - (void)setRCTTurboModuleRegistry:(id<RCTTurboModuleRegistry>)turboModuleRegistry
 {
   _turboModuleRegistry = turboModuleRegistry;
@@ -286,6 +291,18 @@ struct RCTInstanceCallback : public InstanceCallback {
   if ([bridgeModule respondsToSelector:@selector(setCallableJSModules:)]) {
     bridgeModule.callableJSModules = _callableJSModules;
   }
+
+  /**
+   * Attach the RCTModuleRegistry to this TurboModule, which allows this TurboModule
+   * to require other TurboModules/NativeModules.
+   *
+   * Usage: In the TurboModule @implementation, include:
+   *   `@synthesize moduleRegistry = _moduleRegistry`
+   */
+
+  if ([bridgeModule respondsToSelector:@selector(setModuleRegistry:)]) {
+    bridgeModule.moduleRegistry = _objCModuleRegistry;
+  }
 }
 
 - (std::shared_ptr<MessageQueueThread>)jsMessageThread
@@ -1113,7 +1130,7 @@ struct RCTInstanceCallback : public InstanceCallback {
   [self.devSettings setupHMRClientWithBundleURL:self.bundleURL];
 }
 
-#if RCT_DEV_MENU
+#if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
 - (void)loadAndExecuteSplitBundleURL:(NSURL *)bundleURL
                              onError:(RCTLoadAndExecuteErrorBlock)onError
                           onComplete:(dispatch_block_t)onComplete

package/React/DevSupport/RCTPackagerConnection.h

@@ -59,6 +59,9 @@ typedef void (^RCTConnectedHandler)(void);
 /** Disconnects and removes all handlers. */
 - (void)stop;
 
+/** Reconnect with given packager server. */
+- (void)reconnect:(NSString *)packagerServerHostPort;
+
 /**
  * Historically no distinction was made between notification and request
  * handlers. If you use this method, it will be registered as *both* a

package/React/DevSupport/RCTPackagerConnection.mm

@@ -41,6 +41,7 @@ struct Registration {
   RCTReconnectingWebSocket *_socket;
   BOOL _socketConnected;
   NSString *_serverHostPortForSocket;
+  NSString *_serverSchemeForSocket;
   id _bundleURLChangeObserver;
   uint32_t _nextToken;
   std::vector<Registration<RCTNotificationHandler>> _notificationRegistrations;
@@ -63,7 +64,8 @@ struct Registration {
   if (self = [super init]) {
     _nextToken = 1; // Prevent randomly erasing a handler if you pass a bogus 0 token
     _serverHostPortForSocket = [[RCTBundleURLProvider sharedSettings] packagerServerHostPort];
-    _socket = socketForLocation(_serverHostPortForSocket);
+    _serverSchemeForSocket = [[RCTBundleURLProvider sharedSettings] packagerScheme];
+    _socket = socketForLocation(_serverHostPortForSocket, _serverSchemeForSocket);
     _socket.delegate = self;
     [_socket start];
 
@@ -79,7 +81,7 @@ struct Registration {
   return self;
 }
 
-static RCTReconnectingWebSocket *socketForLocation(NSString *const serverHostPort)
+static RCTReconnectingWebSocket *socketForLocation(NSString *const serverHostPort, NSString *scheme)
 {
   NSString *serverHost;
   NSString *serverPort;
@@ -90,9 +92,12 @@ static RCTReconnectingWebSocket *socketForLocation(NSString *const serverHostPor
   if ([locationComponents count] > 1) {
     serverPort = locationComponents[1];
   }
+  if (![scheme length]) {
+    scheme = @"http";
+  }
   NSURLComponents *const components = [NSURLComponents new];
   components.host = serverHost ?: @"localhost";
-  components.scheme = @"http";
+  components.scheme = scheme;
   components.port = serverPort ? @(serverPort.integerValue) : @(kRCTBundleURLProviderDefaultPort);
   components.path = @"/message";
   components.queryItems = @[ [NSURLQueryItem queryItemWithName:@"role" value:@"ios"] ];
@@ -120,26 +125,32 @@ static RCTReconnectingWebSocket *socketForLocation(NSString *const serverHostPor
   _requestRegistrations.clear();
 }
 
-- (void)bundleURLSettingsChanged
+- (void)reconnect:(NSString *)packagerServerHostPort
 {
   std::lock_guard<std::mutex> l(_mutex);
   if (_socket == nil) {
     return; // already stopped
   }
 
-  NSString *const serverHostPort = [[RCTBundleURLProvider sharedSettings] packagerServerHostPort];
-  if ([serverHostPort isEqual:_serverHostPortForSocket]) {
+  NSString *const serverScheme = [[RCTBundleURLProvider sharedSettings] packagerScheme];
+  if ([packagerServerHostPort isEqual:_serverHostPortForSocket] && [serverScheme isEqual:_serverSchemeForSocket]) {
     return; // unchanged
   }
 
   _socket.delegate = nil;
   [_socket stop];
-  _serverHostPortForSocket = serverHostPort;
-  _socket = socketForLocation(serverHostPort);
+  _serverHostPortForSocket = packagerServerHostPort;
+  _serverSchemeForSocket = serverScheme;
+  _socket = socketForLocation(packagerServerHostPort, serverScheme);
   _socket.delegate = self;
   [_socket start];
 }
 
+- (void)bundleURLSettingsChanged
+{
+  [self reconnect:[[RCTBundleURLProvider sharedSettings] packagerServerHostPort]];
+}
+
 - (RCTHandlerToken)addNotificationHandler:(RCTNotificationHandler)handler
                                     queue:(dispatch_queue_t)queue
                                 forMethod:(NSString *)method

package/React/FBReactNativeSpec/FBReactNativeSpec.podspec

@@ -4,7 +4,9 @@
 # LICENSE file in the root directory of this source tree.
 
 require "json"
-require_relative "../../scripts/react_native_pods.rb"
+
+react_native_path = "../.."
+require_relative "#{react_native_path}/scripts/react_native_pods.rb"
 
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
 version = package['version']
@@ -18,7 +20,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.06.28.00'
+folly_version = '2021.06.28.00-v2'
 
 Pod::Spec.new do |s|
   s.name                   = "FBReactNativeSpec"
@@ -30,7 +32,7 @@ Pod::Spec.new do |s|
   s.platforms              = { :ios => "11.0" }
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
-  s.source_files           = "**/*.{c,h,m,mm,cpp}"
+  s.source_files           = "**/FBReactNativeSpec*.{h,mm}"
   s.header_dir             = "FBReactNativeSpec"
 
   s.pod_target_xcconfig    = {
@@ -46,5 +48,11 @@ Pod::Spec.new do |s|
   s.dependency "React-jsi", version
   s.dependency "ReactCommon/turbomodule/core", version
 
-  use_react_native_codegen! (s)
+  use_react_native_codegen!(s, {
+    :react_native_path => react_native_path,
+    :js_srcs_dir => "#{react_native_path}/Libraries",
+    :library_name => "FBReactNativeSpec",
+    :library_type => "modules",
+    :output_dir => "#{react_native_path}/React/FBReactNativeSpec/FBReactNativeSpec"
+  })
 end

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

@@ -171,12 +171,11 @@ static ModalHostViewEventEmitter::OnOrientationChange onOrientationChangeStruct(
     UIView *snapshot = _modalContentsSnapshot;
     [self.viewController.view addSubview:snapshot];
 
-    auto eventEmitter = [self modalEventEmitter];
     [self dismissViewController:self.viewController
                        animated:_shouldAnimatePresentation
                      completion:^{
                        [snapshot removeFromSuperview];
-
+                       auto eventEmitter = [self modalEventEmitter];
                        if (eventEmitter) {
                          eventEmitter->onDismiss(ModalHostViewEventEmitter::OnDismiss{});
                        }