Sort reactions by count with stable fallback order

frontend_nuxt/components/ReactionsGroup.vue

@@ -107,11 +107,12 @@ const likeCount = computed(() => counts.value['LIKE'] || 0)
 const userReacted = (type) =>
   reactions.value.some((r) => r.type === type && r.user === authState.username)
 
-const baseReactionOrder = computed(() => {
-  if (reactionTypes.value.length) return [...reactionTypes.value]
-
-  const order = []
+const defaultOrder = computed(() => {
+  if (reactionTypes.value && reactionTypes.value.length) {
+    return reactionTypes.value
+  }
   const seen = new Set()
+  const order = []
   for (const reaction of reactions.value) {
     if (!seen.has(reaction.type)) {
       seen.add(reaction.type)
@@ -121,38 +122,21 @@ const baseReactionOrder = computed(() => {
   return order
 })
 
-const sortedReactionTypes = computed(() => {
-  const baseOrder = [...baseReactionOrder.value]
-  for (const type of Object.keys(counts.value)) {
-    if (!baseOrder.includes(type)) baseOrder.push(type)
-  }
-
-  const withMetadata = baseOrder.map((type, index) => ({
-    type,
-    count: counts.value[type] || 0,
-    index,
-  }))
-
-  const nonZero = withMetadata
-    .filter((item) => item.count > 0)
+const displayedReactions = computed(() => {
+  const orderIndex = new Map(defaultOrder.value.map((type, index) => [type, index]))
+  return Object.entries(counts.value)
+    .map(([type, count]) => ({ type, count }))
     .sort((a, b) => {
       if (b.count !== a.count) return b.count - a.count
-      return a.index - b.index
+      const indexA = orderIndex.has(a.type) ? orderIndex.get(a.type) : Number.MAX_SAFE_INTEGER
+      const indexB = orderIndex.has(b.type) ? orderIndex.get(b.type) : Number.MAX_SAFE_INTEGER
+      return indexA - indexB
     })
-
-  const zero = withMetadata.filter((item) => item.count === 0)
-
-  return [...nonZero, ...zero].map((item) => item.type)
-})
-
-const displayedReactions = computed(() => {
-  return sortedReactionTypes.value
-    .filter((type) => counts.value[type] > 0)
     .slice(0, 3)
-    .map((type) => ({ type }))
+    .map(({ type }) => ({ type }))
 })
 
-const panelTypes = computed(() => sortedReactionTypes.value.filter((t) => t !== 'LIKE'))
+const panelTypes = computed(() => reactionTypes.value.filter((t) => t !== 'LIKE'))
 
 const panelVisible = ref(false)
 let hideTimer = null

frontend_nuxt/pages/posts/[id]/index.vue

@@ -122,8 +122,7 @@
         <l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
       </div>
       <div v-else class="comments-container">
-        <BasePlaceholder v-if="timelineItems.length === 0" text="暂无评论" icon="inbox" />
-        <BaseTimeline v-else :items="timelineItems">
+        <BaseTimeline :items="timelineItems">
           <template #item="{ item }">
             <CommentItem
               v-if="item.kind === 'comment'"
@@ -185,7 +184,6 @@ import { useRoute } from 'vue-router'
 import CommentItem from '~/components/CommentItem.vue'
 import CommentEditor from '~/components/CommentEditor.vue'
 import BaseTimeline from '~/components/BaseTimeline.vue'
-import BasePlaceholder from '~/components/BasePlaceholder.vue'
 import PostChangeLogItem from '~/components/PostChangeLogItem.vue'
 import ArticleTags from '~/components/ArticleTags.vue'
 import ArticleCategory from '~/components/ArticleCategory.vue'
@@ -815,7 +813,9 @@ const fetchCommentsAndChangeLog = async () => {
 
       for (const item of data) {
         const mappedPayload =
-          item.kind === 'comment' ? mapComment(item.payload) : mapChangeLog(item.payload)
+          item.kind === 'comment'
+            ? mapComment(item.payload)
+            : mapChangeLog(item.payload)
         newTimelineItemList.push(mappedPayload)
 
         if (item.kind === 'comment') {