diff --git a/packages/frontend/src/components/MkModal.vue b/packages/frontend/src/components/MkModal.vue index 8be70373dc..660d5a26be 100644 --- a/packages/frontend/src/components/MkModal.vue +++ b/packages/frontend/src/components/MkModal.vue @@ -30,7 +30,7 @@ SPDX-License-Identifier: AGPL-3.0-only [$style.transition_modal_leaveTo]: transitionName === 'modal', [$style.transition_send_leaveTo]: transitionName === 'send', })" - :duration="transitionDuration" appear @afterLeave="onClosed" @enter="onOpening" @afterEnter="onOpened" + :duration="transitionDuration" appear @afterLeave="onClosed" @enter="emit('opening')" @afterEnter="onOpened" >
@@ -97,14 +97,6 @@ const emit = defineEmits<{ provide(DI.inModal, true); -const isTransitioning = ref((() => { - if (!prefer.s.animation) return false; - if (props.manualShowing === false) return false; - return true; -})()); - -provide(DI.modalTransitioning, isTransitioning); - const maxHeight = ref(); const fixed = ref(false); const transformOrigin = ref('center'); @@ -293,14 +285,8 @@ const align = () => { content.value.style.top = top + 'px'; }; -const onOpening = () => { - emit('opening'); - isTransitioning.value = true; -}; - const onOpened = () => { emit('opened'); - isTransitioning.value = false; // contentの子要素にアクセスするためレンダリングの完了を待つ必要がある(nextTickが必要) nextTick(() => { diff --git a/packages/frontend/src/components/MkTabs.vue b/packages/frontend/src/components/MkTabs.vue index 9ed040f63b..568063af28 100644 --- a/packages/frontend/src/components/MkTabs.vue +++ b/packages/frontend/src/components/MkTabs.vue @@ -53,9 +53,8 @@ export type Tab = {