diff options
| author | anatawa12 <anatawa12@icloud.com> | 2025-12-12 12:53:59 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-12 12:53:59 +0900 |
| commit | 78435dc8d4a2c76798431a1383cee97f9e28ec0f (patch) | |
| tree | efd9eb9df085a3dd1380ad31859fb67b0647585a /packages | |
| parent | fix: remove unused dependencies (#16969) (diff) | |
| download | misskey-78435dc8d4a2c76798431a1383cee97f9e28ec0f.tar.gz misskey-78435dc8d4a2c76798431a1383cee97f9e28ec0f.tar.bz2 misskey-78435dc8d4a2c76798431a1383cee97f9e28ec0f.zip | |
Fix: deckのタイムラインセレクタのデフォルトの値が現在のタイムラインではない問題 (#16008)
* fix: os.selectの型定義の上で default が文字列である問題を修正
* fix: deckのタイムライン選択画面で今指定されているタイムラインがデフォルトで選択されない問題
* fix lint
* fix: type error
Diffstat (limited to 'packages')
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) { |