Skip to content

Commit 7f90c1b

Browse files
* fix: restore back-button propagation from native to RN
1 parent 7d4d946 commit 7f90c1b

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

packages/react-native-brownfield/android/src/main/java/com/callstack/reactnativebrownfield/ReactNativeBrownfield.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,19 +167,20 @@ class ReactNativeBrownfield private constructor(val reactHost: ReactHost) {
167167
val resolvedDelegate =
168168
reactDelegate ?: ReactDelegateWrapper(activity, reactHost, moduleName, launchOptions)
169169

170-
val mBackPressedCallback: OnBackPressedCallback = object : OnBackPressedCallback(true) {
170+
val backPressedCallback: OnBackPressedCallback = object : OnBackPressedCallback(true) {
171171
override fun handleOnBackPressed() {
172172
// invoked for JS stack back navigation
173173
resolvedDelegate.onBackPressed()
174174
}
175175
}
176176

177177
// Register back press callback
178-
activity?.onBackPressedDispatcher?.addCallback(mBackPressedCallback)
178+
activity?.onBackPressedDispatcher?.addCallback(backPressedCallback)
179179
// invoked on the last RN screen exit
180180
resolvedDelegate.setHardwareBackHandler {
181-
mBackPressedCallback.isEnabled = false
181+
backPressedCallback.isEnabled = false
182182
activity?.onBackPressedDispatcher?.onBackPressed()
183+
backPressedCallback.isEnabled = true
183184
}
184185

185186
/**

0 commit comments

Comments
 (0)