react-native-tvos 0.82.1-0 → 0.83.0-0

package/React/CoreModules/RCTDevLoadingView.mm

@@ -85,14 +85,6 @@ RCT_EXPORT_MODULE()
       dispatch_time(DISPATCH_TIME_NOW, 0.2 * NSEC_PER_SEC), dispatch_get_main_queue(), self->_initialMessageBlock);
 }
 
-- (void)hideBannerAfter:(CGFloat)delay
-{
-  // Cancel previous hide call after the delay.
-  [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(hide) object:nil];
-  // Set new hide call after a delay.
-  [self performSelector:@selector(hide) withObject:nil afterDelay:delay];
-}
-
 - (void)showMessage:(NSString *)message color:(UIColor *)color backgroundColor:(UIColor *)backgroundColor
 {
   if (!RCTDevLoadingViewGetEnabled() || _hiding) {
@@ -132,6 +124,9 @@ RCT_EXPORT_MODULE()
     self->_container = [[UIView alloc] init];
     self->_container.backgroundColor = backgroundColor;
     self->_container.translatesAutoresizingMaskIntoConstraints = NO;
+    UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(hide)];
+    [self->_container addGestureRecognizer:tapGesture];
+    self->_container.userInteractionEnabled = YES;
 
     self->_label = [[UILabel alloc] init];
     self->_label.translatesAutoresizingMaskIntoConstraints = NO;
@@ -162,15 +157,12 @@ RCT_EXPORT_MODULE()
       [self->_label.centerXAnchor constraintEqualToAnchor:self->_container.centerXAnchor],
       [self->_label.bottomAnchor constraintEqualToAnchor:self->_container.bottomAnchor constant:-5],
     ]];
-
-    [self hideBannerAfter:15.0];
   });
 }
 
-RCT_EXPORT_METHOD(showMessage
-                  : (NSString *)message withColor
-                  : (NSNumber *__nonnull)color withBackgroundColor
-                  : (NSNumber *__nonnull)backgroundColor)
+RCT_EXPORT_METHOD(
+    showMessage : (NSString *)message withColor : (NSNumber *__nonnull)color withBackgroundColor : (NSNumber *__nonnull)
+        backgroundColor)
 {
   [self showMessage:message color:[RCTConvert UIColor:color] backgroundColor:[RCTConvert UIColor:backgroundColor]];
 }

package/React/CoreModules/RCTDevMenu.h

@@ -12,12 +12,26 @@
 #import <React/RCTBridgeProxy.h>
 #import <React/RCTDefines.h>
 
+RCT_EXTERN NSString *const RCTShowDevMenuNotification;
+
+@interface RCTDevMenuConfiguration : NSObject
+
 #if RCT_DEV_MENU
 
-RCT_EXTERN NSString *const RCTShowDevMenuNotification;
+@property (nonatomic, readonly) BOOL devMenuEnabled;
+@property (nonatomic, readonly) BOOL shakeGestureEnabled;
+@property (nonatomic, readonly) BOOL keyboardShortcutsEnabled;
+
+- (instancetype)initWithDevMenuEnabled:(BOOL)devMenuEnabled
+                   shakeGestureEnabled:(BOOL)shakeGestureEnabled
+              keyboardShortcutsEnabled:(BOOL)keyboardShortcutsEnabled;
 
 #endif
 
++ (instancetype)defaultConfiguration;
+
+@end
+
 @class RCTDevMenuItem;
 
 /**
@@ -45,6 +59,16 @@ RCT_EXTERN NSString *const RCTShowDevMenuNotification;
  */
 @property (nonatomic, assign) BOOL hotkeysEnabled;
 
+/**
+ * Whether the developer menu is enabled.
+ */
+@property (nonatomic, assign) BOOL devMenuEnabled;
+
+/**
+ * Whether keyboard shortcuts are enabled.
+ */
+@property (nonatomic, assign) BOOL keyboardShortcutsEnabled;
+
 /**
  * Presented items in development menu
  */
@@ -76,6 +100,11 @@ RCT_EXTERN NSString *const RCTShowDevMenuNotification;
  */
 - (void)addItem:(RCTDevMenuItem *)item;
 
