update test and logic

Author: tlabaj

packages/react-core/src/components/Drawer/DrawerPanelContent.tsx

@@ -382,7 +382,7 @@ export const DrawerPanelContent: React.FunctionComponent<DrawerPanelContentProps
         hasNoGlass && 'pf-m-no-glass',
         isGlass && styles.modifiers.glass,
         isPlain && styles.modifiers.plain,
-        isNoPlainOnGlass && styles.modifiers.noPlain,
+        isNoPlainOnGlass && styles.modifiers.noPlainOnGlass,
         hasNoBorder && styles.modifiers.noBorder,
         formatBreakpointMods(widths, styles),
         colorVariant === DrawerColorVariant.noBackground && styles.modifiers.noBackground,

packages/react-core/src/components/Drawer/__tests__/DrawerPanelContent.test.tsx

@@ -209,12 +209,12 @@ test(`Renders with class ${styles.modifiers.plain} when isPlain is true`, () =>
   expect(screen.getByText('Drawer panel content')).toHaveClass(styles.modifiers.plain);
 });
 
-test(`Renders with class ${styles.modifiers.noPlain} when isNoPlainOnGlass is true`, () => {
+test(`Renders with class ${styles.modifiers.noPlainOnGlass} when isNoPlainOnGlass is true`, () => {
   render(
     <Drawer isExpanded>
       <DrawerPanelContent isNoPlainOnGlass>Drawer panel content</DrawerPanelContent>
     </Drawer>
   );
 
-  expect(screen.getByText('Drawer panel content')).toHaveClass(styles.modifiers.noPlain);
+  expect(screen.getByText('Drawer panel content')).toHaveClass(styles.modifiers.noPlainOnGlass);
 });

packages/react-integration/cypress/integration/drawer.spec.ts

@@ -1,8 +1,63 @@
 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');
   });
 
+  // Known PatternFly CSS bug: when `pf-v6-theme-glass`, `pf-m-glass` (isGlass), and `pf-m-plain` are all active,
+  // `pf-m-no-plain-on-glass` does not take effect — plain-under-glass wins and no-plain-on-glass cannot restore
+  // the intended glass panel treatment. This test asserts the corrected outcome (semi-transparent background)
+  // and fails until Core CSS fixes selector/specificity for that combination.
+  it('glass theme + plain + glass: no-plain-on-glass should yield semi-transparent panel background (fails until CSS fix)', () => {
+    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-panel-glass-plain-combo.pf-v6-c-drawer__panel')
+      .should('be.visible')
+      .should('have.class', 'pf-m-glass')
+      .and('have.class', 'pf-m-plain')
+      .and('have.class', 'pf-m-no-plain-on-glass');
+
+    cy.get('#drawer-panel-glass-plain-combo').within(() => {
+      cy.contains('Glass theme plain / no-plain-on-glass combo');
+    });
+
+    // When the bug is fixed, no-plain-on-glass should override plain-under-glass and surface a non-opaque background.
+    cy.get('#drawer-panel-glass-plain-combo').should(($el) => {
+      const bg = window.getComputedStyle($el[0]).backgroundColor;
+
+      const rgbaAlpha = (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]);
+      };
+
+      const alpha = rgbaAlpha(bg);
+      const hasSemiTransparentBackground = alpha !== undefined && alpha < 1;
+      if (!hasSemiTransparentBackground) {
+        throw new Error(
+          `expected no-plain-on-glass to win over plain+glass under theme (semi-transparent background, alpha < 1); got backgroundColor=${bg}`
+        );
+      }
+    });
+  });
+
   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');

packages/react-integration/demo-app-ts/src/components/demos/DrawerDemo/DrawerDemo.tsx

@@ -118,6 +118,18 @@ 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.';
 
+    /**
+     * Repro for Core CSS: with glass theme (`pf-v6-theme-glass`, applied in Cypress on `html`), `isGlass` (pf-m-glass),
+     * and `isPlain` (pf-m-plain), `pf-m-no-plain-on-glass` may not apply — see drawer Cypress test.
+     */
+    const glassThemePlainComboPanelContent = (
+      <DrawerPanelContent id="drawer-panel-glass-plain-combo" 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 +163,13 @@ export class DrawerDemo extends Component<DrawerProps, DrawerDemoState> {
             <DrawerContentBody>{drawerContent}</DrawerContentBody>
           </DrawerContent>
         </Drawer>
+        <div id="drawer-glass-plain-combo-container">
+          <Drawer id="drawer-glass-plain-combo" isExpanded style={{ minHeight: '120px', height: '120px' }}>
+            <DrawerContent colorVariant={DrawerColorVariant.default} panelContent={glassThemePlainComboPanelContent}>
+              <DrawerContentBody>Glass theme + isPlain + isNoPlainOnGlass + isGlass demo</DrawerContentBody>
+            </DrawerContent>
+          </Drawer>
+        </div>
       </>
     );
   }