Skip to content

fix compose emoji insert position #1272

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
Tlaster merged 1 commit into from
Sep 22, 2025
Merged

fix compose emoji insert position #1272

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion app/src/main/java/dev/dimension/flare/ui/screen/compose/ComposeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.input.TextFieldState
import androidx.compose.foundation.text.input.insert
import androidx.compose.material3.AssistChip
import androidx.compose.material3.ButtonGroup
import androidx.compose.material3.Card
Expand Down Expand Up @@ -833,7 +834,7 @@ private fun composePresenter(

fun selectEmoji(emoji: UiEmoji) {
textFieldState.edit {
append(emoji.insertText)
insert(textFieldState.selection.start, emoji.insertText)
}
}

Expand Down
3 changes: 2 additions & 1 deletion desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/compose/ComposeDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.BasicTextField
import androidx.compose.foundation.text.input.TextFieldState
import androidx.compose.foundation.text.input.insert
import androidx.compose.material.IconButton
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
Expand Down Expand Up @@ -855,7 +856,7 @@ private fun composePresenter(

fun selectEmoji(emoji: UiEmoji) {
textFieldState.edit {
append(emoji.insertText)
insert(textFieldState.selection.start, emoji.insertText)
}
}

Expand Down