Merge pull request #4136 from traPtitech/fix/stamp_list_priority

同じ優先度のとき、別名スタンプは優先度を低めに並べるように

Author: mehm8128

src/components/Main/StampPicker/composables/useStampFilter.ts

@@ -76,11 +76,15 @@ const useStampFilter = () => {
       const result = [
         ...altNameRes.map(r => ({
           value: altNameToName(r.value),
-          priority: r.priority
+          priority: r.priority,
+          isAltName: true
         })),
-        ...res
+        ...res.map(r => ({ ...r, isAltName: false }))
       ]
-        .map(r => ({ value: r.value, sortKey: `${r.priority}${r.value}` }))
+        .map(r => ({
+          value: r.value,
+          sortKey: `${r.priority}${r.isAltName ? 1 : 0}${r.value}` // 同じpriorityの場合、別名は別名でないものよりも優先度が低い
+        }))
         .sort((a, b) => compareStringInsensitive(a.sortKey, b.sortKey))
         .map(r => r.value)