From e3cc7cf901af0ecf476817b270139dcacf29bd89 Mon Sep 17 00:00:00 2001 From: "Aymane D. Hlamnach" Date: Sat, 11 Jan 2025 17:23:37 +0100 Subject: [PATCH] fix: slottable button --- .../src/components/button/button.vue | 31 ++++++------------- .../src/components/button/link-button.vue | 4 +-- .../button/stories/button.stories.ts | 4 +-- 3 files changed, 14 insertions(+), 25 deletions(-) diff --git a/packages/celeste-vue/src/components/button/button.vue b/packages/celeste-vue/src/components/button/button.vue index e6b504b..dbc8d80 100644 --- a/packages/celeste-vue/src/components/button/button.vue +++ b/packages/celeste-vue/src/components/button/button.vue @@ -7,7 +7,6 @@ const props = withDefaults(defineProps(), { size: 'md', variant: 'fill', type: 'primary', - iconPosition: 'trailing', as: 'button', }); @@ -18,9 +17,6 @@ export interface ButtonProps extends PrimitiveProps { size?: 'xxs' | 'xs' | 'sm' | 'md'; type?: 'primary' | 'neutral' | 'error'; variant?: 'fill' | 'stroke' | 'lighter' | 'ghost'; - iconPosition?: 'leading' | 'trailing'; - icon?: string; - label?: string; } @@ -35,11 +31,8 @@ export interface ButtonProps extends PrimitiveProps { `celeste-button-variant-${variant}`, props.class, )" - :role="as === 'a' ? 'link' : 'button'" > - - {{ label }} - + @@ -51,25 +44,25 @@ $size-map: ( height: 28px, border-radius: var(--radius-8), padding: var(--spacing-4) var(--spacing-6), - gap: var(--spacing-2), + gap: var(--spacing-4), ), 'xs': ( height: 32px, border-radius: var(--radius-8), - padding: var(--spacing-6), - gap: var(--spacing-2), + padding: var(--spacing-6) var(--spacing-8), + gap: var(--spacing-4), ), 'sm': ( height: 36px, border-radius: var(--radius-8), - padding: var(--spacing-8), - gap: var(--spacing-4), + padding: var(--spacing-8) var(--spacing-10), + gap: var(--spacing-6), ), 'md': ( height: 40px, border-radius: var(--radius-10), - padding: var(--spacing-10), - gap: var(--spacing-4), + padding: var(--spacing-10) var(--spacing-12), + gap: var(--spacing-6), ), ); $type-map: ( @@ -232,6 +225,7 @@ $hover-map: ( border: none; border: 1px solid transparent; background-color: transparent; + font: var(--label-sm); text-decoration: none; cursor: pointer; @@ -241,12 +235,7 @@ $hover-map: ( cursor: default; } - span { - padding: 0 4px; - font: var(--label-sm); - } - - i { + :deep(i) { width: 20px; height: 20px; } diff --git a/packages/celeste-vue/src/components/button/link-button.vue b/packages/celeste-vue/src/components/button/link-button.vue index 2ef11c1..5ca9849 100644 --- a/packages/celeste-vue/src/components/button/link-button.vue +++ b/packages/celeste-vue/src/components/button/link-button.vue @@ -71,7 +71,7 @@ export interface LinkButtonProps extends PrimitiveProps { height: 20px; font: var(--label-sm); - i { + :deep(i) { width: 20px; height: 20px; } @@ -81,7 +81,7 @@ export interface LinkButtonProps extends PrimitiveProps { height: 16px; font: var(--label-xs); - i { + :deep(i) { width: 16px; height: 16px; } diff --git a/packages/celeste-vue/src/components/button/stories/button.stories.ts b/packages/celeste-vue/src/components/button/stories/button.stories.ts index c6870da..b278e8d 100644 --- a/packages/celeste-vue/src/components/button/stories/button.stories.ts +++ b/packages/celeste-vue/src/components/button/stories/button.stories.ts @@ -12,8 +12,6 @@ type Story = StoryObj; export const Default: Story = { args: { - label: 'Button', - icon: 'i-celeste-arrow-right-s-line', size: 'md', type: 'primary', }, @@ -25,6 +23,8 @@ export const Default: Story = { }, template: ` `, }),