From eecf4f7ed8a32a874f00afd7bff2964a1366e0b5 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Mon, 23 Sep 2024 09:55:44 +0100 Subject: [PATCH] fix(components): accept partial config in `ui` prop (#2235) --- src/runtime/components/data/Table.vue | 4 ++-- src/runtime/components/elements/Accordion.vue | 4 ++-- src/runtime/components/elements/Alert.vue | 4 ++-- src/runtime/components/elements/Avatar.vue | 4 ++-- src/runtime/components/elements/Badge.vue | 4 ++-- src/runtime/components/elements/Button.vue | 4 ++-- src/runtime/components/elements/Carousel.vue | 4 ++-- src/runtime/components/elements/Chip.vue | 4 ++-- src/runtime/components/elements/Dropdown.vue | 4 ++-- src/runtime/components/elements/Kbd.vue | 4 ++-- src/runtime/components/elements/Meter.vue | 4 ++-- src/runtime/components/elements/Progress.vue | 4 ++-- src/runtime/components/forms/Checkbox.vue | 4 ++-- src/runtime/components/forms/FormGroup.vue | 4 ++-- src/runtime/components/forms/Input.vue | 4 ++-- src/runtime/components/forms/InputMenu.vue | 6 +++--- src/runtime/components/forms/Radio.vue | 4 ++-- src/runtime/components/forms/RadioGroup.vue | 6 +++--- src/runtime/components/forms/Range.vue | 4 ++-- src/runtime/components/forms/Select.vue | 4 ++-- src/runtime/components/forms/SelectMenu.vue | 6 +++--- src/runtime/components/forms/Textarea.vue | 4 ++-- src/runtime/components/forms/Toggle.vue | 4 ++-- src/runtime/components/layout/Card.vue | 4 ++-- src/runtime/components/layout/Container.vue | 4 ++-- src/runtime/components/layout/Divider.vue | 4 ++-- src/runtime/components/layout/Skeleton.vue | 4 ++-- src/runtime/components/navigation/Breadcrumb.vue | 4 ++-- src/runtime/components/navigation/CommandPalette.vue | 4 ++-- src/runtime/components/navigation/HorizontalNavigation.vue | 4 ++-- src/runtime/components/navigation/Pagination.vue | 4 ++-- src/runtime/components/navigation/Tabs.vue | 4 ++-- src/runtime/components/navigation/VerticalNavigation.vue | 4 ++-- src/runtime/components/overlays/ContextMenu.vue | 4 ++-- src/runtime/components/overlays/Modal.vue | 4 ++-- src/runtime/components/overlays/Notification.vue | 4 ++-- src/runtime/components/overlays/Notifications.vue | 4 ++-- src/runtime/components/overlays/Popover.vue | 4 ++-- src/runtime/components/overlays/Slideover.vue | 4 ++-- src/runtime/components/overlays/Tooltip.vue | 4 ++-- 40 files changed, 83 insertions(+), 83 deletions(-) diff --git a/src/runtime/components/data/Table.vue b/src/runtime/components/data/Table.vue index dbf4da5b60..fbbc977cf7 100644 --- a/src/runtime/components/data/Table.vue +++ b/src/runtime/components/data/Table.vue @@ -121,7 +121,7 @@ import UProgress from '../elements/Progress.vue' import UCheckbox from '../forms/Checkbox.vue' import { useUI } from '../../composables/useUI' import { mergeConfig, get } from '../../utils' -import type { Strategy, Button, ProgressColor, ProgressAnimation } from '../../types/index' +import type { Strategy, Button, ProgressColor, ProgressAnimation, DeepPartial } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { table } from '#ui/ui.config' @@ -232,7 +232,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/elements/Accordion.vue b/src/runtime/components/elements/Accordion.vue index df2a951be7..63a663e98b 100644 --- a/src/runtime/components/elements/Accordion.vue +++ b/src/runtime/components/elements/Accordion.vue @@ -73,7 +73,7 @@ import UIcon from '../elements/Icon.vue' import UButton from '../elements/Button.vue' import { useUI } from '../../composables/useUI' import { mergeConfig, omit } from '../../utils' -import type { AccordionItem, Strategy } from '../../types/index' +import type { AccordionItem, DeepPartial, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { accordion, button } from '#ui/ui.config' @@ -122,7 +122,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/elements/Alert.vue b/src/runtime/components/elements/Alert.vue index 5f57d55e59..1767bdebd6 100644 --- a/src/runtime/components/elements/Alert.vue +++ b/src/runtime/components/elements/Alert.vue @@ -47,7 +47,7 @@ import UIcon from '../elements/Icon.vue' import UAvatar from '../elements/Avatar.vue' import UButton from '../elements/Button.vue' import { useUI } from '../../composables/useUI' -import type { Avatar, Button, AlertColor, AlertVariant, AlertAction, Strategy } from '../../types/index' +import type { Avatar, Button, AlertColor, AlertVariant, AlertAction, Strategy, DeepPartial } from '../../types/index' import { mergeConfig } from '../../utils' // @ts-expect-error import appConfig from '#build/app.config' @@ -109,7 +109,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/elements/Avatar.vue b/src/runtime/components/elements/Avatar.vue index 73fcaf106c..3ff03b1386 100644 --- a/src/runtime/components/elements/Avatar.vue +++ b/src/runtime/components/elements/Avatar.vue @@ -27,7 +27,7 @@ import { twMerge, twJoin } from 'tailwind-merge' import UIcon from '../elements/Icon.vue' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { AvatarSize, AvatarChipColor, AvatarChipPosition, Strategy } from '../../types/index' +import type { AvatarSize, AvatarChipColor, AvatarChipPosition, Strategy, DeepPartial } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { avatar } from '#ui/ui.config' @@ -94,7 +94,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/elements/Badge.vue b/src/runtime/components/elements/Badge.vue index 2f82a18e6f..1e278e9ba5 100644 --- a/src/runtime/components/elements/Badge.vue +++ b/src/runtime/components/elements/Badge.vue @@ -11,7 +11,7 @@ import { twMerge, twJoin } from 'tailwind-merge' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' import { useInjectButtonGroup } from '../../composables/useButtonGroup' -import type { BadgeColor, BadgeSize, BadgeVariant, Strategy } from '../../types/index' +import type { BadgeColor, BadgeSize, BadgeVariant, DeepPartial, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { badge } from '#ui/ui.config' @@ -54,7 +54,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/elements/Button.vue b/src/runtime/components/elements/Button.vue index 8bcf767f10..6479102359 100644 --- a/src/runtime/components/elements/Button.vue +++ b/src/runtime/components/elements/Button.vue @@ -25,7 +25,7 @@ import ULink from '../elements/Link.vue' import { useUI } from '../../composables/useUI' import { mergeConfig, nuxtLinkProps, getNuxtLinkProps } from '../../utils' import { useInjectButtonGroup } from '../../composables/useButtonGroup' -import type { ButtonColor, ButtonSize, ButtonVariant, Strategy } from '../../types/index' +import type { ButtonColor, ButtonSize, ButtonVariant, DeepPartial, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { button } from '#ui/ui.config' @@ -125,7 +125,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/elements/Carousel.vue b/src/runtime/components/elements/Carousel.vue index 3593b8ff48..c90e145368 100644 --- a/src/runtime/components/elements/Carousel.vue +++ b/src/runtime/components/elements/Carousel.vue @@ -61,7 +61,7 @@ import type { PropType } from 'vue' import { twMerge } from 'tailwind-merge' import { mergeConfig } from '../../utils' import UButton from '../elements/Button.vue' -import type { Strategy, Button } from '../../types/index' +import type { Strategy, Button, DeepPartial } from '../../types/index' import { useUI } from '../../composables/useUI' import { useCarouselScroll } from '../../composables/useCarouselScroll' import { useScroll, useResizeObserver, useElementSize } from '@vueuse/core' @@ -102,7 +102,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType>, + type: Object as PropType>, default: undefined } }, diff --git a/src/runtime/components/elements/Chip.vue b/src/runtime/components/elements/Chip.vue index 6a529e22e9..b17a722f93 100644 --- a/src/runtime/components/elements/Chip.vue +++ b/src/runtime/components/elements/Chip.vue @@ -16,7 +16,7 @@ import type { PropType } from 'vue' import { twJoin } from 'tailwind-merge' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { ChipSize, ChipColor, ChipPosition, Strategy } from '../../types/index' +import type { ChipSize, ChipColor, ChipPosition, Strategy, DeepPartial } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { chip } from '#ui/ui.config' @@ -64,7 +64,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/elements/Dropdown.vue b/src/runtime/components/elements/Dropdown.vue index 64b4c45cd3..42cf74614e 100644 --- a/src/runtime/components/elements/Dropdown.vue +++ b/src/runtime/components/elements/Dropdown.vue @@ -67,7 +67,7 @@ import UKbd from '../elements/Kbd.vue' import { useUI } from '../../composables/useUI' import { usePopper } from '../../composables/usePopper' import { mergeConfig, getNuxtLinkProps } from '../../utils' -import type { DropdownItem, PopperOptions, Strategy } from '../../types/index' +import type { DeepPartial, DropdownItem, PopperOptions, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { dropdown } from '#ui/ui.config' @@ -121,7 +121,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/elements/Kbd.vue b/src/runtime/components/elements/Kbd.vue index 657c836582..6defd4de27 100644 --- a/src/runtime/components/elements/Kbd.vue +++ b/src/runtime/components/elements/Kbd.vue @@ -10,7 +10,7 @@ import type { PropType } from 'vue' import { twMerge, twJoin } from 'tailwind-merge' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { KbdSize, Strategy } from '../../types/index' +import type { DeepPartial, KbdSize, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { kbd } from '#ui/ui.config' @@ -36,7 +36,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/elements/Meter.vue b/src/runtime/components/elements/Meter.vue index f116dee364..f4c9aa9ab7 100644 --- a/src/runtime/components/elements/Meter.vue +++ b/src/runtime/components/elements/Meter.vue @@ -34,7 +34,7 @@ import { twJoin } from 'tailwind-merge' import UIcon from '../elements/Icon.vue' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { Strategy, MeterColor, MeterSize } from '../../types/index' +import type { Strategy, MeterColor, MeterSize, DeepPartial } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { meter } from '#ui/ui.config' @@ -94,7 +94,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/elements/Progress.vue b/src/runtime/components/elements/Progress.vue index 5ffdbb55df..4dab1c6bf9 100644 --- a/src/runtime/components/elements/Progress.vue +++ b/src/runtime/components/elements/Progress.vue @@ -33,7 +33,7 @@ import type { PropType } from 'vue' import { twJoin } from 'tailwind-merge' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { Strategy, ProgressSize, ProgressAnimation, ProgressColor } from '../../types/index' +import type { Strategy, ProgressSize, ProgressAnimation, ProgressColor, DeepPartial } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { progress } from '#ui/ui.config' @@ -81,7 +81,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/forms/Checkbox.vue b/src/runtime/components/forms/Checkbox.vue index 24f5bbe2fd..2afb423e6a 100644 --- a/src/runtime/components/forms/Checkbox.vue +++ b/src/runtime/components/forms/Checkbox.vue @@ -36,7 +36,7 @@ import { twMerge, twJoin } from 'tailwind-merge' import { useUI } from '../../composables/useUI' import { useFormGroup } from '../../composables/useFormGroup' import { mergeConfig } from '../../utils' -import type { Strategy } from '../../types/index' +import type { DeepPartial, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { checkbox } from '#ui/ui.config' @@ -100,7 +100,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/forms/FormGroup.vue b/src/runtime/components/forms/FormGroup.vue index a08d0b7e44..02fdb0fb3d 100644 --- a/src/runtime/components/forms/FormGroup.vue +++ b/src/runtime/components/forms/FormGroup.vue @@ -44,7 +44,7 @@ import { computed, defineComponent, provide, inject, ref, toRef } from 'vue' import type { Ref, PropType } from 'vue' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { FormError, InjectedFormGroupValue, FormGroupSize, Strategy } from '../../types/index' +import type { FormError, InjectedFormGroupValue, FormGroupSize, Strategy, DeepPartial } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { formGroup } from '#ui/ui.config' @@ -95,7 +95,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) }, eagerValidation: { diff --git a/src/runtime/components/forms/Input.vue b/src/runtime/components/forms/Input.vue index f91260049f..ff3e647bf4 100644 --- a/src/runtime/components/forms/Input.vue +++ b/src/runtime/components/forms/Input.vue @@ -40,7 +40,7 @@ import { useUI } from '../../composables/useUI' import { useFormGroup } from '../../composables/useFormGroup' import { mergeConfig, looseToNumber } from '../../utils' import { useInjectButtonGroup } from '../../composables/useButtonGroup' -import type { InputSize, InputColor, InputVariant, Strategy } from '../../types/index' +import type { InputSize, InputColor, InputVariant, Strategy, DeepPartial } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { input } from '#ui/ui.config' @@ -154,7 +154,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) }, modelModifiers: { diff --git a/src/runtime/components/forms/InputMenu.vue b/src/runtime/components/forms/InputMenu.vue index db0a981e45..243b17fed7 100644 --- a/src/runtime/components/forms/InputMenu.vue +++ b/src/runtime/components/forms/InputMenu.vue @@ -111,7 +111,7 @@ import { usePopper } from '../../composables/usePopper' import { useFormGroup } from '../../composables/useFormGroup' import { get, mergeConfig } from '../../utils' import { useInjectButtonGroup } from '../../composables/useButtonGroup' -import type { InputSize, InputColor, InputVariant, PopperOptions, Strategy } from '../../types/index' +import type { InputSize, InputColor, InputVariant, PopperOptions, Strategy, DeepPartial } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { input, inputMenu } from '#ui/ui.config' @@ -270,11 +270,11 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) }, uiMenu: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/forms/Radio.vue b/src/runtime/components/forms/Radio.vue index ac629ce938..ffda283a48 100644 --- a/src/runtime/components/forms/Radio.vue +++ b/src/runtime/components/forms/Radio.vue @@ -35,7 +35,7 @@ import { twMerge, twJoin } from 'tailwind-merge' import { useUI } from '../../composables/useUI' import { useFormGroup } from '../../composables/useFormGroup' import { mergeConfig } from '../../utils' -import type { Strategy } from '../../types/index' +import type { DeepPartial, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { radio } from '#ui/ui.config' @@ -95,7 +95,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/forms/RadioGroup.vue b/src/runtime/components/forms/RadioGroup.vue index f49675f8b0..da2d246bf3 100644 --- a/src/runtime/components/forms/RadioGroup.vue +++ b/src/runtime/components/forms/RadioGroup.vue @@ -36,7 +36,7 @@ import type { PropType } from 'vue' import { useUI } from '../../composables/useUI' import { useFormGroup } from '../../composables/useFormGroup' import { mergeConfig, get } from '../../utils' -import type { Strategy } from '../../types/index' +import type { DeepPartial, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { radioGroup, radio } from '#ui/ui.config' @@ -91,11 +91,11 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) }, uiRadio: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/forms/Range.vue b/src/runtime/components/forms/Range.vue index 2667a4bba6..e3023ae01b 100644 --- a/src/runtime/components/forms/Range.vue +++ b/src/runtime/components/forms/Range.vue @@ -26,7 +26,7 @@ import { twMerge, twJoin } from 'tailwind-merge' import { useUI } from '../../composables/useUI' import { useFormGroup } from '../../composables/useFormGroup' import { mergeConfig } from '../../utils' -import type { RangeSize, RangeColor, Strategy } from '../../types/index' +import type { RangeSize, RangeColor, Strategy, DeepPartial } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { range } from '#ui/ui.config' @@ -87,7 +87,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/forms/Select.vue b/src/runtime/components/forms/Select.vue index 32ccf3d0bf..92925ee46e 100644 --- a/src/runtime/components/forms/Select.vue +++ b/src/runtime/components/forms/Select.vue @@ -61,7 +61,7 @@ import { useUI } from '../../composables/useUI' import { useFormGroup } from '../../composables/useFormGroup' import { mergeConfig, get } from '../../utils' import { useInjectButtonGroup } from '../../composables/useButtonGroup' -import type { SelectSize, SelectColor, SelectVariant, Strategy } from '../../types/index' +import type { SelectSize, SelectColor, SelectVariant, Strategy, DeepPartial } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { select } from '#ui/ui.config' @@ -175,7 +175,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/forms/SelectMenu.vue b/src/runtime/components/forms/SelectMenu.vue index 34f23caf2d..8d089e2c2b 100644 --- a/src/runtime/components/forms/SelectMenu.vue +++ b/src/runtime/components/forms/SelectMenu.vue @@ -147,7 +147,7 @@ import { usePopper } from '../../composables/usePopper' import { useFormGroup } from '../../composables/useFormGroup' import { get, mergeConfig } from '../../utils' import { useInjectButtonGroup } from '../../composables/useButtonGroup' -import type { SelectSize, SelectColor, SelectVariant, PopperOptions, Strategy } from '../../types/index' +import type { SelectSize, SelectColor, SelectVariant, PopperOptions, Strategy, DeepPartial } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { select, selectMenu } from '#ui/ui.config' @@ -326,11 +326,11 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) }, uiMenu: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/forms/Textarea.vue b/src/runtime/components/forms/Textarea.vue index 1e78f054ac..e4d94fe962 100644 --- a/src/runtime/components/forms/Textarea.vue +++ b/src/runtime/components/forms/Textarea.vue @@ -28,7 +28,7 @@ import { defu } from 'defu' import { useUI } from '../../composables/useUI' import { useFormGroup } from '../../composables/useFormGroup' import { mergeConfig, looseToNumber } from '../../utils' -import type { TextareaSize, TextareaColor, TextareaVariant, Strategy } from '../../types/index' +import type { TextareaSize, TextareaColor, TextareaVariant, Strategy, DeepPartial } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { textarea } from '#ui/ui.config' @@ -123,7 +123,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) }, modelModifiers: { diff --git a/src/runtime/components/forms/Toggle.vue b/src/runtime/components/forms/Toggle.vue index 8e815279ba..24b90cac64 100644 --- a/src/runtime/components/forms/Toggle.vue +++ b/src/runtime/components/forms/Toggle.vue @@ -38,7 +38,7 @@ import UIcon from '../elements/Icon.vue' import { useUI } from '../../composables/useUI' import { useFormGroup } from '../../composables/useFormGroup' import { mergeConfig } from '../../utils' -import type { ToggleSize, ToggleColor, Strategy } from '../../types/index' +import type { ToggleSize, ToggleColor, Strategy, DeepPartial } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { toggle } from '#ui/ui.config' @@ -104,7 +104,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/layout/Card.vue b/src/runtime/components/layout/Card.vue index 63aeb7d7d4..c95370b781 100644 --- a/src/runtime/components/layout/Card.vue +++ b/src/runtime/components/layout/Card.vue @@ -22,7 +22,7 @@ import type { PropType } from 'vue' import { twMerge, twJoin } from 'tailwind-merge' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { Strategy } from '../../types/index' +import type { DeepPartial, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { card } from '#ui/ui.config' @@ -41,7 +41,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/layout/Container.vue b/src/runtime/components/layout/Container.vue index e71e4d8d61..69088ab6f8 100644 --- a/src/runtime/components/layout/Container.vue +++ b/src/runtime/components/layout/Container.vue @@ -10,7 +10,7 @@ import type { PropType } from 'vue' import { twMerge, twJoin } from 'tailwind-merge' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { Strategy } from '../../types/index' +import type { DeepPartial, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { container } from '#ui/ui.config' @@ -29,7 +29,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/layout/Divider.vue b/src/runtime/components/layout/Divider.vue index 3b7d667b1e..e1106249ca 100644 --- a/src/runtime/components/layout/Divider.vue +++ b/src/runtime/components/layout/Divider.vue @@ -26,7 +26,7 @@ import UIcon from '../elements/Icon.vue' import UAvatar from '../elements/Avatar.vue' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { Avatar, DividerSize, Strategy } from '../../types/index' +import type { Avatar, DeepPartial, DividerSize, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { divider } from '#ui/ui.config' @@ -74,7 +74,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/layout/Skeleton.vue b/src/runtime/components/layout/Skeleton.vue index 1198fc173c..2b8d69be72 100644 --- a/src/runtime/components/layout/Skeleton.vue +++ b/src/runtime/components/layout/Skeleton.vue @@ -8,7 +8,7 @@ import type { PropType } from 'vue' import { twMerge, twJoin } from 'tailwind-merge' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { Strategy } from '../../types/index' +import type { DeepPartial, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { skeleton } from '#ui/ui.config' @@ -27,7 +27,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/navigation/Breadcrumb.vue b/src/runtime/components/navigation/Breadcrumb.vue index 106408d2ef..3ac18a41bf 100644 --- a/src/runtime/components/navigation/Breadcrumb.vue +++ b/src/runtime/components/navigation/Breadcrumb.vue @@ -41,7 +41,7 @@ import UIcon from '../elements/Icon.vue' import ULink from '../elements/Link.vue' import { useUI } from '../../composables/useUI' import { mergeConfig, getULinkProps } from '../../utils' -import type { BreadcrumbLink, Strategy } from '../../types/index' +import type { BreadcrumbLink, DeepPartial, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { breadcrumb } from '#ui/ui.config' @@ -68,7 +68,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/navigation/CommandPalette.vue b/src/runtime/components/navigation/CommandPalette.vue index 68cc6efde5..7857000254 100644 --- a/src/runtime/components/navigation/CommandPalette.vue +++ b/src/runtime/components/navigation/CommandPalette.vue @@ -75,7 +75,7 @@ import UButton from '../elements/Button.vue' import CommandPaletteGroup from './CommandPaletteGroup.vue' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { Group, Command, Button, Strategy } from '../../types/index' +import type { Group, Command, Button, Strategy, DeepPartial } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { commandPalette } from '#ui/ui.config' @@ -175,7 +175,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/navigation/HorizontalNavigation.vue b/src/runtime/components/navigation/HorizontalNavigation.vue index ca9937f8f5..11ef4fee7b 100644 --- a/src/runtime/components/navigation/HorizontalNavigation.vue +++ b/src/runtime/components/navigation/HorizontalNavigation.vue @@ -61,7 +61,7 @@ import UBadge from '../elements/Badge.vue' import ULink from '../elements/Link.vue' import { useUI } from '../../composables/useUI' import { mergeConfig, getULinkProps } from '../../utils' -import type { HorizontalNavigationLink, Strategy } from '../../types/index' +import type { DeepPartial, HorizontalNavigationLink, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { horizontalNavigation } from '#ui/ui.config' @@ -86,7 +86,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/navigation/Pagination.vue b/src/runtime/components/navigation/Pagination.vue index 05a39aad76..a8883067b4 100644 --- a/src/runtime/components/navigation/Pagination.vue +++ b/src/runtime/components/navigation/Pagination.vue @@ -78,7 +78,7 @@ import type { RouteLocationRaw } from '#vue-router' import UButton from '../elements/Button.vue' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { Button, ButtonSize, Strategy } from '../../types/index' +import type { Button, ButtonSize, DeepPartial, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { pagination, button } from '#ui/ui.config' @@ -168,7 +168,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/navigation/Tabs.vue b/src/runtime/components/navigation/Tabs.vue index 1fc6246bdf..4a6ff21daf 100644 --- a/src/runtime/components/navigation/Tabs.vue +++ b/src/runtime/components/navigation/Tabs.vue @@ -60,7 +60,7 @@ import { useResizeObserver } from '@vueuse/core' import UIcon from '../elements/Icon.vue' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { TabItem, Strategy } from '../../types/index' +import type { TabItem, Strategy, DeepPartial } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { tabs } from '#ui/ui.config' @@ -109,7 +109,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/navigation/VerticalNavigation.vue b/src/runtime/components/navigation/VerticalNavigation.vue index d481707fda..a1f98b8a23 100644 --- a/src/runtime/components/navigation/VerticalNavigation.vue +++ b/src/runtime/components/navigation/VerticalNavigation.vue @@ -63,7 +63,7 @@ import ULink from '../elements/Link.vue' import UDivider from '../layout/Divider.vue' import { useUI } from '../../composables/useUI' import { mergeConfig, getULinkProps } from '../../utils' -import type { VerticalNavigationLink, Strategy } from '../../types/index' +import type { VerticalNavigationLink, Strategy, DeepPartial } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { verticalNavigation } from '#ui/ui.config' @@ -89,7 +89,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/overlays/ContextMenu.vue b/src/runtime/components/overlays/ContextMenu.vue index 99c095c0e9..9d6e4fac0d 100644 --- a/src/runtime/components/overlays/ContextMenu.vue +++ b/src/runtime/components/overlays/ContextMenu.vue @@ -22,7 +22,7 @@ import { twMerge, twJoin } from 'tailwind-merge' import { useUI } from '../../composables/useUI' import { usePopper } from '../../composables/usePopper' import { mergeConfig } from '../../utils' -import type { PopperOptions, Strategy } from '../../types/index' +import type { DeepPartial, PopperOptions, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { contextMenu } from '#ui/ui.config' @@ -49,7 +49,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/overlays/Modal.vue b/src/runtime/components/overlays/Modal.vue index 289179b68a..ea15e67a0b 100644 --- a/src/runtime/components/overlays/Modal.vue +++ b/src/runtime/components/overlays/Modal.vue @@ -32,7 +32,7 @@ import type { PropType } from 'vue' import { Dialog as HDialog, DialogPanel as HDialogPanel, TransitionRoot, TransitionChild, provideUseId } from '@headlessui/vue' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { Strategy } from '../../types/index' +import type { DeepPartial, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { modal } from '#ui/ui.config' @@ -78,7 +78,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/overlays/Notification.vue b/src/runtime/components/overlays/Notification.vue index 94a3d72575..85c0e8fa5d 100644 --- a/src/runtime/components/overlays/Notification.vue +++ b/src/runtime/components/overlays/Notification.vue @@ -52,7 +52,7 @@ import UButton from '../elements/Button.vue' import { useUI } from '../../composables/useUI' import { useTimer } from '../../composables/useTimer' import { mergeConfig } from '../../utils' -import type { Avatar, Button, NotificationColor, NotificationAction, Strategy } from '../../types/index' +import type { Avatar, Button, NotificationColor, NotificationAction, Strategy, DeepPartial } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { notification } from '#ui/ui.config' @@ -115,7 +115,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/overlays/Notifications.vue b/src/runtime/components/overlays/Notifications.vue index 33e30ab1f7..feea614d9e 100644 --- a/src/runtime/components/overlays/Notifications.vue +++ b/src/runtime/components/overlays/Notifications.vue @@ -27,7 +27,7 @@ import UNotification from './Notification.vue' import { useUI } from '../../composables/useUI' import { useToast } from '../../composables/useToast' import { mergeConfig } from '../../utils' -import type { Notification, Strategy } from '../../types/index' +import type { DeepPartial, Notification, Strategy } from '../../types/index' import { useState } from '#imports' // @ts-expect-error import appConfig from '#build/app.config' @@ -46,7 +46,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/overlays/Popover.vue b/src/runtime/components/overlays/Popover.vue index ff378ba35e..628d033ac8 100644 --- a/src/runtime/components/overlays/Popover.vue +++ b/src/runtime/components/overlays/Popover.vue @@ -43,7 +43,7 @@ import { Popover as HPopover, PopoverButton as HPopoverButton, PopoverPanel as H import { useUI } from '../../composables/useUI' import { usePopper } from '../../composables/usePopper' import { mergeConfig } from '../../utils' -import type { PopperOptions, Strategy } from '../../types/index' +import type { DeepPartial, PopperOptions, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { popover } from '#ui/ui.config' @@ -93,7 +93,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/overlays/Slideover.vue b/src/runtime/components/overlays/Slideover.vue index 6691692194..6ce3225f73 100644 --- a/src/runtime/components/overlays/Slideover.vue +++ b/src/runtime/components/overlays/Slideover.vue @@ -20,7 +20,7 @@ import type { WritableComputedRef, PropType } from 'vue' import { Dialog as HDialog, DialogPanel as HDialogPanel, TransitionRoot, TransitionChild, provideUseId } from '@headlessui/vue' import { useUI } from '../../composables/useUI' import { mergeConfig } from '../../utils' -import type { Strategy } from '../../types/index' +import type { DeepPartial, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { slideover } from '#ui/ui.config' @@ -67,7 +67,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } }, diff --git a/src/runtime/components/overlays/Tooltip.vue b/src/runtime/components/overlays/Tooltip.vue index d2882bc217..74cb2a0f8a 100644 --- a/src/runtime/components/overlays/Tooltip.vue +++ b/src/runtime/components/overlays/Tooltip.vue @@ -36,7 +36,7 @@ import UKbd from '../elements/Kbd.vue' import { useUI } from '../../composables/useUI' import { usePopper } from '../../composables/usePopper' import { mergeConfig } from '../../utils' -import type { PopperOptions, Strategy } from '../../types/index' +import type { DeepPartial, PopperOptions, Strategy } from '../../types/index' // @ts-expect-error import appConfig from '#build/app.config' import { tooltip } from '#ui/ui.config' @@ -78,7 +78,7 @@ export default defineComponent({ default: () => '' }, ui: { - type: Object as PropType & { strategy?: Strategy }>, + type: Object as PropType & { strategy?: Strategy }>, default: () => ({}) } },