From b018e8e2e33a41488ef8903de35797e07acd9ea3 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 5 Oct 2025 17:20:20 +0900
Subject: [PATCH] =?UTF-8?q?Revert=20"fix(frontend):=20modal=E3=81=AE?=
 =?UTF-8?q?=E4=B8=AD=E3=81=A7tabs=E3=82=92=E4=BD=BF=E7=94=A8=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E9=9A=9B=E3=81=AB=E3=83=8F=E3=82=A4=E3=83=A9=E3=82=A4?=
 =?UTF-8?q?=E3=83=88=E3=81=8C=E5=A4=89=E3=81=AA=E4=BD=8D=E7=BD=AE=E3=81=AB?=
 =?UTF-8?q?=E5=87=BA=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3b0ec46990d9ac9ae7f22140dfed5f8b80a4190c.
---
 packages/frontend/src/components/MkModal.vue | 16 +---------------
 packages/frontend/src/components/MkTabs.vue  | 13 +------------
 packages/frontend/src/di.ts                  |  1 -
 3 files changed, 2 insertions(+), 28 deletions(-)

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"
 >
 	<div v-show="manualShowing != null ? manualShowing : showing" ref="modalRootEl" v-hotkey.global="keymap" :class="[$style.root, { [$style.drawer]: type === 'drawer', [$style.dialog]: type === 'dialog', [$style.popup]: type === 'popup' }]" :style="{ zIndex, pointerEvents: (manualShowing != null ? manualShowing : showing) ? 'auto' : 'none', '--transformOrigin': transformOrigin }">
 		<div data-cy-bg :data-cy-transparent="isEnableBgTransparent" class="_modalBg" :class="[$style.bg, { [$style.bgTransparent]: isEnableBgTransparent }]" :style="{ zIndex }" @click="onBgClick" @mousedown="onBgClick" @contextmenu.prevent.stop="() => {}"></div>
@@ -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<number>();
 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<K = string> = {
 </script>
 
 <script lang="ts" setup generic="const T extends Tab">
-import { nextTick, onMounted, onUnmounted, useTemplateRef, ref, watch, inject } from 'vue';
+import { nextTick, onMounted, onUnmounted, useTemplateRef, watch } from 'vue';
 import { prefer } from '@/preferences.js';
-import { DI } from '@/di.js';
 
 const props = withDefaults(defineProps<{
 	tabs?: T[];
@@ -72,8 +71,6 @@ const emit = defineEmits<{
 
 const tab = defineModel<T['key']>('tab');
 
-const modalTransitioning = inject(DI.modalTransitioning, ref(false));
-
 const tabHighlightEl = useTemplateRef('tabHighlightEl');
 const tabRefs: Record<string, HTMLElement | null> = {};
 
@@ -154,14 +151,6 @@ onMounted(() => {
 			if (entering) return;
 			renderTab();
 		});
-	});
-
-	const modalTransitioningWatchStop = watch(modalTransitioning, (to) => {
-		if (!to) {
-			entering = false;
-			renderTab();
-			modalTransitioningWatchStop();
-		}
 	}, { immediate: true });
 });
 
diff --git a/packages/frontend/src/di.ts b/packages/frontend/src/di.ts
index 759965a98e..e2590da60b 100644
--- a/packages/frontend/src/di.ts
+++ b/packages/frontend/src/di.ts
@@ -16,6 +16,5 @@ export const DI = {
 	currentStickyBottom: Symbol() as InjectionKey<Ref<number>>,
 	mfmEmojiReactCallback: Symbol() as InjectionKey<(emoji: string) => void>,
 	inModal: Symbol() as InjectionKey<boolean>,
-	modalTransitioning: Symbol() as InjectionKey<Ref<boolean>>,
 	inAppSearchMarkerId: Symbol() as InjectionKey<Ref<string | null>>,
 };