arthur/ui
1
0
Fork 0
mirror of https://github.com/ArthurDanjou/ui.git synced 2026-01-15 04:29:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat(Select/SelectMenu): handle size prop (#133)

Browse Source 
Co-authored-by: Benjamin Canac <canacb1@gmail.com>
This commit is contained in:
Sandro Circi
2024-07-02 12:03:10 +02:00
committed by GitHub
parent 57a49877ae
commit b61696cdca
42 changed files with 816 additions and 750 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/runtime/components/Checkbox.vue
View File

@@ -83,6 +83,7 @@ const ui = computed(() => tv({ extend: checkbox, slots: props.ui })({
}))
function onUpdate(value: any) {
// @ts-expect-error - 'target' does not exist in type 'EventInit'
const event = new Event('change', { target: { value } })
emits('change', event)
emitFormChange()

2
src/runtime/components/CommandPalette.vue
View File

@@ -262,7 +262,7 @@ const groups = computed(() => {
</slot>
<ComboboxItemIndicator as-child>
<UIcon :name="selectedIcon || appConfig.ui.icons.check" :class="ui.itemTrailingSelectedIcon()" />
<UIcon :name="selectedIcon || appConfig.ui.icons.check" :class="ui.itemTrailingIcon()" />
</ComboboxItemIndicator>
</span>
</slot>

4
src/runtime/components/DropdownMenu.vue
View File

@@ -29,10 +29,10 @@ export interface DropdownMenuItem extends Omit<LinkProps, 'type' | 'custom'>, Pi
select?(e: Event): void
}
type DropdownVariants = VariantProps<typeof dropdownMenu>
type DropdownMenuVariants = VariantProps<typeof dropdownMenu>
export interface DropdownMenuProps<T> extends Omit<DropdownMenuRootProps, 'dir'>, Pick<DropdownMenuTriggerProps, 'disabled'> {
size?: DropdownVariants['size']
size?: DropdownMenuVariants['size']
items?: T[] | T[][]
/**
* The content of the menu.

11
src/runtime/components/InputMenu.vue
View File

@@ -94,8 +94,8 @@ export type InputMenuEmits<T> = ComboboxRootEmits<T> & {
type SlotProps<T> = (props: { item: T, index: number }) => any
export type InputMenuSlots<T> = {
'leading'(props: { modelValue: T, open: boolean }): any
'trailing'(props: { modelValue: T, open: boolean }): any
'leading'(props: { modelValue: T, open: boolean, ui: any }): any
'trailing'(props: { modelValue: T, open: boolean, ui: any }): any
'empty'(props: { searchTerm?: string }): any
'item': SlotProps<T>
'item-leading': SlotProps<T>
@@ -193,6 +193,7 @@ onMounted(() => {
})
function onUpdate(value: any) {
// @ts-expect-error - 'target' does not exist in type 'EventInit'
const event = new Event('change', { target: { value } })
emits('change', event)
emitFormChange()
@@ -280,13 +281,13 @@ function onUpdateOpen(value: boolean) {
/>
<span v-if="isLeading || !!slots.leading" :class="ui.leading()">
<slot name="leading" :model-value="(modelValue as T)" :open="open">
<slot name="leading" :model-value="(modelValue as T)" :open="open" :ui="ui">
<UIcon v-if="leadingIconName" :name="leadingIconName" :class="ui.leadingIcon()" />
</slot>
</span>
<ComboboxTrigger v-if="isTrailing || !!slots.trailing" :class="ui.trailing()">
<slot name="trailing" :model-value="(modelValue as T)" :open="open">
<slot name="trailing" :model-value="(modelValue as T)" :open="open" :ui="ui">
<UIcon v-if="trailingIconName" :name="trailingIconName" :class="ui.trailingIcon()" />
</slot>
</ComboboxTrigger>
@@ -334,7 +335,7 @@ function onUpdateOpen(value: boolean) {
<slot name="item-trailing" :item="(item as T)" :index="index" />
<ComboboxItemIndicator as-child>
<UIcon :name="selectedIcon || appConfig.ui.icons.check" :class="ui.itemTrailingSelectedIcon()" />
<UIcon :name="selectedIcon || appConfig.ui.icons.check" :class="ui.itemTrailingIcon()" />
</ComboboxItemIndicator>
</span>
</slot>

1
src/runtime/components/RadioGroup.vue
View File

@@ -95,6 +95,7 @@ const normalizedItems = computed(() => {
})
function onUpdate(value: any) {
// @ts-expect-error - 'target' does not exist in type 'EventInit'
const event = new Event('change', { target: { value } })
emits('change', event)
emitFormChange()

15
src/runtime/components/Select.vue
View File

@@ -72,8 +72,8 @@ export type SelectEmits = SelectRootEmits & {
type SlotProps<T> = (props: { item: T, index: number }) => any
export interface SelectSlots<T> {
'leading'(props: { modelValue: string, open: boolean }): any
'trailing'(props: { modelValue: string, open: boolean }): any
'leading'(props: { modelValue: string, open: boolean, ui: any }): any
'trailing'(props: { modelValue: string, open: boolean, ui: any }): any
'item': SlotProps<T>
'item-leading': SlotProps<T>
'item-label': SlotProps<T>
@@ -118,6 +118,7 @@ const ui = computed(() => tv({ extend: select, slots: props.ui })({
const groups = computed(() => props.items?.length ? (Array.isArray(props.items[0]) ? props.items : [props.items]) as SelectItem[][] : [])
function onUpdate(value: any) {
// @ts-expect-error - 'target' does not exist in type 'EventInit'
const event = new Event('change', { target: { value } })
emits('change', event)
@@ -148,7 +149,7 @@ function onUpdateOpen(value: boolean) {
>
<SelectTrigger :class="ui.base({ class: props.class })">
<span v-if="isLeading || !!slots.leading" :class="ui.leading()">
<slot name="leading" :model-value="modelValue" :open="open">
<slot name="leading" :model-value="modelValue" :open="open" :ui="ui">
<UIcon v-if="leadingIconName" :name="leadingIconName" :class="ui.leadingIcon()" />
</slot>
</span>
@@ -156,7 +157,7 @@ function onUpdateOpen(value: boolean) {
<SelectValue :placeholder="placeholder ?? '&nbsp;'" :class="ui.value()" />
<span v-if="isTrailing || !!slots.trailing" :class="ui.trailing()">
<slot name="trailing" :model-value="modelValue" :open="open">
<slot name="trailing" :model-value="modelValue" :open="open" :ui="ui">
<UIcon v-if="trailingIconName" :name="trailingIconName" :class="ui.trailingIcon()" />
</slot>
</span>
@@ -174,11 +175,11 @@ function onUpdateOpen(value: boolean) {
<SelectItem v-else :class="ui.item()" :disabled="item.disabled" :value="typeof item === 'object' ? item.value : item">
<slot name="item" :item="(item as T)" :index="index">
<slot name="item-leading" :item="(item as T)" :index="index">
<UAvatar v-if="item.avatar" size="2xs" v-bind="item.avatar" :class="ui.itemLeadingAvatar()" />
<UAvatar v-if="item.avatar" :size="(ui.itemLeadingAvatarSize() as AvatarProps['size'])" v-bind="item.avatar" :class="ui.itemLeadingAvatar()" />
<UIcon v-else-if="item.icon" :name="item.icon" :class="ui.itemLeadingIcon()" />
<UChip
v-else-if="item.chip"
size="md"
:size="(ui.itemLeadingChipSize() as ChipProps['size'])"
inset
standalone
v-bind="item.chip"
@@ -196,7 +197,7 @@ function onUpdateOpen(value: boolean) {
<slot name="item-trailing" :item="(item as T)" :index="index" />
<SelectItemIndicator as-child>
<UIcon :name="selectedIcon || appConfig.ui.icons.check" :class="ui.itemTrailingSelectedIcon()" />
<UIcon :name="selectedIcon || appConfig.ui.icons.check" :class="ui.itemTrailingIcon()" />
</SelectItemIndicator>
</span>
</slot>

19
src/runtime/components/SelectMenu.vue
View File

@@ -81,9 +81,9 @@ export type SelectMenuEmits<T> = ComboboxRootEmits<T> & {
type SlotProps<T> = (props: { item: T, index: number }) => any
export type SelectMenuSlots<T> = {
'leading'(props: { modelValue: T, open: boolean }): any
'leading'(props: { modelValue: T, open: boolean, ui: any }): any
'default'(props: { modelValue: T, open: boolean }): any
'trailing'(props: { modelValue: T, open: boolean }): any
'trailing'(props: { modelValue: T, open: boolean, ui: any }): any
'empty'(props: { searchTerm?: string }): any
'item': SlotProps<T>
'item-leading': SlotProps<T>
@@ -119,12 +119,12 @@ const { emitFormBlur, emitFormInput, emitFormChange, size: formGroupSize, color,
const { orientation, size: buttonGroupSize } = useButtonGroup<InputProps>(props)
const { isLeading, isTrailing, leadingIconName, trailingIconName } = useComponentIcons(toRef(() => defu(props, { trailingIcon: appConfig.ui.icons.chevronDown })))
const inputSize = computed(() => buttonGroupSize.value || formGroupSize.value)
const selectSize = computed(() => buttonGroupSize.value || formGroupSize.value)
const ui = computed(() => tv({ extend: selectMenu, slots: props.ui })({
color: color.value,
variant: props.variant,
size: inputSize?.value,
size: selectSize?.value,
loading: props.loading,
leading: isLeading.value || !!slots.leading,
trailing: isTrailing.value || !!slots.trailing,
@@ -166,6 +166,7 @@ function filterFunction(items: ArrayOrWrapped<AcceptableValue>, searchTerm: stri
const groups = computed(() => props.items?.length ? (Array.isArray(props.items[0]) ? props.items : [props.items]) as SelectMenuItem[][] : [])
function onUpdate(value: any) {
// @ts-expect-error - 'target' does not exist in type 'EventInit'
const event = new Event('change', { target: { value } })
emits('change', event)
emitFormChange()
@@ -201,7 +202,7 @@ function onUpdateOpen(value: boolean) {
<ComboboxAnchor as-child>
<ComboboxTrigger :class="ui.base({ class: props.class })" tabindex="0">
<span v-if="isLeading || !!slots.leading" :class="ui.leading()">
<slot name="leading" :model-value="(modelValue as T)" :open="open">
<slot name="leading" :model-value="(modelValue as T)" :open="open" :ui="ui">
<UIcon v-if="leadingIconName" :name="leadingIconName" :class="ui.leadingIcon()" />
</slot>
</span>
@@ -216,7 +217,7 @@ function onUpdateOpen(value: boolean) {
</slot>
<span v-if="isTrailing || !!slots.trailing" :class="ui.trailing()">
<slot name="trailing" :model-value="(modelValue as T)" :open="open">
<slot name="trailing" :model-value="(modelValue as T)" :open="open" :ui="ui">
<UIcon v-if="trailingIconName" :name="trailingIconName" :class="ui.trailingIcon()" />
</slot>
</span>
@@ -245,11 +246,11 @@ function onUpdateOpen(value: boolean) {
<ComboboxItem v-else :class="ui.item()" :disabled="item.disabled" :value="item">
<slot name="item" :item="(item as T)" :index="index">
<slot name="item-leading" :item="(item as T)" :index="index">
<UAvatar v-if="item.avatar" size="2xs" v-bind="item.avatar" :class="ui.itemLeadingAvatar()" />
<UAvatar v-if="item.avatar" :size="(ui.itemLeadingAvatarSize() as AvatarProps['size'])" v-bind="item.avatar" :class="ui.itemLeadingAvatar()" />
<UIcon v-else-if="item.icon" :name="item.icon" :class="ui.itemLeadingIcon()" />
<UChip
v-else-if="item.chip"
size="md"
:size="(ui.itemLeadingChipSize() as ChipProps['size'])"
inset
standalone
v-bind="item.chip"
@@ -267,7 +268,7 @@ function onUpdateOpen(value: boolean) {
<slot name="item-trailing" :item="(item as T)" :index="index" />
<ComboboxItemIndicator as-child>
<UIcon :name="selectedIcon || appConfig.ui.icons.check" :class="ui.itemTrailingSelectedIcon()" />
<UIcon :name="selectedIcon || appConfig.ui.icons.check" :class="ui.itemTrailingIcon()" />
</ComboboxItemIndicator>
</span>
</slot>

1
src/runtime/components/Slider.vue
View File

@@ -84,6 +84,7 @@ const ui = computed(() => tv({ extend: slider, slots: props.ui })({
}))
function onChange(value: any) {
// @ts-expect-error - 'target' does not exist in type 'EventInit'
const event = new Event('change', { target: { value } })
emits('change', event)
emitFormChange()

1
src/runtime/components/Switch.vue
View File

@@ -76,6 +76,7 @@ const ui = computed(() => tv({ extend: switchTv, slots: props.ui })({
}))
function onUpdate(value: any) {
// @ts-expect-error - 'target' does not exist in type 'EventInit'
const event = new Event('change', { target: { value } })
emits('change', event)
emitFormChange()