From d4e3ab606b19337c33e541ae399466ba8551e898 Mon Sep 17 00:00:00 2001 From: Benjamin Canac Date: Sat, 12 Aug 2023 18:18:09 +0200 Subject: [PATCH] fix(ButtonGroup): switch back to `ui` prop --- src/runtime/components/elements/ButtonGroup.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/runtime/components/elements/ButtonGroup.ts b/src/runtime/components/elements/ButtonGroup.ts index 494bc3d7ad..142d08117d 100644 --- a/src/runtime/components/elements/ButtonGroup.ts +++ b/src/runtime/components/elements/ButtonGroup.ts @@ -52,17 +52,18 @@ export default defineComponent({ vProps.size = props.size } - const classes = ['shadow-none', 'rounded-none'] + vProps.ui = node.props?.ui || {} + vProps.ui.rounded = 'rounded-none' + vProps.ui.base = '!shadow-none' + if (index === 0) { - classes.push(rounded.value.left) + vProps.ui.rounded += ` ${rounded.value.left}` } + if (index === children.value.length - 1) { - classes.push(rounded.value.right) + vProps.ui.rounded += ` ${rounded.value.right}` } - vProps.class = node.props?.class || '' - vProps.class = twMerge(twJoin(...classes), vProps.class) - return cloneVNode(node, vProps) }))