From ff070ea9da7605f1d3f83bdb91ab96139aecd579 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Horv=C3=A1th=20B=C3=A1lint?=
 <40771359+horvbalint@users.noreply.github.com>
Date: Fri, 17 Feb 2023 23:11:35 +0100
Subject: [PATCH] fix: better loading handling on status page (#1729)

Co-authored-by: Michel EDIGHOFFER <edimitchel@gmail.com>
---
 pages/[[server]]/@[account]/[status].vue | 119 ++++++++++++-----------
 1 file changed, 60 insertions(+), 59 deletions(-)

diff --git a/pages/[[server]]/@[account]/[status].vue b/pages/[[server]]/@[account]/[status].vue
index 7d23b4ea2a..4ebe72c5f1 100644
--- a/pages/[[server]]/@[account]/[status].vue
+++ b/pages/[[server]]/@[account]/[status].vue
@@ -14,8 +14,6 @@ const route = useRoute()
 const id = $(computedEager(() => route.params.status as string))
 const main = ref<ComponentPublicInstance | null>(null)
 
-const publishWidget = ref()
-
 const { data: status, pending, refresh: refreshStatus } = useAsyncData(
   `status:${id}`,
   () => fetchStatus(id),
@@ -28,9 +26,15 @@ const { data: context, pending: pendingContext, refresh: refreshContext } = useA
   { watch: [isHydrated], immediate: isHydrated.value, lazy: true, default: () => shallowRef() },
 )
 
-const replyDraft = $computed(() => status.value ? getReplyDraft(status.value) : null)
+if (pendingContext)
+  watchOnce(pendingContext, scrollTo)
+
+if (pending)
+  watchOnce(pending, scrollTo)
+
+async function scrollTo() {
+  await nextTick()
 
-function scrollTo() {
   const statusElement = unrefElement(main)
   if (!statusElement)
     return
@@ -38,18 +42,8 @@ function scrollTo() {
   statusElement.scrollIntoView(true)
 }
 
-onMounted(scrollTo)
-
-if (pendingContext) {
-  watchOnce(pendingContext, async () => {
-    await nextTick()
-    scrollTo()
-  })
-}
-
-const focusEditor = () => {
-  publishWidget.value?.focusEditor?.()
-}
+const publishWidget = ref()
+const focusEditor = () => publishWidget.value?.focusEditor?.()
 
 provide('focus-editor', focusEditor)
 
@@ -58,6 +52,8 @@ watch(publishWidget, () => {
     focusEditor()
 })
 
+const replyDraft = $computed(() => status.value ? getReplyDraft(status.value) : null)
+
 onReactivated(() => {
   // Silently update data when reentering the page
   // The user will see the previous content first, and any changes will be updated to the UI when the request is completed
@@ -68,55 +64,60 @@ onReactivated(() => {
 
 <template>
   <MainContent back>
-    <template v-if="!pending && !pendingContext">
-      <div v-if="status" xl:mt-4 border="b base" mb="50vh">
-        <template v-for="comment, i of context?.ancestors" :key="comment.id">
-          <StatusCard
-            :status="comment" :actions="comment.visibility !== 'direct'" context="account"
-            :has-older="true" :newer="context?.ancestors[i - 1]"
-          />
-        </template>
-
-        <StatusDetails
-          ref="main"
-          :status="status"
-          :newer="context?.ancestors.at(-1)"
-          command
-          style="scroll-margin-top: 60px"
-        />
-        <PublishWidget
-          v-if="currentUser"
-          ref="publishWidget"
-          border="y base"
-          :draft-key="replyDraft!.key"
-          :initial="replyDraft!.draft"
-          @published="refreshContext()"
-        />
-
-        <TimelineSkeleton v-if="pendingContext" />
-        <DynamicScroller
-          v-slot="{ item, index, active }"
-          :items="context?.descendants || []"
-          :min-item-size="200"
-          key-field="id"
-          page-mode
-        >
-          <DynamicScrollerItem :item="item" :active="active">
+    <template v-if="!pending">
+      <template v-if="status">
+        <div xl:mt-4 mb="50vh" border="b base">
+          <template v-if="!pendingContext">
             <StatusCard
-              :status="item"
-              context="account"
-              :older="context?.descendants[index + 1]"
-              :newer="index > 0 ? context?.descendants[index - 1] : status"
-              :has-newer="index === 0"
-              :main="status"
+              v-for="comment, i of context?.ancestors" :key="comment.id"
+              :status="comment" :actions="comment.visibility !== 'direct'" context="account"
+              :has-older="true" :newer="context?.ancestors[i - 1]"
             />
-          </DynamicScrollerItem>
-        </DynamicScroller>
-      </div>
+          </template>
+
+          <StatusDetails
+            ref="main"
+            :status="status"
+            :newer="context?.ancestors.at(-1)"
+            command
+            style="scroll-margin-top: 60px"
+          />
+          <PublishWidget
+            v-if="currentUser"
+            ref="publishWidget"
+            border="y base"
+            :draft-key="replyDraft!.key"
+            :initial="replyDraft!.draft"
+            @published="refreshContext()"
+          />
+
+          <template v-if="!pendingContext">
+            <DynamicScroller
+              v-slot="{ item, index, active }"
+              :items="context?.descendants || []"
+              :min-item-size="200"
+              key-field="id"
+              page-mode
+            >
+              <DynamicScrollerItem :item="item" :active="active">
+                <StatusCard
+                  :status="item"
+                  context="account"
+                  :older="context?.descendants[index + 1]"
+                  :newer="index > 0 ? context?.descendants[index - 1] : status"
+                  :has-newer="index === 0"
+                  :main="status"
+                />
+              </DynamicScrollerItem>
+            </DynamicScroller>
+          </template>
+        </div>
+      </template>
 
       <StatusNotFound v-else :account="route.params.account as string" :status="id" />
     </template>
 
     <StatusCardSkeleton v-else border="b base" />
+    <TimelineSkeleton v-if="pending || pendingContext" />
   </MainContent>
 </template>