From 38491f418c6a65deffc0be20fabb837ddaa0563d Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Fri, 9 May 2025 22:09:41 +0900
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20os.select=E3=81=AE=E5=9E=8B=E5=AE=9A?=
 =?UTF-8?q?=E7=BE=A9=E3=81=AE=E4=B8=8A=E3=81=A7=20default=20=E3=81=8C?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E5=88=97=E3=81=A7=E3=81=82=E3=82=8B=E5=95=8F?=
 =?UTF-8?q?=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkDialog.vue | 2 +-
 packages/frontend/src/os.ts                   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/components/MkDialog.vue b/packages/frontend/src/components/MkDialog.vue
index 3f7519a43f..3ee7bb9580 100644
--- a/packages/frontend/src/components/MkDialog.vue
+++ b/packages/frontend/src/components/MkDialog.vue
@@ -77,7 +77,7 @@ type Select = {
 		sectionTitle: string;
 		items: SelectItem[];
 	})[];
-	default: string | null;
+	default: any | null;
 };
 
 type Result = string | number | true | null;
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index d891525782..2c0be767f4 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -478,7 +478,7 @@ type SelectItem<C> = {
 export function select<C = unknown>(props: {
 	title?: string;
 	text?: string;
-	default: string;
+	default: C;
 	items: (SelectItem<C> | {
 		sectionTitle: string;
 		items: SelectItem<C>[];
@@ -491,7 +491,7 @@ export function select<C = unknown>(props: {
 export function select<C = unknown>(props: {
 	title?: string;
 	text?: string;
-	default?: string | null;
+	default?: C | null;
 	items: (SelectItem<C> | {
 		sectionTitle: string;
 		items: SelectItem<C>[];
@@ -504,7 +504,7 @@ export function select<C = unknown>(props: {
 export function select<C = unknown>(props: {
 	title?: string;
 	text?: string;
-	default?: string | null;
+	default?: C | null;
 	items: (SelectItem<C> | {
 		sectionTitle: string;
 		items: SelectItem<C>[];

From 640f42f8ef9a39162ff732e14c14b55349e6a4d2 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Fri, 9 May 2025 22:12:00 +0900
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20deck=E3=81=AE=E3=82=BF=E3=82=A4?=
 =?UTF-8?q?=E3=83=A0=E3=83=A9=E3=82=A4=E3=83=B3=E9=81=B8=E6=8A=9E=E7=94=BB?=
 =?UTF-8?q?=E9=9D=A2=E3=81=A7=E4=BB=8A=E6=8C=87=E5=AE=9A=E3=81=95=E3=82=8C?=
 =?UTF-8?q?=E3=81=A6=E3=81=84=E3=82=8B=E3=82=BF=E3=82=A4=E3=83=A0=E3=83=A9?=
 =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=81=8C=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB?=
 =?UTF-8?q?=E3=83=88=E3=81=A7=E9=81=B8=E6=8A=9E=E3=81=95=E3=82=8C=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E5=95=8F=E9=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/ui/deck/antenna-column.vue       | 2 +-
 packages/frontend/src/ui/deck/channel-column.vue       | 2 +-
 packages/frontend/src/ui/deck/list-column.vue          | 2 +-
 packages/frontend/src/ui/deck/role-timeline-column.vue | 2 +-
 packages/frontend/src/ui/deck/tl-column.vue            | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/frontend/src/ui/deck/antenna-column.vue b/packages/frontend/src/ui/deck/antenna-column.vue
index 716f0ba995..e8c39fa484 100644
--- a/packages/frontend/src/ui/deck/antenna-column.vue
+++ b/packages/frontend/src/ui/deck/antenna-column.vue
@@ -67,7 +67,7 @@ async function setAntenna() {
 				})),
 			} : undefined),
 		],
-		default: props.column.antennaId,
+		default: antennas.find(x => x.id === props.column.antennaId),
 	});
 	if (canceled || antenna == null) return;
 
diff --git a/packages/frontend/src/ui/deck/channel-column.vue b/packages/frontend/src/ui/deck/channel-column.vue
index 3439a2a56e..cea2c22dbf 100644
--- a/packages/frontend/src/ui/deck/channel-column.vue
+++ b/packages/frontend/src/ui/deck/channel-column.vue
@@ -67,7 +67,7 @@ async function setChannel() {
 		items: channels.map(x => ({
 			value: x, text: x.name,
 		})),
-		default: props.column.channelId,
+		default: channels.find(x => x.id === props.column.channelId),
 	});
 	if (canceled || chosenChannel == null) return;
 	updateColumn(props.column.id, {
diff --git a/packages/frontend/src/ui/deck/list-column.vue b/packages/frontend/src/ui/deck/list-column.vue
index 5b7390b1b2..9766cdeedb 100644
--- a/packages/frontend/src/ui/deck/list-column.vue
+++ b/packages/frontend/src/ui/deck/list-column.vue
@@ -74,7 +74,7 @@ async function setList() {
 				})),
 			} : undefined),
 		],
-		default: props.column.listId,
+		default: lists.find(x => x.id === props.column.listId),
 	});
 	if (canceled || list == null) return;
 
diff --git a/packages/frontend/src/ui/deck/role-timeline-column.vue b/packages/frontend/src/ui/deck/role-timeline-column.vue
index ff00dfa6e0..cc8179571c 100644
--- a/packages/frontend/src/ui/deck/role-timeline-column.vue
+++ b/packages/frontend/src/ui/deck/role-timeline-column.vue
@@ -59,7 +59,7 @@ async function setRole() {
 		items: roles.map(x => ({
 			value: x, text: x.name,
 		})),
-		default: props.column.roleId,
+		default: roles.find(x => x.id === props.column.roleId),
 	});
 	if (canceled || role == null) return;
 	updateColumn(props.column.id, {
diff --git a/packages/frontend/src/ui/deck/tl-column.vue b/packages/frontend/src/ui/deck/tl-column.vue
index 97208f1c6a..f3b4758d3d 100644
--- a/packages/frontend/src/ui/deck/tl-column.vue
+++ b/packages/frontend/src/ui/deck/tl-column.vue
@@ -33,7 +33,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script lang="ts" setup>
 import { onMounted, watch, ref, useTemplateRef, computed } from 'vue';
 import XColumn from './column.vue';
-import type { Column } from '@/deck.js';
+import { type Column, columns } from '@/deck.js';
 import type { MenuItem } from '@/types/menu.js';
 import type { SoundStore } from '@/preferences/def.js';
 import { removeColumn, updateColumn } from '@/deck.js';
@@ -102,6 +102,7 @@ async function setType() {
 		}, {
 			value: 'global' as const, text: i18n.ts._timelines.global,
 		}],
+		default: props.column.tl,
 	});
 	if (canceled) {
 		if (props.column.tl == null) {

From bd41b88eb236e8f6b8040897b875b8987066540d Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Fri, 9 May 2025 22:32:28 +0900
Subject: [PATCH 3/3] fix lint

---
 packages/frontend/src/ui/deck/tl-column.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/ui/deck/tl-column.vue b/packages/frontend/src/ui/deck/tl-column.vue
index f3b4758d3d..791506398b 100644
--- a/packages/frontend/src/ui/deck/tl-column.vue
+++ b/packages/frontend/src/ui/deck/tl-column.vue
@@ -33,7 +33,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script lang="ts" setup>
 import { onMounted, watch, ref, useTemplateRef, computed } from 'vue';
 import XColumn from './column.vue';
-import { type Column, columns } from '@/deck.js';
+import type { Column } from '@/deck.js';
 import type { MenuItem } from '@/types/menu.js';
 import type { SoundStore } from '@/preferences/def.js';
 import { removeColumn, updateColumn } from '@/deck.js';