PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #2253 from matrix-org/dbkr/fix_ascii_smiley_emojification

Browse source 
Fix autoreplacement of ascii emoji
This commit is contained in:
David Baker 2018-10-26 17:46:29 +01:00 committed by GitHub
commit 3b6a0f9132
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/views/rooms/MessageComposerInput.js
View file

@ -544,7 +544,7 @@ export default class MessageComposerInput extends React.Component {
if (editorState.startText !== null) { if (editorState.startText !== null) {
const text = editorState.startText.text; const text = editorState.startText.text;
const currentStartOffset = editorState.startOffset; const currentStartOffset = editorState.selection.start.offset;
// Automatic replacement of plaintext emoji to Unicode emoji // Automatic replacement of plaintext emoji to Unicode emoji
if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) { if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) {
@ -558,11 +558,11 @@ export default class MessageComposerInput extends React.Component {
const range = Range.create({ const range = Range.create({
anchor: { anchor: {
key: editorState.selection.startKey, key: editorState.startText.key,
offset: currentStartOffset - emojiMatch[1].length - 1, offset: currentStartOffset - emojiMatch[1].length - 1,
}, },
focus: { focus: {
key: editorState.selection.startKey, key: editorState.startText.key,
offset: currentStartOffset - 1, offset: currentStartOffset - 1,
}, },
}); });