From 0312547629e401403c0a7e4cbf40bec6554d809a Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Thu, 17 Nov 2022 15:35:42 +0800
Subject: [PATCH] refactor: paginator

---
 components/account/AccountInfo.vue            |  2 +-
 .../account/AccountPaginator.client.vue       | 15 ++++----
 components/common/CommonPaginator.vue         | 31 +++++++++++-----
 components/nav/NavSide.vue                    | 24 +++++--------
 .../NotificationPaginator.client.vue          | 15 ++++----
 .../timeline/TimelinePaginator.client.vue     | 15 ++++----
 composables/paginator.ts                      | 36 +++++++++++++------
 pages/public/index.vue                        |  4 +--
 types/index.ts                                |  2 +-
 9 files changed, 88 insertions(+), 56 deletions(-)

diff --git a/components/account/AccountInfo.vue b/components/account/AccountInfo.vue
index a9fa6031..46ab87a2 100644
--- a/components/account/AccountInfo.vue
+++ b/components/account/AccountInfo.vue
@@ -10,7 +10,7 @@ defineProps<{
   <div flex gap-2>
     <div p1>
       <NuxtLink :to="`/@${account.acct}`">
-        <img :src="account.avatar" rounded w-10 h-10>
+        <img :src="account.avatar" rounded w-10 h-10 bg-gray:10>
       </NuxtLink>
     </div>
     <NuxtLink flex flex-col :to="`/@${account.acct}`">
diff --git a/components/account/AccountPaginator.client.vue b/components/account/AccountPaginator.client.vue
index 91d8b668..0e75d1d5 100644
--- a/components/account/AccountPaginator.client.vue
+++ b/components/account/AccountPaginator.client.vue
@@ -4,15 +4,18 @@ import type { Account, Paginator } from 'masto'
 const { paginator } = defineProps<{
   paginator: Paginator<any, Account[]>
 }>()
-
-const { items: accounts, state, endAnchor } = usePaginator(paginator)
 </script>
 
 <template>
-  <CommonPaginator :state="state">
-    <template v-for="account of accounts" :key="account.id">
-      <AccountCard :account="account" border="t border" pt-4 />
+  <CommonPaginator
+    :paginator="paginator"
+    border="t border"
+  >
+    <template #default="{ item }">
+      <AccountCard
+        :account="item"
+        border="b border" py-1
+      />
     </template>
-    <div ref="endAnchor" />
   </CommonPaginator>
 </template>
diff --git a/components/common/CommonPaginator.vue b/components/common/CommonPaginator.vue
index 96127a8d..a6a2d991 100644
--- a/components/common/CommonPaginator.vue
+++ b/components/common/CommonPaginator.vue
@@ -1,17 +1,30 @@
 <script setup lang="ts">
-import type { PaginatorState } from '~/types'
+import type { Paginator } from 'masto'
 
-defineProps<{
-  state: PaginatorState
+const { paginator, keyProp = 'id' } = defineProps<{
+  paginator: Paginator<any, any[]>
+  keyProp?: string
 }>()
+
+const { items, state, endAnchor, error } = usePaginator(paginator)
 </script>
 
 <template>
-  <slot />
-  <div v-if="state === 'loading'" p5 color-gray-5>
-    Loading...
-  </div>
-  <div v-if="state === 'done'" p5 color-gray>
-    End of list
+  <div>
+    <slot
+      v-for="item of items"
+      :key="item[keyProp]"
+      :item="item"
+    />
+    <div ref="endAnchor" />
+    <div v-if="state === 'loading'" p5 color-gray-5>
+      Loading...
+    </div>
+    <div v-else-if="state === 'done'" p5 color-gray>
+      End of list
+    </div>
+    <div v-else-if="state === 'error'" p5 color-gray>
+      ERROR: {{ error }}
+    </div>
   </div>
 </template>
diff --git a/components/nav/NavSide.vue b/components/nav/NavSide.vue
index 3b7513ff..061c30ff 100644
--- a/components/nav/NavSide.vue
+++ b/components/nav/NavSide.vue
@@ -4,43 +4,37 @@
 
 <template>
   <div px6 py2 flex="~ col gap6" text-lg>
-    <NuxtLink flex gap2 items-center to="/home">
+    <NuxtLink flex gap2 items-center to="/home" active-class="text-primary">
       <div i-ri:home-5-line />
       <span>Home</span>
     </NuxtLink>
-    <NuxtLink flex gap2 items-center to="/notifications">
+    <NuxtLink flex gap2 items-center to="/notifications" active-class="text-primary">
       <div i-ri:notification-4-line />
       <span>Notifications</span>
     </NuxtLink>
-    <NuxtLink flex gap2 items-center>
+    <NuxtLink flex gap2 items-center active-class="text-primary">
       <div i-ri:hashtag />
       <span>Explore</span>
     </NuxtLink>
-    <NuxtLink flex gap2 items-center to="/public/local">
+    <NuxtLink flex gap2 items-center to="/public/local" active-class="text-primary">
       <div i-ri:group-2-line />
       <span>Local</span>
     </NuxtLink>
-    <NuxtLink flex gap2 items-center to="/public">
+    <NuxtLink flex gap2 items-center to="/public" active-class="text-primary">
       <div i-ri:earth-line />
       <span>Federated</span>
     </NuxtLink>
-    <NuxtLink flex gap2 items-center>
+    <NuxtLink flex gap2 items-center active-class="text-primary">
       <div i-ri:at-line />
-      <span>Direct Messages</span>
+      <span>Messages</span>
     </NuxtLink>
-    <NuxtLink flex gap2 items-center to="/favourites">
+    <NuxtLink flex gap2 items-center to="/favourites" active-class="text-primary">
       <div i-ri:heart-3-line />
       <span>Favorites</span>
     </NuxtLink>
-    <NuxtLink flex gap2 items-center to="/bookmarks">
+    <NuxtLink flex gap2 items-center to="/bookmarks" active-class="text-primary">
       <div i-ri:bookmark-line />
       <span>Bookmarks</span>
     </NuxtLink>
   </div>
 </template>
-
-<style lang="postcss">
-.router-link-active {
-  --at-apply: color-primary;
-}
-</style>
diff --git a/components/notification/NotificationPaginator.client.vue b/components/notification/NotificationPaginator.client.vue
index 3dcce353..b539d0ca 100644
--- a/components/notification/NotificationPaginator.client.vue
+++ b/components/notification/NotificationPaginator.client.vue
@@ -4,15 +4,18 @@ import type { Notification, Paginator } from 'masto'
 const { paginator } = defineProps<{
   paginator: Paginator<any, Notification[]>
 }>()
-
-const { items: notifications, state, endAnchor } = usePaginator(paginator)
 </script>
 
 <template>
-  <CommonPaginator :state="state">
-    <template v-for="notification of notifications" :key="notification.id">
-      <NotificationCard :notification="notification" border="t border" pt-4 />
+  <CommonPaginator
+    :paginator="paginator"
+    border="t border"
+  >
+    <template #default="{ item }">
+      <NotificationCard
+        :notification="item"
+        border="t border" pt-4
+      />
     </template>
-    <div ref="endAnchor" />
   </CommonPaginator>
 </template>
diff --git a/components/timeline/TimelinePaginator.client.vue b/components/timeline/TimelinePaginator.client.vue
index dc50598f..88bb5c47 100644
--- a/components/timeline/TimelinePaginator.client.vue
+++ b/components/timeline/TimelinePaginator.client.vue
@@ -4,15 +4,18 @@ import type { Paginator, Status } from 'masto'
 const { paginator } = defineProps<{
   paginator: Paginator<any, Status[]>
 }>()
-
-const { items: statuses, state, endAnchor } = usePaginator(paginator)
 </script>
 
 <template>
-  <CommonPaginator :state="state">
-    <template v-for="status of statuses" :key="status.id">
-      <StatusCard :status="status" border="t border" pt-4 />
+  <CommonPaginator
+    :paginator="paginator"
+    border="t border"
+  >
+    <template #default="{ item }">
+      <StatusCard
+        :status="item"
+        border="b border" py-3
+      />
     </template>
-    <div ref="endAnchor" />
   </CommonPaginator>
 </template>
diff --git a/composables/paginator.ts b/composables/paginator.ts
index 4c3055ed..a9c9ec11 100644
--- a/composables/paginator.ts
+++ b/composables/paginator.ts
@@ -2,23 +2,34 @@ import type { Paginator } from 'masto'
 import type { PaginatorState } from '~/types'
 
 export function usePaginator<T>(paginator: Paginator<any, T[]>) {
-  let state = $ref('ready' as PaginatorState)
-  const items = $ref<T[]>([])
+  const state = ref<PaginatorState>('idle')
+  const items = ref<T[]>([])
 
   const endAnchor = ref<HTMLDivElement>()
   const bound = reactive(useElementBounding(endAnchor))
   const isInScreen = $computed(() => bound.top < window.innerHeight * 2)
+  const error = ref<unknown | undefined>()
 
   async function loadNext() {
-    if (state === 'loading' || state === 'done')
+    if (state.value !== 'idle')
       return
 
-    state = 'loading'
-    const result = await paginator.next()
-    state = result.done ? 'done' : 'ready'
+    state.value = 'loading'
+    try {
+      const result = await paginator.next()
 
-    if (result.value?.length)
-      items.push(...result.value)
+      if (result.value?.length) {
+        items.value.push(...result.value)
+        state.value = 'idle'
+      }
+      else {
+        state.value = 'done'
+      }
+    }
+    catch (e) {
+      error.value = e
+      state.value = 'error'
+    }
 
     await nextTick()
     bound.update()
@@ -31,11 +42,16 @@ export function usePaginator<T>(paginator: Paginator<any, T[]>) {
   watch(
     () => isInScreen,
     () => {
-      if (isInScreen && state !== 'loading')
+      if (isInScreen && state.value === 'idle')
         loadNext()
     },
     { immediate: true },
   )
 
-  return { items, state, endAnchor }
+  return {
+    items,
+    state,
+    error,
+    endAnchor,
+  }
 }
diff --git a/pages/public/index.vue b/pages/public/index.vue
index 5807f39c..afa9a0a2 100644
--- a/pages/public/index.vue
+++ b/pages/public/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 const masto = await useMasto()
-const { data: timelines } = await useAsyncData('timelines-public', () => masto.timelines.fetchPublic().then(r => r.value))
+const paginator = masto.timelines.getPublicIterable()
 </script>
 
 <template>
@@ -12,7 +12,7 @@ const { data: timelines } = await useAsyncData('timelines-public', () => masto.t
       <div color-gray i-ri:equalizer-fill mr-1 h-6 />
     </template>
     <slot>
-      <TimelineList :timelines="timelines" />
+      <TimelinePaginator :paginator="paginator" />
     </slot>
   </MainContent>
 </template>
diff --git a/types/index.ts b/types/index.ts
index 61485d41..f4d1d8af 100644
--- a/types/index.ts
+++ b/types/index.ts
@@ -16,4 +16,4 @@ export interface UserLogin {
   account?: AccountCredentials
 }
 
-export type PaginatorState = 'ready' | 'loading' | 'done'
+export type PaginatorState = 'idle' | 'loading' | 'done' | 'error'