feat(Button): add xs Button size (#663)

gravity-ui · May 15, 2023 · efbe9fc · efbe9fc
1 parent 230aa8b
commit efbe9fc
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 10 deletions.
diff --git a/src/components/Button/Button.scss b/src/components/Button/Button.scss
@@ -85,6 +85,30 @@ $block: '.#{variables.$ns}button';
     }
 
     &_size {
+        &_xs {
+            --yc-button-height: 20px;
+
+            font-size: 13px;
+
+            #{$block}__text {
+                margin: 0 6px;
+            }
+
+            #{$block}__icon {
+                width: var(--yc-button-height);
+
+                &_side_left ~ #{$block}__text {
+                    margin-left: 18px;
+                }
+
+                &_side_right ~ #{$block}__text {
+                    margin-right: 18px;
+                }
+            }
+
+            --yc-button-border-radius: var(--yc-border-radius-xs);
+        }
+
         &_s {
             --yc-button-height: 24px;
 

diff --git a/src/components/Button/Button.tsx b/src/components/Button/Button.tsx
@@ -23,7 +23,7 @@ export type ButtonView =
     | 'outlined-contrast' // outlined button appearance with contrast background
     | 'flat-contrast'; // flat button appearance with contrast background
 
-export type ButtonSize = 's' | 'm' | 'l' | 'xl';
+export type ButtonSize = 'xs' | 's' | 'm' | 'l' | 'xl';
 
 export type ButtonPin =
     | 'round-round'

diff --git a/src/components/Button/README.md b/src/components/Button/README.md
@@ -82,7 +82,7 @@ type ButtonView =
   | 'outlined-contrast'
   | 'flat-contrast';
 
-type ButtonSize = 's' | 'm' | 'l' | 'xl';
+type ButtonSize = 'xs' | 's' | 'm' | 'l' | 'xl';
 
 type ButtonPin =
   | 'round-round'

diff --git a/src/components/Button/__stories__/Button.new.stories.tsx b/src/components/Button/__stories__/Button.new.stories.tsx
@@ -29,7 +29,7 @@ export default {
             defaultValue: 'normal',
         },
         size: {
-            options: ['s', 'm', 'l', 'xl'],
+            options: ['xs', 's', 'm', 'l', 'xl'],
             control: {type: 'radio'},
             defaultValue: 'm',
         },

diff --git a/src/components/Button/__stories__/Button.stories.tsx b/src/components/Button/__stories__/Button.stories.tsx
@@ -15,6 +15,10 @@ export const Default = DefaultTemplate.bind({});
 
 const SizeTemplate: Story<ButtonProps> = (args) => (
     <>
+        <Button {...args} size="xs">
+            Size xs
+        </Button>
+        <span style={{margin: '16px'}} />
         <Button {...args} size="s">
             Size s
         </Button>

diff --git a/src/components/Button/__stories__/ButtonShowcase.tsx b/src/components/Button/__stories__/ButtonShowcase.tsx
@@ -16,6 +16,8 @@ export function ButtonShowcase() {
             {renderViewGrid()}
             <ShowcaseItem title="size">
                 <p>
+                    <Button size="xs">Size xs</Button>
+                    <span style={{margin: '8px'}} />
                     <Button size="s">Size s</Button>
                     <span style={{margin: '8px'}} />
                     <Button size="m">Size m</Button>

diff --git a/src/components/Button/__stories__/examples/ButtonExampleView/ButtonExampleView.tsx b/src/components/Button/__stories__/examples/ButtonExampleView/ButtonExampleView.tsx
@@ -238,6 +238,7 @@ export function ButtonExampleState() {
 export function ButtonExampleSize() {
     return (
         <DocsExample gap="l" space="l">
+            <Button size="xs">XS-size</Button>
             <Button size="s">S-size</Button>
             <Button size="m">M-size</Button>
             <Button size="l">L-size</Button>

diff --git a/src/components/Button/__tests__/Button.test.tsx b/src/components/Button/__tests__/Button.test.tsx
@@ -48,12 +48,15 @@ describe('Button', () => {
         expect(button).not.toBeDisabled();
     });
 
-    test.each(new Array<ButtonSize>('s', 'm', 'l', 'xl'))('render with given "%s" size', (size) => {
-        render(<Button size={size} qa={qaId} />);
-        const button = screen.getByTestId(qaId);
+    test.each(new Array<ButtonSize>('xs', 's', 'm', 'l', 'xl'))(
+        'render with given "%s" size',
+        (size) => {
+            render(<Button size={size} qa={qaId} />);
+            const button = screen.getByTestId(qaId);
 
-        expect(button).toHaveClass(`yc-button_size_${size}`);
-    });
+            expect(button).toHaveClass(`yc-button_size_${size}`);
+        },
+    );
 
     test.each(new Array<ButtonView>(...buttonViews))('render with given "%s" view', (view) => {
         render(<Button view={view} qa={qaId} />);

diff --git a/src/components/Table/hoc/withTableActions/withTableActions.tsx b/src/components/Table/hoc/withTableActions/withTableActions.tsx
@@ -3,7 +3,7 @@ import _memoize from 'lodash/memoize';
 import {block} from '../../../utils/cn';
 import {getComponentName} from '../../../utils/getComponentName';
 import {Icon} from '../../../Icon';
-import {Button, ButtonSize} from '../../../Button';
+import {Button} from '../../../Button';
 import {Popup} from '../../../Popup';
 import {Menu, MenuItemProps} from '../../../Menu';
 import {DotsIcon} from '../../../icons/DotsIcon';
@@ -52,9 +52,14 @@ export interface TableActionGroup<I> {
 
 export type TableActionConfig<I> = TableAction<I> | TableActionGroup<I>;
 
+/**
+ * common sizes for Menu and Button
+ */
+export type TableRowActionsSize = 's' | 'm' | 'l' | 'xl';
+
 export interface WithTableActionsProps<I> {
     getRowActions: (item: I, index: number) => TableActionConfig<I>[];
-    rowActionsSize?: ButtonSize;
+    rowActionsSize?: TableRowActionsSize;
 }
 
 interface WithTableActionsState<I> {