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

Merge branch 'develop' of https://github.com/misskey-dev/misskey into storybook

Browse source
This commit is contained in:
Acid Chicken (硫酸鶏) 2023-04-01 13:46:54 +09:00
commit 2b831da1d1
No known key found for this signature in database
GPG key ID: 3E87B98A3F6BAB99
59 changed files with 222 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

11
packages/frontend/src/components/MkContextMenu.vue
View file

@ -1,10 +1,10 @@
<template>
<Transition
appear
:enter-active-class="animation ? $style.transition_fade_enterActive : ''"
:leave-active-class="animation ? $style.transition_fade_leaveActive : ''"
:enter-from-class="animation ? $style.transition_fade_enterFrom : ''"
:leave-to-class="animation ? $style.transition_fade_leaveTo : ''"
:enter-active-class="defaultStore.state.animation ? $style.transition_fade_enterActive : ''"
:leave-active-class="defaultStore.state.animation ? $style.transition_fade_leaveActive : ''"
:enter-from-class="defaultStore.state.animation ? $style.transition_fade_enterFrom : ''"
:leave-to-class="defaultStore.state.animation ? $style.transition_fade_leaveTo : ''"
>
<div ref="rootEl" :class="$style.root" :style="{ zIndex }" @contextmenu.prevent.stop="() => {}">
<MkMenu :items="items" :align="'left'" @close="$emit('closed')"/>
@ -19,6 +19,7 @@ import { MenuItem } from './types/menu.vue';
import contains from '@/scripts/contains';
import { defaultStore } from '@/store';
import * as os from '@/os';
import { defaultStore } from '@/store';
const props = defineProps<{
items: MenuItem[];
@ -29,8 +30,6 @@ const emit = defineEmits<{
(ev: 'closed'): void;
}>();
const animation = $computed(() => defaultStore.state.animation);
let rootEl = $shallowRef<HTMLDivElement>();
let zIndex = $ref<number>(os.claimZIndex('high'));