From 53755da8359d8d5ffa4426b4f696489ebbe51f47 Mon Sep 17 00:00:00 2001 From: Benjamin Canac Date: Mon, 18 Mar 2024 11:31:29 +0100 Subject: [PATCH] fix(Button): extend now works with compound variants --- src/runtime/components/Button.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/runtime/components/Button.vue b/src/runtime/components/Button.vue index 681166ff..3f59ecb7 100644 --- a/src/runtime/components/Button.vue +++ b/src/runtime/components/Button.vue @@ -55,9 +55,7 @@ const linkProps = useForwardProps(reactiveOmit(props, 'type', 'label', 'color', const isLeading = computed(() => (props.icon && props.leading) || (props.icon && !props.trailing) || (props.loading && !props.trailing && !props.trailingIcon) || !!props.leadingIcon) const isTrailing = computed(() => (props.icon && props.trailing) || (props.loading && props.trailing) || !!props.trailingIcon) -// FIXME: Cannot extend multiple times: https://github.com/nextui-org/tailwind-variants/issues/168 -// const ui = computed(() => tv({ extend: button, slots: props.ui })({ -const ui = computed(() => button({ +const ui = computed(() => tv({ extend: button, slots: props.ui })({ color: props.color, variant: props.variant, size: props.size,