+/**
+ * Disable the reload command (Cmd+R) in the simulator.
+ */
+- (void)disableReloadCommand;
+
 @end
 
 typedef NSString * (^RCTDevMenuItemTitleBlock)(void);

package/React/CoreModules/RCTDevMenu.mm

@@ -29,6 +29,27 @@
 
 NSString *const RCTShowDevMenuNotification = @"RCTShowDevMenuNotification";
 
+@implementation RCTDevMenuConfiguration
+- (instancetype)initWithDevMenuEnabled:(BOOL)devMenuEnabled
+                   shakeGestureEnabled:(BOOL)shakeGestureEnabled
+              keyboardShortcutsEnabled:(BOOL)keyboardShortcutsEnabled
+{
+  if (self = [super init]) {
+    _devMenuEnabled = devMenuEnabled;
+    _shakeGestureEnabled = shakeGestureEnabled;
+    _keyboardShortcutsEnabled = keyboardShortcutsEnabled;
+  }
+  return self;
+}
+
++ (instancetype)defaultConfiguration
+{
+  return [[self alloc] initWithDevMenuEnabled:RCT_DEV_MENU
+                          shakeGestureEnabled:RCT_DEV_MENU
+                     keyboardShortcutsEnabled:RCT_DEV_MENU];
+}
+@end
+
 @implementation UIWindow (RCTDevMenu)
 
 - (void)RCT_motionEnded:(__unused UIEventSubtype)motion withEvent:(UIEvent *)event
