From 121ee723d98542547c16a54f4e246fc31d786b09 Mon Sep 17 00:00:00 2001
From: mattyatea <mattyatea@pm.me>
Date: Wed, 31 Jan 2024 20:12:11 +0900
Subject: [PATCH] =?UTF-8?q?=E3=81=84=E3=82=8D=E3=81=84=E3=82=8D=E3=81=8B?=
 =?UTF-8?q?=E3=81=88=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/MkFoldableSection.vue      | 149 +++++-------------
 .../frontend/src/components/MkTimeline.vue    |   2 +-
 .../frontend/src/pages/settings/general.vue   |  14 +-
 3 files changed, 48 insertions(+), 117 deletions(-)

diff --git a/packages/frontend/src/components/MkFoldableSection.vue b/packages/frontend/src/components/MkFoldableSection.vue
index 8019477c51..5598f7ac8d 100644
--- a/packages/frontend/src/components/MkFoldableSection.vue
+++ b/packages/frontend/src/components/MkFoldableSection.vue
@@ -4,54 +4,48 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div ref="rootEl" :class="$style.root" role="group" :aria-expanded="opened">
-	<header :class="[$style.header, { [$style.opened]: opened }]" class="_button" role="button" data-cy-folder-header @click="toggle">
+<div ref="rootEl" :class="$style.root">
+	<header :class="$style.header" class="_button" :style="{ background: bg }" @click="showBody = !showBody">
 		<div :class="$style.title"><div><slot name="header"></slot></div></div>
 		<div :class="$style.divider"></div>
 		<button class="_button" :class="$style.button">
-			<template v-if="opened"><i class="ti ti-chevron-up"></i></template>
+			<template v-if="showBody"><i class="ti ti-chevron-up"></i></template>
 			<template v-else><i class="ti ti-chevron-down"></i></template>
 		</button>
 	</header>
-	<div v-if="openedAtLeastOnce" :class="[$style.body, { [$style.bgSame]: bgSame }]" :style="{ maxHeight: maxHeight ? `${maxHeight}px` : null, overflow: maxHeight ? `auto` : null }" :aria-hidden="!opened">
-		<Transition
-			:enterActiveClass="defaultStore.state.animation ? $style.transition_toggle_enterActive : ''"
-			:leaveActiveClass="defaultStore.state.animation ? $style.transition_toggle_leaveActive : ''"
-			:enterFromClass="defaultStore.state.animation ? $style.transition_toggle_enterFrom : ''"
-			:leaveToClass="defaultStore.state.animation ? $style.transition_toggle_leaveTo : ''"
-			@enter="enter"
-			@afterEnter="afterEnter"
-			@leave="leave"
-			@afterLeave="afterLeave"
-		>
-			<div v-show="opened">
-				<slot></slot>
-			</div>
-		</Transition>
-	</div>
+	<Transition
+		:enterActiveClass="defaultStore.state.animation ? $style['folder-toggle-enter-active'] : ''"
+		:leaveActiveClass="defaultStore.state.animation ? $style['folder-toggle-leave-active'] : ''"
+		:enterFromClass="defaultStore.state.animation ? $style['folder-toggle-enter-from'] : ''"
+		:leaveToClass="defaultStore.state.animation ? $style['folder-toggle-leave-to'] : ''"
+		@enter="enter"
+		@afterEnter="afterEnter"
+		@leave="leave"
+		@afterLeave="afterLeave"
+	>
+		<div v-show="showBody">
+			<slot></slot>
+		</div>
+	</Transition>
 </div>
 </template>
 
 <script lang="ts" setup>
-import { nextTick, onMounted, shallowRef, ref, watch } from 'vue';
+import { onMounted, ref, shallowRef, watch } from 'vue';
+import tinycolor from 'tinycolor2';
+import { miLocalStorage } from '@/local-storage.js';
 import { defaultStore } from '@/store.js';
+
 const miLocalStoragePrefix = 'ui:folder:' as const;
 
 const props = withDefaults(defineProps<{
+    expanded?: boolean;
+    persistKey?: string;
     defaultOpen?: boolean;
-    maxHeight?: number | null;
 }>(), {
-	defaultOpen: true,
-	maxHeight: null,
+	expanded: true,
 });
