Skip to content

Emoji insertion leftover characters #4566

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
bmarty merged 4 commits into from
Nov 29, 2021
Merged

Emoji insertion leftover characters #4566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dffed44
fixing single character emoji searches retaining the original query
ouchadam Nov 26, 2021
20241f8
basing the emoji ':' search on the current edit text selection to avo…
ouchadam Nov 26, 2021
cc9fb32
adding changelog entry
ouchadam Nov 26, 2021
7b691cc
updating comment to mention the cursor position
ouchadam Nov 26, 2021
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
1 change: 1 addition & 0 deletions changelog.d/3449.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixes left over text when inserting emojis via the ':' menu and replaces the last typed ':' rather than the one at the end of the message
7 changes: 4 additions & 3 deletions vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ class AutoCompleter @AssistedInject constructor(
.with(backgroundDrawable)
.with(object : AutocompleteCallback<String> {
override fun onPopupItemClicked(editable: Editable, item: String): Boolean {
// Detect last ":" and remove it
var startIndex = editable.lastIndexOf(":")
// Infer that the last ":" before the current cursor position is the original popup trigger
var startIndex = editable.subSequence(0, editText.selectionStart).lastIndexOf(":")
Copy link
Member

@bmarty bmarty Nov 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe update the comment above?

Copy link
Contributor Author

@ouchadam ouchadam Nov 26, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

7b691cc

if (startIndex == -1) {
startIndex = 0
}
Expand All @@ -194,7 +194,8 @@ class AutoCompleter @AssistedInject constructor(
}

// Replace the word by its completion
editable.replace(startIndex, endIndex, item)
editable.delete(startIndex, endIndex)
editable.insert(startIndex, item)
return true
}

Expand Down