@@ -47,7 +68,7 @@ NSString *const RCTShowDevMenuNotification = @"RCTShowDevMenuNotification";
 
 - (instancetype)initWithTitleBlock:(RCTDevMenuItemTitleBlock)titleBlock handler:(dispatch_block_t)handler
 {
-  if ((self = [super init])) {
+  if ((self = [super init]) != nullptr) {
     _titleBlock = [titleBlock copy];
     _handler = [handler copy];
   }
@@ -72,14 +93,14 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
 
 - (void)callHandler
 {
-  if (_handler) {
+  if (_handler != nullptr) {
     _handler();
   }
 }
 
 - (NSString *)title
 {
-  if (_titleBlock) {
+  if (_titleBlock != nullptr) {
     return _titleBlock();
   }
   return nil;
@@ -120,13 +141,15 @@ RCT_EXPORT_MODULE()
 
 - (instancetype)init
 {
-  if ((self = [super init])) {
+  if ((self = [super init]) != nullptr) {
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(showOnShake)
                                                  name:RCTShowDevMenuNotification
                                                object:nil];
     _extraMenuItems = [NSMutableArray new];
 
+    _keyboardShortcutsEnabled = true;
+    _devMenuEnabled = true;
     [self registerHotkeys];
   }
   return self;
@@ -162,7 +185,6 @@ RCT_EXPORT_MODULE()
 
   [commands unregisterKeyCommandWithInput:@"d" modifierFlags:UIKeyModifierCommand];
   [commands unregisterKeyCommandWithInput:@"i" modifierFlags:UIKeyModifierCommand];
-  [commands unregisterKeyCommandWithInput:@"n" modifierFlags:UIKeyModifierCommand];
 #endif
 }
 
@@ -172,13 +194,30 @@ RCT_EXPORT_MODULE()
   RCTKeyCommands *commands = [RCTKeyCommands sharedInstance];
 
   return [commands isKeyCommandRegisteredForInput:@"d" modifierFlags:UIKeyModifierCommand] &&
-      [commands isKeyCommandRegisteredForInput:@"i" modifierFlags:UIKeyModifierCommand] &&
-      [commands isKeyCommandRegisteredForInput:@"n" modifierFlags:UIKeyModifierCommand];
+      [commands isKeyCommandRegisteredForInput:@"i" modifierFlags:UIKeyModifierCommand];
+#else
+  return NO;
+#endif
+}
+
+- (BOOL)isReloadCommandRegistered
+{
+#if TARGET_OS_SIMULATOR || TARGET_OS_MACCATALYST
+  RCTKeyCommands *commands = [RCTKeyCommands sharedInstance];
+  return [commands isKeyCommandRegisteredForInput:@"r" modifierFlags:UIKeyModifierCommand];
 #else
   return NO;
 #endif
 }
 
+- (void)unregisterReloadCommand
+{
+#if TARGET_OS_SIMULATOR || TARGET_OS_MACCATALYST
+  RCTKeyCommands *commands = [RCTKeyCommands sharedInstance];
+  [commands unregisterKeyCommandWithInput:@"r" modifierFlags:UIKeyModifierCommand];
+#endif
+}
+
 - (dispatch_queue_t)methodQueue
 {
   return dispatch_get_main_queue();
@@ -214,7 +253,7 @@ RCT_EXPORT_MODULE()
   if (_actionSheet.isBeingPresented || _actionSheet.beingDismissed) {
     return;
   }
-  if (_actionSheet) {
+  if (_actionSheet != nullptr) {
     [_actionSheet dismissViewControllerAnimated:YES
                                      completion:^(void) {
                                        self->_actionSheet = nil;
@@ -240,6 +279,17 @@ RCT_EXPORT_MODULE()
   [_extraMenuItems addObject:item];
 }
 
+- (void)setKeyboardShortcutsEnabled:(BOOL)keyboardShortcutsEnabled
+{
+  if (_keyboardShortcutsEnabled != keyboardShortcutsEnabled) {
+    [self setHotkeysEnabled:keyboardShortcutsEnabled];
+
+    if (!keyboardShortcutsEnabled) {
+      [self disableReloadCommand];
+    }
+  }
+}
+
 - (void)setDefaultJSBundle
 {
   [[RCTBundleURLProvider sharedSettings] resetToDefaults];
@@ -365,11 +415,14 @@ RCT_EXPORT_MODULE()
                                                                         handler:^(__unused UIAlertAction *action) {
                                                                           [weakSelf setDefaultJSBundle];
                                                                         }]];
-                      [alertController addAction:[UIAlertAction actionWithTitle:@"Cancel"
-                                                                          style:UIAlertActionStyleCancel
-                                                                        handler:^(__unused UIAlertAction *action) {
-                                                                          return;
-                                                                        }]];
+                      UIAlertAction *configCancelAction =
+                          [UIAlertAction actionWithTitle:@"Cancel"
+                                                   style:UIAlertActionStyleCancel
+                                                 handler:^(__unused UIAlertAction *action) {
+                                                   return;
+                                                 }];
+                      [configCancelAction setValue:[UIColor systemRedColor] forKey:@"titleTextColor"];
+                      [alertController addAction:configCancelAction];
                       [RCTPresentedViewController() presentViewController:alertController animated:YES completion:NULL];
                     }]];
 
@@ -379,7 +432,7 @@ RCT_EXPORT_MODULE()
 
 RCT_EXPORT_METHOD(show)
 {
-  if (_actionSheet || RCTRunningInAppExtension()) {
+  if ((_actionSheet != nullptr) || RCTRunningInAppExtension() || !_devMenuEnabled) {
     return;
   }
 
@@ -390,6 +443,11 @@ RCT_EXPORT_METHOD(show)
 
   _actionSheet = [UIAlertController alertControllerWithTitle:@"React Native Dev Menu" message:nil preferredStyle:style];
 
+  NSAttributedString *title =
+      [[NSAttributedString alloc] initWithString:@"React Native Dev Menu"
+                                      attributes:@{NSFontAttributeName : [UIFont boldSystemFontOfSize:17]}];
+  [_actionSheet setValue:title forKey:@"_attributedTitle"];
+
   NSArray<RCTDevMenuItem *> *items = [self _menuItemsToPresent];
   for (RCTDevMenuItem *item in items) {
     UIAlertAction *action = [UIAlertAction actionWithTitle:item.title
@@ -399,9 +457,11 @@ RCT_EXPORT_METHOD(show)
     [_actionSheet addAction:action];
   }
 
-  [_actionSheet addAction:[UIAlertAction actionWithTitle:@"Cancel"
-                                                   style:UIAlertActionStyleCancel
-                                                 handler:[self alertActionHandlerForDevItem:nil]]];
+  UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"Cancel"
+                                                         style:UIAlertActionStyleCancel
+                                                       handler:[self alertActionHandlerForDevItem:nil]];
+  [cancelAction setValue:[UIColor systemRedColor] forKey:@"titleTextColor"];
+  [_actionSheet addAction:cancelAction];
 
   _presentedItems = items;
   [RCTPresentedViewController() presentViewController:_actionSheet animated:YES completion:nil];
@@ -412,7 +472,7 @@ RCT_EXPORT_METHOD(show)
 - (RCTDevMenuAlertActionHandler)alertActionHandlerForDevItem:(RCTDevMenuItem *__nullable)item
 {
   return ^(__unused UIAlertAction *action) {
-    if (item) {
+    if (item != nullptr) {
       [item callHandler];
     }
 
@@ -427,7 +487,7 @@ RCT_EXPORT_METHOD(show)
 
 - (void)setShakeToShow:(BOOL)shakeToShow
 {
-  ((RCTDevSettings *)[_moduleRegistry moduleForName:"DevSettings"]).isShakeToShowDevMenuEnabled = shakeToShow;
+  [[_moduleRegistry moduleForName:"DevSettings"] setIsShakeToShowDevMenuEnabled:shakeToShow];
 }
 
 - (BOOL)shakeToShow
@@ -477,6 +537,13 @@ RCT_EXPORT_METHOD(setHotLoadingEnabled : (BOOL)enabled)
   return [self isHotkeysRegistered];
 }
 
+- (void)disableReloadCommand
+{
+  if ([self isReloadCommandRegistered]) {
+    [self unregisterReloadCommand];
+  }
+}
+
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params
 {
@@ -490,6 +557,15 @@ RCT_EXPORT_METHOD(setHotLoadingEnabled : (BOOL)enabled)
 @interface RCTDevMenu () <NativeDevMenuSpec>
 @end
 
+@implementation RCTDevMenuConfiguration
+
++ (instancetype)defaultConfiguration
+{
+  return nil;
+}
+
+@end
+
 @implementation RCTDevMenu
 
 - (void)show
@@ -505,6 +581,10 @@ RCT_EXPORT_METHOD(setHotLoadingEnabled : (BOOL)enabled)
 {
 }
 
+- (void)disableReloadCommand
+{
+}
+
 - (BOOL)isActionSheetShown
 {
   return NO;

package/React/CoreModules/RCTDevMenuConfigurationDecorator.h

@@ -0,0 +1,23 @@
+/*
+ * 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 <React/RCTBridgeModule.h>
+
+@class RCTDevMenuConfiguration;
+
+@interface RCTDevMenuConfigurationDecorator : NSObject
+
+#if RCT_DEV_MENU
+
+@property (nonatomic, strong, readonly) RCTDevMenuConfiguration *__nullable devMenuConfiguration;
+
+- (instancetype)initWithDevMenuConfiguration:(RCTDevMenuConfiguration *__nullable)devMenuConfiguration;
+- (void)decorate:(id<RCTBridgeModule>)devMenuModule;
+
+#endif
+
+@end

package/React/CoreModules/RCTDevMenuConfigurationDecorator.mm

@@ -0,0 +1,52 @@
+/*
+ * 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 "RCTDevMenuConfigurationDecorator.h"
+
+#if RCT_DEV_MENU
+
+#import <React/RCTDevMenu.h>
+#import <React/RCTDevSettings.h>
+
+@implementation RCTDevMenuConfigurationDecorator
+
+- (instancetype)initWithDevMenuConfiguration:(RCTDevMenuConfiguration *__nullable)devMenuConfiguration
+{
+  if (self = [super init]) {
+    _devMenuConfiguration = devMenuConfiguration;
+  }
+
+  return self;
+}
+
+- (void)decorate:(id<RCTBridgeModule>)bridgeModule
+{
+  if (_devMenuConfiguration == nil) {
+    return;
+  }
+
+  if ([bridgeModule isKindOfClass:[RCTDevMenu class]]) {
+    RCTDevMenu *devMenu = (RCTDevMenu *)bridgeModule;
+    devMenu.devMenuEnabled = _devMenuConfiguration.devMenuEnabled;
+    devMenu.keyboardShortcutsEnabled = _devMenuConfiguration.keyboardShortcutsEnabled;
+  }
+
+  if ([bridgeModule isKindOfClass:[RCTDevSettings class]]) {
+    RCTDevSettings *devSettings = (RCTDevSettings *)bridgeModule;
+    devSettings.isShakeGestureEnabled = _devMenuConfiguration.shakeGestureEnabled;
+  }
+}
+
+@end
+
+#else
+
+@implementation RCTDevMenuConfigurationDecorator : NSObject
+
+@end
+
+#endif

package/React/CoreModules/RCTDevSettings.h

@@ -65,6 +65,11 @@
  */
 @property (nonatomic, assign, setter=setHotLoadingEnabled:) BOOL isHotLoadingEnabled;
 
+/**
+ * Whether shake gesture is enabled.
+ */
+@property (nonatomic, assign) BOOL isShakeGestureEnabled;
+
 /**
  * Enables starting of profiling sampler on launch
  */

package/React/CoreModules/RCTDevSettings.mm

@@ -145,6 +145,7 @@ RCT_EXPORT_MODULE()
   };
   RCTDevSettingsUserDefaultsDataSource *dataSource =
       [[RCTDevSettingsUserDefaultsDataSource alloc] initWithDefaultValues:defaultValues];
+  _isShakeGestureEnabled = true;
   return [self initWithDataSource:dataSource];
 }
 
@@ -262,6 +263,12 @@ RCT_EXPORT_MODULE()
   return [_dataSource settingForKey:key];
 }
 
+- (void)setIsShakeGestureEnabled:(BOOL)isShakeGestureEnabled
+{
+  _isShakeGestureEnabled = isShakeGestureEnabled;
+  [self setIsShakeToShowDevMenuEnabled:isShakeGestureEnabled];
+}
+
 - (BOOL)isDeviceDebuggingAvailable
 {
 #if RCT_ENABLE_INSPECTOR
@@ -305,7 +312,7 @@ RCT_EXPORT_METHOD(setIsShakeToShowDevMenuEnabled : (BOOL)enabled)
 
 - (BOOL)isShakeToShowDevMenuEnabled
 {
-  return [[self settingForKey:kRCTDevSettingShakeToShowDevMenu] boolValue];
+  return _isShakeGestureEnabled && [[self settingForKey:kRCTDevSettingShakeToShowDevMenu] boolValue];
 }
 
 RCT_EXPORT_METHOD(setProfilingEnabled : (BOOL)enabled)

package/React/CoreModules/RCTDevToolsRuntimeSettingsModule.mm

@@ -25,8 +25,8 @@ static Config _config;
 @implementation RCTDevToolsRuntimeSettingsModule
 RCT_EXPORT_MODULE(ReactDevToolsRuntimeSettingsModule)
 
-RCT_EXPORT_METHOD(setReloadAndProfileConfig
-                  : (JS::NativeReactDevToolsRuntimeSettingsModule::PartialReloadAndProfileConfig &)config)
+RCT_EXPORT_METHOD(
+    setReloadAndProfileConfig : (JS::NativeReactDevToolsRuntimeSettingsModule::PartialReloadAndProfileConfig &)config)
 {
   if (config.shouldReloadAndProfile().has_value()) {
     _config.shouldReloadAndProfile = config.shouldReloadAndProfile().value();

package/React/CoreModules/RCTDeviceInfo.h

@@ -11,4 +11,6 @@
 
 @interface RCTDeviceInfo : NSObject <RCTBridgeModule>
 
+- (instancetype)initWithDimensionsProvider:(NSDictionary * (^)(void))dimensionsProvider;
+
 @end

package/React/CoreModules/RCTDeviceInfo.mm

@@ -34,6 +34,7 @@ using namespace facebook::react;
   NSDictionary *_constants;
 
   __weak UIWindow *_applicationWindow;
+  NSDictionary * (^_dimensionsProvider)(void);
 }
 
 static NSString *const kFrameKeyPath = @"frame";
@@ -51,6 +52,14 @@ RCT_EXPORT_MODULE()
   return self;
 }
 
+- (instancetype)initWithDimensionsProvider:(NSDictionary * (^)(void))dimensionsProvider
+{
+  if (self = [self init]) {
+    _dimensionsProvider = dimensionsProvider;
+  }
+  return self;
+}
+
 - (void)observeValueForKeyPath:(NSString *)keyPath
                       ofObject:(id)object
                         change:(NSDictionary *)change
@@ -205,6 +214,15 @@ static NSDictionary *RCTExportedDimensions(CGFloat fontScale)
 
 - (NSDictionary *)_exportedDimensions
 {
+  // if a window size provider has been set, use that. If nil is returned from the provider
+  // it will fall back to the default behavior.
+  if (_dimensionsProvider != nil) {
+    auto dimensions = _dimensionsProvider();
+    if (dimensions != nil) {
+      return dimensions;
+    }
+  }
+
   RCTAssert(!_invalidated, @"Failed to get exported dimensions: RCTDeviceInfo has been invalidated");
   RCTAssert(_moduleRegistry, @"Failed to get exported dimensions: RCTModuleRegistry is nil");
   RCTAccessibilityManager *accessibilityManager =
@@ -246,11 +264,10 @@ static NSDictionary *RCTExportedDimensions(CGFloat fontScale)
 - (void)interfaceOrientationDidChange
 {
 #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
-  UIApplication *application = RCTSharedApplication();
-  UIInterfaceOrientation nextOrientation = RCTKeyWindow().windowScene.interfaceOrientation;
+  UIWindow *window = RCTKeyWindow();
+  UIInterfaceOrientation nextOrientation = window.windowScene.interfaceOrientation;
 
-  BOOL isRunningInFullScreen =
-      CGRectEqualToRect(application.delegate.window.frame, application.delegate.window.screen.bounds);
+  BOOL isRunningInFullScreen = window ? CGRectEqualToRect(window.frame, window.screen.bounds) : YES;
   // We are catching here two situations for multitasking view:
   // a) The app is in Split View and the container gets resized -> !isRunningInFullScreen
   // b) The app changes to/from fullscreen example: App runs in slide over mode and goes into fullscreen->

package/React/CoreModules/RCTEventDispatcher.mm

@@ -71,12 +71,14 @@ RCT_EXPORT_MODULE()
 {
   [_callableJSModules invokeModule:@"RCTNativeAppEventEmitter"
                             method:@"emit"
-                          withArgs:body ? @[ name, body ] : @[ name ]];
+                          withArgs:(body != nullptr) ? @[ name, body ] : @[ name ]];
 }
 
 - (void)sendDeviceEventWithName:(NSString *)name body:(id)body
 {
-  [_callableJSModules invokeModule:@"RCTDeviceEventEmitter" method:@"emit" withArgs:body ? @[ name, body ] : @[ name ]];
+  [_callableJSModules invokeModule:@"RCTDeviceEventEmitter"
+                            method:@"emit"
+                          withArgs:(body != nullptr) ? @[ name, body ] : @[ name ]];
 }
 
 - (void)sendTextEventWithType:(RCTTextEventType)type
@@ -91,13 +93,13 @@ RCT_EXPORT_MODULE()
     @"eventCount" : @(eventCount),
   }];
 
-  if (text) {
+  if (text != nullptr) {
     // We copy the string here because if it's a mutable string it may get released before we dispatch the event on a
     // different thread, causing a crash.
     body[@"text"] = [text copy];
   }
 
-  if (key) {
+  if (key != nullptr) {
     if (key.length == 0) {
       key = @"Backspace"; // backspace
     } else {
@@ -142,7 +144,7 @@ RCT_EXPORT_MODULE()
   if (event.canCoalesce) {
     eventID = RCTGetEventID(event.viewTag, event.eventName, event.coalescingKey);
     id<RCTEvent> previousEvent = _events[eventID];
-    if (previousEvent) {
+    if (previousEvent != nullptr) {
       event = [previousEvent coalesceWithEvent:event];
     } else {
       [_eventQueue addObject:eventID];
@@ -173,13 +175,13 @@ RCT_EXPORT_MODULE()
   [_eventQueueLock unlock];
 
   if (scheduleEventsDispatch) {
-    if (_bridge) {
+    if (_bridge != nullptr) {
       [_bridge
           dispatchBlock:^{
             [self flushEventsQueue];
           }
                   queue:RCTJSThread];
-    } else if (_dispatchToJSThread) {
+    } else if (_dispatchToJSThread != nullptr) {
       _dispatchToJSThread(^{
         [self flushEventsQueue];
       });
@@ -236,7 +238,7 @@ RCT_EXPORT_MODULE()
 {
   NSDictionary *userInfo = notification.userInfo;
   id<RCTEvent> event = [userInfo objectForKey:@"event"];
-  if (event) {
+  if (event != nullptr) {
     [self notifyObserversOfEvent:event];
   }
 }

package/React/CoreModules/RCTExceptionsManager.mm

@@ -30,7 +30,7 @@ RCT_EXPORT_MODULE()
 
 - (instancetype)initWithDelegate:(id<RCTExceptionsManagerDelegate>)delegate
 {
-  if ((self = [self init])) {
+  if ((self = [self init]) != nullptr) {
     _delegate = delegate;
   }
   return self;
@@ -46,7 +46,7 @@ RCT_EXPORT_MODULE()
     [redbox showErrorMessage:message withStack:stack errorCookie:(int)exceptionId];
   }
 
-  if (_delegate) {
+  if (_delegate != nullptr) {
     [_delegate handleSoftJSExceptionWithMessage:message
                                           stack:stack
                                     exceptionId:[NSNumber numberWithDouble:exceptionId]
@@ -64,7 +64,7 @@ RCT_EXPORT_MODULE()
     [redbox showErrorMessage:message withStack:stack errorCookie:(int)exceptionId];
   }
 
-  if (_delegate) {
+  if (_delegate != nullptr) {
     [_delegate handleFatalJSExceptionWithMessage:message
                                            stack:stack
                                      exceptionId:[NSNumber numberWithDouble:exceptionId]
@@ -84,19 +84,17 @@ RCT_EXPORT_MODULE()
 }
 
 // TODO(T205456329): This method is deprecated in favour of reportException. Delete in v0.77
-RCT_EXPORT_METHOD(reportSoftException
-                  : (NSString *)message stack
-                  : (NSArray<NSDictionary *> *)stack exceptionId
-                  : (double)exceptionId)
+RCT_EXPORT_METHOD(
+    reportSoftException : (NSString *)message stack : (NSArray<NSDictionary *> *)stack exceptionId : (double)
+        exceptionId)
 {
   [self reportSoft:message stack:stack exceptionId:exceptionId extraDataAsJSON:nil];
 }
 
 // TODO(T205456329): This method is deprecated in favour of reportException. Delete in v0.77
-RCT_EXPORT_METHOD(reportFatalException
-                  : (NSString *)message stack
-                  : (NSArray<NSDictionary *> *)stack exceptionId
-                  : (double)exceptionId)
+RCT_EXPORT_METHOD(
+    reportFatalException : (NSString *)message stack : (NSArray<NSDictionary *> *)stack exceptionId : (double)
+        exceptionId)
 {
   [self reportFatal:message stack:stack exceptionId:exceptionId extraDataAsJSON:nil];
 }
@@ -107,13 +105,13 @@ RCT_EXPORT_METHOD(reportException : (JS::NativeExceptionsManager::ExceptionData
 {
   NSMutableDictionary<NSString *, id> *mutableErrorData = [NSMutableDictionary new];
   mutableErrorData[@"message"] = data.message();
-  if (data.originalMessage()) {
+  if (data.originalMessage() != nullptr) {
     mutableErrorData[@"originalMessage"] = data.originalMessage();
   }
-  if (data.name()) {
+  if (data.name() != nullptr) {
     mutableErrorData[@"name"] = data.name();
   }
-  if (data.componentStack()) {
+  if (data.componentStack() != nullptr) {
     mutableErrorData[@"componentStack"] = data.componentStack();
   }
 
@@ -141,7 +139,7 @@ RCT_EXPORT_METHOD(reportException : (JS::NativeExceptionsManager::ExceptionData
   mutableErrorData[@"id"] = @(data.id_());
   mutableErrorData[@"isFatal"] = @(data.isFatal());
 
-  if (data.extraData()) {
+  if (data.extraData() != nullptr) {
     mutableErrorData[@"extraData"] = data.extraData();
   }