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

chore(components): missing some props.ui merging

Browse Source
This commit is contained in:
Benjamin Canac
2024-09-17 11:25:16 +02:00
parent d0a669ee2e
commit 2346f52cbf
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,7 +90,7 @@ const ui = computed(() => button({
<ULink <ULink
:type="type" :type="type"
:disabled="disabled || isLoading" :disabled="disabled || isLoading"
:class="ui.base({ class: props.class })" :class="ui.base({ class: [props.class, props.ui?.base] })"
v-bind="linkProps" v-bind="linkProps"
raw raw
@click="onClickWrapper" @click="onClickWrapper"

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

@@ -161,7 +161,7 @@ function onUpdateOpen(value: boolean) {
@update:model-value="onUpdate" @update:model-value="onUpdate"
@update:open="onUpdateOpen" @update:open="onUpdateOpen"
> >
<SelectTrigger :class="ui.base({ class: props.class })"> <SelectTrigger :class="ui.base({ class: [props.class, props.ui?.base] })">
<span v-if="isLeading || !!slots.leading" :class="ui.leading({ class: props.ui?.leading })"> <span v-if="isLeading || !!slots.leading" :class="ui.leading({ class: props.ui?.leading })">
<slot name="leading" :model-value="modelValue" :open="open" :ui="ui"> <slot name="leading" :model-value="modelValue" :open="open" :ui="ui">
<UIcon v-if="leadingIconName" :name="leadingIconName" :class="ui.leadingIcon({ class: props.ui?.leadingIcon })" /> <UIcon v-if="leadingIconName" :name="leadingIconName" :class="ui.leadingIcon({ class: props.ui?.leadingIcon })" />

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

@@ -219,7 +219,7 @@ function onUpdateOpen(value: boolean) {
@update:open="onUpdateOpen" @update:open="onUpdateOpen"
> >
<ComboboxAnchor as-child> <ComboboxAnchor as-child>
<ComboboxTrigger :class="ui.base({ class: props.class })" tabindex="0"> <ComboboxTrigger :class="ui.base({ class: [props.class, props.ui?.base] })" tabindex="0">
<span v-if="isLeading || !!slots.leading" :class="ui.leading({ class: props.ui?.leading })"> <span v-if="isLeading || !!slots.leading" :class="ui.leading({ class: props.ui?.leading })">
<slot name="leading" :model-value="(modelValue as T)" :open="open" :ui="ui"> <slot name="leading" :model-value="(modelValue as T)" :open="open" :ui="ui">
<UIcon v-if="leadingIconName" :name="leadingIconName" :class="ui.leadingIcon({ class: props.ui?.leadingIcon })" /> <UIcon v-if="leadingIconName" :name="leadingIconName" :class="ui.leadingIcon({ class: props.ui?.leadingIcon })" />

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

@@ -115,7 +115,7 @@ function getOffset(index: number) {
<ToastViewport <ToastViewport
:data-expanded="expanded" :data-expanded="expanded"
:class="ui.viewport({ class: props.class })" :class="ui.viewport({ class: [props.class, props.ui?.viewport] })"
:style="{ :style="{
'--scale-factor': '0.05', '--scale-factor': '0.05',
'--translate-factor': position?.startsWith('top') ? '1px' : '-1px', '--translate-factor': position?.startsWith('top') ? '1px' : '-1px',