From 640d1d8c72b254ca99076318152f82ee2c00544d Mon Sep 17 00:00:00 2001 From: Radhika Canopas Date: Fri, 11 Aug 2023 14:38:12 +0530 Subject: [PATCH] Fix textfield click --- .../countrypicker/CountryPickerBottomSheet.kt | 2 +- .../countrypicker/CountryPickerTextField.kt | 20 +++++++------------ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/countrypicker/src/main/java/com/canopas/campose/countrypicker/CountryPickerBottomSheet.kt b/countrypicker/src/main/java/com/canopas/campose/countrypicker/CountryPickerBottomSheet.kt index bc4af5e..fa7300a 100644 --- a/countrypicker/src/main/java/com/canopas/campose/countrypicker/CountryPickerBottomSheet.kt +++ b/countrypicker/src/main/java/com/canopas/campose/countrypicker/CountryPickerBottomSheet.kt @@ -33,7 +33,7 @@ import kotlinx.coroutines.launch @OptIn(ExperimentalMaterial3Api::class) @Composable fun CountryPickerBottomSheet( - sheetState: SheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true), + sheetState: SheetState = rememberModalBottomSheetState(skipPartiallyExpanded = false), shape: Shape = BottomSheetDefaults.ExpandedShape, containerColor: Color = BottomSheetDefaults.ContainerColor, contentColor: Color = contentColorFor(containerColor), diff --git a/countrypicker/src/main/java/com/canopas/campose/countrypicker/CountryPickerTextField.kt b/countrypicker/src/main/java/com/canopas/campose/countrypicker/CountryPickerTextField.kt index cd02c45..d7a83e0 100644 --- a/countrypicker/src/main/java/com/canopas/campose/countrypicker/CountryPickerTextField.kt +++ b/countrypicker/src/main/java/com/canopas/campose/countrypicker/CountryPickerTextField.kt @@ -10,7 +10,6 @@ import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.OutlinedTextFieldDefaults import androidx.compose.material3.Text import androidx.compose.material3.TextFieldColors -import androidx.compose.material3.TextFieldDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier @@ -24,7 +23,6 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.semantics.onClick import androidx.compose.ui.semantics.semantics import com.canopas.campose.countrypicker.model.Country -import kotlinx.coroutines.coroutineScope @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -77,17 +75,13 @@ fun Modifier.expandable( onExpandedChange: () -> Unit ) = pointerInput(Unit) { awaitEachGesture { - coroutineScope { - awaitPointerEventScope { - var event: PointerEvent - do { - event = awaitPointerEvent(PointerEventPass.Initial) - } while ( - !event.changes.all { it.changedToUp() } - ) - onExpandedChange.invoke() - } - } + var event: PointerEvent + do { + event = awaitPointerEvent(PointerEventPass.Initial) + } while ( + !event.changes.all { it.changedToUp() } + ) + onExpandedChange.invoke() } }.semantics { onClick {