Arsharth/hydrogen-web
1
0
Fork 0
forked from mystiq/hydrogen-web
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #574 from vector-im/bwindels/multiline-composer-fixups

Browse source 
Multiline composer fixups
This commit is contained in:
Bruno Windels 2021-11-05 18:44:54 +01:00 committed by GitHub
commit 222c616148
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/platform/web/ui/session/room/MessageComposer.js
View file

@ -34,7 +34,11 @@ export class MessageComposer extends TemplateView {
onKeydown: e => this._onKeyDown(e),
onInput: () => {
vm.setInput(this._input.value);
this._adjustHeight();
if (this._input.value) {
this._adjustHeight();
} else {
this._clearHeight();
}
},
placeholder: vm.isEncrypted ? "Send an encrypted message…" : "Send a message…",
rows: "1"
@ -85,14 +89,31 @@ export class MessageComposer extends TemplateView {
async _trySend() {
this._input.focus();
if (await this.value.sendMessage(this._input.value)) {
this._input.value = "";
// we clear the composer while enqueuing
// and restore it when that didn't work somehow
// to prevent the user from sending the message
// every time they hit enter while it's still enqueuing.
const {value} = this._input;
const restoreValue = () => {
this._input.value = value;
this._adjustHeight();
};
this._input.value = "";
this._clearHeight();
try {
if (!await this.value.sendMessage(value)) {
restoreValue();
}
} catch (err) {
restoreValue();
console.error(err);
}
}
_onKeyDown(event) {
if (event.key === "Enter" && !event.shiftKey) {
// don't insert newline into composer
event.preventDefault();
this._trySend();
}
}
@ -123,4 +144,8 @@ export class MessageComposer extends TemplateView {
});
}
_clearHeight() {
this._input.style.removeProperty("height");
}
}