diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2023-02-11 13:05:36 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-11 13:05:36 +0900 |
| commit | 6f33be6c75866bc40cdfc95beb8ba6e1714f1e42 (patch) | |
| tree | aaec1f1bf4dcfca131a5c38e6e2eab64c0b8abc3 /packages/frontend/src/components/MkReactionsViewer.vue | |
| parent | enhance(client): URLが4つ以上添付されている場合折りたたむ... (diff) | |
| download | misskey-6f33be6c75866bc40cdfc95beb8ba6e1714f1e42.tar.gz misskey-6f33be6c75866bc40cdfc95beb8ba6e1714f1e42.tar.bz2 misskey-6f33be6c75866bc40cdfc95beb8ba6e1714f1e42.zip | |
enhance(client): MkNoteのリアクションの表示数は16に制限 (#9841)
* enhance(client): MkNoteのリアクションの表示数は16に制限・リアクションの横の?ボタンでリアクション詳細
* info-circleにする
* - Layout Shiftが起こらないように
- 自分のリアクションは必ずつける
* https://github.com/misskey-dev/misskey/pull/9841#issuecomment-1423786235
* remove logger
* refactor
* refactor
Co-authored-by: acid-chicken <root@acid-chicken.com>
* Revert "https://github.com/misskey-dev/misskey/pull/9841#issuecomment-1423786235"
This reverts commit ec1315b1fb207e0c5b2a5f2f4a00de7379c7a29b.
* wip
* wip
* :art:
* fix
* fix
* fix
* :art:
* wip
* remove extras from MkNoteDetailed
* もっと!
* no v-if
* dashed
---------
Co-authored-by: acid-chicken <root@acid-chicken.com>
Diffstat (limited to 'packages/frontend/src/components/MkReactionsViewer.vue')
| -rw-r--r-- | packages/frontend/src/components/MkReactionsViewer.vue | 51 |
1 files changed, 44 insertions, 7 deletions
diff --git a/packages/frontend/src/components/MkReactionsViewer.vue b/packages/frontend/src/components/MkReactionsViewer.vue index 5981471c68..cdd6f528e7 100644 --- a/packages/frontend/src/components/MkReactionsViewer.vue +++ b/packages/frontend/src/components/MkReactionsViewer.vue @@ -7,23 +7,60 @@ :move-class="$store.state.animation ? $style.transition_x_move : ''" tag="div" :class="$style.root" > - <XReaction v-for="(count, reaction) in note.reactions" :key="reaction" :reaction="reaction" :count="count" :is-initial="initialReactions.has(reaction)" :note="note"/> + <XReaction v-for="[reaction, count] in reactions" :key="reaction" :reaction="reaction" :count="count" :is-initial="initialReactions.has(reaction)" :note="note"/> + <slot v-if="hasMoreReactions" name="more" /> </TransitionGroup> </template> <script lang="ts" setup> -import { computed } from 'vue'; import * as misskey from 'misskey-js'; -import { $i } from '@/account'; import XReaction from '@/components/MkReactionsViewer.reaction.vue'; +import { watch } from 'vue'; -const props = defineProps<{ - note: misskey.entities.Note; -}>(); +const props = withDefaults(defineProps<{ + note: misskey.entities.Note; + maxNumber?: number; +}>(), { + maxNumber: Infinity, +}); const initialReactions = new Set(Object.keys(props.note.reactions)); -const isMe = computed(() => $i && $i.id === props.note.userId); +let reactions = $ref<[string, number][]>([]); +let hasMoreReactions = $ref(false); + +if (props.note.myReaction && !Object.keys(reactions).includes(props.note.myReaction)) { + reactions[props.note.myReaction] = props.note.reactions[props.note.myReaction]; +} + +watch([() => props.note.reactions, () => props.maxNumber], ([newSource, maxNumber]) => { + let newReactions: [string, number][] = []; + hasMoreReactions = Object.keys(newSource).length > maxNumber; + + for (let i = 0; i < reactions.length; i++) { + const reaction = reactions[i][0]; + if (reaction in newSource && newSource[reaction] !== 0) { + reactions[i][1] = newSource[reaction]; + newReactions.push(reactions[i]); + } + } + + const newReactionsNames = newReactions.map(([x]) => x); + newReactions = [ + ...newReactions, + ...Object.entries(newSource) + .sort(([, a], [, b]) => b - a) + .filter(([y], i) => i < maxNumber && !newReactionsNames.includes(y)), + ] + + newReactions = newReactions.slice(0, props.maxNumber); + + if (props.note.myReaction && !newReactions.map(([x]) => x).includes(props.note.myReaction)) { + newReactions.push([props.note.myReaction, newSource[props.note.myReaction]]); + } + + reactions = newReactions; +}, { immediate: true, deep: true }); </script> <style lang="scss" module> |