diff options
| author | Maksim Sukharev <antreesy.web@gmail.com> | 2024-03-14 17:47:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-14 17:47:29 +0100 |
| commit | 3b6dd81ec5f19741a9e0dfa6dc07c561e52e2f8a (patch) | |
| tree | 87237cc71e9a275b6218682adfbf553c59e7c71c | |
| parent | 9ae8a99752cc05a301a579fad44f6fd1f920eda9 (diff) | |
| parent | 3c56ef678c6545cb0e6557a549b0863a8f20699b (diff) | |
Merge pull request #11806 from nextcloud/fix/11803/broken-focusv19.0.0-beta.2
fix(NewMessage): fix broken caret
| -rw-r--r-- | src/components/NewMessage/NewMessage.vue | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/components/NewMessage/NewMessage.vue b/src/components/NewMessage/NewMessage.vue index 7c15dfcea..be5dc08a2 100644 --- a/src/components/NewMessage/NewMessage.vue +++ b/src/components/NewMessage/NewMessage.vue @@ -104,8 +104,6 @@ @shortkey="focusInput" @keydown.esc="handleInputEsc" @keydown.ctrl.up="handleEditLastMessage" - @tribute-active-true.native="isTributePickerActive = true" - @tribute-active-false.native="isTributePickerActive = false" @input="handleTyping" @paste="handlePastedFiles" @submit="handleSubmit" /> @@ -335,7 +333,6 @@ export default { showPollEditor: false, showNewFileDialog: -1, showFilePicker: false, - isTributePickerActive: false, // Check empty template by default userData: {}, clipboardTimeStamp: null, @@ -525,7 +522,7 @@ export default { }, chatInput(newValue) { - if (this.text !== newValue) { + if (parseSpecialSymbols(this.text) !== newValue) { this.text = newValue } }, @@ -623,6 +620,8 @@ export default { return } this.$nextTick(() => { + // reset or fill main input in chat view from the store + this.text = this.chatInput // refocus input as the user might want to type further this.focusInput() }) @@ -959,17 +958,12 @@ export default { }, handleInputEsc() { - if (this.messageToEdit && !this.isTributePickerActive) { + if (this.messageToEdit) { this.handleAbortEdit() this.focusInput() return } - // When the tribute picker (e.g. emoji picker or mentions) is open - // ESC should only close the picker but not blur - if (!this.isTributePickerActive) { - this.blurInput() - } - + this.blurInput() }, handleEditLastMessage() { |