perf: skip message skeleton if it is cached

src/components/ThreadEnvelope.vue

@@ -225,15 +225,15 @@
 				</template>
 			</div>
 		</div>
-		<MessageLoadingSkeleton v-if="loading !== LOADING_DONE" />
-		<Message v-if="message && loading !== LOADING_MESSAGE"
-			v-show="loading === LOADING_DONE"
+		<MessageLoadingSkeleton v-if="loading === Loading.Skeleton" />
+		<Message v-if="message"
+			v-show="loading === Loading.Done"
 			:envelope="envelope"
 			:message="message"
 			:full-height="fullHeight"
 			:smart-replies="showFollowUpHeader ? [] : smartReplies"
 			:reply-button-label="replyButtonLabel"
-			@load="loading = LOADING_DONE"
+			@load="onMessageLoaded"
 			@reply="(body) => onReply(body, showFollowUpHeader)" />
 		<Error v-else-if="error"
 			:error="error.message || t('mail', 'Not found')"
@@ -317,9 +317,11 @@
 import { mapStores } from 'pinia'
 
 // Ternary loading state
-const LOADING_DONE = 0
-const LOADING_MESSAGE = 1
-const LOADING_BODY = 2
+const Loading = Object.seal({
+	Done: 0,
+	Silent: 1,
+	Skeleton: 2,
+})
 
 export default {
 	name: 'ThreadEnvelope',
@@ -389,16 +391,14 @@
 	},
 	data() {
 		return {
-			loading: LOADING_DONE,
+			loading: Loading.Done,
 			showListUnsubscribeConfirmation: false,
 			error: undefined,
 			message: undefined,
 			importantSvg,
 			unsubscribing: false,
 			seenTimer: undefined,
-			LOADING_BODY,
-			LOADING_DONE,
-			LOADING_MESSAGE,
+			Loading,
 			recomputeMenuSize: 0,
 			moreActionsOpen: false,
 			smartReplies: [],
@@ -412,6 +412,7 @@
 			rawMessage: '', // Will hold the raw source of the message when requested
 			isInternal: true,
 			enabledSmartReply: loadState('mail', 'llm_freeprompt_available', false),
+			loadingBodyTimeout: undefined,
 		}
 	},
 	computed: {
@@ -590,7 +591,7 @@
 				this.fetchMessage()
 			} else {
 				this.message = undefined
-				this.loading = LOADING_DONE
+				this.loading = Loading.Done
 			}
 		},
 	},
@@ -632,16 +633,33 @@
 		filterSubject(value) {
 			return value.replace(/((?:[\t ]*(?:R|RE|F|FW|FWD):[\t ]*)*)/i, '')
 		},
+		onMessageLoaded() {
+			if (this.loadingBodyTimeout) {
+				clearTimeout(this.loadingBodyTimeout)
+				this.loadingBodyTimeout = undefined
+			}
+
+			this.loading = Loading.Done
+		},
 		async fetchMessage() {
-			this.loading = LOADING_MESSAGE
-			this.error = undefined
+			let loadingTimeout
+			const isCached = !!this.mainStore.getMessage(this.envelope.databaseId)
+			if (!isCached) {
+				loadingTimeout = setTimeout(() => this.loading = Loading.Skeleton, 200)
+			}
 
+			this.loading = Loading.Silent
+			this.error = undefined
 			logger.debug(`fetching thread message ${this.envelope.databaseId}`)
 
 			try {
 				this.message = await this.mainStore.fetchMessage(this.envelope.databaseId)
 				logger.debug(`message ${this.envelope.databaseId} fetched`, { message: this.message })
 
+				if (loadingTimeout) {
+					clearTimeout(loadingTimeout)
+				}
+
 				if (!this.envelope.flags.seen && this.hasSeenAcl) {
 					logger.info('Starting timer to mark message as seen/read')
 					this.seenTimer = setTimeout(() => {
@@ -651,13 +669,13 @@
 				}
 
 				if (this.message.hasHtmlBody) {
-					this.loading = LOADING_BODY
+					this.loadingBodyTimeout = setTimeout(() => this.loading = Loading.Skeleton, 200)
 				} else {
-					this.loading = LOADING_DONE
+					this.loading = Loading.Done
 				}
 			} catch (error) {
 				this.error = error
-				this.loading = LOADING_DONE
+				this.loading = Loading.Done
 				logger.error('Could not fetch message', { error })
 			}
 

src/store/mainStore/actions.js

@@ -1199,6 +1199,10 @@ export default function mainStoreActions() {
 			})
 		},
 		async fetchMessage(id) {
+			if (this.messages[id]) {
+				return this.messages[id]
+			}
+
 			return handleHttpAuthErrors(async () => {
 				const message = await fetchMessage(id)
 				// Only commit if not undefined (not found)