BetterAndroid/FlexiUI
5
0
Fork 0
mirror of https://github.com/BetterAndroid/FlexiUI.git synced 2025-09-08 11:34:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: request focus when decoration box hold pressed event in TextField

Browse Source
This commit is contained in:
fankesyooni
2023-11-20 01:11:46 +08:00
parent 86f0b72cea
commit 1e998302dd
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/TextField.kt
View File

@@ -33,6 +33,7 @@ import androidx.compose.foundation.hoverable
import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.interaction.collectIsFocusedAsState import androidx.compose.foundation.interaction.collectIsFocusedAsState
import androidx.compose.foundation.interaction.collectIsHoveredAsState import androidx.compose.foundation.interaction.collectIsHoveredAsState
import androidx.compose.foundation.interaction.collectIsPressedAsState
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
@@ -312,6 +313,9 @@ fun PasswordTextField(
contentAlignment = Alignment.Center contentAlignment = Alignment.Center
) { ) {
val animatedSize by animateDpAsState(if (value.text.isNotEmpty()) DefaultDecorIconSize else 0.dp) val animatedSize by animateDpAsState(if (value.text.isNotEmpty()) DefaultDecorIconSize else 0.dp)
val cInteractionSource = remember { MutableInteractionSource() }
val pressed by cInteractionSource.collectIsPressedAsState()
if (pressed) focusRequester.requestFocus()
if (value.text.isEmpty() && animatedSize == 0.dp) passwordVisible = defaultPasswordVisible if (value.text.isEmpty() && animatedSize == 0.dp) passwordVisible = defaultPasswordVisible
IconToggleButton( IconToggleButton(
modifier = Modifier.size(animatedSize).pointerHoverState(TextFieldPointerState.NORMAL), modifier = Modifier.size(animatedSize).pointerHoverState(TextFieldPointerState.NORMAL),
@@ -321,7 +325,8 @@ fun PasswordTextField(
passwordVisible = it passwordVisible = it
focusRequester.requestFocus() focusRequester.requestFocus()
}, },
enabled = enabled enabled = enabled,
interactionSource = cInteractionSource
) { Icon(imageVector = if (passwordVisible) Icons.ViewerOpen else Icons.ViewerClose) } ) { Icon(imageVector = if (passwordVisible) Icons.ViewerOpen else Icons.ViewerClose) }
} }
}, },
@@ -423,6 +428,9 @@ fun BackspaceTextField(
contentAlignment = Alignment.Center contentAlignment = Alignment.Center
) { ) {
val animatedSize by animateDpAsState(if (value.text.isNotEmpty()) DefaultDecorIconSize else 0.dp) val animatedSize by animateDpAsState(if (value.text.isNotEmpty()) DefaultDecorIconSize else 0.dp)
val cInteractionSource = remember { MutableInteractionSource() }
val pressed by cInteractionSource.collectIsPressedAsState()
if (pressed) focusRequester.requestFocus()
IconButton( IconButton(
onClick = { onClick = {
val cursorPosition = value.selection.start val cursorPosition = value.selection.start
@@ -435,7 +443,8 @@ fun BackspaceTextField(
}, },
modifier = Modifier.width(animatedSize).pointerHoverState(TextFieldPointerState.NORMAL), modifier = Modifier.width(animatedSize).pointerHoverState(TextFieldPointerState.NORMAL),
style = IconButton.style.copy(padding = DefaultDecorIconPadding), style = IconButton.style.copy(padding = DefaultDecorIconPadding),
enabled = enabled enabled = enabled,
interactionSource = cInteractionSource
) { Icon(imageVector = Icons.Backspace) } ) { Icon(imageVector = Icons.Backspace) }
} }
}, },