From 8bfc9f1165a3aa4fee164e9afbb64a16cf3efdb2 Mon Sep 17 00:00:00 2001
From: mattyatea <mattyatea@pm.me>
Date: Tue, 11 Jun 2024 17:38:38 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=E3=83=AA=E3=82=B9=E3=83=88=E3=82=92?=
 =?UTF-8?q?=E3=83=94=E3=83=B3=E7=95=99=E3=82=81=E3=81=A7=E3=81=8D=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/settings/timelineHeader.vue     | 51 ++++++------
 packages/frontend/src/timelineHeader.ts       | 81 +++----------------
 2 files changed, 36 insertions(+), 96 deletions(-)

diff --git a/packages/frontend/src/pages/settings/timelineHeader.vue b/packages/frontend/src/pages/settings/timelineHeader.vue
index 9192439bd8..82e407a688 100644
--- a/packages/frontend/src/pages/settings/timelineHeader.vue
+++ b/packages/frontend/src/pages/settings/timelineHeader.vue
@@ -1,33 +1,29 @@
-<!--
-SPDX-FileCopyrightText: syuilo and misskey-project
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
 <template>
 <div class="_gaps_m">
 	<FormSlot>
 		<template #label>{{ i18n.ts.timelineHeader }}</template>
 		<MkContainer :showHeader="false">
-			<Sortable
-				v-model="items"
-				itemKey="id"
-				:animation="150"
-				:handle="'.' + $style.itemHandle"
-				@start="e => e.item.classList.add('active')"
-				@end="e => e.item.classList.remove('active')"
-			>
-				<template #item="{element,index}">
-					<div
-						v-if="element.type === '-' || timelineHeaderItemDef[element.type]"
-						:class="$style.item"
-					>
-						<button class="_button" :class="$style.itemHandle"><i class="ti ti-menu"></i></button>
-
-						<i class="ti-fw" :class="[$style.itemIcon, timelineHeaderItemDef[element.type]?.icon]"></i><span :class="$style.itemText">{{ timelineHeaderItemDef[element.type]?.title }}</span>
-						<button class="_button" :class="$style.itemRemove" @click="removeItem(index)"><i class="ti ti-x"></i></button>
-					</div>
-				</template>
-			</Sortable>
+			<div style="overflow-x: auto;">
+				<Sortable
+					v-model="items"
+					itemKey="id"
+					:class="$style.container"
+					:animation="150"
+					:handle="'.' + $style.itemHandle"
+					@start="e => e.item.classList.add('active')"
+					@end="e => e.item.classList.remove('active')"
+				>
+					<template #item="{element,index}">
+						<div
+							:class="$style.item"
+						>
+							<button class="_button" :class="$style.itemHandle"><i class="ti ti-menu"></i></button>
+							<i class="ti-fw" :class="[$style.itemIcon, timelineHeaderItemDef[element.type]?.icon]"></i><span :class="$style.itemText">{{ timelineHeaderItemDef[element.type]?.title }}</span>
+							<button class="_button" :class="$style.itemRemove" @click="removeItem(index)"><i class="ti ti-x"></i></button>
+						</div>
+					</template>
+				</Sortable>
+			</div>
 		</MkContainer>
 	</FormSlot>
 	<div class="_buttons">
