From 013cad117fd7a7cad1de59b45534771e3bbeb9ff Mon Sep 17 00:00:00 2001
From: Hiroshiba Kazuyuki <kazuyuki_hiroshiba@dwango.co.jp>
Date: Thu, 22 Feb 2024 03:21:19 +0900
Subject: [PATCH 1/6] =?UTF-8?q?HotkeyCombo=E3=83=96=E3=83=A9=E3=83=B3?=
 =?UTF-8?q?=E3=83=89=E5=9E=8B=E3=82=92=E5=B0=8E=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialog/HotkeySettingDialog.vue | 16 +++---
 src/plugins/hotkeyPlugin.ts                   | 17 ++++--
 src/shared/ConfigManager.ts                   |  5 +-
 src/type/preload.ts                           | 53 ++++++++++---------
 tests/unit/lib/hotkeyManager.spec.ts          |  6 +--
 5 files changed, 56 insertions(+), 41 deletions(-)

diff --git a/src/components/Dialog/HotkeySettingDialog.vue b/src/components/Dialog/HotkeySettingDialog.vue
index 3c474cba37..e608fb05bc 100644
--- a/src/components/Dialog/HotkeySettingDialog.vue
+++ b/src/components/Dialog/HotkeySettingDialog.vue
@@ -215,7 +215,11 @@
 <script setup lang="ts">
 import { computed, ref } from "vue";
 import { useStore } from "@/store";
-import { HotkeyActionNameType, HotkeySettingType } from "@/type/preload";
+import {
+  HotkeyActionNameType,
+  HotkeyCombo,
+  HotkeySettingType,
+} from "@/type/preload";
 import { useHotkeyManager, eventToCombination } from "@/plugins/hotkeyPlugin";
 
 const props =
@@ -265,7 +269,7 @@ const hotkeyColumns = ref<
 ]);
 
 const lastAction = ref("");
