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

Merge pull request #3372 from matrix-org/bwindels/fix-command-tab-complete

Browse source 
New composer: fix tab-complete in commands
This commit is contained in:
Bruno Windels 2019-09-02 11:38:13 +00:00 • committed by GitHub
commit 4329d8c4ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -268,7 +268,7 @@ export default class BasicMessageEditor extends React.Component {
handled = true;
// autocomplete or enter to send below shouldn't have any modifier keys pressed.
} else if (!(event.metaKey || event.altKey || event.shiftKey)) {
if (model.autoComplete) {
if (model.autoComplete && model.autoComplete.hasCompletions()) {
const autoComplete = model.autoComplete;
switch (event.key) {
case "ArrowUp":
@ -309,7 +309,11 @@ export default class BasicMessageEditor extends React.Component {
const position = model.positionForOffset(caret.offset, caret.atNodeEnd);
const range = model.startRange(position);
range.expandBackwardsWhile((index, offset, part) => {
return part.text[offset] !== " " && (part.type === "plain" || part.type === "pill-candidate");
return part.text[offset] !== " " && (
part.type === "plain" ||
part.type === "pill-candidate" ||
part.type === "command"
);
});
const {partCreator} = model;
// await for auto-complete to be open