mirror of
https://github.com/facebook/react-native.git
synced 2026-11-18 20:19:07 +00:00
Allow LogBox and RedBox overlay dismissal via Android back button (#56405)
Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/56405 On Android, pressing the hardware back button while the LogBox inspector is open does nothing. `LogBoxDialog` is explicitly set to `setCancelable(false)` and there's no `onBackPressed()` override, so the back button is completely swallowed. The only way to close the inspector is the on-screen Minimize/Dismiss buttons. For RedBox, the dialog is cancelable by default so back press does dismiss it visually, but it bypasses `hideRedboxDialog()`. The dialog reference and content view don't get cleaned up, leaving stale state. This adds proper back button handling for both: **LogBox**: `LogBoxDialog` now takes an `onRequestClose` callback and overrides `onBackPressed()` to invoke it. The surface delegate passes a callback that emits `hardwareBackPress` to the JS runtime, where a new `BackHandler` listener in `LogBoxInspector` calls `onMinimize()`. This keeps `setCancelable(false)` in place (so tapping outside the dialog doesn't dismiss it) while still running the full dismiss flow through JS: state reset, `NativeLogBox.hide()`, dialog cleanup. **RedBox**: The anonymous `Dialog` subclass now overrides `onBackPressed()` to call `hideRedboxDialog()` directly, which dismisses the dialog, destroys the content view, and nulls the reference. Changelog: [Internal] - Allow LogBox and RedBox overlays to respond to Android back button press Reviewed By: alanleedev Differential Revision: D100081099 fbshipit-source-id: cabec9b75fb3e733662457bc34de006a45a11494
This commit is contained in:
1 parent
0d1b70ee22
commit
8629a34d45
3 files changed
+19
-2
No files matched your search
@@ -11,6 +11,7 @@
|
||||
import Keyboard from '../../Components/Keyboard/Keyboard';
|
||||
import View from '../../Components/View/View';
|
||||
import StyleSheet from '../../StyleSheet/StyleSheet';
|
||||
import BackHandler from '../../Utilities/BackHandler';
|
||||
import * as LogBoxData from '../Data/LogBoxData';
|
||||
import LogBoxLog, {type LogLevel} from '../Data/LogBoxLog';
|
||||
import LogBoxInspectorBody from './LogBoxInspectorBody';
|
||||
@@ -30,7 +31,7 @@ type Props = Readonly<{
|
||||
}>;
|
||||
|
||||
export default function LogBoxInspector(props: Props): React.Node {
|
||||
const {logs, selectedIndex} = props;
|
||||
const {logs, selectedIndex, onMinimize} = props;
|
||||
let log = logs[selectedIndex];
|
||||
|
||||
useEffect(() => {
|
||||
@@ -55,6 +56,17 @@ export default function LogBoxInspector(props: Props): React.Node {
|
||||
Keyboard.dismiss();
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
const subscription = BackHandler.addEventListener(
|
||||
'hardwareBackPress',
|
||||
() => {
|
||||
onMinimize();
|
||||
return true;
|
||||
},
|
||||
);
|
||||
return () => subscription.remove();
|
||||
}, [onMinimize]);
|
||||
|
||||
function _handleRetry() {
|
||||
LogBoxData.retrySymbolicateLogNow(log);
|
||||
}
|
||||
|
||||
+5
-1
@@ -66,7 +66,11 @@ internal class LogBoxDialogSurfaceDelegate(private val devSupportManager: DevSup
|
||||
|
||||
dialog = LogBoxDialog(context, reactRootView)
|
||||
dialog?.let { dialog ->
|
||||
dialog.setCancelable(false)
|
||||
dialog.setCancelable(true)
|
||||
dialog.setCanceledOnTouchOutside(false)
|
||||
dialog.setOnCancelListener {
|
||||
devSupportManager.currentReactContext?.emitDeviceEvent("hardwareBackPress")
|
||||
}
|
||||
dialog.show()
|
||||
}
|
||||
}
|
||||
|
||||
+1
@@ -125,6 +125,7 @@ internal class RedBoxDialogSurfaceDelegate(private val devSupportManager: DevSup
|
||||
.apply {
|
||||
requestWindowFeature(Window.FEATURE_NO_TITLE)
|
||||
setContentView(checkNotNull(redBoxContentView))
|
||||
setOnCancelListener { devSupportManager.hideRedboxDialog() }
|
||||
}
|
||||
}
|
||||
dialog?.show()
|
||||
|
||||
Reference in new issue
Block a user