misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge branch 'misskey-develop' into merge/2025-03-24

Browse source
This commit is contained in:
Hazelnoot 2025-03-30 01:58:17 -04:00
commit 4ae26e6e18
113 changed files with 1303 additions and 1720 deletions
Download patch file Download diff file Expand all files Collapse all files

17
packages/frontend/src/ui/_common_/common.vue
View file

@ -14,7 +14,8 @@ SPDX-License-Identifier: AGPL-3.0-only
<XUpload v-if="uploads.length > 0"/>
<TransitionGroup
<component
:is="prefer.s.animation ? TransitionGroup : 'div'"
tag="div"
:class="[$style.notifications, {
[$style.notificationsPosition_leftTop]: prefer.s.notificationPosition === 'leftTop',
@ -24,11 +25,11 @@ SPDX-License-Identifier: AGPL-3.0-only
[$style.notificationsStackAxis_vertical]: prefer.s.notificationStackAxis === 'vertical',
[$style.notificationsStackAxis_horizontal]: prefer.s.notificationStackAxis === 'horizontal',
}]"
:moveClass="prefer.s.animation ? $style.transition_notification_move : ''"
:enterActiveClass="prefer.s.animation ? $style.transition_notification_enterActive : ''"
:leaveActiveClass="prefer.s.animation ? $style.transition_notification_leaveActive : ''"
:enterFromClass="prefer.s.animation ? $style.transition_notification_enterFrom : ''"
:leaveToClass="prefer.s.animation ? $style.transition_notification_leaveTo : ''"
:moveClass="$style.transition_notification_move"
:enterActiveClass="$style.transition_notification_enterActive"
:leaveActiveClass="$style.transition_notification_leaveActive"
:enterFromClass="$style.transition_notification_enterFrom"
:leaveToClass="$style.transition_notification_leaveTo"
>
<div
v-for="notification in notifications" :key="notification.id" :class="$style.notification" :style="{
@ -37,7 +38,7 @@ SPDX-License-Identifier: AGPL-3.0-only
>
<XNotification :notification="notification"/>
</div>
</TransitionGroup>
</component>
<XStreamIndicator/>
@ -51,7 +52,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</template>
<script lang="ts" setup>
import { defineAsyncComponent, ref } from 'vue';
import { defineAsyncComponent, ref, TransitionGroup } from 'vue';
import * as Misskey from 'misskey-js';
import { swInject } from './sw-inject.js';
import XNotification from './notification.vue';