diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-05-27 17:12:45 +0000 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-05-27 17:12:45 +0000 |
| commit | dd95d4a2d6c9bc7f6a764589366e0f78e17dfb1d (patch) | |
| tree | f9bdc5a0ee86754dd48ff4087af60a9b0f9f1f09 /packages/frontend/src | |
| parent | merge: Fix translate button (!1047) (diff) | |
| parent | avoid use of <template> as a child of <TransitionGroup> (diff) | |
| download | sharkey-dd95d4a2d6c9bc7f6a764589366e0f78e17dfb1d.tar.gz sharkey-dd95d4a2d6c9bc7f6a764589366e0f78e17dfb1d.tar.bz2 sharkey-dd95d4a2d6c9bc7f6a764589366e0f78e17dfb1d.zip | |
merge: Avoid use of <template> as a child of <TransitionGroup> (resolves #1059) (!1049)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1049
Closes #1059
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
Diffstat (limited to 'packages/frontend/src')
4 files changed, 7 insertions, 7 deletions
diff --git a/packages/frontend/src/components/MkNotifications.vue b/packages/frontend/src/components/MkNotifications.vue index 55ee054285..54edf771ed 100644 --- a/packages/frontend/src/components/MkNotifications.vue +++ b/packages/frontend/src/components/MkNotifications.vue @@ -23,10 +23,10 @@ SPDX-License-Identifier: AGPL-3.0-only :moveClass=" $style.transition_x_move" tag="div" > - <template v-for="(notification, i) in notifications" :key="notification.id"> + <div v-for="(notification, i) in notifications" :key="notification.id"> <DynamicNote v-if="['reply', 'quote', 'mention'].includes(notification.type)" :class="$style.item" :note="notification.note" :withHardMute="true" :data-scroll-anchor="notification.id"/> <XNotification v-else :class="$style.item" :notification="notification" :withTime="true" :full="true" :data-scroll-anchor="notification.id"/> - </template> + </div> </component> </template> </MkPagination> diff --git a/packages/frontend/src/components/MkReactionsViewer.vue b/packages/frontend/src/components/MkReactionsViewer.vue index 70d0ddca0a..945640ab41 100644 --- a/packages/frontend/src/components/MkReactionsViewer.vue +++ b/packages/frontend/src/components/MkReactionsViewer.vue @@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only tag="div" :class="$style.root" > <XReaction v-for="[reaction, count] in reactions" :key="reaction" :reaction="reaction" :count="count" :isInitial="initialReactions.has(reaction)" :note="note" @reactionToggled="onMockToggleReaction"/> - <slot v-if="hasMoreReactions" name="more"/> + <slot v-if="hasMoreReactions" :key="'$more'" name="more"/> </component> </template> diff --git a/packages/frontend/src/components/MkTimeline.vue b/packages/frontend/src/components/MkTimeline.vue index 87e8f0e258..48e8c7f377 100644 --- a/packages/frontend/src/components/MkTimeline.vue +++ b/packages/frontend/src/components/MkTimeline.vue @@ -24,7 +24,7 @@ SPDX-License-Identifier: AGPL-3.0-only :moveClass=" $style.transition_x_move" tag="div" > - <template v-for="(note, i) in notes" :key="note.id"> + <div v-for="(note, i) in notes" :key="note.id"> <div v-if="note._shouldInsertAd_" :class="[$style.noteWithAd, { '_gaps': !noGap }]" :data-scroll-anchor="note.id"> <DynamicNote :class="$style.note" :note="note" :withHardMute="true"/> <div :class="$style.ad"> @@ -32,7 +32,7 @@ SPDX-License-Identifier: AGPL-3.0-only </div> </div> <DynamicNote v-else :class="$style.note" :note="note" :withHardMute="true" :data-scroll-anchor="note.id"/> - </template> + </div> </component> </template> </MkPagination> diff --git a/packages/frontend/src/pages/chat/room.vue b/packages/frontend/src/pages/chat/room.vue index e05125a3b2..5afda5682f 100644 --- a/packages/frontend/src/pages/chat/room.vue +++ b/packages/frontend/src/pages/chat/room.vue @@ -39,14 +39,14 @@ SPDX-License-Identifier: AGPL-3.0-only :moveClass="prefer.s.animation ? $style.transition_x_move : ''" tag="div" class="_gaps" > - <template v-for="item in timeline.toReversed()" :key="item.id"> + <div v-for="item in timeline.toReversed()" :key="item.id"> <XMessage v-if="item.type === 'item'" :message="item.data"/> <div v-else-if="item.type === 'date'" :class="$style.dateDivider"> <span><i class="ti ti-chevron-up"></i> {{ item.nextText }}</span> <span style="height: 1em; width: 1px; background: var(--MI_THEME-divider);"></span> <span>{{ item.prevText }} <i class="ti ti-chevron-down"></i></span> </div> - </template> + </div> </TransitionGroup> </div> |