imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some cleanup

Browse source
This commit is contained in:
Bruno Windels 2019-08-27 16:17:41 +02:00
parent f02713d08e
commit f5bb872efa
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -75,10 +75,10 @@ export default class BasicMessageEditor extends React.Component {
this._modifiedFlag = false; this._modifiedFlag = false;
} }
_replaceEmoticon = (caret, inputType, diff) => { _replaceEmoticon = (caretPosition, inputType, diff) => {
const {model} = this.props; const {model} = this.props;
const range = model.startRange(caret); const range = model.startRange(caretPosition);
// expand range max 8 characters backwards from caret, // expand range max 8 characters backwards from caretPosition,
// as a space to look for an emoticon // as a space to look for an emoticon
let n = 8; let n = 8;
range.expandBackwardsWhile((index, offset) => { range.expandBackwardsWhile((index, offset) => {
@ -91,6 +91,7 @@ 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) {
const {partCreator} = model;
const hasPrecedingSpace = emoticonMatch[0][0] === " "; const hasPrecedingSpace = emoticonMatch[0][0] === " ";
// we need the range to only comprise of the emoticon // we need the range to only comprise of the emoticon
// because we'll replace the whole range with an emoji, // because we'll replace the whole range with an emoji,
@ -99,7 +100,7 @@ export default class BasicMessageEditor extends React.Component {
range.moveStart(emoticonMatch.index + (hasPrecedingSpace ? 1 : 0)); range.moveStart(emoticonMatch.index + (hasPrecedingSpace ? 1 : 0));
// this returns the amount of added/removed characters during the replace // this returns the amount of added/removed characters during the replace
// so the caret position can be adjusted. // so the caret position can be adjusted.
return range.replace([this.props.model.partCreator.plain(data.unicode + " ")]); return range.replace([partCreator.plain(data.unicode + " ")]);
} }
} }
} }
@ -160,7 +161,7 @@ export default class BasicMessageEditor extends React.Component {
} }
_refreshLastCaretIfNeeded() { _refreshLastCaretIfNeeded() {
// TODO: needed when going up and down in editing messages ... not sure why yet // XXX: needed when going up and down in editing messages ... not sure why yet
// because the editors should stop doing this when when blurred ... // because the editors should stop doing this when when blurred ...
// maybe it's on focus and the _editorRef isn't available yet or something. // maybe it's on focus and the _editorRef isn't available yet or something.
if (!this._editorRef) { if (!this._editorRef) {