-const getBgColor = (el: HTMLElement) => {
-    const style = window.getComputedStyle(el);
-    if (style.backgroundColor && !['rgba(0, 0, 0, 0)', 'rgba(0,0,0,0)', 'transparent'].includes(style.backgroundColor)) {
-        return style.backgroundColor;
-    } else {
-        return el.parentElement ? getBgColor(el.parentElement) : 'transparent';
-    }
-};
+
 const rootEl = shallowRef<HTMLDivElement>();
 const bg = ref<string>();
 const showBody = ref((props.persistKey && miLocalStorage.getItem(`${miLocalStoragePrefix}${props.persistKey}`)) ? (miLocalStorage.getItem(`${miLocalStoragePrefix}${props.persistKey}`) === 't') : props.expanded);
@@ -62,17 +56,12 @@ watch(showBody, () => {
 	}
 });
 
-const rootEl = shallowRef<HTMLElement>();
-const bgSame = ref(false);
-const opened = ref(props.defaultOpen);
-const openedAtLeastOnce = ref(props.defaultOpen);
-
 function enter(element: Element) {
 	const el = element as HTMLElement;
 	const elementHeight = el.getBoundingClientRect().height;
 	el.style.height = '0';
 	el.offsetHeight; // reflow
-	el.style.height = Math.min(elementHeight, props.maxHeight ?? Infinity) + 'px';
+	el.style.height = elementHeight + 'px';
 }
 
 function afterEnter(element: Element) {
@@ -93,16 +82,6 @@ function afterLeave(element: Element) {
 	el.style.height = 'unset';
 }
 
-function toggle() {
-	if (!opened.value) {
-		openedAtLeastOnce.value = true;
-	}
-
-	nextTick(() => {
-		opened.value = !opened.value;
-	});
-}
-
 onMounted(() => {
 	function getParentBg(el?: HTMLElement | null): string {
 		if (el == null || el.tagName === 'BODY') return 'var(--bg)';
@@ -113,10 +92,7 @@ onMounted(() => {
 			return getParentBg(el.parentElement);
 		}
 	}
-    const computedStyle = getComputedStyle(document.documentElement);
-    const parentBg = getBgColor(rootEl.value.parentElement);
-    const myBg = computedStyle.getPropertyValue('--panel');
-    bgSame.value = parentBg === myBg;
+
 	const rawBg = getParentBg(rootEl.value);
 	const _bg = tinycolor(rawBg.startsWith('var(') ? getComputedStyle(document.documentElement).getPropertyValue(rawBg.slice(4, -1)) : rawBg);
 	_bg.setAlpha(0.85);
@@ -125,18 +101,17 @@ onMounted(() => {
 </script>
 
 <style lang="scss" module>
-.transition_toggle_enterActive,
-.transition_toggle_leaveActive {
+.folder-toggle-enter-active, .folder-toggle-leave-active {
   overflow-y: clip;
-  transition: opacity 0.3s, height 0.3s, transform 0.3s !important;
+  transition: opacity 0.5s, height 0.5s !important;
 }
-.transition_toggle_enterFrom,
-.transition_toggle_leaveTo {
+
+.folder-toggle-enter-from, .folder-toggle-leave-to {
   opacity: 0;
 }
 
 .root {
-  display: block;
+  position: relative;
 }
 
 .header {
@@ -147,64 +122,14 @@ onMounted(() => {
   top: var(--stickyTop, 0px);
   -webkit-backdrop-filter: var(--blur, blur(8px));
   backdrop-filter: var(--blur, blur(20px));
-
-  &.opened {
-    border-radius: 6px 6px 0 0;
-  }
 }
 
-.headerUpper {
-  display: flex;
-  align-items: center;
-}
-
-.headerLower {
-  color: var(--fgTransparentWeak);
-  font-size: .85em;
-  padding-left: 4px;
-}
-
-.headerIcon {
-  margin-right: 0.75em;
-  flex-shrink: 0;
-  text-align: center;
-  opacity: 0.8;
-
-  &:empty {
-    display: none;
-
-    & + .headerText {
-      padding-left: 4px;
-    }
-  }
-}
 .title {
   display: grid;
   place-content: center;
   margin: 0;
   padding: 12px 16px 12px 0;
 }
-.headerText {
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  padding-right: 12px;
-}
-
-.headerTextSub {
-  color: var(--fgTransparentWeak);
-  font-size: .85em;
-}
-
-.headerRight {
-  margin-left: auto;
-  color: var(--fgTransparentWeak);
-  white-space: nowrap;
-}
-
-.headerRightText:not(:empty) {
-  margin-right: 0.75em;
-}
 
 .divider {
   flex: 1;
@@ -212,4 +137,14 @@ onMounted(() => {
   height: 1px;
   background: var(--divider);
 }
+
+.button {
+  padding: 12px 0 12px 16px;
+}
+
+@container (max-width: 500px) {
+  .title {
+    padding: 8px 10px 8px 0;
+  }
+}
 </style>
diff --git a/packages/frontend/src/components/MkTimeline.vue b/packages/frontend/src/components/MkTimeline.vue
index c7341518e9..21f501afe0 100644
--- a/packages/frontend/src/components/MkTimeline.vue
+++ b/packages/frontend/src/components/MkTimeline.vue
@@ -17,7 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { computed, watch, onUnmounted, provide, ref, shallowRef } from 'vue';
+import { computed, watch, onUnmounted, provide, shallowRef } from 'vue';
 import Misskey from 'misskey-js';
 import { Connection } from 'misskey-js/built/streaming.js';
 import MkNotes from '@/components/MkNotes.vue';
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 4ee4e011ff..bc8a55c76f 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -50,7 +50,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkSwitch v-model="showGlobalTimeline">{{ i18n.ts.showGlobalTimeline }}</MkSwitch>
 		</div>
 	</FormSection>
-	<MkFoldableSection :defaultOpen="false" class="item">
+	<MkFoldableSection :expanded="false" class="item">
 		<template #header>{{ i18n.ts.displayOfNote }}</template>
 
 		<div class="_gaps_m">
@@ -108,7 +108,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</MkRadios>
 		</div>
 	</MkFoldableSection>
-	<MkFoldableSection :defaultOpen="false" class="item">
+	<MkFoldableSection :expanded="false" class="item">
 		<template #header>{{ i18n.ts.notificationDisplay }}</template>
 
 		<div class="_gaps_m">
@@ -131,7 +131,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkButton @click="testNotification">{{ i18n.ts._notification.checkNotificationBehavior }}</MkButton>
 		</div>
 	</MkFoldableSection>
-	<MkFoldableSection :defaultOpen="false" class="item">
+	<MkFoldableSection :expanded="false" class="item">
 		<template #header>{{ i18n.ts.appearance }}</template>
 		<div class="_gaps_m">
 			<div class="_gaps_s">
@@ -169,7 +169,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</MkRadios>
 		</div>
 	</MkFoldableSection>
-	<MkFoldableSection :defaultOpen="false" class="item">
+	<MkFoldableSection :expanded="false" class="item">
 		<template #header>{{ i18n.ts.behavior }}</template>
 
 		<div class="_gaps_m">
@@ -227,13 +227,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</MkFolder>
 		</div>
 	</MkFoldableSection>
-	<MkFoldableSection :defaultOpen="false">
+	<MkFoldableSection :expanded="false">
 		<template #header>他のサーバーのローカルタイムラインを覗けるようにする</template>
 		<div class="_gaps_m">
-			<MkFoldableSection :defaultOpen="false">
-				<template #header>{{ i18n.ts.accessToken }} の発行の仕方</template>
-				<img width="400" src="https://files.prismisskey.space/misskey/676e4b79-7897-4ea9-b074-a98139312f76.gif">
-			</MkFoldableSection>
 			<div v-if="maxLocalTimeline >= 1">
 				<MkInput v-model="remoteLocalTimelineName1" placeholder="prismisskey">
 					<template #label>{{ i18n.ts.name }}</template>