diff options
| author | かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com> | 2025-09-13 21:00:33 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-13 21:00:33 +0900 |
| commit | d4654dd7bd5bf1c7faa74ed89f592448c0076be8 (patch) | |
| tree | b4f51e86f174717fef469fbedca48faa2a55e841 /packages/frontend/src/preferences | |
| parent | fix(deps): update dependency vite [security] (#16535) (diff) | |
| download | misskey-d4654dd7bd5bf1c7faa74ed89f592448c0076be8.tar.gz misskey-d4654dd7bd5bf1c7faa74ed89f592448c0076be8.tar.bz2 misskey-d4654dd7bd5bf1c7faa74ed89f592448c0076be8.zip | |
refactor(frontend): os.select, MkSelectのitem指定をオブジェクトによる定義に統一し、型を狭める (#16475)
* refactor(frontend): MkSelectのitem指定をオブジェクトによる定義に統一
* fix
* spdx
* fix
* fix os.select
* fix lint
* add comment
* fix
* fix: os.select対応漏れを修正
* fix
* fix
* fix: MkSelectのmodelに対する型チェックを厳格化
* fix
* fix
* fix
* Update packages/frontend/src/components/MkEmbedCodeGenDialog.vue
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
* fix
* fix types
* fix
* fix
* Update packages/frontend/src/pages/admin/roles.editor.vue
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
* fix: MkSelectに直接配列を指定している場合に正常に型が解決されるように
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Diffstat (limited to 'packages/frontend/src/preferences')
| -rw-r--r-- | packages/frontend/src/preferences/manager.ts | 14 | ||||
| -rw-r--r-- | packages/frontend/src/preferences/utility.ts | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/packages/frontend/src/preferences/manager.ts b/packages/frontend/src/preferences/manager.ts index d26d590851..b6d3d55a5f 100644 --- a/packages/frontend/src/preferences/manager.ts +++ b/packages/frontend/src/preferences/manager.ts @@ -447,16 +447,16 @@ export class PreferencesManager { title: i18n.ts.preferenceSyncConflictTitle, text: i18n.ts.preferenceSyncConflictText, items: [...(mergedValue !== undefined ? [{ - text: i18n.ts.preferenceSyncConflictChoiceMerge, - value: 'merge', + label: i18n.ts.preferenceSyncConflictChoiceMerge, + value: 'merge' as const, }] : []), { - text: i18n.ts.preferenceSyncConflictChoiceServer, - value: 'remote', + label: i18n.ts.preferenceSyncConflictChoiceServer, + value: 'remote' as const, }, { - text: i18n.ts.preferenceSyncConflictChoiceDevice, - value: 'local', + label: i18n.ts.preferenceSyncConflictChoiceDevice, + value: 'local' as const, }, { - text: i18n.ts.preferenceSyncConflictChoiceCancel, + label: i18n.ts.preferenceSyncConflictChoiceCancel, value: null, }], default: mergedValue !== undefined ? 'merge' : 'remote', diff --git a/packages/frontend/src/preferences/utility.ts b/packages/frontend/src/preferences/utility.ts index 80949f4971..33d379509a 100644 --- a/packages/frontend/src/preferences/utility.ts +++ b/packages/frontend/src/preferences/utility.ts @@ -187,7 +187,7 @@ export async function restoreFromCloudBackup() { const select = await os.select({ title: i18n.ts._preferencesBackup.selectBackupToRestore, items: backups.map(backup => ({ - text: backup.name, + label: backup.name, value: backup.name, })), }); |