From af1c782ba5db1afbf8117632b5458ca9421cdfe2 Mon Sep 17 00:00:00 2001 From: Jhony Cesar Date: Tue, 28 Jul 2026 01:12:46 -0400 Subject: [PATCH] fix: handle sheet dismissal conflict with keyboard visibility by clearing focus instead of blocking back button --- .../ui/screens/MaintenanceDashboardScreen.kt | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/example/ui/screens/MaintenanceDashboardScreen.kt b/app/src/main/java/com/example/ui/screens/MaintenanceDashboardScreen.kt index e35d798..c6de577 100644 --- a/app/src/main/java/com/example/ui/screens/MaintenanceDashboardScreen.kt +++ b/app/src/main/java/com/example/ui/screens/MaintenanceDashboardScreen.kt @@ -1075,29 +1075,30 @@ fun EditActivityBottomSheet( onGoogleLoginClick: () -> Unit ) { val density = LocalDensity.current + val keyboardController = LocalSoftwareKeyboardController.current + val focusManager = LocalFocusManager.current + + // Track keyboard visibility reactively val isKeyboardOpen = WindowInsets.ime.getBottom(density) > 0 + val sheetState = rememberModalBottomSheetState( + skipPartiallyExpanded = true, + confirmValueChange = { targetValue -> + if (targetValue == SheetValue.Hidden && isKeyboardOpen) { + // Keyboard is open: reject sheet dismissal and hide keyboard instead + keyboardController?.hide() + focusManager.clearFocus() + false + } else { + true + } + } + ) + ModalBottomSheet( onDismissRequest = onDismiss, - sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true), - containerColor = Color.White, - properties = ModalBottomSheetDefaults.properties( - shouldDismissOnBackPress = false - ), - modifier = Modifier - .focusable() - .onPreviewKeyEvent { event -> - if (event.key == Key.Back && event.type == KeyEventType.KeyUp) { - if (isKeyboardOpen) { - false - } else { - onDismiss() - true - } - } else { - false - } - } + sheetState = sheetState, + containerColor = Color.White ) { var progressValue by remember(activity) { mutableStateOf(activity.percentualExecucao.toFloat()) }