Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Fix behaviour of Enter and Tab hardware keys in TextFields (#216)

Browse source 
* Fix behaviour of Enter and Tab hardware keys in TextFields

* Add changelog
This commit is contained in:
Jorge Martin Espinosa 2023-03-15 13:57:51 +01:00 • committed by GitHub
parent 3fb87c40fd
commit ce981bc6a5
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/216.bugfix Normal file
View file

@ -0,0 +1 @@
Make sure `Modifier.onTabOrEnterKeyFocusNext` doesn't add line breaks or tabs to TextFields.

8
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/root/LoginRootView.kt
View file

@ -244,8 +244,8 @@ internal fun LoginForm(
readOnly = !interactionEnabled, readOnly = !interactionEnabled,
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.testTag(TestTags.loginEmailUsername) .onTabOrEnterKeyFocusNext(focusManager)
.onTabOrEnterKeyFocusNext(focusManager), .testTag(TestTags.loginEmailUsername),
label = { label = {
Text(text = stringResource(StringR.string.ex_login_username_hint)) Text(text = stringResource(StringR.string.ex_login_username_hint))
}, },
@ -284,8 +284,8 @@ internal fun LoginForm(
readOnly = !interactionEnabled, readOnly = !interactionEnabled,
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.testTag(TestTags.loginPassword) .onTabOrEnterKeyFocusNext(focusManager)
.onTabOrEnterKeyFocusNext(focusManager), .testTag(TestTags.loginPassword),
onValueChange = { onValueChange = {
passwordFieldState = it passwordFieldState = it
eventSink(LoginRootEvents.SetPassword(it)) eventSink(LoginRootEvents.SetPassword(it))

6
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/OutlinedTextField.kt
View file

@ -99,8 +99,10 @@ fun OutlinedTextField(
@OptIn(ExperimentalComposeUiApi::class) @OptIn(ExperimentalComposeUiApi::class)
fun Modifier.onTabOrEnterKeyFocusNext(focusManager: FocusManager): Modifier = onPreviewKeyEvent { event -> fun Modifier.onTabOrEnterKeyFocusNext(focusManager: FocusManager): Modifier = onPreviewKeyEvent { event ->
if (event.type == KeyEventType.KeyUp && (event.key == Key.Tab || event.key == Key.Enter)) { if (event.key == Key.Tab || event.key == Key.Enter) {
focusManager.moveFocus(FocusDirection.Down) if (event.type == KeyEventType.KeyUp) {
focusManager.moveFocus(FocusDirection.Down)
}
true true
} else { } else {
false false