refactor: injectの書き方をより良い形に (#2497)

VOICEVOX · Jan 25, 2025 · af114ee · af114ee
1 parent 39d2948
commit af114ee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/src/components/Dialog/DictionaryEditWordDialog.vue b/src/components/Dialog/DictionaryEditWordDialog.vue
@@ -163,10 +163,7 @@
 <script setup lang="ts">
 import { inject, ref } from "vue";
 import { QInput } from "quasar";
-import {
-  DictionaryManageDialogContext,
-  dictionaryManageDialogContextKey,
-} from "./DictionaryManageDialog.vue";
+import { dictionaryManageDialogContextKey } from "./DictionaryManageDialog.vue";
 import AudioAccent from "@/components/Talk/AudioAccent.vue";
 import ContextMenu from "@/components/Menu/ContextMenu/Container.vue";
 import { useRightClickContextMenu } from "@/composables/useRightClickContextMenu";
@@ -175,9 +172,7 @@ import type { FetchAudioResult } from "@/store/type";
 
 const store = useStore();
 
-const context = inject<DictionaryManageDialogContext>(
-  dictionaryManageDialogContextKey,
-);
+const context = inject(dictionaryManageDialogContextKey);
 if (context == undefined)
   throw new Error(`dictionaryManageDialogContext == undefined`);
 const {

diff --git a/src/components/Dialog/DictionaryManageDialog.vue b/src/components/Dialog/DictionaryManageDialog.vue
@@ -124,11 +124,9 @@
 </template>
 
 <script lang="ts">
-import { Ref, ComputedRef } from "vue";
+import { Ref, ComputedRef, type InjectionKey } from "vue";
 
-export const dictionaryManageDialogContextKey = "dictionaryManageDialogContext";
-
-export interface DictionaryManageDialogContext {
+export const dictionaryManageDialogContextKey: InjectionKey<{
   wordEditing: Ref<boolean>;
   surfaceInput: Ref<QInput | undefined>;
   selectedId: Ref<string>;
@@ -153,7 +151,7 @@ export interface DictionaryManageDialogContext {
   toInitialState: () => void;
   toWordEditingState: () => void;
   cancel: () => void;
-}
+}> = Symbol("dictionaryManageDialogContextKey");
 </script>
 
 <script setup lang="ts">
@@ -426,7 +424,7 @@ const toDialogClosedState = () => {
   dictionaryManageDialogOpenedComputed.value = false;
 };
 
-provide<DictionaryManageDialogContext>(dictionaryManageDialogContextKey, {
+provide(dictionaryManageDialogContextKey, {
   wordEditing,
   surfaceInput,
   selectedId,