From c212222bcd69c7df1c53310db0e8497de3f85543 Mon Sep 17 00:00:00 2001 From: Icet <92614422+IcetCode@users.noreply.github.com> Date: Thu, 22 Jun 2023 18:30:51 +0800 Subject: [PATCH] chore: replace deprecated `vueuse` API (#189) Co-authored-by: jd-solanki --- .../anu-vue/src/composables/useCheckbox.ts | 19 ++++++++++--------- .../src/composables/useConfigurable.ts | 4 ++-- .../src/composables/useTypographyColor.ts | 6 +++--- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/packages/anu-vue/src/composables/useCheckbox.ts b/packages/anu-vue/src/composables/useCheckbox.ts index 14c4045c..c1aa1d23 100644 --- a/packages/anu-vue/src/composables/useCheckbox.ts +++ b/packages/anu-vue/src/composables/useCheckbox.ts @@ -1,5 +1,6 @@ import type { MaybeRefOrGetter } from '@vueuse/core' import type { ComponentObjectPropsOptions, PropType } from 'vue' +import { toValue } from 'vue' export type CheckboxModelValue = null | string | number | boolean | unknown[] @@ -59,12 +60,12 @@ export function useCheckbox( cycleIndeterminate: MaybeRefOrGetter = false, ) { const handleModelValueChange = () => { - const _cycleIndeterminate = resolveUnref(cycleIndeterminate) - const _modelValue = resolveUnref(modelValue) + const _cycleIndeterminate = toValue(cycleIndeterminate) + const _modelValue = toValue(modelValue) - const _checkedValue = resolveUnref(checkedValue) - const _uncheckedValue = resolveUnref(uncheckedValue) - const _indeterminateValue = resolveUnref(indeterminateValue) + const _checkedValue = toValue(checkedValue) + const _uncheckedValue = toValue(uncheckedValue) + const _indeterminateValue = toValue(indeterminateValue) const cycleInitialValue = Array.isArray(_modelValue) ? (_modelValue.includes(_checkedValue) ? _checkedValue : _uncheckedValue) @@ -96,8 +97,8 @@ export function useCheckbox( const isChecked = computed({ get: () => { - const _modelValue = resolveUnref(modelValue) - const _checkedValue = resolveUnref(checkedValue) + const _modelValue = toValue(modelValue) + const _checkedValue = toValue(checkedValue) if (Array.isArray(_modelValue)) return _modelValue.includes(_checkedValue) @@ -108,8 +109,8 @@ export function useCheckbox( }) const isIndeterminate = computed(() => { - const _modelValue = resolveUnref(modelValue) - const _indeterminateValue = resolveUnref(indeterminateValue) + const _modelValue = toValue(modelValue) + const _indeterminateValue = toValue(indeterminateValue) if (Array.isArray(_modelValue)) return _modelValue.includes(_indeterminateValue) diff --git a/packages/anu-vue/src/composables/useConfigurable.ts b/packages/anu-vue/src/composables/useConfigurable.ts index 4b1f2744..77712059 100644 --- a/packages/anu-vue/src/composables/useConfigurable.ts +++ b/packages/anu-vue/src/composables/useConfigurable.ts @@ -1,5 +1,5 @@ import type { MaybeRef } from '@vueuse/core' -import { resolveUnref } from '@vueuse/core' +import { toValue } from '@vueuse/core' import { computed } from 'vue' // ℹ️ We might need generic here in future @@ -12,7 +12,7 @@ export type ConfigurableValue = undefined | ContentType | [ContentType, ClassAtt export function useConfigurable(value: MaybeRef) { return computed(() => { - const _value = resolveUnref(value) + const _value = toValue(value) const [content, classes, attrs] = _value === undefined ? [] diff --git a/packages/anu-vue/src/composables/useTypographyColor.ts b/packages/anu-vue/src/composables/useTypographyColor.ts index 4c2acdff..bcfdc821 100644 --- a/packages/anu-vue/src/composables/useTypographyColor.ts +++ b/packages/anu-vue/src/composables/useTypographyColor.ts @@ -1,5 +1,5 @@ import type { MaybeRefOrGetter } from '@vueuse/core' -import { resolveUnref } from '@vueuse/core' +import { toValue } from '@vueuse/core' import type { ColorProp } from './useProps' import { colord } from '@/utils/colord' import { isThemeColor } from '@/composables/useColor' @@ -43,8 +43,8 @@ export function useTypographyColor(color: MaybeRefOrGetter, va const typographyClasses = ref([]) const typographyStyles = ref([]) - const _color = resolveUnref(color) - const _variant = resolveUnref(variant) + const _color = toValue(color) + const _variant = toValue(variant) const _isThemeColor = isThemeColor(_color) watch([() => color, () => variant], () => {