diff --git a/.changeset/busy-bananas-smash.md b/.changeset/busy-bananas-smash.md new file mode 100644 index 00000000000..c4da7de8816 --- /dev/null +++ b/.changeset/busy-bananas-smash.md @@ -0,0 +1,5 @@ +--- +'@primer/react': major +--- + +Update Popover to no longer support sx diff --git a/e2e/components/Popover.test.ts b/e2e/components/Popover.test.ts index 8061b4a31a9..7407287d8e1 100644 --- a/e2e/components/Popover.test.ts +++ b/e2e/components/Popover.test.ts @@ -11,10 +11,6 @@ const stories = [ title: 'Playground', id: 'components-popover--playground', }, - { - title: 'SX Props', - id: 'components-popover-dev--sx-props', - }, ] as const test.describe('Popover', () => { diff --git a/packages/react/src/Popover/Popover.dev.stories.tsx b/packages/react/src/Popover/Popover.dev.stories.tsx deleted file mode 100644 index fe33a72bea6..00000000000 --- a/packages/react/src/Popover/Popover.dev.stories.tsx +++ /dev/null @@ -1,37 +0,0 @@ -import type {Meta} from '@storybook/react-vite' -import Heading from '../Heading' -import Popover from './Popover' -import Text from '../Text' -import {Button} from '../Button' - -export default { - title: 'Components/Popover/Dev', - component: Popover, -} as Meta - -export const SxProps = () => ( - - - Popover heading - Message about popovers - - - -) diff --git a/packages/react/src/Popover/Popover.stories.tsx b/packages/react/src/Popover/Popover.stories.tsx index 68e4c6244c8..6d1cd698a49 100644 --- a/packages/react/src/Popover/Popover.stories.tsx +++ b/packages/react/src/Popover/Popover.stories.tsx @@ -11,8 +11,8 @@ export default { export const Default = () => ( - - Popover heading + + Popover heading Message about popovers @@ -21,8 +21,13 @@ export const Default = () => ( export const Playground: StoryFn = args => ( - - Popover heading + + Popover heading Message about popovers diff --git a/packages/react/src/Popover/Popover.tsx b/packages/react/src/Popover/Popover.tsx index 295014c4255..442ba337583 100644 --- a/packages/react/src/Popover/Popover.tsx +++ b/packages/react/src/Popover/Popover.tsx @@ -1,9 +1,7 @@ import {clsx} from 'clsx' -import type {SxProp} from '../sx' import classes from './Popover.module.css' import type {HTMLProps} from 'react' import React from 'react' -import {BoxWithFallback} from '../internal/components/BoxWithFallback' type CaretPosition = | 'top' @@ -26,12 +24,11 @@ type StyledPopoverProps = { caret?: CaretPosition relative?: boolean open?: boolean -} & SxProp +} export type PopoverProps = { /** Class name for custom styling */ className?: string - as?: React.ElementType } & StyledPopoverProps & HTMLProps @@ -40,7 +37,7 @@ const Popover = React.forwardRef(function Popover( forwardRef, ) { return ( - + overflow?: 'auto' | 'hidden' | 'scroll' | 'visible' +} & HTMLProps const PopoverContent: React.FC> = ({ className, @@ -66,14 +62,7 @@ const PopoverContent: React.FC> = ( height = 'fit-content', ...props }) => { - return ( - - ) + return
} PopoverContent.displayName = 'Popover.Content' diff --git a/packages/styled-react/src/__tests__/__snapshots__/exports.test.ts.snap b/packages/styled-react/src/__tests__/__snapshots__/exports.test.ts.snap index e1bf1906e1e..fbb4eb59ca8 100644 --- a/packages/styled-react/src/__tests__/__snapshots__/exports.test.ts.snap +++ b/packages/styled-react/src/__tests__/__snapshots__/exports.test.ts.snap @@ -28,7 +28,6 @@ exports[`@primer/styled-react exports 1`] = ` "Overlay", "PageHeader", "PageLayout", - "Popover", "ProgressBar", "RadioGroup", "RelativeTime", diff --git a/packages/styled-react/src/__tests__/primer-react.browser.test.tsx b/packages/styled-react/src/__tests__/primer-react.browser.test.tsx index f0340084e04..c6ddf546b16 100644 --- a/packages/styled-react/src/__tests__/primer-react.browser.test.tsx +++ b/packages/styled-react/src/__tests__/primer-react.browser.test.tsx @@ -27,7 +27,6 @@ import { Overlay, PageHeader, PageLayout, - Popover, ProgressBar, RadioGroup, RelativeTime, @@ -287,16 +286,6 @@ describe('@primer/react', () => { expect(window.getComputedStyle(container.firstElementChild!).backgroundColor).toBe('rgb(255, 0, 0)') }) - test('Popover supports `sx` prop', () => { - const {container} = render() - expect(window.getComputedStyle(container.firstElementChild!).backgroundColor).toBe('rgb(255, 0, 0)') - }) - - test('Popover.Content supports `sx` prop', () => { - const {container} = render() - expect(window.getComputedStyle(container.firstElementChild!).backgroundColor).toBe('rgb(255, 0, 0)') - }) - test('ProgressBar supports `sx` prop', () => { const {container} = render() expect(window.getComputedStyle(container.firstElementChild!).backgroundColor).toBe('rgb(255, 0, 0)') diff --git a/packages/styled-react/src/index.tsx b/packages/styled-react/src/index.tsx index 953d20b1d75..66763c5389a 100644 --- a/packages/styled-react/src/index.tsx +++ b/packages/styled-react/src/index.tsx @@ -117,7 +117,6 @@ export { Overlay, PageHeader, PageLayout, - Popover, ProgressBar, RadioGroup, RelativeTime,