Repair when RCTRedBoxGetEnabled is false , inoperative in RCTExceptio…

…nsManager
facebook · Dec 6, 2022 · 4f5bf74 · 4f5bf74
1 parent 96d6680
commit 4f5bf74
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/React/CoreModules/RCTExceptionsManager.mm b/React/CoreModules/RCTExceptionsManager.mm
@@ -12,6 +12,7 @@
 #import <React/RCTDefines.h>
 #import <React/RCTLog.h>
 #import <React/RCTRedBox.h>
+#import <React/RCTRedBoxSetEnabled.h>
 #import <React/RCTReloadCommand.h>
 #import <React/RCTRootView.h>
 
@@ -40,8 +41,10 @@ - (void)reportSoft:(NSString *)message
  exceptionId:(double)exceptionId
  extraDataAsJSON:(nullable NSString *)extraDataAsJSON
 {
- RCTRedBox *redbox = [_moduleRegistry moduleForName:"RedBox"];
- [redbox showErrorMessage:message withStack:stack errorCookie:(int)exceptionId];
+ if (RCTRedBoxGetEnabled()) {
+ RCTRedBox *redbox = [_moduleRegistry moduleForName:"RedBox"];
+ [redbox showErrorMessage:message withStack:stack errorCookie:(int)exceptionId];
+ }
 
  if (_delegate) {
  [_delegate handleSoftJSExceptionWithMessage:message
@@ -56,8 +59,10 @@ - (void)reportFatal:(NSString *)message
  exceptionId:(double)exceptionId
  extraDataAsJSON:(nullable NSString *)extraDataAsJSON
 {
- RCTRedBox *redbox = [_moduleRegistry moduleForName:"RedBox"];
- [redbox showErrorMessage:message withStack:stack errorCookie:(int)exceptionId];
+ if (RCTRedBoxGetEnabled()) {
+ RCTRedBox *redbox = [_moduleRegistry moduleForName:"RedBox"];
+ [redbox showErrorMessage:message withStack:stack errorCookie:(int)exceptionId];
+ }
 
  if (_delegate) {
  [_delegate handleFatalJSExceptionWithMessage:message
@@ -99,8 +104,10 @@ - (void)reportFatal:(NSString *)message
  : (NSArray<NSDictionary *> *)stack exceptionId
  : (double)exceptionId)
 {
- RCTRedBox *redbox = [_moduleRegistry moduleForName:"RedBox"];
- [redbox updateErrorMessage:message withStack:stack errorCookie:(int)exceptionId];
+ if (RCTRedBoxGetEnabled()) {
+ RCTRedBox *redbox = [_moduleRegistry moduleForName:"RedBox"];
+ [redbox updateErrorMessage:message withStack:stack errorCookie:(int)exceptionId];
+ }
 
  if (_delegate && [_delegate respondsToSelector:@selector(updateJSExceptionWithMessage:stack:exceptionId:)]) {
  [_delegate updateJSExceptionWithMessage:message stack:stack exceptionId:[NSNumber numberWithDouble:exceptionId]];