Skip to content

feat(Button): add ui to slots leading and trailing #4823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: v4
Choose a base branch
from
+4 −4
Open

feat(Button): add ui to slots leading and trailing #4823

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c61ab6
feat: restore
Barbapapazes Sep 6, 2025
1104713
Merge branch 'v4' into feat/button-ui-leading-trailing
Barbapapazes Sep 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/runtime/components/Button.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ export interface ButtonProps extends UseComponentIconsProps, Omit<LinkProps, 'ra
}

export interface ButtonSlots {
leading(props?: {}): any
leading(props?: { ui: Button['slots'] }): any
default(props?: {}): any
trailing(props?: {}): any
trailing(props?: { ui: Button['slots'] }): any
Comment on lines +38 to +40
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you need this to have correct types:

Suggested change
leading(props?: { ui: Button['slots'] }): any
default(props?: {}): any
trailing(props?: {}): any
trailing(props?: { ui: Button['slots'] }): any
leading(props: { ui: { [K in keyof Required<Button['slots']>]: (props?: Record<string, any>) => string } }): any
default(props?: {}): any
trailing(props: { ui: { [K in keyof Required<Button['slots']>]: (props?: Record<string, any>) => string } }): any

}
</script>

Expand Down Expand Up @@ -132,7 +132,7 @@ const ui = computed(() => tv({
})"
@click="onClickWrapper"
>
<slot name="leading">
<slot name="leading" :ui="ui">
<UIcon v-if="isLeading && leadingIconName" :name="leadingIconName" :class="ui.leadingIcon({ class: props.ui?.leadingIcon, active })" />
<UAvatar v-else-if="!!avatar" :size="((props.ui?.leadingAvatarSize || ui.leadingAvatarSize()) as AvatarProps['size'])" v-bind="avatar" :class="ui.leadingAvatar({ class: props.ui?.leadingAvatar, active })" />
</slot>
Expand All @@ -143,7 +143,7 @@ const ui = computed(() => tv({
</span>
</slot>

<slot name="trailing">
<slot name="trailing" :ui="ui">
<UIcon v-if="isTrailing && trailingIconName" :name="trailingIconName" :class="ui.trailingIcon({ class: props.ui?.trailingIcon, active })" />
</slot>
</ULinkBase>
Expand Down
Loading