-const lastRecord = ref("");
+const lastRecord = ref(HotkeyCombo(""));
 
 const recordCombination = (event: KeyboardEvent) => {
   if (!isHotkeyDialogOpened.value) {
@@ -278,7 +282,7 @@ const recordCombination = (event: KeyboardEvent) => {
 };
 
 const { hotkeyManager } = useHotkeyManager();
-const changeHotkeySettings = (action: string, combo: string) => {
+const changeHotkeySettings = (action: string, combo: HotkeyCombo) => {
   hotkeyManager.replace({
     action: action as HotkeyActionNameType,
     combination: combo,
@@ -301,7 +305,7 @@ const duplicatedHotkey = computed(() => {
 
 // FIXME: actionはHotkeyAction型にすべき
 const deleteHotkey = (action: string) => {
-  changeHotkeySettings(action, "");
+  changeHotkeySettings(action, HotkeyCombo(""));
 };
 
 const getHotkeyText = (action: string, combo: string) => {
@@ -325,14 +329,14 @@ const checkHotkeyReadonly = (action: string) => {
 
 const openHotkeyDialog = (action: string) => {
   lastAction.value = action;
-  lastRecord.value = "";
+  lastRecord.value = HotkeyCombo("");
   isHotkeyDialogOpened.value = true;
   document.addEventListener("keydown", recordCombination);
 };
 
 const closeHotkeyDialog = () => {
   lastAction.value = "";
-  lastRecord.value = "";
+  lastRecord.value = HotkeyCombo("");
   isHotkeyDialogOpened.value = false;
   document.removeEventListener("keydown", recordCombination);
 };
diff --git a/src/plugins/hotkeyPlugin.ts b/src/plugins/hotkeyPlugin.ts
index 796b444e9e..c2e2a215f0 100644
--- a/src/plugins/hotkeyPlugin.ts
+++ b/src/plugins/hotkeyPlugin.ts
@@ -9,7 +9,11 @@
  */
 import { Plugin, inject, onMounted, onUnmounted } from "vue";
 import hotkeys from "hotkeys-js";
-import { HotkeyActionNameType, HotkeySettingType } from "@/type/preload";
+import {
+  HotkeyActionNameType,
+  HotkeyCombo,
+  HotkeySettingType,
+} from "@/type/preload";
 
 const hotkeyManagerKey = "hotkeyManager";
 export const useHotkeyManager = () => {
@@ -64,7 +68,7 @@ type Log = (message: string, ...args: unknown[]) => void;
 type RegisteredCombination = {
   editor: Editor;
   name: HotkeyActionNameType;
-  combination: string;
+  combination: HotkeyCombo;
 };
 
 interface HotkeyTarget {
@@ -121,7 +125,9 @@ export class HotkeyManager {
     return setting;
   }
 
-  private getRegisteredCombination(action: HotkeyAction): string | undefined {
+  private getRegisteredCombination(
+    action: HotkeyAction
+  ): HotkeyCombo | undefined {
     return this.registeredCombinations.find(isSameHotkeyTarget(action))
       ?.combination;
   }
@@ -275,7 +281,8 @@ export const hotkeyPlugin: Plugin = {
   },
 };
 
-export const eventToCombination = (event: KeyboardEvent): string => {
+/** キーボードイベントをショートカットキーの文字列に変換する */
+export const eventToCombination = (event: KeyboardEvent): HotkeyCombo => {
   let recordedCombination = "";
   if (event.ctrlKey) {
     recordedCombination += "Ctrl ";
@@ -300,5 +307,5 @@ export const eventToCombination = (event: KeyboardEvent): string => {
         event.key.length > 1 ? event.key : event.key.toUpperCase();
     }
   }
-  return recordedCombination;
+  return HotkeyCombo(recordedCombination);
 };
diff --git a/src/shared/ConfigManager.ts b/src/shared/ConfigManager.ts
index 1fe0eb5381..5467aa1025 100644
--- a/src/shared/ConfigManager.ts
+++ b/src/shared/ConfigManager.ts
@@ -9,6 +9,7 @@ import {
   defaultHotkeySettings,
   HotkeySettingType,
   ExperimentalSettingType,
+  HotkeyCombo,
 } from "@/type/preload";
 
 const lockKey = "save";
@@ -223,7 +224,7 @@ export abstract class BaseConfigManager {
   }
 
   private migrateHotkeySettings(data: ConfigType): ConfigType {
-    const COMBINATION_IS_NONE = "####";
+    const COMBINATION_IS_NONE = HotkeyCombo("####");
     const loadedHotkeys = structuredClone(data.hotkeySettings);
     const hotkeysWithoutNewCombination = defaultHotkeySettings.map(
       (defaultHotkey) => {
@@ -249,7 +250,7 @@ export abstract class BaseConfigManager {
         if (combinationExists) {
           const emptyHotkey: HotkeySettingType = {
             action: newHotkey.action,
-            combination: "",
+            combination: HotkeyCombo(""),
           };
           return emptyHotkey;
         } else {
diff --git a/src/type/preload.ts b/src/type/preload.ts
index 279ad492e5..84d342ec9b 100644
--- a/src/type/preload.ts
+++ b/src/type/preload.ts
@@ -31,6 +31,11 @@ const urlStringSchema = z.string().url().brand("URL");
 export type UrlString = z.infer<typeof urlStringSchema>;
 export const UrlString = (url: string): UrlString => urlStringSchema.parse(url);
 
+const hotkeyComboSchema = z.string().brand("HotkeyCombo");
+export type HotkeyCombo = z.infer<typeof hotkeyComboSchema>;
+export const HotkeyCombo = (hotkeyCombo: string): HotkeyCombo =>
+  hotkeyComboSchema.parse(hotkeyCombo);
+
 export const engineIdSchema = z.string().brand<"EngineId">();
 export type EngineId = z.infer<typeof engineIdSchema>;
 export const EngineId = (id: string): EngineId => engineIdSchema.parse(id);
@@ -60,91 +65,91 @@ export const VoiceId = (voice: Voice): VoiceId =>
 export const defaultHotkeySettings: HotkeySettingType[] = [
   {
     action: "音声書き出し",
-    combination: !isMac ? "Ctrl E" : "Meta E",
+    combination: HotkeyCombo(!isMac ? "Ctrl E" : "Meta E"),
   },
   {
     action: "選択音声を書き出し",
-    combination: "E",
+    combination: HotkeyCombo("E"),
   },
   {
     action: "音声を繋げて書き出し",
-    combination: "",
+    combination: HotkeyCombo(""),
   },
   {
     action: "再生/停止",
-    combination: "Space",
+    combination: HotkeyCombo("Space"),
   },
   {
     action: "連続再生/停止",
-    combination: "Shift Space",
+    combination: HotkeyCombo("Shift Space"),
   },
   {
     action: "ｱｸｾﾝﾄ欄を表示",
-    combination: "1",
+    combination: HotkeyCombo("1"),
   },
   {
     action: "ｲﾝﾄﾈｰｼｮﾝ欄を表示",
-    combination: "2",
+    combination: HotkeyCombo("2"),
   },
   {
     action: "長さ欄を表示",
-    combination: "3",
+    combination: HotkeyCombo("3"),
   },
   {
     action: "テキスト欄を追加",
-    combination: "Shift Enter",
+    combination: HotkeyCombo("Shift Enter"),
   },
   {
     action: "テキスト欄を複製",
-    combination: !isMac ? "Ctrl D" : "Meta D",
+    combination: HotkeyCombo(!isMac ? "Ctrl D" : "Meta D"),
   },
   {
     action: "テキスト欄を削除",
-    combination: "Shift Delete",
+    combination: HotkeyCombo("Shift Delete"),
   },
   {
     action: "テキスト欄からフォーカスを外す",
-    combination: "Escape",
+    combination: HotkeyCombo("Escape"),
   },
   {
     action: "テキスト欄にフォーカスを戻す",
-    combination: "Enter",
+    combination: HotkeyCombo("Enter"),
   },
   {
     action: "元に戻す",
-    combination: !isMac ? "Ctrl Z" : "Meta Z",
+    combination: HotkeyCombo(!isMac ? "Ctrl Z" : "Meta Z"),
   },
   {
     action: "やり直す",
-    combination: !isMac ? "Ctrl Y" : "Shift Meta Z",
+    combination: HotkeyCombo(!isMac ? "Ctrl Y" : "Shift Meta Z"),
   },
   {
     action: "新規プロジェクト",
-    combination: !isMac ? "Ctrl N" : "Meta N",
+    combination: HotkeyCombo(!isMac ? "Ctrl N" : "Meta N"),
   },
   {
     action: "プロジェクトを名前を付けて保存",
-    combination: !isMac ? "Ctrl Shift S" : "Shift Meta S",
+    combination: HotkeyCombo(!isMac ? "Ctrl Shift S" : "Shift Meta S"),
   },
   {
     action: "プロジェクトを上書き保存",
-    combination: !isMac ? "Ctrl S" : "Meta S",
+    combination: HotkeyCombo(!isMac ? "Ctrl S" : "Meta S"),
   },
   {
     action: "プロジェクト読み込み",
-    combination: !isMac ? "Ctrl O" : "Meta O",
+    combination: HotkeyCombo(!isMac ? "Ctrl O" : "Meta O"),
   },
   {
     action: "テキスト読み込む",
-    combination: "",
+    combination: HotkeyCombo(""),
   },
   {
     action: "全体のイントネーションをリセット",
-    combination: !isMac ? "Ctrl G" : "Meta G",
+    combination: HotkeyCombo(!isMac ? "Ctrl G" : "Meta G"),
   },
   {
     action: "選択中のアクセント句のイントネーションをリセット",
-    combination: "R",
+    combination: HotkeyCombo("R"),
   },
 ];
 
@@ -430,11 +435,9 @@ export const hotkeyActionNameSchema = z.enum([
 
 export type HotkeyActionNameType = z.infer<typeof hotkeyActionNameSchema>;
 
-export type HotkeyCombo = string;
-
 export const hotkeySettingSchema = z.object({
   action: hotkeyActionNameSchema,
-  combination: z.string(),
+  combination: hotkeyComboSchema,
 });
 export type HotkeySettingType = z.infer<typeof hotkeySettingSchema>;
 
diff --git a/tests/unit/lib/hotkeyManager.spec.ts b/tests/unit/lib/hotkeyManager.spec.ts
index c6d5624e9d..71ad7df32a 100644
--- a/tests/unit/lib/hotkeyManager.spec.ts
+++ b/tests/unit/lib/hotkeyManager.spec.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect, beforeEach } from "vitest";
 import { HotkeyManager, HotkeysJs, HotkeyAction } from "@/plugins/hotkeyPlugin";
-import { HotkeySettingType } from "@/type/preload";
+import { HotkeyCombo, HotkeySettingType } from "@/type/preload";
 
 type DummyHotkeysJs = HotkeysJs & {
   registeredHotkeys: {
@@ -70,7 +70,7 @@ it("unregisterできる", () => {
   hotkeyManager.load([
     {
       action: "音声書き出し",
-      combination: "1",
+      combination: HotkeyCombo("1"),
     },
   ]);
   hotkeyManager.register(action);
@@ -91,7 +91,7 @@ const dummyAction: HotkeyAction = {
 };
 const createDummySetting = (combination: string): HotkeySettingType => ({
   action: "音声書き出し",
-  combination,
+  combination: HotkeyCombo(combination),
 });
 
 describe("設定変更", () => {

From 7a13bc2663ce86707de4bceff88bc8673209ddb1 Mon Sep 17 00:00:00 2001
From: Hiroshiba Kazuyuki <kazuyuki_hiroshiba@dwango.co.jp>
Date: Thu, 22 Feb 2024 03:37:39 +0900
Subject: [PATCH 2/6] =?UTF-8?q?=E5=BF=98=E3=82=8C=E7=89=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/hotkeyPlugin.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/hotkeyPlugin.ts b/src/plugins/hotkeyPlugin.ts
index c2e2a215f0..f27b94ac3b 100644
--- a/src/plugins/hotkeyPlugin.ts
+++ b/src/plugins/hotkeyPlugin.ts
@@ -269,7 +269,7 @@ export class HotkeyManager {
   }
 }
 
-const combinationToBindingKey = (combination: string) => {
+const combinationToBindingKey = (combination: HotkeyCombo) => {
   return combination.toLowerCase().replaceAll(" ", "+");
 };
 

From a45c2effd82eea02c905c10fa0db2437150b343a Mon Sep 17 00:00:00 2001
From: Hiroshiba Kazuyuki <kazuyuki_hiroshiba@dwango.co.jp>
Date: Thu, 22 Feb 2024 03:41:15 +0900
Subject: [PATCH 3/6] =?UTF-8?q?cmd=E3=82=92=E4=BD=BF=E3=81=88=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/hotkeyPlugin.ts | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/plugins/hotkeyPlugin.ts b/src/plugins/hotkeyPlugin.ts
index f27b94ac3b..c19b7415c8 100644
--- a/src/plugins/hotkeyPlugin.ts
+++ b/src/plugins/hotkeyPlugin.ts
@@ -34,6 +34,8 @@ export const useHotkeyManager = () => {
 
 type Editor = "talk" | "song";
 
+type BindingKey = string & { __brand: "BindingKey" };
+
 /**
  * ショートカットキーの処理を登録するための型。
  */
@@ -50,16 +52,17 @@ export type HotkeyAction = {
 
 export type HotkeysJs = {
   (
-    key: string,
+    key: BindingKey,
     options: {
       scope: string;
     },
     callback: (e: KeyboardEvent) => void
   ): void;
-  unbind: (key: string, scope: string) => void;
+  unbind: (key: BindingKey, scope: string) => void;
   setScope: (scope: string) => void;
 };
 
+// デフォルトはテキストボックス内でショートカットキー無効なので有効にする
 hotkeys.filter = () => {
   return true;
 };
@@ -269,8 +272,16 @@ export class HotkeyManager {
   }
 }
 
-const combinationToBindingKey = (combination: HotkeyCombo) => {
-  return combination.toLowerCase().replaceAll(" ", "+");
+/** hotkeys-js用のキーに変換する */
+const combinationToBindingKey = (combination: HotkeyCombo): BindingKey => {
+  // MetaキーはCommandキーとして扱う
+  //TODO: Windowsの場合はWindowsキーとして扱う
+  const bindingKey = combination
+    .toLowerCase()
+    .split(" ")
+    .map((key) => (key === "meta" ? "command" : key))
+    .join("+");
+  return bindingKey as BindingKey;
 };
 
 export const hotkeyPlugin: Plugin = {

From cf951e04694183e70c452f8f57d090f3c487a75f Mon Sep 17 00:00:00 2001
From: y-chan <y-chan@y-chan.dev>
Date: Fri, 23 Feb 2024 09:21:05 +0900
Subject: [PATCH 4/6] resolve conflict

---
 src/components/Dialog/HotkeySettingDialog.vue | 24 -----
 src/plugins/hotkeyPlugin.ts                   | 29 +-----
 src/shared/ConfigManager.ts                   | 12 ---
 src/type/preload.ts                           | 99 -------------------
 tests/unit/lib/hotkeyManager.spec.ts          | 12 ---
 5 files changed, 3 insertions(+), 173 deletions(-)

diff --git a/src/components/Dialog/HotkeySettingDialog.vue b/src/components/Dialog/HotkeySettingDialog.vue
index fb47e3fae3..f3518fcd2f 100644
--- a/src/components/Dialog/HotkeySettingDialog.vue
+++ b/src/components/Dialog/HotkeySettingDialog.vue
@@ -217,11 +217,7 @@ import { computed, ref } from "vue";
 import { useStore } from "@/store";
 import {
   HotkeyActionNameType,
-<<<<<<< HEAD
-  HotkeyCombo,
-=======
   HotkeyCombination,
->>>>>>> upstream/main
   HotkeySettingType,
 } from "@/type/preload";
 import { useHotkeyManager, eventToCombination } from "@/plugins/hotkeyPlugin";
@@ -273,11 +269,7 @@ const hotkeyColumns = ref<
 ]);
 
 const lastAction = ref("");
-<<<<<<< HEAD
-const lastRecord = ref(HotkeyCombo(""));
-=======
 const lastRecord = ref(HotkeyCombination(""));
->>>>>>> upstream/main
 
 const recordCombination = (event: KeyboardEvent) => {
   if (!isHotkeyDialogOpened.value) {
@@ -290,14 +282,10 @@ const recordCombination = (event: KeyboardEvent) => {
 };
 
 const { hotkeyManager } = useHotkeyManager();
-<<<<<<< HEAD
-const changeHotkeySettings = (action: string, combo: HotkeyCombo) => {
-=======
 const changeHotkeySettings = (
   action: string,
   combination: HotkeyCombination
 ) => {
->>>>>>> upstream/main
   hotkeyManager.replace({
     action: action as HotkeyActionNameType,
     combination,
@@ -320,11 +308,7 @@ const duplicatedHotkey = computed(() => {
 
 // FIXME: actionはHotkeyAction型にすべき
 const deleteHotkey = (action: string) => {
-<<<<<<< HEAD
-  changeHotkeySettings(action, HotkeyCombo(""));
-=======
   changeHotkeySettings(action, HotkeyCombination(""));
->>>>>>> upstream/main
 };
 
 const getHotkeyText = (action: string, combo: string) => {
@@ -348,22 +332,14 @@ const checkHotkeyReadonly = (action: string) => {
 
 const openHotkeyDialog = (action: string) => {
   lastAction.value = action;
-<<<<<<< HEAD
-  lastRecord.value = HotkeyCombo("");
-=======
   lastRecord.value = HotkeyCombination("");
->>>>>>> upstream/main
   isHotkeyDialogOpened.value = true;
   document.addEventListener("keydown", recordCombination);
 };
 
 const closeHotkeyDialog = () => {
   lastAction.value = "";
-<<<<<<< HEAD
-  lastRecord.value = HotkeyCombo("");
-=======
   lastRecord.value = HotkeyCombination("");
->>>>>>> upstream/main
   isHotkeyDialogOpened.value = false;
   document.removeEventListener("keydown", recordCombination);
 };
diff --git a/src/plugins/hotkeyPlugin.ts b/src/plugins/hotkeyPlugin.ts
index 1b31ba4728..2e085a0135 100644
--- a/src/plugins/hotkeyPlugin.ts
+++ b/src/plugins/hotkeyPlugin.ts
@@ -11,11 +11,7 @@ import { Plugin, inject, onMounted, onUnmounted } from "vue";
 import hotkeys from "hotkeys-js";
 import {
   HotkeyActionNameType,
-<<<<<<< HEAD
-  HotkeyCombo,
-=======
   HotkeyCombination,
->>>>>>> upstream/main
   HotkeySettingType,
 } from "@/type/preload";
 
@@ -75,11 +71,7 @@ type Log = (message: string, ...args: unknown[]) => void;
 type RegisteredCombination = {
   editor: Editor;
   name: HotkeyActionNameType;
-<<<<<<< HEAD
-  combination: HotkeyCombo;
-=======
   combination: HotkeyCombination;
->>>>>>> upstream/main
 };
 
 interface HotkeyTarget {
@@ -138,11 +130,7 @@ export class HotkeyManager {
 
   private getRegisteredCombination(
     action: HotkeyAction
-<<<<<<< HEAD
-  ): HotkeyCombo | undefined {
-=======
   ): HotkeyCombination | undefined {
->>>>>>> upstream/main
     return this.registeredCombinations.find(isSameHotkeyTarget(action))
       ?.combination;
   }
@@ -284,9 +272,10 @@ export class HotkeyManager {
   }
 }
 
-<<<<<<< HEAD
 /** hotkeys-js用のキーに変換する */
-const combinationToBindingKey = (combination: HotkeyCombo): BindingKey => {
+const combinationToBindingKey = (
+  combination: HotkeyCombination
+): BindingKey => {
   // MetaキーはCommandキーとして扱う
   //TODO: Windowsの場合はWindowsキーとして扱う
   const bindingKey = combination
@@ -295,10 +284,6 @@ const combinationToBindingKey = (combination: HotkeyCombo): BindingKey => {
     .map((key) => (key === "meta" ? "command" : key))
     .join("+");
   return bindingKey as BindingKey;
-=======
-const combinationToBindingKey = (combination: HotkeyCombination) => {
-  return combination.toLowerCase().replaceAll(" ", "+");
->>>>>>> upstream/main
 };
 
 export const hotkeyPlugin: Plugin = {
@@ -310,11 +295,7 @@ export const hotkeyPlugin: Plugin = {
 };
 
 /** キーボードイベントをショートカットキーの文字列に変換する */
-<<<<<<< HEAD
-export const eventToCombination = (event: KeyboardEvent): HotkeyCombo => {
-=======
 export const eventToCombination = (event: KeyboardEvent): HotkeyCombination => {
->>>>>>> upstream/main
   let recordedCombination = "";
   if (event.ctrlKey) {
     recordedCombination += "Ctrl ";
@@ -339,9 +320,5 @@ export const eventToCombination = (event: KeyboardEvent): HotkeyCombination => {
         event.key.length > 1 ? event.key : event.key.toUpperCase();
     }
   }
-<<<<<<< HEAD
-  return HotkeyCombo(recordedCombination);
-=======
   return HotkeyCombination(recordedCombination);
->>>>>>> upstream/main
 };
diff --git a/src/shared/ConfigManager.ts b/src/shared/ConfigManager.ts
index 8106d1ce36..43f37c3112 100644
--- a/src/shared/ConfigManager.ts
+++ b/src/shared/ConfigManager.ts
@@ -9,11 +9,7 @@ import {
   defaultHotkeySettings,
   HotkeySettingType,
   ExperimentalSettingType,
-<<<<<<< HEAD
-  HotkeyCombo,
-=======
   HotkeyCombination,
->>>>>>> upstream/main
 } from "@/type/preload";
 
 const lockKey = "save";
@@ -228,11 +224,7 @@ export abstract class BaseConfigManager {
   }
 
   private migrateHotkeySettings(data: ConfigType): ConfigType {
-<<<<<<< HEAD
-    const COMBINATION_IS_NONE = HotkeyCombo("####");
-=======
     const COMBINATION_IS_NONE = HotkeyCombination("####");
->>>>>>> upstream/main
     const loadedHotkeys = structuredClone(data.hotkeySettings);
     const hotkeysWithoutNewCombination = defaultHotkeySettings.map(
       (defaultHotkey) => {
@@ -258,11 +250,7 @@ export abstract class BaseConfigManager {
         if (combinationExists) {
           const emptyHotkey: HotkeySettingType = {
             action: newHotkey.action,
-<<<<<<< HEAD
-            combination: HotkeyCombo(""),
-=======
             combination: HotkeyCombination(""),
->>>>>>> upstream/main
           };
           return emptyHotkey;
         } else {
diff --git a/src/type/preload.ts b/src/type/preload.ts
index 58160df196..d1b7bfd2e3 100644
--- a/src/type/preload.ts
+++ b/src/type/preload.ts
@@ -31,18 +31,11 @@ const urlStringSchema = z.string().url().brand("URL");
 export type UrlString = z.infer<typeof urlStringSchema>;
 export const UrlString = (url: string): UrlString => urlStringSchema.parse(url);
 
-<<<<<<< HEAD
-const hotkeyComboSchema = z.string().brand("HotkeyCombo");
-export type HotkeyCombo = z.infer<typeof hotkeyComboSchema>;
-export const HotkeyCombo = (hotkeyCombo: string): HotkeyCombo =>
-  hotkeyComboSchema.parse(hotkeyCombo);
-=======
 const hotkeyCombinationSchema = z.string().brand("HotkeyCombination");
 export type HotkeyCombination = z.infer<typeof hotkeyCombinationSchema>;
 export const HotkeyCombination = (
   hotkeyCombination: string
 ): HotkeyCombination => hotkeyCombinationSchema.parse(hotkeyCombination);
->>>>>>> upstream/main
 
 export const engineIdSchema = z.string().brand<"EngineId">();
 export type EngineId = z.infer<typeof engineIdSchema>;
@@ -73,93 +66,6 @@ export const VoiceId = (voice: Voice): VoiceId =>
 export const defaultHotkeySettings: HotkeySettingType[] = [
   {
     action: "音声書き出し",
-<<<<<<< HEAD
-    combination: HotkeyCombo(!isMac ? "Ctrl E" : "Meta E"),
-  },
-  {
-    action: "選択音声を書き出し",
-    combination: HotkeyCombo("E"),
-  },
-  {
-    action: "音声を繋げて書き出し",
-    combination: HotkeyCombo(""),
-  },
-  {
-    action: "再生/停止",
-    combination: HotkeyCombo("Space"),
-  },
-  {
-    action: "連続再生/停止",
-    combination: HotkeyCombo("Shift Space"),
-  },
-  {
-    action: "ｱｸｾﾝﾄ欄を表示",
-    combination: HotkeyCombo("1"),
-  },
-  {
-    action: "ｲﾝﾄﾈｰｼｮﾝ欄を表示",
-    combination: HotkeyCombo("2"),
-  },
-  {
-    action: "長さ欄を表示",
-    combination: HotkeyCombo("3"),
-  },
-  {
-    action: "テキスト欄を追加",
-    combination: HotkeyCombo("Shift Enter"),
-  },
-  {
-    action: "テキスト欄を複製",
-    combination: HotkeyCombo(!isMac ? "Ctrl D" : "Meta D"),
-  },
-  {
-    action: "テキスト欄を削除",
-    combination: HotkeyCombo("Shift Delete"),
-  },
-  {
-    action: "テキスト欄からフォーカスを外す",
-    combination: HotkeyCombo("Escape"),
-  },
-  {
-    action: "テキスト欄にフォーカスを戻す",
-    combination: HotkeyCombo("Enter"),
-  },
-  {
-    action: "元に戻す",
-    combination: HotkeyCombo(!isMac ? "Ctrl Z" : "Meta Z"),
-  },
-  {
-    action: "やり直す",
-    combination: HotkeyCombo(!isMac ? "Ctrl Y" : "Shift Meta Z"),
-  },
-  {
-    action: "新規プロジェクト",
-    combination: HotkeyCombo(!isMac ? "Ctrl N" : "Meta N"),
-  },
-  {
-    action: "プロジェクトを名前を付けて保存",
-    combination: HotkeyCombo(!isMac ? "Ctrl Shift S" : "Shift Meta S"),
-  },
-  {
-    action: "プロジェクトを上書き保存",
-    combination: HotkeyCombo(!isMac ? "Ctrl S" : "Meta S"),
-  },
-  {
-    action: "プロジェクト読み込み",
-    combination: HotkeyCombo(!isMac ? "Ctrl O" : "Meta O"),
-  },
-  {
-    action: "テキスト読み込む",
-    combination: HotkeyCombo(""),
-  },
-  {
-    action: "全体のイントネーションをリセット",
-    combination: HotkeyCombo(!isMac ? "Ctrl G" : "Meta G"),
-  },
-  {
-    action: "選択中のアクセント句のイントネーションをリセット",
-    combination: HotkeyCombo("R"),
-=======
     combination: HotkeyCombination(!isMac ? "Ctrl E" : "Meta E"),
   },
   {
@@ -245,7 +151,6 @@ export const defaultHotkeySettings: HotkeySettingType[] = [
   {
     action: "選択中のアクセント句のイントネーションをリセット",
     combination: HotkeyCombination("R"),
->>>>>>> upstream/main
   },
 ];
 
@@ -533,11 +438,7 @@ export type HotkeyActionNameType = z.infer<typeof hotkeyActionNameSchema>;
 
 export const hotkeySettingSchema = z.object({
   action: hotkeyActionNameSchema,
-<<<<<<< HEAD
-  combination: hotkeyComboSchema,
-=======
   combination: hotkeyCombinationSchema,
->>>>>>> upstream/main
 });
 export type HotkeySettingType = z.infer<typeof hotkeySettingSchema>;
 
diff --git a/tests/unit/lib/hotkeyManager.spec.ts b/tests/unit/lib/hotkeyManager.spec.ts
index 36cf8bba5f..3e6d743b95 100644
--- a/tests/unit/lib/hotkeyManager.spec.ts
+++ b/tests/unit/lib/hotkeyManager.spec.ts
@@ -1,10 +1,6 @@
 import { describe, it, expect, beforeEach } from "vitest";
 import { HotkeyManager, HotkeysJs, HotkeyAction } from "@/plugins/hotkeyPlugin";
-<<<<<<< HEAD
-import { HotkeyCombo, HotkeySettingType } from "@/type/preload";
-=======
 import { HotkeyCombination, HotkeySettingType } from "@/type/preload";
->>>>>>> upstream/main
 
 type DummyHotkeysJs = HotkeysJs & {
   registeredHotkeys: {
@@ -74,11 +70,7 @@ it("unregisterできる", () => {
   hotkeyManager.load([
     {
       action: "音声書き出し",
-<<<<<<< HEAD
-      combination: HotkeyCombo("1"),
-=======
       combination: HotkeyCombination("1"),
->>>>>>> upstream/main
     },
   ]);
   hotkeyManager.register(action);
@@ -99,11 +91,7 @@ const dummyAction: HotkeyAction = {
 };
 const createDummySetting = (combination: string): HotkeySettingType => ({
   action: "音声書き出し",
-<<<<<<< HEAD
-  combination: HotkeyCombo(combination),
-=======
   combination: HotkeyCombination(combination),
->>>>>>> upstream/main
 });
 
 describe("設定変更", () => {

From 249e442d6b0ebdd1b8dec61c428ae032f040d942 Mon Sep 17 00:00:00 2001
From: Hiroshiba <hihokaruta@gmail.com>
Date: Sat, 24 Feb 2024 01:47:21 +0900
Subject: [PATCH 5/6] Update src/plugins/hotkeyPlugin.ts

---
 src/plugins/hotkeyPlugin.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/hotkeyPlugin.ts b/src/plugins/hotkeyPlugin.ts
index 2e085a0135..b777fa7b9c 100644
--- a/src/plugins/hotkeyPlugin.ts
+++ b/src/plugins/hotkeyPlugin.ts
@@ -34,7 +34,7 @@ export const useHotkeyManager = () => {
 
 type Editor = "talk" | "song";
 
-type BindingKey = string & { __brand: "BindingKey" };
+type BindingKey = string & { __brand: "BindingKey" }; // BindingKey専用のブランド型
 
 /**
  * ショートカットキーの処理を登録するための型。

From fa2fb4272fc4ed0fd5d466f61a508b469e632d85 Mon Sep 17 00:00:00 2001
From: Hiroshiba <hihokaruta@gmail.com>
Date: Mon, 26 Feb 2024 00:36:29 +0900
Subject: [PATCH 6/6] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E3=82=92=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/hotkeyPlugin.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/hotkeyPlugin.ts b/src/plugins/hotkeyPlugin.ts
index b777fa7b9c..c25462159e 100644
--- a/src/plugins/hotkeyPlugin.ts
+++ b/src/plugins/hotkeyPlugin.ts
@@ -277,7 +277,8 @@ const combinationToBindingKey = (
   combination: HotkeyCombination
 ): BindingKey => {
   // MetaキーはCommandキーとして扱う
-  //TODO: Windowsの場合はWindowsキーとして扱う
+  // NOTE: hotkeys-jsにはWinキーが無く、Commandキーとして扱われている
+  // NOTE: Metaキーは以前採用していたmousetrapがそうだった名残り
   const bindingKey = combination
     .toLowerCase()
     .split(" ")