Merge pull request 'Fix emojis breaking user bio editing' (#3483) from shibao/pleroma-fe:fix-emojis into develop

Reviewed-on: https://git.pleroma.social/pleroma/pleroma-fe/pulls/3483

changelog.d/fix-emojis-breaking-bio.fix

@@ -0,0 +1 @@
+Fix emojis breaking user bio/description editing

src/components/post_status_form/post_status_form.js

@@ -277,10 +277,10 @@ const PostStatusForm = {
       })
     },
     emoji() {
-      return useEmojiStore().standardEmojiList || []
+      return useEmojiStore().standardEmojiList
     },
     customEmoji() {
-      return useEmojiStore().customEmoji || []
+      return useEmojiStore().customEmoji
     },
     statusLength() {
       return this.newStatus.status.length

src/components/user_card/user_card.js

@@ -380,7 +380,7 @@ export default {
     emojiUserSuggestor() {
       return suggestor({
         emoji: [
-          ...this.$store.getters.standardEmojiList,
+          ...useEmojiStore().standardEmojiList,
           ...useEmojiStore().customEmoji,
         ],
         store: this.$store,
@@ -389,7 +389,7 @@ export default {
     emojiSuggestor() {
       return suggestor({
         emoji: [
-          ...this.$store.getters.standardEmojiList,
+          ...useEmojiStore().standardEmojiList,
           ...useEmojiStore().customEmoji,
         ],
       })

src/stores/emoji.js

@@ -115,19 +115,23 @@ export const useEmojiStore = defineStore('emoji', {
       }, {})
     },
     standardEmojiList(state) {
-      return SORTED_EMOJI_GROUP_IDS.map((groupId) =>
+      return (
-        (this.emoji[groupId] || []).map((k) =>
+        SORTED_EMOJI_GROUP_IDS.map((groupId) =>
-          injectAnnotations(k, this.unicodeEmojiAnnotations),
+          (this.emoji[groupId] || []).map((k) =>
-        ),
+            injectAnnotations(k, this.unicodeEmojiAnnotations),
-      ).reduce((a, b) => a.concat(b), [])
+          ),
+        ).reduce((a, b) => a.concat(b), []) ?? []
+      )
     },
     standardEmojiGroupList(state) {
-      return SORTED_EMOJI_GROUP_IDS.map((groupId) => ({
+      return (
-        id: groupId,
+        SORTED_EMOJI_GROUP_IDS.map((groupId) => ({
-        emojis: (this.emoji[groupId] || []).map((k) =>
+          id: groupId,
-          injectAnnotations(k, this.unicodeEmojiAnnotations),
+          emojis: (this.emoji[groupId] || []).map((k) =>
-        ),
+            injectAnnotations(k, this.unicodeEmojiAnnotations),
-      }))
+          ),
+        })) ?? []
+      )
     },
   },
   actions: {