Refactor: いらないhotkeyデフォルト設定取得関数を失くす (#2393)

VOICEVOX · Dec 15, 2024 · 4233089 · 4233089
1 parent 85f488a
commit 4233089
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 27 deletions.
diff --git a/src/backend/browser/sandbox.ts b/src/backend/browser/sandbox.ts
@@ -9,7 +9,6 @@ import {
 import { getConfigManager } from "./browserConfig";
 import { IpcSOData } from "@/type/ipc";
 import {
-  defaultHotkeySettings,
   defaultToolbarButtonSetting,
   EngineId,
   EngineSettingType,
@@ -247,9 +246,6 @@ export const api: Sandbox = {
   changePinWindow() {
     throw new Error(`Not supported on Browser version: changePinWindow`);
   },
-  getDefaultHotkeySettings() {
-    return Promise.resolve(defaultHotkeySettings);
-  },
   getDefaultToolbarSetting() {
     return Promise.resolve(defaultToolbarButtonSetting);
   },

diff --git a/src/backend/electron/main.ts b/src/backend/electron/main.ts
@@ -40,7 +40,6 @@ import { AssetTextFileNames } from "@/type/staticResources";
 import {
   EngineInfo,
   SystemError,
-  defaultHotkeySettings,
   defaultToolbarButtonSetting,
   EngineId,
   TextAsset,
@@ -695,10 +694,6 @@ registerIpcMainHandle<IpcMainHandle>({
     }
   },
 
-  GET_DEFAULT_HOTKEY_SETTINGS: () => {
-    return defaultHotkeySettings;
-  },
-
   GET_DEFAULT_TOOLBAR_SETTING: () => {
     return defaultToolbarButtonSetting;
   },

diff --git a/src/backend/electron/preload.ts b/src/backend/electron/preload.ts
@@ -176,10 +176,6 @@ const api: Sandbox = {
     return ipcRendererInvokeProxy.HOTKEY_SETTINGS({ newData });
   },
 
-  getDefaultHotkeySettings: async () => {
-    return await ipcRendererInvokeProxy.GET_DEFAULT_HOTKEY_SETTINGS();
-  },
-
   getDefaultToolbarSetting: async () => {
     return await ipcRendererInvokeProxy.GET_DEFAULT_TOOLBAR_SETTING();
   },

diff --git a/src/components/Dialog/HotkeySettingDialog.vue b/src/components/Dialog/HotkeySettingDialog.vue
@@ -127,9 +127,9 @@ import BaseIconButton from "@/components/Base/BaseIconButton.vue";
 import BaseScrollArea from "@/components/Base/BaseScrollArea.vue";
 import { useStore } from "@/store";
 import {
+  defaultHotkeySettings,
   HotkeyActionNameType,
   HotkeyCombination,
-  HotkeySettingType,
 } from "@/type/preload";
 import { useHotkeyManager, eventToCombination } from "@/plugins/hotkeyPlugin";
 
@@ -225,13 +225,8 @@ const setHotkeyDialogOpened = () => {
   document.removeEventListener("keydown", recordCombination);
 };
 
-const defaultSettings = ref<HotkeySettingType[]>([]);
-void window.backend
-  .getDefaultHotkeySettings()
-  .then((settings) => (defaultSettings.value = settings));
-
 const isDefaultCombination = (action: string) => {
-  const defaultSetting = defaultSettings.value.find(
+  const defaultSetting = defaultHotkeySettings.find(
     (value) => value.action === action,
   );
   const hotkeySetting = hotkeySettings.value.find(
@@ -249,7 +244,7 @@ const resetHotkey = async (action: string) => {
 
   if (result !== "OK") return;
 
-  const setting = defaultSettings.value.find((value) => value.action == action);
+  const setting = defaultHotkeySettings.find((value) => value.action == action);
   if (setting == undefined) {
     return;
   }

diff --git a/src/type/ipc.ts b/src/type/ipc.ts
@@ -178,11 +178,6 @@ export type IpcIHData = {
     return: HotkeySettingType[];
   };
 
-  GET_DEFAULT_HOTKEY_SETTINGS: {
-    args: [];
-    return: HotkeySettingType[];
-  };
-
   GET_DEFAULT_TOOLBAR_SETTING: {
     args: [];
     return: ToolbarSettingType;

diff --git a/src/type/preload.ts b/src/type/preload.ts
@@ -268,7 +268,6 @@ export interface Sandbox {
   hotkeySettings(newData?: HotkeySettingType): Promise<HotkeySettingType[]>;
   checkFileExists(file: string): Promise<boolean>;
   changePinWindow(): void;
-  getDefaultHotkeySettings(): Promise<HotkeySettingType[]>;
   getDefaultToolbarSetting(): Promise<ToolbarSettingType>;
   setNativeTheme(source: NativeThemeType): void;
   vuexReady(): void;