Skip to content

fix(login): keyboard flash #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OffRange merged 1 commit into from
Aug 27, 2026
Merged

fix(login): keyboard flash #86

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions .../src/main/kotlin/de/davis/keygo/feature/item/core/presentation/component/ChipFormGroup.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import androidx.compose.material3.TextFieldLabelScope
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.Stable
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue
import androidx.compose.runtime.key
import androidx.compose.runtime.mutableStateOf
Expand All @@ -38,11 +37,13 @@ import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.runtime.snapshotFlow
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusDirection
import androidx.compose.ui.input.key.Key
import androidx.compose.ui.input.key.KeyEventType
import androidx.compose.ui.input.key.key
import androidx.compose.ui.input.key.onPreviewKeyEvent
import androidx.compose.ui.input.key.type
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
Expand Down Expand Up @@ -82,6 +83,7 @@ fun <T> ChipFormGroup(
inputTransformation: InputTransformation? = null,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
) {
val focusManager = LocalFocusManager.current
val currentOnSubmit by rememberUpdatedState(onSubmit)
val currentContainsForInput by rememberUpdatedState(containsForInput)
val currentOnEdit by rememberUpdatedState(onEdit)
Expand Down Expand Up @@ -188,12 +190,8 @@ fun <T> ChipFormGroup(
inputTransformation?.then(noLeadingDelimiters) ?: noLeadingDelimiters
}

// Dynamically switch IME action: Send to submit text as chips, Next to move focus.
val hasText by remember { derivedStateOf { state.text.isNotBlank() } }
val effectiveKeyboardOptions = remember(keyboardOptions, hasText) {
keyboardOptions.copy(
imeAction = if (hasText) ImeAction.Send else ImeAction.Next
)
val effectiveKeyboardOptions = remember(keyboardOptions) {
keyboardOptions.copy(imeAction = ImeAction.Send)
}

val modifier = modifier
Expand All @@ -219,9 +217,9 @@ fun <T> ChipFormGroup(
true
}

// Flush pending text as chips before forwarding the keyboard action.
val keyboardActionHandler = KeyboardActionHandler { defaultAction ->
if (hasText) handleText(state.text.toString(), keepLast = false)
if (state.text.isNotBlank()) handleText(state.text.toString(), keepLast = false)
else focusManager.moveFocus(FocusDirection.Next)

onKeyboardAction?.onKeyboardAction(defaultAction) ?: defaultAction()
}
Expand Down
Loading