Skip to content

Fix(NewMessage): Clear main message input when upload editor is open #11838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Antreesy merged 1 commit into from
Mar 18, 2024
Merged

Fix(NewMessage): Clear main message input when upload editor is open #11838

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions src/components/NewMessage/NewMessage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,10 @@ export default {
return this.$store.getters.currentConversationIsJoined
},

currentUploadId() {
return this.$store.getters.currentUploadId
},

hasText() {
return this.text.trim() !== ''
},
Expand Down Expand Up @@ -502,7 +506,19 @@ export default {
this.focusInput()
},

currentUploadId(value) {
if (value && !this.upload) {
this.text = ''
} else if (!value && !this.upload) {
// reset or fill main input in chat view from the store
this.text = this.chatInput
}
},

text(newValue) {
if (this.currentUploadId && !this.upload) {
return
}
this.debouncedUpdateChatInput(newValue)
},

Expand All @@ -522,6 +538,10 @@ export default {
},

chatInput(newValue) {
if (this.currentUploadId && !this.upload) {
return
}

if (parseSpecialSymbols(this.text) !== newValue) {
this.text = newValue
}
Expand Down Expand Up @@ -620,8 +640,6 @@ 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()
})
Expand Down Expand Up @@ -659,7 +677,7 @@ export default {
// remove Quote component
this.chatExtrasStore.removeParentIdToReply(this.token)

if (this.$store.getters.getInitialisedUploads(this.$store.getters.currentUploadId).length) {
if (this.$store.getters.getInitialisedUploads(this.currentUploadId).length) {
// If dialog contains files to upload, delegate sending
this.$emit('upload', { caption: this.text, options })
return
Expand Down Expand Up @@ -826,7 +844,7 @@ export default {
*/
async handleFiles(files, rename = false, isVoiceMessage = false) {
// Create a unique id for the upload operation
const uploadId = this.$store.getters.currentUploadId ?? new Date().getTime()
const uploadId = this.currentUploadId ?? new Date().getTime()
// Uploads and shares the files
await this.$store.dispatch('initialiseUpload', { files, token: this.token, uploadId, rename, isVoiceMessage })
},
Expand Down