From 8bc924ea624b1a5216a23cc0c19f74748b4065a6 Mon Sep 17 00:00:00 2001 From: neverland Date: Sun, 4 Jul 2021 23:04:54 +0800 Subject: [PATCH] types: using InjectionKey in composables (#8976) --- src/composables/on-popup-reopen.ts | 9 +++------ src/composables/use-tab-status.ts | 6 +++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/composables/on-popup-reopen.ts b/src/composables/on-popup-reopen.ts index 78e39e883..e74e713d0 100644 --- a/src/composables/on-popup-reopen.ts +++ b/src/composables/on-popup-reopen.ts @@ -1,13 +1,10 @@ -import { inject, watch } from 'vue'; +import { inject, InjectionKey, watch } from 'vue'; // eslint-disable-next-line -export const POPUP_TOGGLE_KEY = Symbol(); +export const POPUP_TOGGLE_KEY: InjectionKey<() => boolean> = Symbol(); export function onPopupReopen(callback: () => void) { - const popupToggleStatus = inject<(() => boolean) | null>( - POPUP_TOGGLE_KEY, - null - ); + const popupToggleStatus = inject(POPUP_TOGGLE_KEY, null); if (popupToggleStatus) { watch(popupToggleStatus, (show) => { diff --git a/src/composables/use-tab-status.ts b/src/composables/use-tab-status.ts index 319aa8f2c..8a9b37bea 100644 --- a/src/composables/use-tab-status.ts +++ b/src/composables/use-tab-status.ts @@ -1,8 +1,8 @@ -import { inject, ComputedRef } from 'vue'; +import { inject, ComputedRef, InjectionKey } from 'vue'; // eslint-disable-next-line -export const TAB_STATUS_KEY = Symbol(); +export const TAB_STATUS_KEY: InjectionKey> = Symbol(); export function useTabStatus() { - return inject | null>(TAB_STATUS_KEY, null); + return inject(TAB_STATUS_KEY, null); }