Skip to content

Commit 46c4274

Browse files
RSNarafacebook-github-bot
authored andcommitted
ReactDelegate: make onBackPressed return correct status
Summary: onBackPressed returns a boolean: whether the back press was handled. When react is invalid, this method should return false. This diff accomplishes that. Reviewed By: mdvacca Differential Revision: D88787192
1 parent dd1f83e commit 46c4274

File tree

1 file changed

+3
-6
lines changed
  • packages/react-native/ReactAndroid/src/main/java/com/facebook/react

1 file changed

+3
-6
lines changed

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactDelegate.kt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -178,13 +178,10 @@ public open class ReactDelegate {
178178
if (
179179
ReactNativeNewArchitectureFeatureFlags.enableBridgelessArchitecture() && reactHost != null
180180
) {
181-
reactHost?.onBackPressed()
181+
return reactHost?.onBackPressed() == true
182+
} else if (reactNativeHost?.hasInstance() == true) {
183+
reactNativeHost?.reactInstanceManager?.onBackPressed()
182184
return true
183-
} else {
184-
if (reactNativeHost?.hasInstance() == true) {
185-
reactNativeHost?.reactInstanceManager?.onBackPressed()
186-
return true
187-
}
188185
}
189186
return false
190187
}

0 commit comments

Comments
 (0)