Skip to content
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

fix: user must scroll to view most recent message in thread #10674

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+37 −8
Open

fix: user must scroll to view most recent message in thread #10674

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
45 changes: 37 additions & 8 deletions src/components/ThreadEnvelope.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ export default {

// Only one envelope is expanded at the time of mounting so we can
// assume that this is the relevant envelope to be scrolled to.
this.$nextTick(() => this.scrollToCurrentEnvelope())
this.$nextTick(() => this.handleThreadScrolling())
}
if (this.mainStore.getPreference('internal-addresses', 'false') === 'true') {
this.isInternal = this.mainStore.isInternalAddress(this.envelope.from[0].email)
Expand Down Expand Up @@ -655,6 +655,9 @@ export default {
} else {
this.loading = LOADING_DONE
}
this.$nextTick(() => {
this.handleThreadScrolling()
})
} catch (error) {
this.error = error
this.loading = LOADING_DONE
Expand All @@ -675,6 +678,39 @@ export default {
this.smartReplies = await smartReply(this.envelope.databaseId)
}
},
handleThreadScrolling() {
const threadId = this.envelope.threadId // Assuming each envelope has a thread ID

if (threadId && this.$parent.toggleExpand) {
// If thread is not expanded, expand it first
if (!this.$parent.expandedThreads.includes(threadId)) {
this.$parent.toggleExpand(threadId)
this.$nextTick(() => this.scrollToThread(threadId))
} else {
this.scrollToThread(threadId)
}
} else {
// If there's no thread, just scroll to the envelope
this.scrollToEnvelope()
}
},
scrollToThread(threadId) {
this.$nextTick(() => {
const threadElement = document.querySelector(`[data-thread-id="${threadId}"]`)
if (threadElement) {
threadElement.scrollIntoView({ behavior: 'smooth', block: 'center' })
}
})
},

scrollToEnvelope() {
this.$nextTick(() => {
const envelopeElement = this.$refs.envelope
if (envelopeElement) {
envelopeElement.scrollIntoView({ behavior: 'smooth', block: 'center' })
}
})
},
async fetchItineraries() {
// Sanity check before actually making the request
if (!this.message.hasHtmlBody && this.message.attachments.length === 0) {
Expand Down Expand Up @@ -704,13 +740,6 @@ export default {
logger.error(`Could not fetch DKIM of message ${this.envelope.databaseId}`, { error })
}
},
scrollToCurrentEnvelope() {
// Account for global navigation bar and thread header
const globalHeader = document.querySelector('#header').clientHeight
const threadHeader = document.querySelector('#mail-thread-header').clientHeight
const top = this.$el.getBoundingClientRect().top - globalHeader - threadHeader
window.scrollTo({ top })
},
onReply(body = '', followUp = false, replySenderOnly = false) {
this.mainStore.startComposerSession({
reply: {
Expand Down
Loading