Skip to content

Commit 40f669d

Browse files
authored
Merge pull request #1272 from DimensionDev/bugfix/compose_emoji
fix compose emoji insert position
2 parents b1f1496 + a692422 commit 40f669d

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

app/src/main/java/dev/dimension/flare/ui/screen/compose/ComposeScreen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import androidx.compose.foundation.rememberScrollState
2626
import androidx.compose.foundation.shape.CircleShape
2727
import androidx.compose.foundation.shape.RoundedCornerShape
2828
import androidx.compose.foundation.text.input.TextFieldState
29+
import androidx.compose.foundation.text.input.insert
2930
import androidx.compose.material3.AssistChip
3031
import androidx.compose.material3.ButtonGroup
3132
import androidx.compose.material3.Card
@@ -833,7 +834,7 @@ private fun composePresenter(
833834

834835
fun selectEmoji(emoji: UiEmoji) {
835836
textFieldState.edit {
836-
append(emoji.insertText)
837+
insert(textFieldState.selection.start, emoji.insertText)
837838
}
838839
}
839840

desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/compose/ComposeDialog.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import androidx.compose.foundation.shape.CircleShape
2525
import androidx.compose.foundation.shape.RoundedCornerShape
2626
import androidx.compose.foundation.text.BasicTextField
2727
import androidx.compose.foundation.text.input.TextFieldState
28+
import androidx.compose.foundation.text.input.insert
2829
import androidx.compose.material.IconButton
2930
import androidx.compose.runtime.Composable
3031
import androidx.compose.runtime.CompositionLocalProvider
@@ -855,7 +856,7 @@ private fun composePresenter(
855856

856857
fun selectEmoji(emoji: UiEmoji) {
857858
textFieldState.edit {
858-
append(emoji.insertText)
859+
insert(textFieldState.selection.start, emoji.insertText)
859860
}
860861
}
861862

0 commit comments

Comments
 (0)