OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'develop' into travis/permalink-routing

pull/21833/head
Travis Ralston 2018-10-25 15:23:33 -06:00
parent 52094964a0 85bb8392c4
commit d58ff90ec1
1 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/views/rooms/MessageComposerInput.js
View File

@ -573,9 +573,14 @@ export default class MessageComposerInput extends React.Component {
} }
// emojioneify any emoji // emojioneify any emoji
editorState.document.getTexts().forEach(node => { let foundEmoji;
do {
foundEmoji = false;
for (const node of editorState.document.getTexts()) {
if (node.text !== '' && HtmlUtils.containsEmoji(node.text)) { if (node.text !== '' && HtmlUtils.containsEmoji(node.text)) {
let match; let match;
EMOJI_REGEX.lastIndex = 0;
while ((match = EMOJI_REGEX.exec(node.text)) !== null) { while ((match = EMOJI_REGEX.exec(node.text)) !== null) {
const range = Range.create({ const range = Range.create({
anchor: { anchor: {
@ -593,9 +598,17 @@ export default class MessageComposerInput extends React.Component {
}); });
change = change.insertInlineAtRange(range, inline); change = change.insertInlineAtRange(range, inline);
editorState = change.value; editorState = change.value;
// if we replaced an emoji, start again looking for more
// emoji in the new editor state since doing the replacement
// will change the node structure & offsets so we can't compute
// insertion ranges from node.key / match.index anymore.
foundEmoji = true;
break;
} }
} }
}); }
} while (foundEmoji);
// work around weird bug where inserting emoji via the macOS // work around weird bug where inserting emoji via the macOS
// emoji picker can leave the selection stuck in the emoji's // emoji picker can leave the selection stuck in the emoji's