From bf61ba93fed2b19b6a39dca2b99b77595299a986 Mon Sep 17 00:00:00 2001 From: Johnny Bouder Date: Mon, 26 Aug 2024 15:25:55 -0400 Subject: [PATCH 1/3] Update button to provide big variant through size prop. Update tests and stories. --- .../src/components/button/button.stories.tsx | 2 ++ .../comet-uswds/src/components/button/button.test.tsx | 10 +++++----- packages/comet-uswds/src/components/button/button.tsx | 8 ++++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/packages/comet-uswds/src/components/button/button.stories.tsx b/packages/comet-uswds/src/components/button/button.stories.tsx index 93bcae6d..44f1b0d1 100644 --- a/packages/comet-uswds/src/components/button/button.stories.tsx +++ b/packages/comet-uswds/src/components/button/button.stories.tsx @@ -10,6 +10,7 @@ const meta: Meta = { id: { required: true }, type: { control: 'select', required: true }, variant: { control: 'select' }, + size: { control: 'select' }, disabled: { control: 'boolean' }, }, }; @@ -22,6 +23,7 @@ Default.args = { id: 'button-1', type: 'button', variant: 'default', + size: 'default', className: '', disabled: false, }; diff --git a/packages/comet-uswds/src/components/button/button.test.tsx b/packages/comet-uswds/src/components/button/button.test.tsx index 2bfae63f..cb7a48e2 100644 --- a/packages/comet-uswds/src/components/button/button.test.tsx +++ b/packages/comet-uswds/src/components/button/button.test.tsx @@ -43,16 +43,16 @@ describe('Button', () => { expect(screen.getByTestId('button')).toHaveClass('usa-button--inverse'); }); - test('should render a big button', () => { - render(); - expect(screen.getByTestId('button')).toHaveClass('usa-button--big'); - }); - test('should render a unstyled button', () => { render(); expect(screen.getByTestId('button')).toHaveClass('usa-button--unstyled'); }); + test('should render a big button', () => { + render(); + expect(screen.getByTestId('button')).toHaveClass('usa-button--big'); + }); + test('should render a button with custom className', () => { render(); expect(screen.getByTestId('button')).toHaveClass('usa-custom'); diff --git a/packages/comet-uswds/src/components/button/button.tsx b/packages/comet-uswds/src/components/button/button.tsx index 5e31d1ea..6ec319cf 100644 --- a/packages/comet-uswds/src/components/button/button.tsx +++ b/packages/comet-uswds/src/components/button/button.tsx @@ -21,8 +21,11 @@ export interface ButtonProps { | 'base' | 'outline' | 'outline-inverse' - | 'big' | 'unstyled'; + /** + * The size of the tag + */ + size?: 'default' | 'big'; /** * A custom class to apply to the component */ @@ -44,6 +47,7 @@ export const Button = ({ id, type = 'button', variant = 'default', + size = 'default', className, children, ...props @@ -57,8 +61,8 @@ export const Button = ({ 'usa-button--base': variant === 'base', 'usa-button--outline': variant === 'outline', 'usa-button--outline usa-button--inverse': variant === 'outline-inverse', - 'usa-button--big': variant === 'big', 'usa-button--unstyled': variant === 'unstyled', + 'usa-button--big': size === 'big', }, className, ); From 18d32efc736980c91d7ba68f297a918d81422c8f Mon Sep 17 00:00:00 2001 From: Johnny Bouder Date: Mon, 26 Aug 2024 15:26:25 -0400 Subject: [PATCH 2/3] Update comet-uswds to next minor version. --- package-lock.json | 2 +- packages/comet-uswds/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index ddca942b..c02d05d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14395,7 +14395,7 @@ }, "packages/comet-uswds": { "name": "@metrostar/comet-uswds", - "version": "3.0.1", + "version": "3.1.0", "license": "Apache-2.0", "dependencies": { "@uswds/uswds": "3.8.2", diff --git a/packages/comet-uswds/package.json b/packages/comet-uswds/package.json index d056abc5..0daf4f83 100644 --- a/packages/comet-uswds/package.json +++ b/packages/comet-uswds/package.json @@ -1,6 +1,6 @@ { "name": "@metrostar/comet-uswds", - "version": "3.0.1", + "version": "3.1.0", "description": "React with TypeScript Component Library based on USWDS 3.0.", "license": "Apache-2.0", "main": "./dist/cjs/index.js", From 40f2189efb48d4b9b30145e907c908be44a99be0 Mon Sep 17 00:00:00 2001 From: Johnny Bouder Date: Mon, 26 Aug 2024 15:31:22 -0400 Subject: [PATCH 3/3] Update size docs. --- packages/comet-uswds/src/components/button/button.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/comet-uswds/src/components/button/button.tsx b/packages/comet-uswds/src/components/button/button.tsx index 6ec319cf..1756ee90 100644 --- a/packages/comet-uswds/src/components/button/button.tsx +++ b/packages/comet-uswds/src/components/button/button.tsx @@ -23,7 +23,7 @@ export interface ButtonProps { | 'outline-inverse' | 'unstyled'; /** - * The size of the tag + * The size of the button */ size?: 'default' | 'big'; /**