yilsem/aiturk-mobil
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

fix(#599): place cursor at end of text when a slash command is inserted from the dropdown (#600)

Browse Source 
Co-authored-by: hy4ri <hy4ri@users.noreply.github.com>
This commit is contained in:
M57andhy4ri authored and GitHub committed 2026-07-15 10:36:18 +03:00
1 parent 5376d46683
commit 0823fe3117
3 files changed
+54 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/m57/hermescontrol/ui/chat/ChatInputPolicy.kt
+13
View File
@@ -1,5 +1,8 @@
package com.m57.hermescontrol.ui.chat
import androidx.compose.ui.text.TextRange
import androidx.compose.ui.text.input.TextFieldValue
/**
* Pure, testable decision logic for the chat input bar.
*
@@ -32,4 +35,14 @@ object ChatInputPolicy {
text: String,
isAgentTyping: Boolean,
): Boolean = isAgentTyping && text.isNotBlank()
/**
* Builds the [TextFieldValue] for a slash command inserted via the
* suggestion dropdown. The cursor is placed at the END of the text, not the
* middle (issue #599): a plain-String [OutlinedTextField] value leaves the
* cursor at the end of the shared prefix when an external update replaces
* `/h` with `/help`, so the dropdown click must carry an explicit end
* selection.
*/
fun commandFieldValue(command: String): TextFieldValue = TextFieldValue(command, TextRange(command.length))
}
app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt
+23 -18
View File
@@ -114,6 +114,7 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.input.PasswordVisualTransformation
import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
@@ -187,7 +188,9 @@ fun ChatScreen(
}
}
val scrollScope = rememberCoroutineScope()
var inputText by rememberSaveable { mutableStateOf("") }
var inputFieldValue by rememberSaveable(stateSaver = TextFieldValue.Saver) {
mutableStateOf(TextFieldValue(""))
}
var isListening by rememberSaveable { mutableStateOf(false) }
var lastAnimatedMessageId by rememberSaveable { mutableStateOf<String?>(null) }
var showReloginDialog by rememberSaveable { mutableStateOf(false) }
@@ -212,12 +215,13 @@ fun ChatScreen(
?.firstOrNull()
.orEmpty()
if (spokenText.isNotBlank()) {
inputText =
if (inputText.isBlank()) {
val merged =
if (inputFieldValue.text.isBlank()) {
spokenText
} else {
"$inputText $spokenText"
"${inputFieldValue.text} $spokenText"
}
inputFieldValue = ChatInputPolicy.commandFieldValue(merged)
}
}
}
@@ -469,11 +473,11 @@ fun ChatScreen(
}
ChatInputBar(
inputText = inputText,
onInputChange = { inputText = it },
inputFieldValue = inputFieldValue,
onInputChange = { inputFieldValue = it },
onSend = {
viewModel.sendMessage(inputText)
inputText = ""
viewModel.sendMessage(inputFieldValue.text)
inputFieldValue = TextFieldValue("")
scrollScope.launch {
val totalItems =
state.messages.size +
@@ -686,8 +690,8 @@ private fun ReasoningIndicator(reasoningText: String) {
@Composable
private fun ChatInputBar(
inputText: String,
onInputChange: (String) -> Unit,
inputFieldValue: TextFieldValue,
onInputChange: (TextFieldValue) -> Unit,
onSend: () -> Unit,
onMicTap: () -> Unit,
isListening: Boolean,
@@ -704,8 +708,8 @@ private fun ChatInputBar(
// gateway's prompt.submit busy-input policy queues it as the next turn
// (tui_gateway/server.py:_handle_busy_submit), so the message is never
// dropped. Slash commands were already allowed; regular prompts now are too.
val isSlashCommand = inputText.startsWith("/")
val canSend = ChatInputPolicy.canSend(inputText, pendingAttachments, isConnected)
val isSlashCommand = inputFieldValue.text.startsWith("/")
val canSend = ChatInputPolicy.canSend(inputFieldValue.text, pendingAttachments, isConnected)
// Attachment menu state
var showAttachmentMenu by remember { mutableStateOf(false) }
@@ -776,11 +780,12 @@ private fun ChatInputBar(
val commandNames = commandCatalog.pairs.map { it[0] }.filter { it !in hiddenSlashDisplay }
androidx.compose.animation.AnimatedVisibility(
visible = inputText.startsWith("/") && !inputText.contains(" "),
visible = inputFieldValue.text.startsWith("/") && !inputFieldValue.text.contains(" "),
enter = androidx.compose.animation.fadeIn() + androidx.compose.animation.expandVertically(),
exit = androidx.compose.animation.fadeOut() + androidx.compose.animation.shrinkVertically(),
) {
val filteredCommands = commandNames.filter { it.startsWith(inputText, ignoreCase = true) }
val filteredCommands =
commandNames.filter { it.startsWith(inputFieldValue.text, ignoreCase = true) }
if (filteredCommands.isNotEmpty()) {
androidx.compose.material3.Surface(
modifier =
@@ -807,7 +812,7 @@ private fun ChatInputBar(
color = MaterialTheme.colorScheme.primary,
)
},
onClick = { onInputChange(cmd) },
onClick = { onInputChange(ChatInputPolicy.commandFieldValue(cmd)) },
)
}
}
@@ -905,7 +910,7 @@ private fun ChatInputBar(
}
OutlinedTextField(
value = inputText,
value = inputFieldValue,
onValueChange = onInputChange,
modifier =
Modifier
@@ -917,7 +922,7 @@ private fun ChatInputBar(
Text(
if (!isConnected) {
stringResource(R.string.chat_input_placeholder_not_connected)
} else if (ChatInputPolicy.showQueuePlaceholder(inputText, isAgentTyping)) {
} else if (ChatInputPolicy.showQueuePlaceholder(inputFieldValue.text, isAgentTyping)) {
stringResource(R.string.chat_input_placeholder_queue)
} else if (isAgentTyping) {
stringResource(R.string.chat_input_placeholder_waiting)
@@ -946,7 +951,7 @@ private fun ChatInputBar(
targetState =
when {
isListening -> "listening"
inputText.isBlank() && pendingAttachments.isEmpty() -> "mic"
inputFieldValue.text.isBlank() && pendingAttachments.isEmpty() -> "mic"
else -> "send"
},
transitionSpec = {