From f8117caa922a39d042c7225622a525ee1b7f4f1b Mon Sep 17 00:00:00 2001 From: Katie Langerman <18661030+langermank@users.noreply.github.com> Date: Thu, 1 Aug 2024 11:17:20 -0700 Subject: [PATCH 1/7] fire --- docs/content/deprecated/Buttons.mdx | 74 ------------------- packages/react/codemods/removeSystemProps.js | 2 - .../src/Details/__tests__/Details.test.tsx | 7 +- packages/react/src/Overlay/Overlay.test.tsx | 7 +- .../react/src/deprecated/Button/Button.tsx | 41 ---------- .../src/deprecated/Button/ButtonBase.tsx | 39 ---------- .../src/deprecated/Button/ButtonClose.tsx | 42 ----------- .../src/deprecated/Button/ButtonDanger.tsx | 44 ----------- .../src/deprecated/Button/ButtonInvisible.tsx | 33 --------- .../src/deprecated/Button/ButtonOutline.tsx | 44 ----------- .../src/deprecated/Button/ButtonPrimary.tsx | 42 ----------- .../src/deprecated/Button/ButtonStyles.tsx | 36 --------- .../src/deprecated/Button/ButtonTableList.tsx | 46 ------------ packages/react/src/deprecated/Button/index.ts | 14 ---- packages/react/src/deprecated/index.ts | 18 ----- .../src/stories/deprecated/Button.stories.tsx | 70 ------------------ 16 files changed, 7 insertions(+), 552 deletions(-) delete mode 100644 docs/content/deprecated/Buttons.mdx delete mode 100644 packages/react/src/deprecated/Button/Button.tsx delete mode 100644 packages/react/src/deprecated/Button/ButtonBase.tsx delete mode 100644 packages/react/src/deprecated/Button/ButtonClose.tsx delete mode 100644 packages/react/src/deprecated/Button/ButtonDanger.tsx delete mode 100644 packages/react/src/deprecated/Button/ButtonInvisible.tsx delete mode 100644 packages/react/src/deprecated/Button/ButtonOutline.tsx delete mode 100644 packages/react/src/deprecated/Button/ButtonPrimary.tsx delete mode 100644 packages/react/src/deprecated/Button/ButtonStyles.tsx delete mode 100644 packages/react/src/deprecated/Button/ButtonTableList.tsx delete mode 100644 packages/react/src/deprecated/Button/index.ts delete mode 100644 packages/react/src/stories/deprecated/Button.stories.tsx diff --git a/docs/content/deprecated/Buttons.mdx b/docs/content/deprecated/Buttons.mdx deleted file mode 100644 index 6e2d39101093..000000000000 --- a/docs/content/deprecated/Buttons.mdx +++ /dev/null @@ -1,74 +0,0 @@ ---- -title: Button (legacy) -status: Deprecated -source: https://github.com/primer/react/tree/main/packages/react/src/Button -storybook: '/react/storybook?path=/story/components-button--default-button' ---- - -## Deprecation - -Use [Button](/components/button/react/latest) instead. - -`Button` is used for actions, like in forms, while `Link` is used for destinations, or moving from one page to another. - -In special cases where you'd like to use a `` styled like a Button, use ` - Button danger - Button outline - Button primary - Button invisible - window.alert('button clicked')} /> - - - - - - - - Button table list - -``` - -## Props - -Native ` - test + ) diff --git a/packages/react/src/Overlay/Overlay.test.tsx b/packages/react/src/Overlay/Overlay.test.tsx index e83cabfb0142..824efd783c52 100644 --- a/packages/react/src/Overlay/Overlay.test.tsx +++ b/packages/react/src/Overlay/Overlay.test.tsx @@ -1,6 +1,5 @@ import React, {useRef, useState} from 'react' -import {Overlay, Box, Text} from '..' -import {ButtonDanger, Button} from '../deprecated' +import {Overlay, Box, Text, Button} from '..' import {render, waitFor, fireEvent} from '@testing-library/react' import userEvent from '@testing-library/user-event' import axe from 'axe-core' @@ -43,7 +42,9 @@ const TestComponent = ({initialFocus, callback}: TestComponentSettings) => { > Are you sure? - Cancel + diff --git a/packages/react/src/deprecated/Button/Button.tsx b/packages/react/src/deprecated/Button/Button.tsx deleted file mode 100644 index cc5e90d9bc52..000000000000 --- a/packages/react/src/deprecated/Button/Button.tsx +++ /dev/null @@ -1,41 +0,0 @@ -import styled from 'styled-components' -import {get} from '../../constants' -import type {SxProp} from '../../sx' -import sx from '../../sx' -import type {ComponentProps} from '../../utils/types' -import type {ButtonBaseProps} from './ButtonBase' -import ButtonBase from './ButtonBase' - -/** @deprecated Use the new Label instead. See https://primer.style/react/Button for more details. */ -const Button = styled(ButtonBase)` - color: ${get('colors.btn.text')}; - background-color: ${get('colors.btn.bg')}; - border: 1px solid ${get('colors.btn.border')}; - box-shadow: ${get('shadows.btn.shadow')}, ${get('shadows.btn.insetShadow')}; - - &:hover { - background-color: ${get('colors.btn.hoverBg')}; - border-color: ${get('colors.btn.hoverBorder')}; - } - - // focus must come before :active so that the active box shadow overrides - &:focus { - outline: solid 2px ${get('colors.accent.fg')}; - } - - &:active { - background-color: ${get('colors.btn.selectedBg')}; - box-shadow: ${get('shadows.btn.shadowActive')}; - } - - &:disabled { - color: ${get('colors.primer.fg.disabled')}; - background-color: ${get('colors.btn.bg')}; - border-color: ${get('colors.btn.border')}; - } - - ${sx}; -` - -export type ButtonProps = ComponentProps -export default Button diff --git a/packages/react/src/deprecated/Button/ButtonBase.tsx b/packages/react/src/deprecated/Button/ButtonBase.tsx deleted file mode 100644 index 72036b01460e..000000000000 --- a/packages/react/src/deprecated/Button/ButtonBase.tsx +++ /dev/null @@ -1,39 +0,0 @@ -import styled from 'styled-components' -import {variant} from 'styled-system' -import type {ComponentProps} from '../../utils/types' -import buttonBaseStyles from './ButtonStyles' - -const variants = variant({ - variants: { - small: { - p: '4px 12px', - fontSize: 0, - }, - medium: { - fontSize: 1, - }, - large: { - fontSize: 2, - p: '10px 20px', - }, - }, -}) - -type StyledButtonBaseProps = { - as?: 'button' | 'a' | 'summary' | 'input' | string | React.ElementType - variant?: 'small' | 'medium' | 'large' -} - -const ButtonBase = styled.button.attrs(({disabled, onClick}) => ({ - onClick: disabled ? undefined : onClick, -}))` - ${buttonBaseStyles} - ${variants} -` - -ButtonBase.defaultProps = { - variant: 'medium', -} - -export type ButtonBaseProps = ComponentProps -export default ButtonBase diff --git a/packages/react/src/deprecated/Button/ButtonClose.tsx b/packages/react/src/deprecated/Button/ButtonClose.tsx deleted file mode 100644 index bc233b60cd49..000000000000 --- a/packages/react/src/deprecated/Button/ButtonClose.tsx +++ /dev/null @@ -1,42 +0,0 @@ -import {XIcon} from '@primer/octicons-react' -import React, {forwardRef} from 'react' -import styled from 'styled-components' -import {get} from '../../constants' -import type {SxProp} from '../../sx' -import sx from '../../sx' -import type {ComponentProps} from '../../utils/types' - -const StyledButton = styled.button` - border: none; - padding: 0; - background: transparent; - cursor: pointer; - border-radius: ${get('radii.2')}; - color: ${get('colors.fg.muted')}; - - &:focus { - outline: solid 2px ${get('colors.accent.fg')}; - } - - &:hover { - color: ${get('colors.accent.fg')}; - } - ${sx}; -` - -const ButtonClose = forwardRef< - HTMLButtonElement, - // Include {theme?: any} in the intersection as it mirrors the generated type - // from styled-components - // eslint-disable-next-line @typescript-eslint/no-explicit-any - React.ButtonHTMLAttributes & {theme?: any} & SxProp ->((props, ref) => { - return ( - - - - ) -}) - -export type ButtonCloseProps = ComponentProps -export default ButtonClose diff --git a/packages/react/src/deprecated/Button/ButtonDanger.tsx b/packages/react/src/deprecated/Button/ButtonDanger.tsx deleted file mode 100644 index e825d608068a..000000000000 --- a/packages/react/src/deprecated/Button/ButtonDanger.tsx +++ /dev/null @@ -1,44 +0,0 @@ -import styled from 'styled-components' -import {get} from '../../constants' -import type {SxProp} from '../../sx' -import sx from '../../sx' -import type {ComponentProps} from '../../utils/types' -import type {ButtonBaseProps} from './ButtonBase' -import ButtonBase from './ButtonBase' - -const ButtonDanger = styled(ButtonBase)` - color: ${get('colors.btn.danger.text')}; - border: 1px solid ${get('colors.btn.border')}; - background-color: ${get('colors.btn.bg')}; - box-shadow: ${get('shadows.btn.shadow')}; - - &:hover { - color: ${get('colors.btn.danger.hoverText')}; - background-color: ${get('colors.btn.danger.hoverBg')}; - border-color: ${get('colors.btn.danger.hoverBorder')}; - box-shadow: ${get('shadows.btn.danger.hoverShadow')}; - } - // focus must come before :active so that the active box shadow overrides - &:focus { - border-color: ${get('colors.btn.danger.focusBorder')}; - box-shadow: ${get('shadows.btn.danger.focusShadow')}; - } - - &:active { - color: ${get('colors.btn.danger.selectedText')}; - background-color: ${get('colors.btn.danger.selectedBg')}; - box-shadow: ${get('shadows.btn.danger.selectedShadow')}; - border-color: ${get('colors.btn.danger.selectedBorder')}; - } - - &:disabled { - color: ${get('colors.btn.danger.disabledText')}; - background-color: ${get('colors.btn.danger.disabledBg')}; - border-color: ${get('colors.btn.danger.disabledBorder')}; - } - - ${sx}; -` - -export type ButtonDangerProps = ComponentProps -export default ButtonDanger diff --git a/packages/react/src/deprecated/Button/ButtonInvisible.tsx b/packages/react/src/deprecated/Button/ButtonInvisible.tsx deleted file mode 100644 index b5abd84ef7eb..000000000000 --- a/packages/react/src/deprecated/Button/ButtonInvisible.tsx +++ /dev/null @@ -1,33 +0,0 @@ -import styled from 'styled-components' -import {get} from '../../constants' -import type {SxProp} from '../../sx' -import sx from '../../sx' -import type {ComponentProps} from '../../utils/types' -import type {ButtonBaseProps} from './ButtonBase' -import ButtonBase from './ButtonBase' - -const ButtonInvisible = styled(ButtonBase)` - color: ${get('colors.accent.fg')}; - background-color: transparent; - border: 0; - border-radius: ${get('radii.2')}; - box-shadow: none; - - &:disabled { - color: ${get('colors.primer.fg.disabled')}; - } - &:focus { - outline: solid 2px ${get('colors.accent.fg')}; - } - &:hover { - background-color: ${get('colors.btn.hoverBg')}; - } - &:active { - background-color: ${get('colors.btn.selectedBg')}; - } - - ${sx} -` - -export type ButtonInvisibleProps = ComponentProps -export default ButtonInvisible diff --git a/packages/react/src/deprecated/Button/ButtonOutline.tsx b/packages/react/src/deprecated/Button/ButtonOutline.tsx deleted file mode 100644 index 7b68836c87a3..000000000000 --- a/packages/react/src/deprecated/Button/ButtonOutline.tsx +++ /dev/null @@ -1,44 +0,0 @@ -import styled from 'styled-components' -import {get} from '../../constants' -import type {SxProp} from '../../sx' -import sx from '../../sx' -import type {ComponentProps} from '../../utils/types' -import type {ButtonBaseProps} from './ButtonBase' -import ButtonBase from './ButtonBase' - -const ButtonOutline = styled(ButtonBase)` - color: ${get('colors.btn.outline.text')}; - border: 1px solid ${get('colors.btn.border')}; - background-color: ${get('colors.btn.bg')}; - box-shadow: ${get('shadows.btn.shadow')}; - - &:hover { - color: ${get('colors.btn.outline.hoverText')}; - background-color: ${get('colors.btn.outline.hoverBg')}; - border-color: ${get('colors.btn.outline.hoverBorder')}; - box-shadow: ${get('shadows.btn.outline.hoverShadow')}; - } - // focus must come before :active so that the active box shadow overrides - &:focus { - border-color: ${get('colors.btn.outline.focusBorder')}; - box-shadow: ${get('shadows.btn.outline.focusShadow')}; - } - - &:active { - color: ${get('colors.btn.outline.selectedText')}; - background-color: ${get('colors.btn.outline.selectedBg')}; - box-shadow: ${get('shadows.btn.outline.selectedShadow')}; - border-color: ${get('colors.btn.outline.selectedBorder')}; - } - - &:disabled { - color: ${get('colors.btn.outline.disabledText')}; - background-color: ${get('colors.btn.outline.disabledBg')}; - border-color: ${get('colors.btn.border')}; - } - - ${sx}; -` - -export type ButtonOutlineProps = ComponentProps -export default ButtonOutline diff --git a/packages/react/src/deprecated/Button/ButtonPrimary.tsx b/packages/react/src/deprecated/Button/ButtonPrimary.tsx deleted file mode 100644 index 26ce8c0e19da..000000000000 --- a/packages/react/src/deprecated/Button/ButtonPrimary.tsx +++ /dev/null @@ -1,42 +0,0 @@ -import styled from 'styled-components' -import {get} from '../../constants' -import type {SxProp} from '../../sx' -import sx from '../../sx' -import type {ComponentProps} from '../../utils/types' -import type {ButtonBaseProps} from './ButtonBase' -import ButtonBase from './ButtonBase' - -export const ButtonPrimary = styled(ButtonBase)` - color: ${get('colors.btn.primary.text')}; - border: 1px solid ${get('colors.btn.primary.border')}; - background-color: ${get('colors.btn.primary.bg')}; - box-shadow: ${get('shadows.btn.primary.shadow')}; - - &:hover { - color: ${get('colors.btn.primary.hoverText')}; - background-color: ${get('colors.btn.primary.hoverBg')}; - border-color: ${get('colors.btn.primary.hoverBorder')}; - box-shadow: ${get('shadows.btn.primary.hoverShadow')}; - } - // focus must come before :active so that the active box shadow overrides - &:focus { - border-color: ${get('colors.btn.primary.focusBorder')}; - box-shadow: ${get('shadows.btn.primary.focusShadow')}; - } - - &:active { - background-color: ${get('colors.btn.primary.selectedBg')}; - box-shadow: ${get('shadows.btn.primary.selectedShadow')}; - } - - &:disabled { - color: ${get('colors.btn.primary.disabledText')}; - background-color: ${get('colors.btn.primary.disabledBg')}; - border-color: ${get('colors.btn.primary.disabledBorder')}; - } - - ${sx}; -` - -export type ButtonPrimaryProps = ComponentProps -export default ButtonPrimary diff --git a/packages/react/src/deprecated/Button/ButtonStyles.tsx b/packages/react/src/deprecated/Button/ButtonStyles.tsx deleted file mode 100644 index 93562ace2d9e..000000000000 --- a/packages/react/src/deprecated/Button/ButtonStyles.tsx +++ /dev/null @@ -1,36 +0,0 @@ -import {css} from 'styled-components' -import {get} from '../../constants' - -export default css` - position: relative; - display: inline-block; - padding: 6px 16px; - font-family: inherit; - font-weight: ${get('fontWeights.bold')}; - line-height: 20px; - white-space: nowrap; - vertical-align: middle; - cursor: pointer; - user-select: none; - border-radius: ${get('radii.2')}; - appearance: none; - text-decoration: none; - text-align: center; - - &:hover { - // needed to override link styles - text-decoration: none; - } - - &:focus { - outline: none; - } - - &:disabled { - cursor: default; - } - - &:disabled svg { - opacity: 0.6; - } -` diff --git a/packages/react/src/deprecated/Button/ButtonTableList.tsx b/packages/react/src/deprecated/Button/ButtonTableList.tsx deleted file mode 100644 index 06fc4fb33b65..000000000000 --- a/packages/react/src/deprecated/Button/ButtonTableList.tsx +++ /dev/null @@ -1,46 +0,0 @@ -import styled from 'styled-components' -import {get} from '../../constants' -import type {SxProp} from '../../sx' -import sx from '../../sx' -import type {ComponentProps} from '../../utils/types' - -const ButtonTableList = styled.summary` - display: inline-block; - padding: 0; - font-size: ${get('fontSizes.1')}; - color: ${get('colors.fg.muted')}; - text-decoration: none; - white-space: nowrap; - cursor: pointer; - user-select: none; - background-color: transparent; - border: 0; - appearance: none; // Corrects inability to style clickable input types in iOS. - - &:hover { - text-decoration: underline; - } - - &:disabled { - &, - &:hover { - color: ${get('colors.primer.fg.disabled')}; - cursor: default; - } - } - - &:after { - display: inline-block; - margin-left: ${get('space.1')}; - width: 0; - height: 0; - vertical-align: -2px; - content: ''; - border: 4px solid transparent; - border-top-color: currentcolor; - } - ${sx}; -` - -export type ButtonTableListProps = ComponentProps -export default ButtonTableList diff --git a/packages/react/src/deprecated/Button/index.ts b/packages/react/src/deprecated/Button/index.ts deleted file mode 100644 index 81bef2927767..000000000000 --- a/packages/react/src/deprecated/Button/index.ts +++ /dev/null @@ -1,14 +0,0 @@ -export {default} from './Button' -export type {ButtonProps} from './Button' -export {default as ButtonDanger} from './ButtonDanger' -export type {ButtonDangerProps} from './ButtonDanger' -export {default as ButtonOutline} from './ButtonOutline' -export type {ButtonOutlineProps} from './ButtonOutline' -export {default as ButtonPrimary} from './ButtonPrimary' -export type {ButtonPrimaryProps} from './ButtonPrimary' -export {default as ButtonInvisible} from './ButtonInvisible' -export type {ButtonInvisibleProps} from './ButtonInvisible' -export {default as ButtonTableList} from './ButtonTableList' -export type {ButtonTableListProps} from './ButtonTableList' -export {default as ButtonClose} from './ButtonClose' -export type {ButtonCloseProps} from './ButtonClose' diff --git a/packages/react/src/deprecated/index.ts b/packages/react/src/deprecated/index.ts index b446111bc45a..b54e74a6af55 100644 --- a/packages/react/src/deprecated/index.ts +++ b/packages/react/src/deprecated/index.ts @@ -15,24 +15,6 @@ export type {ActionListProps} from './ActionList' export {ActionMenu} from './ActionMenu' export type {ActionMenuProps} from './ActionMenu' // (copied over from src/index) not exporting new DropdownMenu types yet due to conflict with Dropdown types above -export { - default as Button, - ButtonDanger, - ButtonOutline, - ButtonPrimary, - ButtonInvisible, - ButtonTableList, - ButtonClose, -} from './Button' -export type { - ButtonProps, - ButtonDangerProps, - ButtonOutlineProps, - ButtonPrimaryProps, - ButtonInvisibleProps, - ButtonTableListProps, - ButtonCloseProps, -} from './Button' // end of v35.0.0 // Deprecated in v36.0.0 diff --git a/packages/react/src/stories/deprecated/Button.stories.tsx b/packages/react/src/stories/deprecated/Button.stories.tsx deleted file mode 100644 index 3f86247cf37e..000000000000 --- a/packages/react/src/stories/deprecated/Button.stories.tsx +++ /dev/null @@ -1,70 +0,0 @@ -import React from 'react' -import type {Meta} from '@storybook/react' - -import {Button, ButtonClose, ButtonDanger, ButtonInvisible, ButtonPrimary, ButtonTableList} from '../../deprecated' -import type {ButtonStyleProps} from 'styled-system' -import type {ButtonBaseProps} from '../../deprecated/Button/ButtonBase' -type StrictButtonStyleProps = ButtonStyleProps & {variant: ButtonBaseProps['variant']} - -export default { - title: 'Deprecated/Components/Button', - argTypes: { - as: { - table: { - disable: true, - }, - }, - theme: { - table: { - disable: true, - }, - }, - sx: { - table: { - disable: true, - }, - }, - variant: { - control: { - type: 'radio', - }, - options: ['small', 'medium', 'large'], - }, - }, -} as Meta - -// eslint-disable-next-line storybook/prefer-pascal-case -export const defaultButton = (args: StrictButtonStyleProps) => -defaultButton.args = {variant: 'medium'} - -// eslint-disable-next-line storybook/prefer-pascal-case -export const dangerButton = (args: StrictButtonStyleProps) => Danger Button -dangerButton.args = {variant: 'medium'} - -// eslint-disable-next-line storybook/prefer-pascal-case -export const primaryButton = (args: StrictButtonStyleProps) => Primary Button -primaryButton.args = {variant: 'medium'} - -// eslint-disable-next-line storybook/prefer-pascal-case -export const invisibleButton = (args: StrictButtonStyleProps) => ( - Invisible Button -) -invisibleButton.args = {variant: 'medium'} - -// eslint-disable-next-line storybook/prefer-pascal-case -export const closeButton = (args: ButtonStyleProps) => ( - alert('button clicked.')} /> -) -closeButton.args = {variant: 'medium'} - -// eslint-disable-next-line storybook/prefer-pascal-case -export const buttonTableList = (args: ButtonStyleProps) => ( - Button Table List -) -buttonTableList.args = {variant: 'medium'} - -// eslint-disable-next-line storybook/prefer-pascal-case -export const disabledButton = (args: StrictButtonStyleProps) => { - const props = {disabled: true, ...args} - return -} From f34855e7d9f88592d1f14de8c5ae74232ebd0af9 Mon Sep 17 00:00:00 2001 From: Katie Langerman <18661030+langermank@users.noreply.github.com> Date: Thu, 1 Aug 2024 11:18:00 -0700 Subject: [PATCH 2/7] Create strong-tables-rest.md --- .changeset/strong-tables-rest.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/strong-tables-rest.md diff --git a/.changeset/strong-tables-rest.md b/.changeset/strong-tables-rest.md new file mode 100644 index 000000000000..4eb9144fd313 --- /dev/null +++ b/.changeset/strong-tables-rest.md @@ -0,0 +1,6 @@ +--- +"@primer/react": major +"docs": major +--- + +Remove deprecated `Button` component From 13ec50c0f3bbffca22c7208dd68a69180dd77459 Mon Sep 17 00:00:00 2001 From: Katie Langerman <18661030+langermank@users.noreply.github.com> Date: Thu, 1 Aug 2024 11:23:35 -0700 Subject: [PATCH 3/7] fix import --- packages/react/src/deprecated/ActionMenu.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react/src/deprecated/ActionMenu.tsx b/packages/react/src/deprecated/ActionMenu.tsx index e505020aadc7..4943bf4d64de 100644 --- a/packages/react/src/deprecated/ActionMenu.tsx +++ b/packages/react/src/deprecated/ActionMenu.tsx @@ -3,8 +3,8 @@ import {List} from './ActionList/List' import type {ItemProps} from './ActionList/Item' import {Item} from './ActionList/Item' import {Divider} from './ActionList/Divider' -import type {ButtonProps} from './Button' -import Button from './Button' +import type {ButtonProps} from '../Button' +import {Button} from '../Button' import React, {useCallback, useMemo} from 'react' import {AnchoredOverlay} from '../AnchoredOverlay' import {useProvidedStateOrCreate} from '../hooks/useProvidedStateOrCreate' From 607db7bca00afe37a3acdadce6c5ef1c4f61aa36 Mon Sep 17 00:00:00 2001 From: Katie Langerman <18661030+langermank@users.noreply.github.com> Date: Thu, 1 Aug 2024 11:33:19 -0700 Subject: [PATCH 4/7] Update .changeset/strong-tables-rest.md Co-authored-by: Josh Black --- .changeset/strong-tables-rest.md | 1 - 1 file changed, 1 deletion(-) diff --git a/.changeset/strong-tables-rest.md b/.changeset/strong-tables-rest.md index 4eb9144fd313..15c49bc963b9 100644 --- a/.changeset/strong-tables-rest.md +++ b/.changeset/strong-tables-rest.md @@ -1,6 +1,5 @@ --- "@primer/react": major -"docs": major --- Remove deprecated `Button` component From b1fa0147992d5b6befadc6a9b70c21e0065f98dc Mon Sep 17 00:00:00 2001 From: Katie Langerman <18661030+langermank@users.noreply.github.com> Date: Thu, 1 Aug 2024 11:55:48 -0700 Subject: [PATCH 5/7] fix test --- .../react/src/ConfirmationDialog/ConfirmationDialog.test.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/src/ConfirmationDialog/ConfirmationDialog.test.tsx b/packages/react/src/ConfirmationDialog/ConfirmationDialog.test.tsx index f623b0d87083..dcd8bfc9a5f7 100644 --- a/packages/react/src/ConfirmationDialog/ConfirmationDialog.test.tsx +++ b/packages/react/src/ConfirmationDialog/ConfirmationDialog.test.tsx @@ -5,7 +5,7 @@ import React, {useCallback, useRef, useState} from 'react' import {ActionMenu} from '../deprecated/ActionMenu' import BaseStyles from '../BaseStyles' import Box from '../Box' -import Button from '../deprecated/Button/Button' +import {Button} from '../Button' import {ConfirmationDialog, useConfirm} from './ConfirmationDialog' import theme from '../theme' import {ThemeProvider} from '../ThemeProvider' From d9cab3e7fa734f55106507f18e451218a9c61abe Mon Sep 17 00:00:00 2001 From: Katie Langerman <18661030+langermank@users.noreply.github.com> Date: Thu, 1 Aug 2024 13:38:53 -0700 Subject: [PATCH 6/7] remove test --- .../src/__tests__/deprecated/Button.test.tsx | 126 ------------------ 1 file changed, 126 deletions(-) delete mode 100644 packages/react/src/__tests__/deprecated/Button.test.tsx diff --git a/packages/react/src/__tests__/deprecated/Button.test.tsx b/packages/react/src/__tests__/deprecated/Button.test.tsx deleted file mode 100644 index 14b12d2e34d4..000000000000 --- a/packages/react/src/__tests__/deprecated/Button.test.tsx +++ /dev/null @@ -1,126 +0,0 @@ -import React from 'react' -import { - Button, - ButtonPrimary, - ButtonClose, - ButtonDanger, - ButtonOutline, - ButtonInvisible, - ButtonTableList, -} from '../../deprecated' -import {ButtonGroup} from '../..' -import {render, behavesAsComponent, checkExports} from '../../utils/testing' -import {render as HTMLRender} from '@testing-library/react' -import axe from 'axe-core' - -function noop() {} - -describe('Button', () => { - behavesAsComponent({Component: Button}) - - checkExports('deprecated/Button', { - default: Button, - ButtonPrimary, - ButtonDanger, - ButtonOutline, - ButtonInvisible, - ButtonTableList, - ButtonClose, - }) - checkExports('ButtonGroup', { - default: ButtonGroup, - }) - - it('renders a ) - const results = await axe.run(container) - expect(results).toHaveNoViolations() - }) - - it('preserves "onClick" prop', () => { - expect(render( ) } export function ActionMenuWithDoubleClickStory(): JSX.Element {