diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f4bc1c9d..81f1d3b7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -38,6 +38,7 @@ jobs: with: registry-url: https://registry.npmjs.org/ node-version-file: '.nvmrc' + token: ${{ secrets.VA_MOBILE_ROBOT_GITHUB_PAT }} - run: yarn install - name: Bump version and publish to NPM id: bump-version diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..7b3a351a --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,209 @@ +# Changelog + +## [Unreleased](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/HEAD) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.2.0...HEAD) + +**Merged pull requests:** + +- feature/6870-nr-vabutton [\#34](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/34) ([narin](https://github.com/narin)) + +## [components-v0.2.0](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.2.0) (2023-11-16) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.1.1-alpha.15...components-v0.2.0) + +## [components-v0.1.1-alpha.15](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.1.1-alpha.15) (2023-11-16) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.1.1-alpha.14...components-v0.1.1-alpha.15) + +## [components-v0.1.1-alpha.14](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.1.1-alpha.14) (2023-11-16) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.1.1-alpha.13...components-v0.1.1-alpha.14) + +## [components-v0.1.1-alpha.13](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.1.1-alpha.13) (2023-11-09) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.1.1-alpha.12...components-v0.1.1-alpha.13) + +## [components-v0.1.1-alpha.12](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.1.1-alpha.12) (2023-11-09) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.1.1-alpha.11...components-v0.1.1-alpha.12) + +## [components-v0.1.1-alpha.11](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.1.1-alpha.11) (2023-11-09) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.1.1-alpha.10...components-v0.1.1-alpha.11) + +## [components-v0.1.1-alpha.10](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.1.1-alpha.10) (2023-11-09) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.1.1-alpha.9...components-v0.1.1-alpha.10) + +## [components-v0.1.1-alpha.9](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.1.1-alpha.9) (2023-11-09) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.1.1-alpha.7...components-v0.1.1-alpha.9) + +## [components-v0.1.1-alpha.7](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.1.1-alpha.7) (2023-11-09) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/tokens-v0.2.0...components-v0.1.1-alpha.7) + +## [tokens-v0.2.0](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/tokens-v0.2.0) (2023-11-09) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/tokens-v0.1.1-alpha.1...tokens-v0.2.0) + +## [tokens-v0.1.1-alpha.1](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/tokens-v0.1.1-alpha.1) (2023-11-09) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.1.1-alpha.6...tokens-v0.1.1-alpha.1) + +## [components-v0.1.1-alpha.6](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.1.1-alpha.6) (2023-11-09) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/tokens-v0.1.1-alpha.0...components-v0.1.1-alpha.6) + +## [tokens-v0.1.1-alpha.0](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/tokens-v0.1.1-alpha.0) (2023-11-09) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.1.1-alpha.5...tokens-v0.1.1-alpha.0) + +**Merged pull requests:** + +- CU/6700-roettger-MobileLibraryPRTemplate [\#33](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/33) ([TimRoe](https://github.com/TimRoe)) + +## [components-v0.1.1-alpha.5](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.1.1-alpha.5) (2023-11-08) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.1.1-alpha.4...components-v0.1.1-alpha.5) + +**Merged pull requests:** + +- 6857-roettger-FixRNWebDeprecatedAttribsOnSegmentedControl [\#32](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/32) ([TimRoe](https://github.com/TimRoe)) +- 6989-roettger storybook missing dist folder locally [\#31](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/31) ([TimRoe](https://github.com/TimRoe)) + +## [components-v0.1.1-alpha.4](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.1.1-alpha.4) (2023-11-08) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.1.1-alpha.3...components-v0.1.1-alpha.4) + +## [components-v0.1.1-alpha.3](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.1.1-alpha.3) (2023-11-08) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.1.1-alpha.2...components-v0.1.1-alpha.3) + +## [components-v0.1.1-alpha.2](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.1.1-alpha.2) (2023-11-08) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.1.1-alpha.1...components-v0.1.1-alpha.2) + +## [components-v0.1.1-alpha.1](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.1.1-alpha.1) (2023-11-08) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.1.1-alpha.0...components-v0.1.1-alpha.1) + +## [components-v0.1.1-alpha.0](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.1.1-alpha.0) (2023-11-08) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/tokens-v0.1.0...components-v0.1.1-alpha.0) + +## [tokens-v0.1.0](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/tokens-v0.1.0) (2023-11-08) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/tokens-v0.0.13-alpha.3...tokens-v0.1.0) + +## [tokens-v0.0.13-alpha.3](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/tokens-v0.0.13-alpha.3) (2023-11-08) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/tokens-v0.0.13-alpha.2...tokens-v0.0.13-alpha.3) + +## [tokens-v0.0.13-alpha.2](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/tokens-v0.0.13-alpha.2) (2023-11-08) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/tokens-v0.0.13-alpha.0...tokens-v0.0.13-alpha.2) + +## [tokens-v0.0.13-alpha.0](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/tokens-v0.0.13-alpha.0) (2023-11-08) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/tokens-v0.0.12...tokens-v0.0.13-alpha.0) + +**Merged pull requests:** + +- Bump browserify-sign from 4.2.1 to 4.2.2 [\#30](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/30) ([dependabot[bot]](https://github.com/apps/dependabot)) +- Bump browserify-sign from 4.2.1 to 4.2.2 in /packages/components [\#29](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/29) ([dependabot[bot]](https://github.com/apps/dependabot)) +- GHA Release Workflow [\#28](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/28) ([narin](https://github.com/narin)) +- Bump @babel/traverse from 7.22.8 to 7.23.2 [\#27](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/27) ([dependabot[bot]](https://github.com/apps/dependabot)) + +## [tokens-v0.0.12](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/tokens-v0.0.12) (2023-10-27) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.0.31...tokens-v0.0.12) + +## [components-v0.0.31](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.0.31) (2023-10-27) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/tokens-v0.0.11-alpha.0...components-v0.0.31) + +## [tokens-v0.0.11-alpha.0](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/tokens-v0.0.11-alpha.0) (2023-10-26) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.0.31-alpha.2...tokens-v0.0.11-alpha.0) + +## [components-v0.0.31-alpha.2](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.0.31-alpha.2) (2023-10-26) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.0.31-alpha.1...components-v0.0.31-alpha.2) + +## [components-v0.0.31-alpha.1](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.0.31-alpha.1) (2023-10-26) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.0.31-alpha.0...components-v0.0.31-alpha.1) + +## [components-v0.0.31-alpha.0](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.0.31-alpha.0) (2023-10-26) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.0.30...components-v0.0.31-alpha.0) + +## [components-v0.0.30](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.0.30) (2023-10-26) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.0.29...components-v0.0.30) + +## [components-v0.0.29](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.0.29) (2023-10-26) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.0.28...components-v0.0.29) + +## [components-v0.0.28](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.0.28) (2023-10-26) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.0.27...components-v0.0.28) + +## [components-v0.0.27](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.0.27) (2023-10-26) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.0.27-beta.1...components-v0.0.27) + +## [components-v0.0.27-beta.1](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.0.27-beta.1) (2023-10-26) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.0.27-beta.0...components-v0.0.27-beta.1) + +## [components-v0.0.27-beta.0](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.0.27-beta.0) (2023-10-25) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.0.27-alpha.0...components-v0.0.27-beta.0) + +## [components-v0.0.27-alpha.0](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.0.27-alpha.0) (2023-10-25) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/components-v0.0.26...components-v0.0.27-alpha.0) + +## [components-v0.0.26](https://github.com/department-of-veterans-affairs/va-mobile-library/tree/components-v0.0.26) (2023-10-25) + +[Full Changelog](https://github.com/department-of-veterans-affairs/va-mobile-library/compare/bfe7f18051ff4723b5e7085061f9b2749690d10d...components-v0.0.26) + +**Closed issues:** + +- Error: GitHub Repository Not Mapped To eMASS System [\#5](https://github.com/department-of-veterans-affairs/va-mobile-library/issues/5) +- Error: GitHub Repository Not Mapped To eMASS System [\#4](https://github.com/department-of-veterans-affairs/va-mobile-library/issues/4) + +**Merged pull requests:** + +- Bump @babel/traverse from 7.22.8 to 7.23.2 in /packages/components [\#26](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/26) ([dependabot[bot]](https://github.com/apps/dependabot)) +- 6826 roettger segmented control storybook updates [\#25](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/25) ([TimRoe](https://github.com/TimRoe)) +- Added CI check to require checkboxes be complete [\#24](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/24) ([timwright12](https://github.com/timwright12)) +- Fix Storybook on Android [\#23](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/23) ([narin](https://github.com/narin)) +- 6507 roettger add segmented control unit tests [\#22](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/22) ([TimRoe](https://github.com/TimRoe)) +- Chore/6692 add nvm [\#21](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/21) ([timwright12](https://github.com/timwright12)) +- Adding workflow to run checks against the VA Mobile App [\#20](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/20) ([timwright12](https://github.com/timwright12)) +- Add testIDs prop to SegmentedControl [\#19](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/19) ([narin](https://github.com/narin)) +- Add style-dictionary and generate initial tokens [\#18](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/18) ([narin](https://github.com/narin)) +- Fix Storybook web [\#17](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/17) ([narin](https://github.com/narin)) +- Updated repo name assets [\#16](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/16) ([timwright12](https://github.com/timwright12)) +- Adding Storybook publishing workflow [\#15](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/15) ([timwright12](https://github.com/timwright12)) +- 6407-roettger-implementSegmentedControlToApp [\#14](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/14) ([TimRoe](https://github.com/TimRoe)) +- Automate Linting [\#13](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/13) ([narin](https://github.com/narin)) +- Adding npm publish workflow [\#12](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/12) ([timwright12](https://github.com/timwright12)) +- Storybook Docs template [\#11](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/11) ([narin](https://github.com/narin)) +- 6509-roettger-segmentedControlStorybook [\#10](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/10) ([TimRoe](https://github.com/TimRoe)) +- Added npm publish commands [\#9](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/9) ([timwright12](https://github.com/timwright12)) +- 6353-roettger-CreateSegmentedControl [\#8](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/8) ([TimRoe](https://github.com/TimRoe)) +- Figma Integration [\#7](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/7) ([narin](https://github.com/narin)) +- Storybook Initial Setup [\#6](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/6) ([narin](https://github.com/narin)) +- Action Required: Configure CodeQL [\#3](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/3) ([veterans-affairs-code-scanning](https://github.com/veterans-affairs-code-scanning)) +- 6266-roettger-repoFoundationalStructure [\#2](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/2) ([TimRoe](https://github.com/TimRoe)) +- Components automated tests [\#1](https://github.com/department-of-veterans-affairs/va-mobile-library/pull/1) ([narin](https://github.com/narin)) + + + +\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)* diff --git a/packages/components/package.json b/packages/components/package.json index fb7c29a6..ff3646cf 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@department-of-veterans-affairs/mobile-component-library", - "version": "0.2.0", + "version": "0.2.1", "description": "VA Design System Mobile Component Library", "main": "src/index.tsx", "scripts": { diff --git a/packages/components/src/components/Button/Button.stories.tsx b/packages/components/src/components/Button/Button.stories.tsx index 85587908..ea31b33b 100644 --- a/packages/components/src/components/Button/Button.stories.tsx +++ b/packages/components/src/components/Button/Button.stories.tsx @@ -16,7 +16,7 @@ const meta: Meta = { docs: generateDocs({ name: 'Button', docUrl: - 'https://department-of-veterans-affairs.github.io/va-mobile-app/docs/Flagship%20design%20library/Components/Buttons%20and%20Links/VAButton/', + 'https://department-of-veterans-affairs.github.io/va-mobile-app/design/Components/Buttons%20and%20links/Button', }), }, decorators: [ @@ -38,56 +38,56 @@ export default meta type Story = StoryObj -export const Base: Story = { - storyName: 'Base', +export const _Primary: Story = { + storyName: 'Primary', args: { - buttonType: ButtonVariants.Base, label: 'Button text', a11yLabel: 'Alternate a11y text', a11yHint: 'Descriptive text about this Button', }, } -export const BaseSecondary: Story = { - storyName: 'Base Secondary', +export const __Secondary: Story = { + storyName: 'Secondary', args: { - buttonType: ButtonVariants.BaseSecondary, + buttonType: ButtonVariants.Secondary, label: 'Button text', a11yLabel: 'Alternate a11y text', a11yHint: 'Descriptive text about this Button', }, } -export const Destructive: Story = { - storyName: 'Destructive', +export const ___Base: Story = { + storyName: 'Base Primary', args: { - buttonType: ButtonVariants.Destructive, + buttonType: ButtonVariants.Base, label: 'Button text', a11yLabel: 'Alternate a11y text', a11yHint: 'Descriptive text about this Button', }, } -export const Primary: Story = { - storyName: 'Primary', +export const ____BaseSecondary: Story = { + storyName: 'Base Secondary', args: { + buttonType: ButtonVariants.BaseSecondary, label: 'Button text', a11yLabel: 'Alternate a11y text', a11yHint: 'Descriptive text about this Button', }, } -export const Secondary: Story = { - storyName: 'Secondary', +export const _____Destructive: Story = { + storyName: 'Destructive', args: { - buttonType: ButtonVariants.Secondary, + buttonType: ButtonVariants.Destructive, label: 'Button text', a11yLabel: 'Alternate a11y text', a11yHint: 'Descriptive text about this Button', }, } -export const White: Story = { +export const ______White: Story = { storyName: 'White', args: { buttonType: ButtonVariants.White, diff --git a/packages/components/src/components/Button/Button.test.tsx b/packages/components/src/components/Button/Button.test.tsx index 5be46e0f..30ddec0e 100644 --- a/packages/components/src/components/Button/Button.test.tsx +++ b/packages/components/src/components/Button/Button.test.tsx @@ -118,7 +118,7 @@ describe('Button', () => { const { backgroundColor, borderWidth, borderColor } = button.props.style const { color } = text.props.style - expect(backgroundColor).toEqual(DesignTokens.colorWhite) + expect(backgroundColor).toEqual('transparent') expect(borderColor).toEqual(DesignTokens.colorUswdsSystemColorBlueVivid60) expect(borderWidth).toEqual(2) expect(color).toEqual(DesignTokens.colorUswdsSystemColorBlueVivid60) @@ -139,7 +139,7 @@ describe('Button', () => { const { backgroundColor, borderColor, borderWidth } = button.props.style const { color } = text.props.style - expect(backgroundColor).toEqual(DesignTokens.colorWhite) + expect(backgroundColor).toEqual('transparent') expect(borderColor).toEqual( DesignTokens.colorUswdsSystemColorBlueWarmVivid80, ) @@ -252,7 +252,7 @@ describe('Button', () => { const { backgroundColor, borderWidth, borderColor } = button.props.style const { color } = text.props.style - expect(backgroundColor).toEqual(DesignTokens.colorWhite) + expect(backgroundColor).toEqual('transparent') expect(borderColor).toEqual(DesignTokens.colorGrayMedium) expect(borderWidth).toEqual(2) expect(color).toEqual(DesignTokens.colorGrayMedium) @@ -273,7 +273,7 @@ describe('Button', () => { const { backgroundColor, borderColor, borderWidth } = button.props.style const { color } = text.props.style - expect(backgroundColor).toEqual(DesignTokens.colorWhite) + expect(backgroundColor).toEqual('transparent') expect(borderColor).toEqual(DesignTokens.colorUswdsSystemColorGray80) expect(borderWidth).toEqual(2) expect(color).toEqual(DesignTokens.colorUswdsSystemColorGray80) diff --git a/packages/components/src/components/Button/Button.tsx b/packages/components/src/components/Button/Button.tsx index e5adb723..55df978c 100644 --- a/packages/components/src/components/Button/Button.tsx +++ b/packages/components/src/components/Button/Button.tsx @@ -72,8 +72,8 @@ export const Button: React.FC = ({ } break case ButtonVariants.BaseSecondary: - bgColor = DesignTokens.colorWhite - bgColorPressed = DesignTokens.colorWhite + bgColor = 'transparent' + bgColorPressed = 'transparent' borderColor = DesignTokens.colorGrayMedium borderColorPressed = DesignTokens.colorUswdsSystemColorGray80 textColor = DesignTokens.colorGrayMedium @@ -81,8 +81,6 @@ export const Button: React.FC = ({ borderWidth = 2 if (isDarkMode) { - bgColor = DesignTokens.colorBlack - bgColorPressed = DesignTokens.colorBlack borderColor = DesignTokens.colorGrayLightest borderColorPressed = DesignTokens.colorUswdsSystemColorGray30 textColor = DesignTokens.colorGrayLightest @@ -103,8 +101,8 @@ export const Button: React.FC = ({ } break case ButtonVariants.Secondary: - bgColor = DesignTokens.colorWhite - bgColorPressed = DesignTokens.colorWhite + bgColor = 'transparent' + bgColorPressed = 'transparent' borderColor = DesignTokens.colorUswdsSystemColorBlueVivid60 borderColorPressed = DesignTokens.colorUswdsSystemColorBlueWarmVivid80 textColor = DesignTokens.colorUswdsSystemColorBlueVivid60 @@ -112,9 +110,7 @@ export const Button: React.FC = ({ borderWidth = 2 if (isDarkMode) { - bgColor = DesignTokens.colorBlack - bgColorPressed = DesignTokens.colorBlack - borderColor = DesignTokens.colorUswdsSystemColorBlueVivid60 + borderColor = DesignTokens.colorUswdsSystemColorBlueVivid30 borderColorPressed = DesignTokens.colorWhite textColor = DesignTokens.colorUswdsSystemColorBlueVivid30 textColorPressed = DesignTokens.colorWhite