Merge pull request #3375 from matrix-org/bwindels/cider-colononmention

New composer: share user pill postfix between autocomplete and insert mention
This commit is contained in:
Bruno Windels 2019-09-02 14:58:23 +00:00 committed by GitHub
commit c4d7df768d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions

View file

@ -290,11 +290,12 @@ export default class SendMessageComposer extends React.Component {
const member = this.props.room.getMember(userId);
const displayName = member ?
member.rawDisplayName : userId;
const userPillPart = partCreator.userPill(displayName, userId);
const caret = this._editorRef.getCaret();
const position = model.positionForOffset(caret.offset, caret.atNodeEnd);
const insertIndex = position.index + 1;
const parts = partCreator.createMentionParts(insertIndex, displayName, userId);
model.transform(() => {
const addedLen = model.insert([userPillPart], position);
const addedLen = model.insert(parts, position);
return model.positionForOffset(caret.offset + addedLen, true);
});
// refocus on composer, as we just clicked "Mention"