From bbd16a08e9711b2018bb8c8a4e67358db6123208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= Date: Mon, 29 Nov 2021 15:58:44 +0800 Subject: [PATCH] refactor(hooks): refactor hooks (#4253) * refactor(hooks): remove use-css-var * refactor(hooks): remove use-events * refactor(hooks): remove use-migrating * refactor(hooks): remove use-transition * refactor(hooks): named export useAttrs * refactor(hooks): named export useFocus * refactor(hooks): refactor useFormItem * refactor(hooks): refactor useGlobalConfig * refactor(hooks): refactor useLocale * refactor(hooks): refactor useLockscreen * refactor(hooks): refactor useModal * refactor(hooks): refactor useModelToggle * refactor(hooks): refactor usePreventGlobal * refactor(hooks): refactor useRestoreActive * refactor(hooks): refactor useTeleport * refactor(hooks): refactor useThrottleRender * refactor(hooks): refactor useTimeout * refactor(hooks): refactor useTransitionFallthrogh --- .../components/calendar/src/date-table.vue | 4 +- packages/components/calendar/src/index.vue | 4 +- .../components/cascader-panel/src/menu.vue | 4 +- packages/components/cascader/src/index.vue | 4 +- .../components/color-picker/src/index.vue | 4 +- .../__tests__/config-provider.spec.ts | 4 +- .../components/config-provider/src/index.ts | 4 +- .../src/date-picker-com/basic-date-table.vue | 4 +- .../src/date-picker-com/basic-month-table.vue | 4 +- .../src/date-picker-com/basic-year-table.vue | 4 +- .../src/date-picker-com/panel-date-pick.vue | 4 +- .../src/date-picker-com/panel-date-range.vue | 4 +- .../src/date-picker-com/panel-month-range.vue | 4 +- packages/components/dialog/src/use-dialog.ts | 4 +- packages/components/empty/src/empty.vue | 4 +- .../image-viewer/src/image-viewer.vue | 4 +- packages/components/image/src/image.vue | 4 +- packages/components/message-box/src/index.vue | 8 +- .../page-header/src/page-header.vue | 4 +- .../pagination/src/components/jumper.vue | 4 +- .../pagination/src/components/sizes.vue | 4 +- .../pagination/src/components/total.vue | 4 +- .../components/pagination/src/pagination.ts | 4 +- .../components/popconfirm/src/popconfirm.vue | 4 +- .../components/select-v2/src/useSelect.ts | 4 +- packages/components/select/src/select.vue | 4 +- packages/components/select/src/useSelect.ts | 6 +- .../components/table/src/filter-panel.vue | 4 +- packages/components/table/src/table.vue | 4 +- .../time-picker/src/common/picker.vue | 4 +- .../src/time-picker-com/panel-time-pick.vue | 4 +- .../src/time-picker-com/panel-time-range.vue | 4 +- packages/components/transfer/src/index.vue | 4 +- .../transfer/src/transfer-panel.vue | 4 +- packages/components/tree-v2/src/tree.vue | 4 +- packages/components/tree/src/tree.vue | 4 +- .../components/upload/src/upload-list.vue | 4 +- packages/element-plus/make-installer.ts | 4 +- packages/hooks/__tests__/use-attrs.spec.ts | 2 +- packages/hooks/__tests__/use-css-var.spec.ts | 60 ----------- packages/hooks/__tests__/use-focus.spec.ts | 2 +- packages/hooks/__tests__/use-locale.spec.ts | 6 +- .../hooks/__tests__/use-lockscreen.spec.ts | 6 +- packages/hooks/__tests__/use-modal.spec.ts | 2 +- .../hooks/__tests__/use-prevent-global.ts | 2 +- .../__tests__/use-restore-active.spec.ts | 2 +- packages/hooks/__tests__/use-teleport.spec.ts | 2 +- packages/hooks/__tests__/use-timeout.spec.ts | 2 +- .../hooks/__tests__/use-transition.spec.ts | 101 ----------------- packages/hooks/index.ts | 27 +++-- packages/hooks/use-attrs/index.ts | 4 +- packages/hooks/use-css-var/index.ts | 102 ------------------ packages/hooks/use-events/index.ts | 23 ---- packages/hooks/use-focus/index.ts | 2 +- packages/hooks/use-form-item/index.ts | 8 +- packages/hooks/use-global-config/index.ts | 5 +- packages/hooks/use-locale/index.ts | 87 +++++---------- packages/hooks/use-lockscreen/index.ts | 60 +++++------ packages/hooks/use-migrating/index.ts | 35 ------ packages/hooks/use-modal/index.ts | 35 +++--- packages/hooks/use-model-toggle/index.ts | 22 ++-- packages/hooks/use-popper/index.ts | 4 +- packages/hooks/use-prevent-global/index.ts | 20 ++-- packages/hooks/use-restore-active/index.ts | 5 +- packages/hooks/use-teleport/index.ts | 9 +- packages/hooks/use-throttle-render/index.ts | 5 +- packages/hooks/use-timeout/index.ts | 26 ++--- .../hooks/use-transition-fallthrough/index.ts | 4 +- packages/hooks/use-transition/index.ts | 33 ------ 69 files changed, 233 insertions(+), 628 deletions(-) delete mode 100644 packages/hooks/__tests__/use-css-var.spec.ts delete mode 100644 packages/hooks/__tests__/use-transition.spec.ts delete mode 100644 packages/hooks/use-css-var/index.ts delete mode 100644 packages/hooks/use-events/index.ts delete mode 100644 packages/hooks/use-migrating/index.ts delete mode 100644 packages/hooks/use-transition/index.ts diff --git a/packages/components/calendar/src/date-table.vue b/packages/components/calendar/src/date-table.vue index 2bb795d2b7..648e4d3f8a 100644 --- a/packages/components/calendar/src/date-table.vue +++ b/packages/components/calendar/src/date-table.vue @@ -40,7 +40,7 @@ import { computed, defineComponent, ref } from 'vue' import dayjs from 'dayjs' import localeData from 'dayjs/plugin/localeData' -import { useLocaleInject } from '@element-plus/hooks' +import { useLocale } from '@element-plus/hooks' import { rangeArr } from '@element-plus/components/time-picker' import type { Dayjs } from 'dayjs' import type { PropType } from 'vue' @@ -73,7 +73,7 @@ export default defineComponent({ }, emits: ['pick'], setup(props, ctx) { - const { lang } = useLocaleInject() + const { lang } = useLocale() const WEEK_DAYS = ref( dayjs().locale(lang.value).localeData().weekdaysShort() ) diff --git a/packages/components/calendar/src/index.vue b/packages/components/calendar/src/index.vue index a2a294a68b..176754038b 100644 --- a/packages/components/calendar/src/index.vue +++ b/packages/components/calendar/src/index.vue @@ -51,7 +51,7 @@ import { ref, computed, defineComponent } from 'vue' import dayjs from 'dayjs' import ElButton from '@element-plus/components/button' -import { useLocaleInject } from '@element-plus/hooks' +import { useLocale } from '@element-plus/hooks' import { debugWarn } from '@element-plus/utils/error' import DateTable from './date-table.vue' import type { PropType, ComputedRef } from 'vue' @@ -94,7 +94,7 @@ export default defineComponent({ emits: ['input', 'update:modelValue'], setup(props, ctx) { - const { t, lang } = useLocaleInject() + const { t, lang } = useLocale() const selectedDay = ref(null) const now = dayjs().locale(lang.value) diff --git a/packages/components/cascader-panel/src/menu.vue b/packages/components/cascader-panel/src/menu.vue index 84b316979a..9cff9c2a18 100644 --- a/packages/components/cascader-panel/src/menu.vue +++ b/packages/components/cascader-panel/src/menu.vue @@ -30,7 +30,7 @@