diff --git a/packages/react-core/src/components/Drawer/Drawer.tsx b/packages/react-core/src/components/Drawer/Drawer.tsx index 3470426a6b8..eaa6c58dfcd 100644 --- a/packages/react-core/src/components/Drawer/Drawer.tsx +++ b/packages/react-core/src/components/Drawer/Drawer.tsx @@ -5,6 +5,9 @@ import { css } from '@patternfly/react-styles'; export enum DrawerColorVariant { default = 'default', secondary = 'secondary', + /** + * @deprecated `DrawerColorVariant.noBackground` is deprecated. Use the `isPlain` prop on `DrawerPanelContent` and the `DrawerSection`instead. + */ noBackground = 'no-background' } diff --git a/packages/react-core/src/components/Drawer/DrawerPanelContent.tsx b/packages/react-core/src/components/Drawer/DrawerPanelContent.tsx index 814390d3955..83e03eddc54 100644 --- a/packages/react-core/src/components/Drawer/DrawerPanelContent.tsx +++ b/packages/react-core/src/components/Drawer/DrawerPanelContent.tsx @@ -37,6 +37,12 @@ export interface DrawerPanelContentProps extends Omit void; /** The minimum size of a drawer. */ @@ -56,7 +62,10 @@ export interface DrawerPanelContentProps extends Omit { className?: string; /** Content to be rendered in the drawer section. */ children?: React.ReactNode; - /** Color variant of the background of the drawer Section */ + /** + * Color variant of the background of the drawer section. + * The `no-background` value is deprecated; use the `isPlain` prop instead. + */ colorVariant?: DrawerColorVariant | 'no-background' | 'default' | 'secondary'; + /** @beta Flag indicating that the drawer section should use plain styles. */ + isPlain?: boolean; } export const DrawerSection: React.FunctionComponent = ({ className = '', children, colorVariant = DrawerColorVariant.default, + isPlain = false, ...props }: DrawerSectionProps) => (
{ expect(screen.getByText('Drawer panel content')).toHaveClass(styles.drawerPanel, { exact: true }); }); -test(`Renders with class ${styles.modifiers.noBackground} when colorVariant="no-background"`, () => { +test(`Renders with class ${styles.modifiers.noBackground} when deprecated colorVariant="no-background" is used`, () => { render( Drawer panel content @@ -188,3 +188,33 @@ test(`Renders with class 'pf-m-no-glass' when hasNoGlass is true`, () => { expect(screen.getByText('Drawer panel content')).toHaveClass('pf-m-no-glass'); }); + +test(`Renders with class ${styles.modifiers.glass} when isGlass is true`, () => { + render( + + Drawer panel content + + ); + + expect(screen.getByText('Drawer panel content')).toHaveClass(styles.modifiers.glass); +}); + +test(`Renders with class ${styles.modifiers.plain} when isPlain is true`, () => { + render( + + Drawer panel content + + ); + + expect(screen.getByText('Drawer panel content')).toHaveClass(styles.modifiers.plain); +}); + +test(`Renders with class ${styles.modifiers.noPlainOnGlass} when isNoPlainOnGlass is true`, () => { + render( + + Drawer panel content + + ); + + expect(screen.getByText('Drawer panel content')).toHaveClass(styles.modifiers.noPlainOnGlass); +}); diff --git a/packages/react-core/src/components/Drawer/__tests__/DrawerSection.test.tsx b/packages/react-core/src/components/Drawer/__tests__/DrawerSection.test.tsx new file mode 100644 index 00000000000..849cf457ddf --- /dev/null +++ b/packages/react-core/src/components/Drawer/__tests__/DrawerSection.test.tsx @@ -0,0 +1,15 @@ +import { render, screen } from '@testing-library/react'; +import { DrawerSection } from '../DrawerSection'; +import styles from '@patternfly/react-styles/css/components/Drawer/drawer'; + +test(`Renders with only class ${styles.drawerSection} by default`, () => { + render(Section content); + + expect(screen.getByText('Section content')).toHaveClass(styles.drawerSection, { exact: true }); +}); + +test(`Renders with class ${styles.modifiers.plain} when isPlain is true`, () => { + render(Section content); + + expect(screen.getByText('Section content')).toHaveClass(styles.modifiers.plain); +}); diff --git a/packages/react-core/src/components/Drawer/examples/Drawer.md b/packages/react-core/src/components/Drawer/examples/Drawer.md index 544bc08a2ba..22d79215fe6 100644 --- a/packages/react-core/src/components/Drawer/examples/Drawer.md +++ b/packages/react-core/src/components/Drawer/examples/Drawer.md @@ -13,7 +13,7 @@ propComponents: DrawerCloseButton, DrawerPanelDescription, DrawerPanelBody, - DrawerPanelFocusTrapObject + DrawerPanelFocusTrapObject, ] section: components --- diff --git a/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailContentPadding.tsx b/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailContentPadding.tsx index c19ed8ca8ca..cd5f84f2bae 100644 --- a/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailContentPadding.tsx +++ b/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailContentPadding.tsx @@ -178,7 +178,7 @@ export const PrimaryDetailContentPadding: React.FunctionComponent = () => { ); const panelContent = ( - + node-{drawerPanelBodyContent} @@ -429,7 +429,7 @@ export const PrimaryDetailContentPadding: React.FunctionComponent = () => { <Divider component="div" /> <PageSection padding={{ default: 'noPadding' }} aria-label="Drawer content section"> <Drawer isExpanded={isDrawerExpanded}> - <DrawerContent panelContent={panelContent} colorVariant="no-background"> + <DrawerContent panelContent={panelContent}> <DrawerContentBody hasPadding>{drawerContent}</DrawerContentBody> </DrawerContent> </Drawer> diff --git a/packages/react-integration/cypress/integration/drawer.spec.ts b/packages/react-integration/cypress/integration/drawer.spec.ts index 02a06d3fb9d..5ab5a595626 100644 --- a/packages/react-integration/cypress/integration/drawer.spec.ts +++ b/packages/react-integration/cypress/integration/drawer.spec.ts @@ -1,8 +1,82 @@ describe('Drawer Demo Test', () => { + afterEach(() => { + cy.document().then((doc) => { + doc.documentElement.classList.remove('pf-v6-theme-glass'); + }); + }); + it('Navigate to the drawer demo', () => { cy.visit('http://localhost:3000/drawer-demo-nav-link'); }); + it('glass theme + plain + glass: panel shows glass treatment (transparent bg and/or backdrop-filter)', () => { + // Self-contained: do not rely on test order; other specs leave the page in various states. + cy.visit('http://localhost:3000/drawer-demo-nav-link'); + cy.viewport(1280, 800); + + cy.document().then((doc) => { + doc.documentElement.classList.add('pf-v6-theme-glass'); + }); + cy.get('html').should('have.class', 'pf-v6-theme-glass'); + + cy.get('#drawer-glass-plain-combo.pf-v6-c-drawer').should('have.class', 'pf-m-expanded'); + + cy.get('[data-testid="drawer-glass-plain-panel"]').should(($el) => { + expect($el, 'glass plain combo panel').to.have.length(1); + expect($el).to.not.have.attr('hidden'); + expect($el).to.not.have.attr('inert'); + expect($el).to.have.class('pf-m-glass'); + expect($el).to.have.class('pf-m-plain'); + expect($el).to.have.class('pf-m-no-plain-on-glass'); + expect($el).to.contain.text('Glass theme plain / no-plain-on-glass combo'); + }); + + cy.get('[data-testid="drawer-glass-plain-panel"]').should(($el) => { + const style = window.getComputedStyle($el[0]); + const bg = style.backgroundColor; + const backdrop = style.backdropFilter; + + const rgbaCommaAlpha = (color: string): number | undefined => { + if (color === 'transparent') { + return 0; + } + if (!color.startsWith('rgba(') || !color.endsWith(')')) { + return undefined; + } + const inner = color.slice('rgba('.length, -1); + const parts = inner.split(',').map((p) => p.trim()); + if (parts.length !== 4) { + return undefined; + } + return parseFloat(parts[3]); + }; + + // e.g. rgb(255 255 255 / 0.08) from getComputedStyle in some engines + const rgbSlashAlpha = (color: string): number | undefined => { + if (!color.startsWith('rgb(')) { + return undefined; + } + const slash = color.indexOf('/'); + const close = color.lastIndexOf(')'); + if (slash === -1 || close === -1 || slash >= close) { + return undefined; + } + const a = parseFloat(color.slice(slash + 1, close).trim()); + return Number.isNaN(a) ? undefined : a; + }; + + const alpha = rgbaCommaAlpha(bg) ?? rgbSlashAlpha(bg); + const hasSemiTransparentBackground = alpha !== undefined && alpha < 1; + const hasBackdropBlur = Boolean(backdrop && backdrop !== 'none'); + + if (!hasSemiTransparentBackground && !hasBackdropBlur) { + throw new Error( + `expected glass panel (semi-transparent background or backdrop-filter); got backgroundColor=${bg}, backdropFilter=${backdrop || ''}` + ); + } + }); + }); + it('Verify focus is automatically handled with focus trap enabled', () => { cy.get('#toggleFocusTrapButton').click(); cy.get('#focusTrap-panelContent .pf-v6-c-button.pf-m-plain').should('have.focus'); diff --git a/packages/react-integration/demo-app-ts/src/components/demos/DrawerDemo/DrawerDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/DrawerDemo/DrawerDemo.tsx index 6286a8a2330..1af229d0ee6 100644 --- a/packages/react-integration/demo-app-ts/src/components/demos/DrawerDemo/DrawerDemo.tsx +++ b/packages/react-integration/demo-app-ts/src/components/demos/DrawerDemo/DrawerDemo.tsx @@ -118,6 +118,20 @@ export class DrawerDemo extends Component<DrawerProps, DrawerDemoState> { const drawerContent = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus pretium est a porttitor vehicula. Quisque vel commodo urna. Morbi mattis rutrum ante, id vehicula ex accumsan ut. Morbi viverra, eros vel porttitor facilisis, eros purus aliquet erat,nec lobortis felis elit pulvinar sem. Vivamus vulputate, risus eget commodo eleifend, eros nibh porta quam, vitae lacinia leo libero at magna. Maecenas aliquam sagittis orci, et posuere nisi ultrices sit amet. Aliquam ex odio, malesuada sed posuere quis, pellentesque at mauris. Phasellus venenatis massa ex, eget pulvinar libero auctor pretium. Aliquam erat volutpat. Duis euismod justo in quam ullamcorper, in commodo massa vulputate.'; + const glassThemePlainComboPanelContent = ( + <DrawerPanelContent + id="drawer-panel-glass-plain-combo" + data-testid="drawer-glass-plain-panel" + isPlain + isNoPlainOnGlass + isGlass + > + <DrawerHead> + <span>Glass theme plain / no-plain-on-glass combo</span> + </DrawerHead> + </DrawerPanelContent> + ); + return ( <> <Button id="toggleButton" onClick={this.onClick}> @@ -151,6 +165,22 @@ export class DrawerDemo extends Component<DrawerProps, DrawerDemoState> { <DrawerContentBody>{drawerContent}</DrawerContentBody> </DrawerContent> </Drawer> + <div id="drawer-glass-plain-combo-container"> + {/* + isStatic: panel must not use the collapsed `hidden` / inert path — Cypress be.visible fails on a hidden panel. + isExpanded: keeps pf-m-expanded on the drawer root for layout. + */} + <Drawer + id="drawer-glass-plain-combo" + isExpanded={true} + isStatic={true} + style={{ minHeight: '120px', height: '120px' }} + > + <DrawerContent colorVariant={DrawerColorVariant.default} panelContent={glassThemePlainComboPanelContent}> + <DrawerContentBody>Glass theme + isPlain + isNoPlainOnGlass + isGlass demo</DrawerContentBody> + </DrawerContent> + </Drawer> + </div> </> ); }