react-native 0.70.6 → 0.71.0-rc.1

package/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm

@@ -27,17 +27,18 @@ static NSString *const kErrorUnableToRequestPermissions = @"E_UNABLE_TO_REQUEST_
 #if !TARGET_OS_UIKITFORMAC
 @implementation RCTConvert (NSCalendarUnit)
 
-RCT_ENUM_CONVERTER(NSCalendarUnit,
-                   (@{
-                      @"year": @(NSCalendarUnitYear),
-                      @"month": @(NSCalendarUnitMonth),
-                      @"week": @(NSCalendarUnitWeekOfYear),
-                      @"day": @(NSCalendarUnitDay),
-                      @"hour": @(NSCalendarUnitHour),
-                      @"minute": @(NSCalendarUnitMinute)
-                      }),
-                   0,
-                   integerValue)
+RCT_ENUM_CONVERTER(
+    NSCalendarUnit,
+    (@{
+      @"year" : @(NSCalendarUnitYear),
+      @"month" : @(NSCalendarUnitMonth),
+      @"week" : @(NSCalendarUnitWeekOfYear),
+      @"day" : @(NSCalendarUnitDay),
+      @"hour" : @(NSCalendarUnitHour),
+      @"minute" : @(NSCalendarUnitMinute)
+    }),
+    0,
+    integerValue)
 
 @end
 
@@ -68,11 +69,15 @@ RCT_ENUM_CONVERTER(NSCalendarUnit,
   return notification;
 }
 
-RCT_ENUM_CONVERTER(UIBackgroundFetchResult, (@{
-  @"UIBackgroundFetchResultNewData": @(UIBackgroundFetchResultNewData),
-  @"UIBackgroundFetchResultNoData": @(UIBackgroundFetchResultNoData),
-  @"UIBackgroundFetchResultFailed": @(UIBackgroundFetchResultFailed),
-}), UIBackgroundFetchResultNoData, integerValue)
+RCT_ENUM_CONVERTER(
+    UIBackgroundFetchResult,
+    (@{
+      @"UIBackgroundFetchResultNewData" : @(UIBackgroundFetchResultNewData),
+      @"UIBackgroundFetchResultNoData" : @(UIBackgroundFetchResultNoData),
+      @"UIBackgroundFetchResultFailed" : @(UIBackgroundFetchResultFailed),
+    }),
+    UIBackgroundFetchResultNoData,
+    integerValue)
 
 @end
 #else
@@ -163,10 +168,12 @@ RCT_EXPORT_MODULE()
 
 - (NSArray<NSString *> *)supportedEvents
 {
-  return @[@"localNotificationReceived",
-           @"remoteNotificationReceived",
-           @"remoteNotificationsRegistered",
-           @"remoteNotificationRegistrationError"];
+  return @[
+    @"localNotificationReceived",
+    @"remoteNotificationReceived",
+    @"remoteNotificationsRegistered",
+    @"remoteNotificationRegistrationError"
+  ];
 }
 
 + (void)didRegisterUserNotificationSettings:(__unused UIUserNotificationSettings *)notificationSettings
