Skip to content

feat(POM-494): Support text OTP UI component #291

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
vitalii-vanziak-cko merged 2 commits into from
May 26, 2025
Merged

feat(POM-494): Support text OTP UI component #291

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be63aff
Support OTP as text, reimplement next field focus
vitalii-vanziak-cko May 23, 2025
aeb07d3
LengthMax = 8
vitalii-vanziak-cko May 23, 2025
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
71 changes: 37 additions & 34 deletions ui-core/src/main/kotlin/com/processout/sdk/ui/core/component/field/code/POCodeField.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,13 @@ fun POCodeField(
for (textFieldIndex in values.indices) {
val focusRequester = remember { FocusRequester() }
POTextField(
value = values.getOrNull(textFieldIndex) ?: TextFieldValue(),
value = values[textFieldIndex],
onValueChange = { updatedValue ->
if (updatedValue.selection.length == 0) {
val filteredText = updatedValue.text.filter { it.isDigit() }
values = values.mapIndexed { valueIndex, textFieldValue ->
if (valueIndex == textFieldIndex) {
val updatedText = filteredText.firstOrNull()?.toString() ?: String()
val currentValue = values[textFieldIndex]
values = values.mapIndexed { index, textFieldValue ->
if (index == textFieldIndex) {
val updatedText = updatedValue.text.firstOrNull()?.toString() ?: String()
val isTextChanged = textFieldValue.text != updatedText
TextFieldValue(
text = updatedText,
Expand All @@ -112,10 +112,10 @@ fun POCodeField(
}
}
if (textFieldIndex != values.lastIndex &&
filteredText.length == 2 &&
updatedValue.text.length == 2 &&
updatedValue.selection.start == 2
) {
val nextText = filteredText.last().toString()
val nextText = updatedValue.text.last().toString()
values = values.mapIndexed { index, textFieldValue ->
if (index == textFieldIndex + 1) {
TextFieldValue(
Expand All @@ -127,6 +127,14 @@ fun POCodeField(
}
}
}
val isSelectionChangedOnly = currentValue.text == updatedValue.text &&
currentValue.selection != updatedValue.selection
if (updatedValue.text.isNotEmpty() &&
!isSelectionChangedOnly &&
textFieldIndex != values.lastIndex
) {
focusedIndex = textFieldIndex + 1
}
onValueChange(values.codeValue())
}
},
Expand All @@ -140,28 +148,22 @@ fun POCodeField(
)
)
.onPreviewKeyEvent {
when {
it.key == Key.Backspace && it.type == KeyEventType.KeyDown -> {
if (textFieldIndex != 0 && values[textFieldIndex].selection.start == 0) {
values = values.mapIndexed { index, textFieldValue ->
if (index == textFieldIndex - 1) {
TextFieldValue()
} else {
textFieldValue.copy(selection = TextRange.Zero)
}
}
focusManager.moveFocus(FocusDirection.Previous)
onValueChange(values.codeValue())
}
false
}
else -> {
if (it.type == KeyEventType.KeyDown && textFieldIndex != values.lastIndex) {
focusManager.moveFocus(FocusDirection.Next)
if (it.key == Key.Backspace &&
it.type == KeyEventType.KeyDown &&
textFieldIndex != 0 &&
values[textFieldIndex].selection.start == 0
) {
values = values.mapIndexed { index, textFieldValue ->
if (index == textFieldIndex - 1) {
TextFieldValue()
} else {
textFieldValue.copy(selection = TextRange.Zero)
}
false
}
focusManager.moveFocus(FocusDirection.Previous)
onValueChange(values.codeValue())
}
false
}
.focusRequester(focusRequester)
.onFocusChanged {
Expand Down Expand Up @@ -197,13 +199,14 @@ private fun values(
while (values.size < length) {
values.add(TextFieldValue())
}
val filteredText = text.filter { it.isDigit() }.take(length)
filteredText.forEachIndexed { index, char ->
values[index] = TextFieldValue(
text = char.toString(),
selection = TextRange(char.toString().length)
)
}
text.take(length)
.forEachIndexed { index, char ->
val value = char.toString()
values[index] = TextFieldValue(
text = value,
selection = TextRange(value.length)
)
}
return values
}

Expand Down Expand Up @@ -251,7 +254,7 @@ object POCodeField {
)

val LengthMin = 1
val LengthMax = 6
val LengthMax = 8

internal fun validLength(length: Int): Int {
if (length in LengthMin..LengthMax) {
Expand Down