Skip to content
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

Jump to bottom

fix(comp:button): the radius of button group always hidden #1290

Merged
merged 1 commit into from
Nov 21, 2022
Merged

fix(comp:button): the radius of button group always hidden #1290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion packages/components/button/__tests__/__snapshots__/buttonGroup.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Vitest Snapshot v1

exports[`ButtonGroup > render work 1`] = `
"<div class=\\"ix-space ix-button-group\\" style=\\"margin-bottom: -0px;\\">
"<div class=\\"ix-space ix-button-group ix-button-group-compact\\" style=\\"margin-bottom: -0px;\\">
<div class=\\"ix-space-item\\" style=\\"margin-right: 0px; padding-bottom: 0px;\\"><button class=\\"ix-button ix-button-default ix-button-md\\" type=\\"button\\"><span>default</span></button></div>
<div class=\\"ix-space-item\\" style=\\"margin-right: 0px; padding-bottom: 0px;\\"><button class=\\"ix-button ix-button-primary ix-button-md\\" type=\\"button\\"><span>primary</span></button></div>
<div class=\\"ix-space-item\\" style=\\"margin-right: 0px; padding-bottom: 0px;\\"><button class=\\"ix-button ix-button-default ix-button-lg\\" type=\\"button\\"><span>large</span></button></div>
Expand Down
8 changes: 4 additions & 4 deletions packages/components/button/__tests__/buttonGroup.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@ describe('ButtonGroup', () => {
test('gap work', async () => {
const wrapper = ButtonGroupMount({ props: { gap: 12 } })

expect(wrapper.classes()).toContain('ix-button-group-with-gap')
expect(wrapper.classes()).not.toContain('ix-button-group-compact')

await wrapper.setProps({ gap: 0 })

expect(wrapper.classes()).not.toContain('ix-button-group-with-gap')
expect(wrapper.classes()).toContain('ix-button-group-compact')

await wrapper.setProps({ gap: '0' })

expect(wrapper.classes()).not.toContain('ix-button-group-with-gap')
expect(wrapper.classes()).toContain('ix-button-group-compact')

await wrapper.setProps({ gap: '' })

expect(wrapper.classes()).not.toContain('ix-button-group-with-gap')
expect(wrapper.classes()).toContain('ix-button-group-compact')
})

test('mode work', async () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/components/button/demo/Group.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<template>
<IxSpace>
<IxButtonGroup>
<IxButton block>Default</IxButton>
<IxButton>Default</IxButton>
<IxButton icon="setting" shape="square"></IxButton>
</IxButtonGroup>
<IxButtonGroup>
<IxButton block>Default</IxButton>
<IxButton>Default</IxButton>
<IxButton icon="down" shape="square"></IxButton>
</IxButtonGroup>
</IxSpace>
Expand Down
2 changes: 1 addition & 1 deletion packages/components/button/src/ButtonGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default defineComponent({
const prefixCls = mergedPrefixCls.value
return normalizeClass({
[prefixCls]: true,
[`${prefixCls}-with-gap`]: !!gap && gap !== '0',
[`${prefixCls}-compact`]: !gap || gap === '0',
})
})

Expand Down
2 changes: 1 addition & 1 deletion packages/components/button/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export const buttonGroupProps = {
} as const

export type ButtonGroupProps = ExtractInnerPropTypes<typeof buttonGroupProps>
export type ButtonGroupPublicProps = ExtractPublicPropTypes<typeof buttonGroupProps> & SpaceProps
export type ButtonGroupPublicProps = ExtractPublicPropTypes<typeof buttonGroupProps> & Omit<SpaceProps, 'size'>
export type ButtonGroupComponent = DefineComponent<
Omit<HTMLAttributes, keyof ButtonGroupPublicProps> & ButtonGroupPublicProps
>
Expand Down
24 changes: 14 additions & 10 deletions packages/components/button/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,6 @@
}

.@{button-prefix}-group {
position: relative;
display: inline-flex;
align-items: center;

.@{button-prefix} {
z-index: auto;

Expand All @@ -314,15 +310,23 @@
}
}

&:not(&-with-gap) {
.@{button-prefix} {
&-compact {
.@{space-prefix}-item:first-child .@{button-prefix} {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}

.@{space-prefix}-item:last-child .@{button-prefix} {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}

.@{space-prefix}-item:not(:first-child):not(:last-child) .@{button-prefix} {
border-radius: 0;
}

.@{space-prefix}-item:not(:first-child) {
.@{button-prefix} {
margin-left: -1px;
}
.@{space-prefix}-item:not(:last-child) .@{button-prefix} {
margin-right: -1px;
}
}
}