Skip to content

Commit 4a82278

Browse files
committed
Redesign paused in debugger overlay (iOS)
1 parent 6fa0b40 commit 4a82278

10 files changed

Lines changed: 294 additions & 155 deletions

‎packages/react-native/React/Base/RCTBridge.mm‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#import "RCTJSThread.h"
2626
#import "RCTLog.h"
2727
#import "RCTModuleData.h"
28-
#import "RCTPausedInDebuggerOverlayController.h"
2928
#import "RCTPerformanceLogger.h"
3029
#import "RCTProfile.h"
3130
#import "RCTReloadCommand.h"

‎packages/react-native/React/CoreModules/RCTDevLoadingView.h‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,15 @@
99
#import <React/RCTDevLoadingViewProtocol.h>
1010

1111
@interface RCTDevLoadingView : NSObject <RCTDevLoadingViewProtocol, RCTBridgeModule>
12+
13+
/**
14+
* Shows the banner in its paused-in-debugger state: a capsule with a leading pause icon and a "Tap to resume" line,
15+
* over a dimmed app that takes no touches, with a tap on the banner calling `onResume`. The banner stays until
16+
* `hidePausedInDebuggerMessage`, and a loading banner stacks below it while both are visible. Unlike the loading
17+
* messages, this state ignores `RCTDevLoadingViewSetEnabled`. Meant for a dedicated instance, kept apart from the
18+
* module's own.
19+
*/
20+
- (void)showPausedInDebuggerMessage:(NSString *)message onResume:(dispatch_block_t)onResume;
21+
- (void)hidePausedInDebuggerMessage;
22+
1223
@end

‎packages/react-native/React/CoreModules/RCTDevLoadingView.mm‎

Lines changed: 241 additions & 18 deletions
Large diffs are not rendered by default.

packages/react-native/React/DevSupport/RCTPausedInDebuggerOverlayController.h renamed to packages/react-native/React/CoreModules/RCTPausedInDebuggerOverlayController.h

File renamed without changes.
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/*
2+
* Copyright (c) Meta Platforms, Inc. and affiliates.
3+
*
4+
* This source code is licensed under the MIT license found in the
5+
* LICENSE file in the root directory of this source tree.
6+
*/
7+
8+
#import "RCTPausedInDebuggerOverlayController.h"
9+
10+
#import <React/RCTDevLoadingView.h>
11+
12+
// The debugger frontend sends a generic message with each pause; the banner shows React Native's own wording, which
13+
// also tells someone who is not debugging what happened to the app.
14+
static NSString *const RCTPausedInDebuggerMessage = @"App paused in debugger";
15+
16+
@implementation RCTPausedInDebuggerOverlayController {
17+
// A dedicated banner, so the paused state neither replaces nor is replaced by the module's loading messages.
18+
RCTDevLoadingView *_banner;
19+
}
20+
21+
- (void)showWithMessage:(__unused NSString *)message onResume:(void (^)(void))onResume
22+
{
23+
if (_banner == nil) {
24+
_banner = [RCTDevLoadingView new];
25+
}
26+
[_banner showPausedInDebuggerMessage:RCTPausedInDebuggerMessage onResume:onResume];
27+
}
28+
29+
- (void)hide
30+
{
31+
[_banner hidePausedInDebuggerMessage];
32+
}
33+
34+
@end

‎packages/react-native/React/DevSupport/RCTPausedInDebuggerOverlayController.mm‎

Lines changed: 0 additions & 136 deletions
This file was deleted.

‎scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -944,6 +944,8 @@ interface RCTDefaultReactNativeFactoryDelegate : public UIResponder <RCTReactNat
944944
}
945945

946946
interface RCTDevLoadingView : public NSObject <RCTDevLoadingViewProtocol, RCTBridgeModule> {
947+
public virtual void hidePausedInDebuggerMessage();
948+
public virtual void showPausedInDebuggerMessage:onResume:(NSString* message, dispatch_block_t onResume);
947949
}
948950

949951
interface RCTDevMenu : public NSObject {

‎scripts/cxx-api/api-snapshots/ReactAppleFrameworksCxx.api‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -953,6 +953,8 @@ interface RCTDefaultReactNativeFactoryDelegate : public UIResponder <RCTReactNat
953953
}
954954

955955
interface RCTDevLoadingView : public NSObject <RCTDevLoadingViewProtocol, RCTBridgeModule> {
956+
public virtual void hidePausedInDebuggerMessage();
957+
public virtual void showPausedInDebuggerMessage:onResume:(NSString* message, dispatch_block_t onResume);
956958
}
957959

958960
interface RCTDevMenu : public NSObject {

‎scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -944,6 +944,8 @@ interface RCTDefaultReactNativeFactoryDelegate : public UIResponder <RCTReactNat
944944
}
945945

946946
interface RCTDevLoadingView : public NSObject <RCTDevLoadingViewProtocol, RCTBridgeModule> {
947+
public virtual void hidePausedInDebuggerMessage();
948+
public virtual void showPausedInDebuggerMessage:onResume:(NSString* message, dispatch_block_t onResume);
947949
}
948950

949951
interface RCTDevMenu : public NSObject {

‎scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -944,6 +944,8 @@ interface RCTDefaultReactNativeFactoryDelegate : public UIResponder <RCTReactNat
944944
}
945945

946946
interface RCTDevLoadingView : public NSObject <RCTDevLoadingViewProtocol, RCTBridgeModule> {
947+
public virtual void hidePausedInDebuggerMessage();
948+
public virtual void showPausedInDebuggerMessage:onResume:(NSString* message, dispatch_block_t onResume);
947949
}
948950

949951
interface RCTDevMenu : public NSObject {

0 commit comments

Comments
 (0)