From 78435dc8d4a2c76798431a1383cee97f9e28ec0f Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Fri, 12 Dec 2025 12:53:59 +0900
Subject: [PATCH] =?UTF-8?q?Fix:=20deck=E3=81=AE=E3=82=BF=E3=82=A4=E3=83=A0?=
 =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=B3=E3=82=BB=E3=83=AC=E3=82=AF=E3=82=BF?=
 =?UTF-8?q?=E3=81=AE=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB=E3=83=88=E3=81=AE?=
 =?UTF-8?q?=E5=80=A4=E3=81=8C=E7=8F=BE=E5=9C=A8=E3=81=AE=E3=82=BF=E3=82=A4?=
 =?UTF-8?q?=E3=83=A0=E3=83=A9=E3=82=A4=E3=83=B3=E3=81=A7=E3=81=AF=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E5=95=8F=E9=A1=8C=20(#16008)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: os.selectの型定義の上で default が文字列である問題を修正

* fix: deckのタイムライン選択画面で今指定されているタイムラインがデフォルトで選択されない問題

* fix lint

* fix: type error
---
 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            | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/ui/deck/antenna-column.vue b/packages/frontend/src/ui/deck/antenna-column.vue
index 0423a22ce1..1668af79ee 100644
--- a/packages/frontend/src/ui/deck/antenna-column.vue
+++ b/packages/frontend/src/ui/deck/antenna-column.vue
@@ -63,7 +63,7 @@ async function setAntenna() {
 				})),
 			} : undefined),
 		],
-		default: props.column.antennaId,
+		default: antennas.find(x => x.id === props.column.antennaId)?.id,
 	});
 
 	if (canceled || antennaIdOrOperation == null) return;
diff --git a/packages/frontend/src/ui/deck/channel-column.vue b/packages/frontend/src/ui/deck/channel-column.vue
index 35ca9f5cc6..dd14e7019e 100644
--- a/packages/frontend/src/ui/deck/channel-column.vue
+++ b/packages/frontend/src/ui/deck/channel-column.vue
@@ -63,7 +63,7 @@ async function setChannel() {
 		items: channels.map(x => ({
 			value: x.id, label: x.name,
 		})),
-		default: props.column.channelId,
+		default: channels.find(x => x.id === props.column.channelId)?.id,
 	});
 	if (canceled || chosenChannelId == null) return;
 	const chosenChannel = channels.find(x => x.id === chosenChannelId)!;
diff --git a/packages/frontend/src/ui/deck/list-column.vue b/packages/frontend/src/ui/deck/list-column.vue
index 7fb0aba1e1..6fc4680396 100644
--- a/packages/frontend/src/ui/deck/list-column.vue
+++ b/packages/frontend/src/ui/deck/list-column.vue
@@ -70,7 +70,7 @@ async function setList() {
 				})),
 			} : undefined),
 		],
-		default: props.column.listId,
+		default: lists.find(x => x.id === props.column.listId)?.id,
 	});
 	if (canceled || listIdOrOperation == 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 beb679169c..1f6e8c73d5 100644
--- a/packages/frontend/src/ui/deck/role-timeline-column.vue
+++ b/packages/frontend/src/ui/deck/role-timeline-column.vue
@@ -54,7 +54,7 @@ async function setRole() {
 		items: roles.map(x => ({
 			value: x.id, label: x.name,
 		})),
-		default: props.column.roleId,
+		default: roles.find(x => x.id === props.column.roleId)?.id,
 	});
 	if (canceled || roleId == null) return;
 	const role = roles.find(x => x.id === roleId)!;
diff --git a/packages/frontend/src/ui/deck/tl-column.vue b/packages/frontend/src/ui/deck/tl-column.vue
index afaa08e6d0..0e59913c4c 100644
--- a/packages/frontend/src/ui/deck/tl-column.vue
+++ b/packages/frontend/src/ui/deck/tl-column.vue
@@ -104,6 +104,7 @@ async function setType() {
 		}, {
 			value: 'global', label: i18n.ts._timelines.global,
 		}],
+		default: props.column.tl,
 	});
 	if (canceled) {
 		if (props.column.tl == null) {