@@ -116,6 +112,7 @@ definePageMetadata(() => ({
 	overflow: hidden;
 	white-space: nowrap;
 	color: var(--navFg);
+	min-width: 200px;
 }
 
 .itemIcon {
@@ -146,4 +143,8 @@ definePageMetadata(() => ({
 	margin: 0 8px;
 	opacity: 0.5;
 }
+
+.container{
+	display: flex;
+}
 </style>
diff --git a/packages/frontend/src/timelineHeader.ts b/packages/frontend/src/timelineHeader.ts
index 490a9442c8..f603dc4206 100644
--- a/packages/frontend/src/timelineHeader.ts
+++ b/packages/frontend/src/timelineHeader.ts
@@ -5,12 +5,9 @@
 
 import { reactive } from 'vue';
 import { i18n } from '@/i18n.js';
-import { antennasCache, favoritedChannelsCache, userListsCache } from '@/cache.js';
-import { MenuItem } from '@/types/menu.js';
-import * as os from '@/os.js';
-import { miLocalStorage } from '@/local-storage.js';
+import { userListsCache } from '@/cache.js';
 import { isLocalTimelineAvailable, isGlobalTimelineAvailable } from '@/store.js';
-
+const lists = await userListsCache.fetch();
 export const timelineHeaderItemDef = reactive({
 	home: {
 		title: i18n.ts._timelines.home,
@@ -19,7 +16,6 @@ export const timelineHeaderItemDef = reactive({
 	},
 	...(isLocalTimelineAvailable ? {
 		local: {
-			key: 'local',
 			title: i18n.ts._timelines.local,
 			icon: 'ti ti-planet',
 			iconOnly: true,
@@ -30,7 +26,6 @@ export const timelineHeaderItemDef = reactive({
 			iconOnly: true,
 		} } : {}),
 	...(isGlobalTimelineAvailable ? { global: {
-		key: 'global',
 		title: i18n.ts._timelines.global,
 		icon: 'ti ti-whirl',
 		iconOnly: true,
@@ -50,68 +45,12 @@ export const timelineHeaderItemDef = reactive({
 		title: i18n.ts.channel,
 		iconOnly: true,
 	},
+	...lists.reduce((acc, l) => {
+		acc['list:' + l.id] = {
+			title: i18n.ts.lists + ':' + l.name,
+			icon: 'ti ti-star',
+			iconOnly: true,
+		};
+		return acc;
+	}, {}),
 });
-
-async function chooseList(ev: MouseEvent): Promise<void> {
-	const lists = await userListsCache.fetch();
-	const items: MenuItem[] = [
-		...lists.map(list => ({
-			type: 'link' as const,
-			text: list.name,
-			to: `/timeline/list/${list.id}`,
-		})),
-		(lists.length === 0 ? undefined : { type: 'divider' }),
-		{
-			type: 'link' as const,
-			icon: 'ti ti-plus',
-			text: i18n.ts.createNew,
-			to: '/my/lists',
-		},
-	];
-	os.popupMenu(items, ev.currentTarget ?? ev.target);
-}
-
-async function chooseAntenna(ev: MouseEvent): Promise<void> {
-	const antennas = await antennasCache.fetch();
-	const items: MenuItem[] = [
-		...antennas.map(antenna => ({
-			type: 'link' as const,
-			text: antenna.name,
-			indicate: antenna.hasUnreadNote,
-			to: `/timeline/antenna/${antenna.id}`,
-		})),
-		(antennas.length === 0 ? undefined : { type: 'divider' }),
-		{
-			type: 'link' as const,
-			icon: 'ti ti-plus',
-			text: i18n.ts.createNew,
-			to: '/my/antennas',
-		},
-	];
-	os.popupMenu(items, ev.currentTarget ?? ev.target);
-}
-
-async function chooseChannel(ev: MouseEvent): Promise<void> {
-	const channels = await favoritedChannelsCache.fetch();
-	const items: MenuItem[] = [
-		...channels.map(channel => {
-			const lastReadedAt = miLocalStorage.getItemAsJson(`channelLastReadedAt:${channel.id}`) ?? null;
-			const hasUnreadNote = (lastReadedAt && channel.lastNotedAt) ? Date.parse(channel.lastNotedAt) > lastReadedAt : !!(!lastReadedAt && channel.lastNotedAt);
-
-			return {
-				type: 'link' as const,
-				text: channel.name,
-				indicate: hasUnreadNote,
-				to: `/channels/${channel.id}`,
-			};
-		}),
-		(channels.length === 0 ? undefined : { type: 'divider' }),
-		{
-			type: 'link' as const,
-			icon: 'ti ti-plus',
-			text: i18n.ts.createNew,
-			to: '/channels',
-		},
-	];
-	os.popupMenu(items, ev.currentTarget ?? ev.target);
-}