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

don't assume preceding space for emoticon at start of document

Browse source 
also add more inline comments to explain what is going on
This commit is contained in:
Bruno Windels 2019-08-27 09:50:36 +02:00
parent 5c28b57681
commit 56606a46f4
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/components/views/rooms/BasicMessageComposer.js
View file

@ -78,7 +78,8 @@ export default class BasicMessageEditor extends React.Component {
_replaceEmoticon = (caret, inputType, diff) => { _replaceEmoticon = (caret, inputType, diff) => {
const {model} = this.props; const {model} = this.props;
const range = model.startRange(caret); const range = model.startRange(caret);
// expand range max 8 characters backwards from caret // expand range max 8 characters backwards from caret,
// as a space to look for an emoticon
let n = 8; let n = 8;
range.expandBackwardsWhile((index, offset) => { range.expandBackwardsWhile((index, offset) => {
const part = model.parts[index]; const part = model.parts[index];
@ -90,8 +91,14 @@ export default class BasicMessageEditor extends React.Component {
const query = emoticonMatch[1].toLowerCase().replace("-", ""); const query = emoticonMatch[1].toLowerCase().replace("-", "");
const data = EMOJIBASE.find(e => e.emoticon ? e.emoticon.toLowerCase() === query : false); const data = EMOJIBASE.find(e => e.emoticon ? e.emoticon.toLowerCase() === query : false);
if (data) { if (data) {
// + 1 because index is reported without preceding space const hasPrecedingSpace = emoticonMatch[0][0] === " ";
range.moveStart(emoticonMatch.index + 1); // we need the range to only comprise of the emoticon
// because we'll replace the whole range with an emoji,
// so move the start forward to the start of the emoticon.
// Take + 1 because index is reported without the possible preceding space.
range.moveStart(emoticonMatch.index + (hasPrecedingSpace ? 1 : 0));
// this returns the amount of added/removed characters during the replace
// so the caret position can be adjusted.
return range.replace([this.props.model.partCreator.plain(data.unicode + " ")]); return range.replace([this.props.model.partCreator.plain(data.unicode + " ")]);
} }
} }