@@ -190,12 +197,12 @@ RCT_EXPORT_MODULE()
 {
   [[NSNotificationCenter defaultCenter] postNotificationName:kRemoteNotificationRegistrationFailed
                                                       object:self
-                                                    userInfo:@{@"error": error}];
+                                                    userInfo:@{@"error" : error}];
 }
 
 + (void)didReceiveRemoteNotification:(NSDictionary *)notification
 {
-  NSDictionary *userInfo = @{@"notification": notification};
+  NSDictionary *userInfo = @{@"notification" : notification};
   [[NSNotificationCenter defaultCenter] postNotificationName:RCTRemoteNotificationReceived
                                                       object:self
                                                     userInfo:userInfo];
@@ -204,7 +211,7 @@ RCT_EXPORT_MODULE()
 + (void)didReceiveRemoteNotification:(NSDictionary *)notification
               fetchCompletionHandler:(RCTRemoteNotificationCallback)completionHandler
 {
-  NSDictionary *userInfo = @{@"notification": notification, @"completionHandler": completionHandler};
+  NSDictionary *userInfo = @{@"notification" : notification, @"completionHandler" : completionHandler};
   [[NSNotificationCenter defaultCenter] postNotificationName:RCTRemoteNotificationReceived
                                                       object:self
                                                     userInfo:userInfo];
@@ -224,7 +231,8 @@ RCT_EXPORT_MODULE()
 
 - (void)handleRemoteNotificationReceived:(NSNotification *)notification
 {
-  NSMutableDictionary *remoteNotification = [NSMutableDictionary dictionaryWithDictionary:notification.userInfo[@"notification"]];
+  NSMutableDictionary *remoteNotification =
+      [NSMutableDictionary dictionaryWithDictionary:notification.userInfo[@"notification"]];
   RCTRemoteNotificationCallback completionHandler = notification.userInfo[@"completionHandler"];
   NSString *notificationId = [[NSUUID UUID] UUIDString];
   remoteNotification[@"notificationId"] = notificationId;
@@ -249,14 +257,15 @@ RCT_EXPORT_MODULE()
 {
   NSError *error = notification.userInfo[@"error"];
   NSDictionary *errorDetails = @{
-    @"message": error.localizedDescription,
-    @"code": @(error.code),
-    @"details": error.userInfo,
+    @"message" : error.localizedDescription,
+    @"code" : @(error.code),
+    @"details" : error.userInfo,
   };
   [self sendEventWithName:@"remoteNotificationRegistrationError" body:errorDetails];
 }
 
-RCT_EXPORT_METHOD(onFinishRemoteNotification:(NSString *)notificationId fetchResult:(NSString *)fetchResult) {
+RCT_EXPORT_METHOD(onFinishRemoteNotification : (NSString *)notificationId fetchResult : (NSString *)fetchResult)
+{
   UIBackgroundFetchResult result = [RCTConvert UIBackgroundFetchResult:fetchResult];
   RCTRemoteNotificationCallback completionHandler = self.remoteNotificationCallbacks[notificationId];
   if (!completionHandler) {
@@ -270,7 +279,7 @@ RCT_EXPORT_METHOD(onFinishRemoteNotification:(NSString *)notificationId fetchRes
 /**
  * Update the application icon badge number on the home screen
  */
-RCT_EXPORT_METHOD(setApplicationIconBadgeNumber:(double)number)
+RCT_EXPORT_METHOD(setApplicationIconBadgeNumber : (double)number)
 {
   RCTSharedApplication().applicationIconBadgeNumber = number;
 }
@@ -278,19 +287,23 @@ RCT_EXPORT_METHOD(setApplicationIconBadgeNumber:(double)number)
 /**
  * Get the current application icon badge number on the home screen
  */
-RCT_EXPORT_METHOD(getApplicationIconBadgeNumber:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(getApplicationIconBadgeNumber : (RCTResponseSenderBlock)callback)
 {
-  callback(@[@(RCTSharedApplication().applicationIconBadgeNumber)]);
+  callback(@[ @(RCTSharedApplication().applicationIconBadgeNumber) ]);
 }
 
-RCT_EXPORT_METHOD(requestPermissions:(JS::NativePushNotificationManagerIOS::SpecRequestPermissionsPermission &)permissions
-                 resolve:(RCTPromiseResolveBlock)resolve
-                 reject:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(requestPermissions
+                  : (JS::NativePushNotificationManagerIOS::SpecRequestPermissionsPermission &)permissions resolve
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (RCTPromiseRejectBlock)reject)
 {
-   if (RCTRunningInAppExtension()) {
-     reject(kErrorUnableToRequestPermissions, nil, RCTErrorWithMessage(@"Requesting push notifications is currently unavailable in an app extension"));
-     return;
-   }
+  if (RCTRunningInAppExtension()) {
+    reject(
+        kErrorUnableToRequestPermissions,
+        nil,
+        RCTErrorWithMessage(@"Requesting push notifications is currently unavailable in an app extension"));
+    return;
+  }
 
   // Add a listener to make sure that startObserving has been called
   [self addListener:@"remoteNotificationsRegistered"];
@@ -308,19 +321,21 @@ RCT_EXPORT_METHOD(requestPermissions:(JS::NativePushNotificationManagerIOS::Spec
   }
 
   [UNUserNotificationCenter.currentNotificationCenter
-   requestAuthorizationWithOptions:types
-   completionHandler:^(BOOL granted, NSError *_Nullable error) {
-    if (error != NULL) {
-      reject(@"-1", @"Error - Push authorization request failed.", error);
-    } else {
-      dispatch_async(dispatch_get_main_queue(), ^{
-        [RCTSharedApplication() registerForRemoteNotifications];
-        [UNUserNotificationCenter.currentNotificationCenter getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings * _Nonnull settings) {
-           resolve(RCTPromiseResolveValueForUNNotificationSettings(settings));
-        }];
-      });
-    }
-  }];
+      requestAuthorizationWithOptions:types
+                    completionHandler:^(BOOL granted, NSError *_Nullable error) {
+                      if (error != NULL) {
+                        reject(@"-1", @"Error - Push authorization request failed.", error);
+                      } else {
+                        dispatch_async(dispatch_get_main_queue(), ^{
+                          [RCTSharedApplication() registerForRemoteNotifications];
+                          [UNUserNotificationCenter.currentNotificationCenter
+                              getNotificationSettingsWithCompletionHandler:^(
+                                  UNNotificationSettings *_Nonnull settings) {
+                                resolve(RCTPromiseResolveValueForUNNotificationSettings(settings));
+                              }];
+                        });
+                      }
+                    }];
 }
 
 RCT_EXPORT_METHOD(abandonPermissions)
@@ -328,33 +343,52 @@ RCT_EXPORT_METHOD(abandonPermissions)
   [RCTSharedApplication() unregisterForRemoteNotifications];
 }
 
-RCT_EXPORT_METHOD(checkPermissions:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(checkPermissions : (RCTResponseSenderBlock)callback)
 {
   if (RCTRunningInAppExtension()) {
-    callback(@[RCTSettingsDictForUNNotificationSettings(NO, NO, NO, NO, NO, NO, UNAuthorizationStatusNotDetermined)]);
+    callback(@[ RCTSettingsDictForUNNotificationSettings(NO, NO, NO, NO, NO, NO, UNAuthorizationStatusNotDetermined) ]);
     return;
   }
 
-  [UNUserNotificationCenter.currentNotificationCenter getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings * _Nonnull settings) {
-    callback(@[RCTPromiseResolveValueForUNNotificationSettings(settings)]);
-  }];
-}
-
-static inline NSDictionary *RCTPromiseResolveValueForUNNotificationSettings(UNNotificationSettings* _Nonnull settings) {
-  return RCTSettingsDictForUNNotificationSettings(settings.alertSetting == UNNotificationSettingEnabled,
-                                                  settings.badgeSetting == UNNotificationSettingEnabled,
-                                                  settings.soundSetting == UNNotificationSettingEnabled,
-                                                  settings.criticalAlertSetting == UNNotificationSettingEnabled,
-                                                  settings.lockScreenSetting == UNNotificationSettingEnabled,
-                                                  settings.notificationCenterSetting == UNNotificationSettingEnabled,
-                                                  settings.authorizationStatus);
-}
-
-static inline NSDictionary *RCTSettingsDictForUNNotificationSettings(BOOL alert, BOOL badge, BOOL sound, BOOL critical, BOOL lockScreen, BOOL notificationCenter, UNAuthorizationStatus authorizationStatus) {
-  return @{@"alert": @(alert), @"badge": @(badge), @"sound": @(sound), @"critical": @(critical), @"lockScreen": @(lockScreen), @"notificationCenter": @(notificationCenter), @"authorizationStatus": @(authorizationStatus)};
+  [UNUserNotificationCenter.currentNotificationCenter
+      getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings *_Nonnull settings) {
+        callback(@[ RCTPromiseResolveValueForUNNotificationSettings(settings) ]);
+      }];
+}
+
+static inline NSDictionary *RCTPromiseResolveValueForUNNotificationSettings(UNNotificationSettings *_Nonnull settings)
+{
+  return RCTSettingsDictForUNNotificationSettings(
+      settings.alertSetting == UNNotificationSettingEnabled,
+      settings.badgeSetting == UNNotificationSettingEnabled,
+      settings.soundSetting == UNNotificationSettingEnabled,
+      settings.criticalAlertSetting == UNNotificationSettingEnabled,
+      settings.lockScreenSetting == UNNotificationSettingEnabled,
+      settings.notificationCenterSetting == UNNotificationSettingEnabled,
+      settings.authorizationStatus);
+}
+
+static inline NSDictionary *RCTSettingsDictForUNNotificationSettings(
+    BOOL alert,
+    BOOL badge,
+    BOOL sound,
+    BOOL critical,
+    BOOL lockScreen,
+    BOOL notificationCenter,
+    UNAuthorizationStatus authorizationStatus)
+{
+  return @{
+    @"alert" : @(alert),
+    @"badge" : @(badge),
+    @"sound" : @(sound),
+    @"critical" : @(critical),
+    @"lockScreen" : @(lockScreen),
+    @"notificationCenter" : @(notificationCenter),
+    @"authorizationStatus" : @(authorizationStatus)
+  };
 }
 
-RCT_EXPORT_METHOD(presentLocalNotification:(JS::NativePushNotificationManagerIOS::Notification &)notification)
+RCT_EXPORT_METHOD(presentLocalNotification : (JS::NativePushNotificationManagerIOS::Notification &)notification)
 {
   NSMutableDictionary *notificationDict = [NSMutableDictionary new];
   notificationDict[@"alertTitle"] = notification.alertTitle();
@@ -378,7 +412,7 @@ RCT_EXPORT_METHOD(presentLocalNotification:(JS::NativePushNotificationManagerIOS
   [RCTSharedApplication() presentLocalNotificationNow:[RCTConvert UILocalNotification:notificationDict]];
 }
 
-RCT_EXPORT_METHOD(scheduleLocalNotification:(JS::NativePushNotificationManagerIOS::Notification &)notification)
+RCT_EXPORT_METHOD(scheduleLocalNotification : (JS::NativePushNotificationManagerIOS::Notification &)notification)
 {
   NSMutableDictionary *notificationDict = [NSMutableDictionary new];
   notificationDict[@"alertTitle"] = notification.alertTitle();
@@ -407,7 +441,7 @@ RCT_EXPORT_METHOD(cancelAllLocalNotifications)
   [RCTSharedApplication() cancelAllLocalNotifications];
 }
 
-RCT_EXPORT_METHOD(cancelLocalNotifications:(NSDictionary<NSString *, id> *)userInfo)
+RCT_EXPORT_METHOD(cancelLocalNotifications : (NSDictionary<NSString *, id> *)userInfo)
 {
   for (UILocalNotification *notification in RCTSharedApplication().scheduledLocalNotifications) {
     __block BOOL matchesAll = YES;
@@ -428,14 +462,15 @@ RCT_EXPORT_METHOD(cancelLocalNotifications:(NSDictionary<NSString *, id> *)userI
   }
 }
 
-RCT_EXPORT_METHOD(getInitialNotification:(RCTPromiseResolveBlock)resolve
-                  reject:(__unused RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(getInitialNotification
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (__unused RCTPromiseRejectBlock)reject)
 {
   NSMutableDictionary<NSString *, id> *initialNotification =
-    [self.bridge.launchOptions[UIApplicationLaunchOptionsRemoteNotificationKey] mutableCopy];
+      [self.bridge.launchOptions[UIApplicationLaunchOptionsRemoteNotificationKey] mutableCopy];
 
   UILocalNotification *initialLocalNotification =
-    self.bridge.launchOptions[UIApplicationLaunchOptionsLocalNotificationKey];
+      self.bridge.launchOptions[UIApplicationLaunchOptionsLocalNotificationKey];
 
   if (initialNotification) {
     initialNotification[@"remote"] = @YES;
@@ -447,14 +482,14 @@ RCT_EXPORT_METHOD(getInitialNotification:(RCTPromiseResolveBlock)resolve
   }
 }
 
-RCT_EXPORT_METHOD(getScheduledLocalNotifications:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(getScheduledLocalNotifications : (RCTResponseSenderBlock)callback)
 {
   NSArray<UILocalNotification *> *scheduledLocalNotifications = RCTSharedApplication().scheduledLocalNotifications;
   NSMutableArray<NSDictionary *> *formattedScheduledLocalNotifications = [NSMutableArray new];
   for (UILocalNotification *notification in scheduledLocalNotifications) {
     [formattedScheduledLocalNotifications addObject:RCTFormatLocalNotification(notification)];
   }
-  callback(@[formattedScheduledLocalNotifications]);
+  callback(@[ formattedScheduledLocalNotifications ]);
 }
 
 RCT_EXPORT_METHOD(removeAllDeliveredNotifications)
@@ -463,13 +498,13 @@ RCT_EXPORT_METHOD(removeAllDeliveredNotifications)
   [center removeAllDeliveredNotifications];
 }
 
-RCT_EXPORT_METHOD(removeDeliveredNotifications:(NSArray<NSString *> *)identifiers)
+RCT_EXPORT_METHOD(removeDeliveredNotifications : (NSArray<NSString *> *)identifiers)
 {
   UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
   [center removeDeliveredNotificationsWithIdentifiers:identifiers];
 }
 
-RCT_EXPORT_METHOD(getDeliveredNotifications:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(getDeliveredNotifications : (RCTResponseSenderBlock)callback)
 {
   UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
   [center getDeliveredNotificationsWithCompletionHandler:^(NSArray<UNNotification *> *_Nonnull notifications) {
@@ -478,38 +513,39 @@ RCT_EXPORT_METHOD(getDeliveredNotifications:(RCTResponseSenderBlock)callback)
     for (UNNotification *notification in notifications) {
       [formattedNotifications addObject:RCTFormatUNNotification(notification)];
     }
-    callback(@[formattedNotifications]);
+    callback(@[ formattedNotifications ]);
   }];
 }
 
-RCT_EXPORT_METHOD(getAuthorizationStatus:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(getAuthorizationStatus : (RCTResponseSenderBlock)callback)
 {
   UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
-  [center getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings *_Nonnull settings)  {
-    callback(@[@(settings.authorizationStatus)]);
+  [center getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings *_Nonnull settings) {
+    callback(@[ @(settings.authorizationStatus) ]);
   }];
 }
 
 #else // TARGET_OS_UIKITFORMAC
 
-RCT_EXPORT_METHOD(onFinishRemoteNotification:(NSString *)notificationId fetchResult:(NSString *)fetchResult)
+RCT_EXPORT_METHOD(onFinishRemoteNotification : (NSString *)notificationId fetchResult : (NSString *)fetchResult)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
-RCT_EXPORT_METHOD(setApplicationIconBadgeNumber:(double)number)
+RCT_EXPORT_METHOD(setApplicationIconBadgeNumber : (double)number)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
-RCT_EXPORT_METHOD(getApplicationIconBadgeNumber:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(getApplicationIconBadgeNumber : (RCTResponseSenderBlock)callback)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
-RCT_EXPORT_METHOD(requestPermissions:(JS::NativePushNotificationManagerIOS::SpecRequestPermissionsPermission &)permissions
-                 resolve:(RCTPromiseResolveBlock)resolve
-                 reject:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(requestPermissions
+                  : (JS::NativePushNotificationManagerIOS::SpecRequestPermissionsPermission &)permissions resolve
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (RCTPromiseRejectBlock)reject)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
@@ -519,17 +555,17 @@ RCT_EXPORT_METHOD(abandonPermissions)
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
-RCT_EXPORT_METHOD(checkPermissions:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(checkPermissions : (RCTResponseSenderBlock)callback)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
-RCT_EXPORT_METHOD(presentLocalNotification:(JS::NativePushNotificationManagerIOS::Notification &)notification)
+RCT_EXPORT_METHOD(presentLocalNotification : (JS::NativePushNotificationManagerIOS::Notification &)notification)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
-RCT_EXPORT_METHOD(scheduleLocalNotification:(JS::NativePushNotificationManagerIOS::Notification &)notification)
+RCT_EXPORT_METHOD(scheduleLocalNotification : (JS::NativePushNotificationManagerIOS::Notification &)notification)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
@@ -539,18 +575,19 @@ RCT_EXPORT_METHOD(cancelAllLocalNotifications)
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
-RCT_EXPORT_METHOD(cancelLocalNotifications:(NSDictionary<NSString *, id> *)userInfo)
+RCT_EXPORT_METHOD(cancelLocalNotifications : (NSDictionary<NSString *, id> *)userInfo)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
-RCT_EXPORT_METHOD(getInitialNotification:(RCTPromiseResolveBlock)resolve
-                  reject:(__unused RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(getInitialNotification
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (__unused RCTPromiseRejectBlock)reject)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
-RCT_EXPORT_METHOD(getScheduledLocalNotifications:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(getScheduledLocalNotifications : (RCTResponseSenderBlock)callback)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
@@ -560,17 +597,17 @@ RCT_EXPORT_METHOD(removeAllDeliveredNotifications)
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
-RCT_EXPORT_METHOD(removeDeliveredNotifications:(NSArray<NSString *> *)identifiers)
+RCT_EXPORT_METHOD(removeDeliveredNotifications : (NSArray<NSString *> *)identifiers)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
-RCT_EXPORT_METHOD(getDeliveredNotifications:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(getDeliveredNotifications : (RCTResponseSenderBlock)callback)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
-RCT_EXPORT_METHOD(getAuthorizationStatus:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(getAuthorizationStatus : (RCTResponseSenderBlock)callback)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
@@ -582,13 +619,15 @@ RCT_EXPORT_METHOD(getAuthorizationStatus:(RCTResponseSenderBlock)callback)
 
 #endif // TARGET_OS_UIKITFORMAC
 
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
 {
   return std::make_shared<facebook::react::NativePushNotificationManagerIOSSpecJSI>(params);
 }
 
 @end
 
-Class RCTPushNotificationManagerCls(void) {
+Class RCTPushNotificationManagerCls(void)
+{
   return RCTPushNotificationManager.class;
 }

package/Libraries/RCTRequired/BUCK

@@ -11,7 +11,8 @@ fb_apple_library(
     extension_api_only = True,
     frameworks = ["Foundation"],
     labels = [
+        "fbios_link_group:xplat/default/public.react_native.infra",
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
+        "talkios_link_group:xplat/default/public.react_native.infra",
     ],
 )

package/Libraries/RCTRequired/RCTRequired/RCTRequired.h

@@ -19,9 +19,11 @@
 #endif
 
 /**
- RCTRequired<T> uses the compiler to enforce definition of a struct member (primitives, pointers, or objects).
+ RCTRequired<T> uses the compiler to enforce definition of a struct member
+ (primitives, pointers, or objects).
 
- Internally, we use an implicit constructor without a default, so there has to be an initial value.
+ Internally, we use an implicit constructor without a default, so there has to
+ be an initial value.
 
  Usage:
  @code
@@ -39,39 +41,50 @@
  */
 template <typename T>
 struct RCTRequired {
-  /// Pass-through constructor (allows for implicit conversion) for wrapped type T
-  template<typename... Args>
-  RCTREQUIRED_INLINE
-  RCTRequired(Args&&... args): _t(std::forward<Args>(args)...) {
-    static_assert(sizeof...(Args) > 0, "Required struct member not initialized. Expand assert trace to see where this was triggered.");
+  /// Pass-through constructor (allows for implicit conversion) for wrapped type
+  /// T
+  template <typename... Args>
+  RCTREQUIRED_INLINE RCTRequired(Args &&...args)
+      : _t(std::forward<Args>(args)...) {
+    static_assert(
+        sizeof...(Args) > 0,
+        "Required struct member not initialized. Expand assert trace to see where this was triggered.");
   }
 
   RCTREQUIRED_INLINE
-  RCTRequired(const RCTRequired&) = default;
+  RCTRequired(const RCTRequired &) = default;
   RCTREQUIRED_INLINE
-  RCTRequired(RCTRequired&&) = default;
+  RCTRequired(RCTRequired &&) = default;
 
   RCTREQUIRED_INLINE
-  RCTRequired& operator=(const RCTRequired&) = default;
+  RCTRequired &operator=(const RCTRequired &) = default;
   RCTREQUIRED_INLINE
-  RCTRequired& operator=(RCTRequired&&) = default;
+  RCTRequired &operator=(RCTRequired &&) = default;
 
   RCTREQUIRED_INLINE
   ~RCTRequired() = default;
 
-  /// Public accessor for private storage (Use when implicit conversion is impracticable)
+  /// Public accessor for private storage (Use when implicit conversion is
+  /// impracticable)
   RCTREQUIRED_INLINE
-  const T &get() const { return _t; }
+  const T &get() const {
+    return _t;
+  }
   RCTREQUIRED_INLINE
-  T &get() { return _t; }
-
+  T &get() {
+    return _t;
+  }
 
   // Implicit conversion
   RCTREQUIRED_INLINE
-  operator T() const { return _t; }
+  operator T() const {
+    return _t;
+  }
   RCTREQUIRED_INLINE
-  operator T&() { return _t; }
+  operator T &() {
+    return _t;
+  }
 
-private:
+ private:
   T _t;
 };

package/Libraries/ReactNative/AppContainer.js

@@ -8,12 +8,13 @@
  * @flow
  */
 
+import type {RootTag} from './RootTag';
+
 import View from '../Components/View/View';
 import RCTDeviceEventEmitter from '../EventEmitter/RCTDeviceEventEmitter';
 import StyleSheet from '../StyleSheet/StyleSheet';
 import {type EventSubscription} from '../vendor/emitter/EventEmitter';
 import {RootTagContext, createRootTag} from './RootTag';
-import type {RootTag} from './RootTag';
 import * as React from 'react';
 
 type Props = $ReadOnly<{|
@@ -25,10 +26,12 @@ type Props = $ReadOnly<{|
   showArchitectureIndicator?: boolean,
   WrapperComponent?: ?React.ComponentType<any>,
   internal_excludeLogBox?: ?boolean,
+  internal_excludeInspector?: ?boolean,
 |}>;
 
 type State = {|
   inspector: ?React.Node,
+  devtoolsOverlay: ?React.Node,
   mainKey: number,
   hasError: boolean,
 |};
@@ -36,6 +39,7 @@ type State = {|
 class AppContainer extends React.Component<Props, State> {
   state: State = {
     inspector: null,
+    devtoolsOverlay: null,
     mainKey: 1,
     hasError: false,
   };
@@ -46,7 +50,7 @@ class AppContainer extends React.Component<Props, State> {
 
   componentDidMount(): void {
     if (__DEV__) {
-      if (!global.__RCTProfileIsProfiling) {
+      if (!this.props.internal_excludeInspector) {
         this._subscription = RCTDeviceEventEmitter.addListener(
           'toggleElementInspector',
           () => {
@@ -65,6 +69,14 @@ class AppContainer extends React.Component<Props, State> {
             this.setState({inspector});
           },
         );
+        if (window.__REACT_DEVTOOLS_GLOBAL_HOOK__ != null) {
+          const DevtoolsOverlay =
+            require('../Inspector/DevtoolsOverlay').default;
+          const devtoolsOverlay = (
+            <DevtoolsOverlay inspectedView={this._mainRef} />
+          );
+          this.setState({devtoolsOverlay});
+        }
       }
     }
   }
@@ -78,10 +90,7 @@ class AppContainer extends React.Component<Props, State> {
   render(): React.Node {
     let logBox = null;
     if (__DEV__) {
-      if (
-        !global.__RCTProfileIsProfiling &&
-        !this.props.internal_excludeLogBox
-      ) {
+      if (!this.props.internal_excludeLogBox) {
         const LogBoxNotificationContainer =
           require('../LogBox/LogBoxNotificationContainer').default;
         logBox = <LogBoxNotificationContainer />;
@@ -90,7 +99,7 @@ class AppContainer extends React.Component<Props, State> {
 
     let innerView: React.Node = (
       <View
-        collapsable={!this.state.inspector}
+        collapsable={!this.state.inspector && !this.state.devtoolsOverlay}
         key={this.state.mainKey}
         pointerEvents="box-none"
         style={styles.appContainer}
@@ -118,6 +127,7 @@ class AppContainer extends React.Component<Props, State> {
       <RootTagContext.Provider value={createRootTag(this.props.rootTag)}>
         <View style={styles.appContainer} pointerEvents="box-none">
           {!this.state.hasError && innerView}
+          {this.state.devtoolsOverlay}
           {this.state.inspector}
           {logBox}
         </View>