From ada09d66317319bba6fdc0968cb9519fa10df513 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 6 Sep 2025 13:12:31 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20os.select=E5=AF=BE=E5=BF=9C=E6=BC=8F?=
 =?UTF-8?q?=E3=82=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/ui/deck/antenna-column.vue | 16 ++++++++++------
 packages/frontend/src/ui/deck/list-column.vue    | 15 +++++++++------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/packages/frontend/src/ui/deck/antenna-column.vue b/packages/frontend/src/ui/deck/antenna-column.vue
index 0042882728..0423a22ce1 100644
--- a/packages/frontend/src/ui/deck/antenna-column.vue
+++ b/packages/frontend/src/ui/deck/antenna-column.vue
@@ -51,22 +51,24 @@ watch(soundSetting, v => {
 
 async function setAntenna() {
 	const antennas = await misskeyApi('antennas/list');
-	const { canceled, result: antenna } = await os.select<MisskeyEntities.Antenna | '_CREATE_'>({
+	const { canceled, result: antennaIdOrOperation } = await os.select({
 		title: i18n.ts.selectAntenna,
 		items: [
-			{ value: '_CREATE_', text: i18n.ts.createNew },
+			{ value: '_CREATE_', label: i18n.ts.createNew },
 			(antennas.length > 0 ? {
-				sectionTitle: i18n.ts.createdAntennas,
+				type: 'group' as const,
+				label: i18n.ts.createdAntennas,
 				items: antennas.map(x => ({
-					value: x, text: x.name,
+					value: x.id, label: x.name,
 				})),
 			} : undefined),
 		],
 		default: props.column.antennaId,
 	});
-	if (canceled || antenna == null) return;
 
-	if (antenna === '_CREATE_') {
+	if (canceled || antennaIdOrOperation == null) return;
+
+	if (antennaIdOrOperation === '_CREATE_') {
 		const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkAntennaEditorDialog.vue').then(x => x.default), {}, {
 			created: (newAntenna: MisskeyEntities.Antenna) => {
 				antennasCache.delete();
@@ -82,6 +84,8 @@ async function setAntenna() {
 		return;
 	}
 
+	const antenna = antennas.find(x => x.id === antennaIdOrOperation)!;
+
 	updateColumn(props.column.id, {
 		antennaId: antenna.id,
 		timelineNameCache: antenna.name,
diff --git a/packages/frontend/src/ui/deck/list-column.vue b/packages/frontend/src/ui/deck/list-column.vue
index 5c5891ece8..7fb0aba1e1 100644
--- a/packages/frontend/src/ui/deck/list-column.vue
+++ b/packages/frontend/src/ui/deck/list-column.vue
@@ -58,22 +58,23 @@ watch(soundSetting, v => {
 
 async function setList() {
 	const lists = await misskeyApi('users/lists/list');
-	const { canceled, result: list } = await os.select<MisskeyEntities.UserList | '_CREATE_'>({
+	const { canceled, result: listIdOrOperation } = await os.select({
 		title: i18n.ts.selectList,
 		items: [
-			{ value: '_CREATE_', text: i18n.ts.createNew },
+			{ value: '_CREATE_', label: i18n.ts.createNew },
 			(lists.length > 0 ? {
-				sectionTitle: i18n.ts.createdLists,
+				type: 'group' as const,
+				label: i18n.ts.createdLists,
 				items: lists.map(x => ({
-					value: x, text: x.name,
+					value: x.id, label: x.name,
 				})),
 			} : undefined),
 		],
 		default: props.column.listId,
 	});
-	if (canceled || list == null) return;
+	if (canceled || listIdOrOperation == null) return;
 
-	if (list === '_CREATE_') {
+	if (listIdOrOperation === '_CREATE_') {
 		const { canceled, result: name } = await os.inputText({
 			title: i18n.ts.enterListName,
 		});
@@ -87,6 +88,8 @@ async function setList() {
 			timelineNameCache: res.name,
 		});
 	} else {
+		const list = lists.find(x => x.id === listIdOrOperation)!;
+
 		updateColumn(props.column.id, {
 			listId: list.id,
 			timelineNameCache: list.name,