Merge remote-tracking branch 'upstream/main' into merge-0.22.2

package.json

@@ -57,6 +57,7 @@
     "glob": "11.0.0",
     "hotkeys-js": "3.13.6",
     "immer": "9.0.21",
+    "kuromoji": "github:VOICEVOX/kuromoji.js#0.0.1",
     "markdown-it": "13.0.2",
     "move-file": "3.0.0",
     "multistream": "4.1.0",

src/backend/browser/sandbox.ts

@@ -9,15 +9,14 @@ import {
 import { getConfigManager } from "./browserConfig";
 import { IpcSOData } from "@/type/ipc";
 import {
-  defaultHotkeySettings,
   defaultToolbarButtonSetting,
   EngineId,
   EngineSettingType,
   EngineSettings,
-  HotkeySettingType,
   Sandbox,
 } from "@/type/preload";
 import { AssetTextFileNames } from "@/type/staticResources";
+import { HotkeySettingType } from "@/domain/hotkeyAction";
 
 const toStaticPath = (fileName: string) =>
   `${import.meta.env.BASE_URL}/${fileName}`.replaceAll(/\/\/+/g, "/");
@@ -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);
   },

src/backend/common/ConfigManager.ts

@@ -5,15 +5,17 @@ import {
   ConfigType,
   configSchema,
   DefaultStyleId,
-  defaultHotkeySettings,
-  HotkeySettingType,
   ExperimentalSettingType,
-  HotkeyCombination,
   VoiceId,
   PresetKey,
 } from "@/type/preload";
 import { ensureNotNullish } from "@/helpers/errorHelper";
 import { loadEnvEngineInfos } from "@/domain/defaultEngine/envEngineInfo";
+import {
+  HotkeyCombination,
+  defaultHotkeySettings,
+  HotkeySettingType,
+} from "@/domain/hotkeyAction";
 
 const lockKey = "save";
 
@@ -341,6 +343,12 @@ export abstract class BaseConfigManager {
     this._save();
   }
 
+  /** 全ての設定を取得する。テスト用。 */
+  public getAll(): ConfigType {
+    if (!this.config) throw new Error("Config is not initialized");
+    return this.config;
+  }
+
   private _save() {
     void this.lock.acquire(lockKey, async () => {
       await this.save({

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;
   },

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();
   },

src/components/Base/BaseSlider.stories.ts

@@ -0,0 +1,33 @@
+import type { Meta, StoryObj } from "@storybook/vue3";
+
+import { ref } from "vue";
+import BaseSlider from "./BaseSlider.vue";
+
+const meta: Meta<typeof BaseSlider> = {
+  component: BaseSlider,
+  args: {
+    modelValue: 50,
+    min: 0,
+    max: 100,
+    step: 1,
+  },
+  render: (args) => ({
+    components: { BaseSlider },
+    setup() {
+      const model = ref(Number(args.modelValue));
+      return { args, model };
+    },
+    template: `<BaseSlider v-bind="args" v-model="model"></BaseSlider>`,
+  }),
+};
+
+export default meta;
+type Story = StoryObj<typeof BaseSlider>;
+
+export const Default: Story = {};
+
+export const Disabled: Story = {
+  args: {
+    disabled: true,
+  },
+};

src/components/Base/BaseSlider.vue

@@ -0,0 +1,102 @@
+<template>
+  <SliderRoot
+    class="SliderRoot"
+    :min
+    :max
+    :step
+    :disabled
+    :modelValue="[model]"
+    @update:modelValue="
+      (value) => {
+        if (value == undefined) {
+          throw new Error('Undefined value received');
+        }
+        $emit('update:modelValue', value[0]);
+      }
+    "
+  >
+    <SliderTrack class="SliderTrack">
+      <SliderRange class="SliderRange" />
+    </SliderTrack>
+    <SliderThumb class="SliderThumb" />
+  </SliderRoot>
+</template>
+
+<script setup lang="ts">
+import { SliderRange, SliderRoot, SliderThumb, SliderTrack } from "radix-vue";
+
+defineProps<{
+  min?: number;
+  max?: number;
+  step?: number;
+  disabled?: boolean;
+  modelValue: number;
+}>();
+
+defineEmits<{
+  "update:modelValue": [value: number];
+}>();
+
+const model = defineModel<number>({ required: true });
+</script>
+
+<style lang="scss">
+@use "@/styles/v2/variables" as vars;
+@use "@/styles/v2/colors" as colors;
+@use "@/styles/v2/mixin" as mixin;
+
+.SliderRoot {
+  position: relative;
+  display: flex;
+  align-items: center;
+  height: vars.$size-control;
+  cursor: grab;
+
+  &:active {
+    cursor: grabbing;
+  }
+
+  &[data-disabled] {
+    opacity: 0.5;
+    cursor: not-allowed;
+  }
+}
+
+.SliderTrack {
+  background-color: colors.$border;
+  position: relative;
+  flex-grow: 1;
+  border-radius: 9999px;
+  height: 4px;
+}
+
+.SliderRange {
+  position: absolute;
+  background-color: colors.$primary;
+  border-radius: 9999px;
+  height: 100%;
+}
+
+.SliderThumb {
+  display: block;
+  width: 8px;
+  height: vars.$size-indicator;
+  background-color: colors.$primary;
+  border: 1px solid colors.$border;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+  border-radius: vars.$radius-1;
+
+  :hover:not([data-disabled]) > & {
+    background-color: colors.$primary-hovered;
+  }
+
+  :active:not([data-disabled]) > & {
+    background-color: colors.$primary-pressed;
+    box-shadow: 0 0 0 transparent;
+  }
+
+  &:focus-visible {
+    @include mixin.on-focus;
+  }
+}
+</style>

src/components/Base/BaseSwitch.vue

@@ -45,7 +45,6 @@ const checked = defineModel<boolean>("checked", { required: true });
 
   &:focus-visible {
     @include mixin.on-focus;
-    outline-offset: 2px;
   }
 
   &[data-state="checked"] {

src/components/Dialog/AllDialog.vue

@@ -3,7 +3,6 @@
     v-model="isAcceptRetrieveTelemetryDialogOpenComputed"
   />
   <AcceptTermsDialog v-model="isAcceptTermsDialogOpenComputed" />
-  <HelpDialog v-model="isHelpDialogOpenComputed" />
   <SettingDialog v-model="isSettingDialogOpenComputed" />
   <HotkeySettingDialog v-model="isHotkeySettingDialogOpenComputed" />
   <ToolBarCustomDialog v-model="isToolbarSettingDialogOpenComputed" />
@@ -28,7 +27,6 @@
 
 <script setup lang="ts">
 import { computed } from "vue";
-import HelpDialog from "@/components/Dialog/HelpDialog/HelpDialog.vue";
 import SettingDialog from "@/components/Dialog/SettingDialog/SettingDialog.vue";
 import HotkeySettingDialog from "@/components/Dialog/HotkeySettingDialog.vue";
 import ToolBarCustomDialog from "@/components/Dialog/ToolBarCustomDialog.vue";
@@ -49,12 +47,6 @@ const props = defineProps<{
 }>();
 const store = useStore();
 
-// ライセンス表示
-const isHelpDialogOpenComputed = computed({
-  get: () => store.state.isHelpDialogOpen,
-  set: (val) => store.actions.SET_DIALOG_OPEN({ isHelpDialogOpen: val }),
-});
-
 // 設定
 const isSettingDialogOpenComputed = computed({
   get: () => store.state.isSettingDialogOpen,