diff --git a/src/components/App.vue b/src/components/App.vue index 50c1d87164..643255c72c 100644 --- a/src/components/App.vue +++ b/src/components/App.vue @@ -157,6 +157,7 @@ onMounted(async () => { isAcceptTermsDialogOpen: import.meta.env.MODE !== "development" && store.state.acceptTerms !== "Accepted", + isInitialSettingsDialogOpen: store.state.openedEditor == undefined, }); // プロジェクトファイルが指定されていればロード diff --git a/src/components/Dialog/AllDialog.vue b/src/components/Dialog/AllDialog.vue index 4c714f1b7f..15fdcf410c 100644 --- a/src/components/Dialog/AllDialog.vue +++ b/src/components/Dialog/AllDialog.vue @@ -23,6 +23,7 @@ /> + + + diff --git a/src/store/type.ts b/src/store/type.ts index 88c4682444..435a9eae65 100644 --- a/src/store/type.ts +++ b/src/store/type.ts @@ -1912,9 +1912,7 @@ export type SettingStoreState = { experimentalSetting: ExperimentalSettingType; confirmedTips: ConfirmedTips; engineSettings: EngineSettings; -} & Omit & { - openedEditor: EditorType | undefined; // undefinedのときはどのエディタを開くか定まっていない - }; +} & RootMiscSettingType; // keyとvalueの型を連動するようにしたPayloadを作る type KeyValuePayload = K extends keyof R @@ -2035,6 +2033,7 @@ export type DialogStates = { isUpdateNotificationDialogOpen: boolean; isExportSongAudioDialogOpen: boolean; isImportSongProjectDialogOpen: boolean; + isInitialSettingsDialogOpen: boolean; }; export type UiStoreTypes = { diff --git a/src/store/ui.ts b/src/store/ui.ts index f75913f5d6..87261dfcd3 100644 --- a/src/store/ui.ts +++ b/src/store/ui.ts @@ -78,6 +78,7 @@ export const uiStoreState: UiStoreState = { isUpdateNotificationDialogOpen: false, isExportSongAudioDialogOpen: false, isImportSongProjectDialogOpen: false, + isInitialSettingsDialogOpen: false, isMaximized: false, isPinned: false, isFullscreen: false, diff --git a/src/type/preload.ts b/src/type/preload.ts index 5fdd6f40fe..f22e8aee5e 100644 --- a/src/type/preload.ts +++ b/src/type/preload.ts @@ -370,7 +370,7 @@ export type ConfirmedTips = { // ルート直下にある雑多な設定値 export const rootMiscSettingSchema = z.object({ - openedEditor: z.enum(["talk", "song"]).default("talk"), + openedEditor: z.enum(["talk", "song"]).optional(), editorFont: z.enum(["default", "os"]).default("default"), showTextLineNumber: z.boolean().default(false), showAddAudioItemButton: z.boolean().default(true), diff --git a/tests/unit/backend/common/__snapshots__/configManager.spec.ts.snap b/tests/unit/backend/common/__snapshots__/configManager.spec.ts.snap index c7b4ee14d0..c22553fc08 100644 --- a/tests/unit/backend/common/__snapshots__/configManager.spec.ts.snap +++ b/tests/unit/backend/common/__snapshots__/configManager.spec.ts.snap @@ -202,7 +202,6 @@ exports[`0.13.0からマイグレーションできる 1`] = ` }, ], "inheritAudioInfo": true, - "openedEditor": "talk", "playheadPositionDisplayFormat": "MINUTES_SECONDS", "presets": { "items": {},