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

feat(VaButton): updated button size props to accept px values #4240

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

feat(VaButton): updated button size props to accept px values #4240

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
11 changes: 11 additions & 0 deletions packages/ui/src/components/va-button/VaButton.demo.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,17 @@
</td>
</tr>

<tr>
<td>Px sizes</td>
<td>
<va-button :size="16">16px</va-button>
<va-button :size="24">24px</va-button>
<va-button :size="32">32px</va-button>
<va-button :size="48">48px</va-button>
<va-button :size="56">56px</va-button>
</td>
</tr>

<tr>
<td>With icons</td>
<td>
Expand Down
78 changes: 74 additions & 4 deletions packages/ui/src/components/va-button/VaButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,10 @@ const props = defineProps({
plain: { type: Boolean, default: false },
round: { type: Boolean, default: false },
size: {
type: String as PropType<'small' | 'medium' | 'large'>,
type: [String, Number] as PropType<'small' | 'medium' | 'large' | number>,
default: 'medium',
validator: (v: string) => ['small', 'medium', 'large'].includes(v),
validator: (v: string | number) => ['small', 'medium', 'large'].includes(v as string) || typeof v === 'number',
},

icon: { type: String, default: '' },
iconRight: { type: String, default: '' },
iconColor: { type: String, default: '' },
Expand Down Expand Up @@ -156,6 +155,7 @@ const computedClass = useBem('va-button', () => ({
iconOnly: isOnlyIcon.value,
leftIcon: !isOnlyIcon.value && !!props.icon && !props.iconRight,
rightIcon: !isOnlyIcon.value && !props.icon && !!props.iconRight,
px: typeof props.size === 'number',
}))

// styles
Expand All @@ -170,9 +170,29 @@ const {
} = useButtonBackground(colorComputed, isPressed, isHovered)
const contentColorComputed = useButtonTextColor(textColorComputed, colorComputed, isPressed, isHovered)

const computedPxSizeStyle = computed(() => {
if (typeof props.size === 'number') {
return {
'--va-button-px-size': `${props.size}px`,
Copy link
Collaborator

Choose a reason for hiding this comment

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

@Fsss126, please, review this logic and how it can be applied to sizes config.

Copy link
Contributor

Choose a reason for hiding this comment

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

We have a size config refactoring in progress that would provide a more generalized way to solve cases like this one and make and desired customizations in-place #4246.

I would suggest releasing that one first and see if a need to pass px values would make sense to support then.

'--va-button-px-content-py': `${props.size * 0.2}px`,
'--va-button-px-content-px': `${props.size * 0.3}px`,
'--va-button-px-only-icon-content-px': `${props.size * 0.2}px`,
'--va-button-px-font-size': `${props.size * 0.4}px`,
'--va-button-px-letter-spacing': `${props.size * 0}px`,
'--va-button-px-line-height': `${props.size * 0.5}px`,
'--va-button-px-border-radius': `${props.size * 0.1}px`,
'--va-button-px-icon-side-padding': `${props.size * 0.2}px`,
'--va-button-px-icon-spacing': `${props.size * 0.1}px`,
}
}

return {}
})

const computedStyle = computed(() => ({
borderColor: props.borderColor ? getColor(props.borderColor) : 'transparent',
...contentColorComputed.value,
...computedPxSizeStyle.value,
}))

defineExpose({
Expand Down Expand Up @@ -384,9 +404,59 @@ defineExpose({
}
}

&--px {
line-height: var(--va-button-px-line-height);
border-radius: var(--va-button-px-border-radius);
letter-spacing: var(--va-button-px-letter-spacing);
min-height: var(--va-button-px-size);
min-width: var(--va-button-px-size);

.va-button__content {
font-size: var(--va-button-px-font-size);
padding: var(--va-button-px-content-py) var(--va-button-px-content-px);
line-height: var(--va-button-px-line-height);
}

// set icons the same size as text
.va-button__left-icon,
.va-button__right-icon {
// font-size: var(--va-button-px-line-height) !important;
// height: var(--va-button-px-line-height) !important;
// line-height: var(--va-button-px-line-height) !important;
}

.va-button__left-icon {
margin-right: var(--va-button-px-icons-spacing);
}

.va-button__right-icon {
margin-left: var(--va-button-px-icons-spacing);
}

&.va-button--bordered {
.va-button__content {
padding-top: calc(var(--va-button-px-content-py) - var(--va-button-bordered-border));
padding-bottom: calc(var(--va-button-px-content-py) - var(--va-button-bordered-border));
}
}

&.va-button--left-icon {
.va-button__content {
padding-left: var(--va-button-px-icon-side-padding);
}
}

&.va-button--right-icon {
.va-button__content {
padding-right: var(--va-button-px-icon-side-padding);
}
}
}

&--small,
&--normal,
&--large {
&--large,
&--px {
&.va-button--icon-only {
.va-button__content {
padding-right: 0;
Expand Down