diff --git a/packages/react-core/package.json b/packages/react-core/package.json index 971a1d6208f..4bd1accbad5 100644 --- a/packages/react-core/package.json +++ b/packages/react-core/package.json @@ -54,7 +54,7 @@ "tslib": "^2.5.0" }, "devDependencies": { - "@patternfly/patternfly": "6.0.0-alpha.51", + "@patternfly/patternfly": "6.0.0-alpha.63", "@rollup/plugin-commonjs": "^25.0.0", "@rollup/plugin-node-resolve": "^15.0.2", "@rollup/plugin-replace": "^5.0.2", diff --git a/packages/react-core/src/components/Card/Card.tsx b/packages/react-core/src/components/Card/Card.tsx index abdf05d82b3..dcf4ba2580d 100644 --- a/packages/react-core/src/components/Card/Card.tsx +++ b/packages/react-core/src/components/Card/Card.tsx @@ -87,9 +87,11 @@ export const Card: React.FunctionComponent = ({ isSelectableRaised = false, isSelected = false, isDisabledRaised = false, - isFlat = false, + // TODO: Update with issue #9991 + // isFlat = false, isExpanded = false, - isRounded = false, + // TODO: Update with issue #9991 + // isRounded = false, isLarge = false, isFullHeight = false, isPlain = false, @@ -112,12 +114,13 @@ export const Card: React.FunctionComponent = ({ } const getSelectableModifiers = () => { - if (isDisabledRaised) { - return css(styles.modifiers.nonSelectableRaised); - } - if (isSelectableRaised) { - return css(styles.modifiers.selectableRaised, isSelected && styles.modifiers.selectedRaised); - } + // TODO: Update with issue #9991 + // if (isDisabledRaised) { + // return css(styles.modifiers.nonSelectableRaised); + // } + // if (isSelectableRaised) { + // return css(styles.modifiers.selectableRaised, isSelected && styles.modifiers.selectedRaised); + // } if (isSelectable && isClickable) { return css(styles.modifiers.selectable, styles.modifiers.clickable, isSelected && styles.modifiers.current); } @@ -185,8 +188,9 @@ export const Card: React.FunctionComponent = ({ styles.card, isCompact && styles.modifiers.compact, isExpanded && styles.modifiers.expanded, - isFlat && styles.modifiers.flat, - isRounded && styles.modifiers.rounded, + // TODO: Update with issue #9991 + // isFlat && styles.modifiers.flat, + // isRounded && styles.modifiers.rounded, isLarge && styles.modifiers.displayLg, isFullHeight && styles.modifiers.fullHeight, isPlain && styles.modifiers.plain, diff --git a/packages/react-core/src/components/Card/__tests__/Card.test.tsx b/packages/react-core/src/components/Card/__tests__/Card.test.tsx index 2c6e5f94d92..4e4803b9a15 100644 --- a/packages/react-core/src/components/Card/__tests__/Card.test.tsx +++ b/packages/react-core/src/components/Card/__tests__/Card.test.tsx @@ -69,12 +69,14 @@ describe('Card', () => { expect(card.getAttribute('tabindex')).toBeNull(); }); - test('card with isDisabledRaised applied', () => { + // TODO: Update with issue #9991 + xtest('card with isDisabledRaised applied', () => { render(disabled raised card); expect(screen.getByText('disabled raised card')).toHaveClass('pf-m-non-selectable-raised'); }); - test('card with isSelectableRaised applied - not change', () => { + // TODO: Update with issue #9991 + xtest('card with isSelectableRaised applied - not change', () => { render(raised selectable card); const card = screen.getByText('raised selectable card'); @@ -82,7 +84,8 @@ describe('Card', () => { expect(card).toHaveAttribute('tabindex', '0'); }); - test('card with isSelectableRaised and isSelected applied ', () => { + // TODO: Update with issue #9991 + xtest('card with isSelectableRaised and isSelected applied ', () => { render( raised selected card @@ -95,7 +98,8 @@ describe('Card', () => { expect(card).toHaveAttribute('tabindex', '0'); }); - test('card with isFlat applied', () => { + // TODO: Update with issue #9991 + xtest('card with isFlat applied', () => { render(flat card); expect(screen.getByText('flat card')).toHaveClass('pf-m-flat'); }); @@ -105,7 +109,8 @@ describe('Card', () => { expect(screen.getByText('expanded card')).toHaveClass('pf-m-expanded'); }); - test('card with isRounded applied', () => { + // TODO: Update with issue #9991 + xtest('card with isRounded applied', () => { render(rounded card); expect(screen.getByText('rounded card')).toHaveClass('pf-m-rounded'); }); diff --git a/packages/react-core/src/components/Card/examples/CardWithModifiers.tsx b/packages/react-core/src/components/Card/examples/CardWithModifiers.tsx index cc628e54636..051166695ae 100644 --- a/packages/react-core/src/components/Card/examples/CardWithModifiers.tsx +++ b/packages/react-core/src/components/Card/examples/CardWithModifiers.tsx @@ -2,7 +2,8 @@ import React from 'react'; import { Card, CardTitle, CardBody, CardFooter, Checkbox } from '@patternfly/react-core'; export const CardWithModifiers: React.FunctionComponent = () => { - const mods = ['isCompact', 'isFlat', 'isRounded', 'isLarge', 'isFullHeight', 'isPlain']; + // TODO: Update with issue #9991 removed isFlat and isRounded + const mods = ['isCompact', 'isLarge', 'isFullHeight', 'isPlain']; const [modifiers, setModifiers] = React.useState({}); return ( diff --git a/packages/react-core/src/components/Drawer/Drawer.tsx b/packages/react-core/src/components/Drawer/Drawer.tsx index c8ffba99f3c..f2e8d3016eb 100644 --- a/packages/react-core/src/components/Drawer/Drawer.tsx +++ b/packages/react-core/src/components/Drawer/Drawer.tsx @@ -4,7 +4,6 @@ import { css } from '@patternfly/react-styles'; export enum DrawerColorVariant { default = 'default', - light200 = 'light-200', noBackground = 'no-background' } diff --git a/packages/react-core/src/components/Drawer/DrawerContent.tsx b/packages/react-core/src/components/Drawer/DrawerContent.tsx index 5dce83ef59a..fe048d89669 100644 --- a/packages/react-core/src/components/Drawer/DrawerContent.tsx +++ b/packages/react-core/src/components/Drawer/DrawerContent.tsx @@ -12,7 +12,7 @@ export interface DrawerContentProps extends React.HTMLProps { /** Content rendered in the drawer panel. */ panelContent: React.ReactNode; /** Color variant of the background of the drawer panel */ - colorVariant?: DrawerColorVariant | 'light-200' | 'no-background' | 'default'; + colorVariant?: DrawerColorVariant | 'no-background' | 'default'; } export const DrawerContent: React.FunctionComponent = ({ @@ -30,7 +30,6 @@ export const DrawerContent: React.FunctionComponent = ({
{ /** Content to be rendered in the drawer section. */ children?: React.ReactNode; /** Color variant of the background of the drawer Section */ - colorVariant?: DrawerColorVariant | 'light-200' | 'no-background' | 'default'; + colorVariant?: DrawerColorVariant | 'no-background' | 'default'; } export const DrawerSection: React.FunctionComponent = ({ @@ -22,7 +22,6 @@ export const DrawerSection: React.FunctionComponent = ({
{ expect(asFragment()).toMatchSnapshot(); }); -test(`Drawer has resizable css and color variants`, () => { +// TODO: Update/renable with issue #9979 +xtest(`Drawer has resizable css and color variants`, () => { const panelContent = ( drawer-panel diff --git a/packages/react-core/src/components/Drawer/__tests__/__snapshots__/Drawer.test.tsx.snap b/packages/react-core/src/components/Drawer/__tests__/__snapshots__/Drawer.test.tsx.snap index 29e09375c59..11183c275fe 100644 --- a/packages/react-core/src/components/Drawer/__tests__/__snapshots__/Drawer.test.tsx.snap +++ b/packages/react-core/src/components/Drawer/__tests__/__snapshots__/Drawer.test.tsx.snap @@ -133,7 +133,7 @@ exports[`Drawer has resizable callback and id 1`] = ` aria-disabled="false" aria-label="Close drawer panel" class="pf-v5-c-button pf-m-plain" - data-ouia-component-id="OUIA-Generated-Button-plain-6" + data-ouia-component-id="OUIA-Generated-Button-plain-5" data-ouia-component-type="PF5/Button" data-ouia-safe="true" type="button" diff --git a/packages/react-core/src/components/Drawer/examples/DrawerSecondaryBackground.tsx b/packages/react-core/src/components/Drawer/examples/DrawerSecondaryBackground.tsx index 93bd9e93de4..7f8aa3a857b 100644 --- a/packages/react-core/src/components/Drawer/examples/DrawerSecondaryBackground.tsx +++ b/packages/react-core/src/components/Drawer/examples/DrawerSecondaryBackground.tsx @@ -46,7 +46,8 @@ export const DrawerSecondaryBackground: React.FunctionComponent = () => { }; const panelContent = ( - + // TODO: need to update with issue #9979. Removed light color variant for secondary panel. + drawer-panel @@ -92,11 +93,11 @@ export const DrawerSecondaryBackground: React.FunctionComponent = () => { Toggle drawer - - drawer-section - + {/* TODO: MAy need to update with issue #9979. Removed light color variant for secondary panel. */} + drawer-section {drawerContent} diff --git a/packages/react-core/src/components/NumberInput/NumberInput.tsx b/packages/react-core/src/components/NumberInput/NumberInput.tsx index baa6de14eb2..a7338ac13a1 100644 --- a/packages/react-core/src/components/NumberInput/NumberInput.tsx +++ b/packages/react-core/src/components/NumberInput/NumberInput.tsx @@ -106,7 +106,8 @@ export const NumberInput: React.FunctionComponent = ({ return (
{ + // TODO: need to update with issue #9979. Removed light color variant for secondary panel. + Drawer content: {activeStep?.name} diff --git a/packages/react-core/src/demos/examples/Wizard/InModalWithDrawer.tsx b/packages/react-core/src/demos/examples/Wizard/InModalWithDrawer.tsx index 4b98dbb6ca5..196036758c3 100644 --- a/packages/react-core/src/demos/examples/Wizard/InModalWithDrawer.tsx +++ b/packages/react-core/src/demos/examples/Wizard/InModalWithDrawer.tsx @@ -12,8 +12,7 @@ import { ModalVariant, Wizard, WizardHeader, - WizardStep, - DrawerColorVariant + WizardStep } from '@patternfly/react-core'; export const WizardModalWithDrawerDemo: React.FunctionComponent = () => { @@ -38,7 +37,8 @@ export const WizardModalWithDrawerDemo: React.FunctionComponent = () => { + // TODO: MAy need to update with issue #9979. Removed light color variant. + Drawer content: {stepName} diff --git a/packages/react-core/src/demos/examples/Wizard/InModalWithDrawerInformationalStep.tsx b/packages/react-core/src/demos/examples/Wizard/InModalWithDrawerInformationalStep.tsx index ce0f2e3f2f7..0f0468443f8 100644 --- a/packages/react-core/src/demos/examples/Wizard/InModalWithDrawerInformationalStep.tsx +++ b/packages/react-core/src/demos/examples/Wizard/InModalWithDrawerInformationalStep.tsx @@ -15,8 +15,7 @@ import { TextVariants, Wizard, WizardHeader, - WizardStep, - DrawerColorVariant + WizardStep } from '@patternfly/react-core'; export const WizardModalWithDrawerInfoStepDemo: React.FunctionComponent = () => { @@ -41,7 +40,8 @@ export const WizardModalWithDrawerInfoStepDemo: React.FunctionComponent = () => + // TODO: MAy need to update with issue #9979. Removed light color variant. + Drawer content: {stepName} diff --git a/packages/react-core/src/demos/examples/Wizard/InPageWithDrawer.tsx b/packages/react-core/src/demos/examples/Wizard/InPageWithDrawer.tsx index 30254bcd7b1..3272a52393d 100644 --- a/packages/react-core/src/demos/examples/Wizard/InPageWithDrawer.tsx +++ b/packages/react-core/src/demos/examples/Wizard/InPageWithDrawer.tsx @@ -28,8 +28,7 @@ import { MastheadMain, MastheadBrand, Wizard, - WizardStep, - DrawerColorVariant + WizardStep } from '@patternfly/react-core'; import pfLogo from '@patternfly/react-core/src/demos/assets/PF-HorizontalLogo-Color.svg'; import BarsIcon from '@patternfly/react-icons/dist/js/icons/bars-icon'; @@ -119,7 +118,8 @@ export const WizardFullPageWithDrawerDemo: React.FunctionComponent = () => { + // TODO: MAy need to update with issue #9979. Removed light color variant. + Drawer content: {stepName} diff --git a/packages/react-core/src/demos/examples/Wizard/InPageWithDrawerInformationalStep.tsx b/packages/react-core/src/demos/examples/Wizard/InPageWithDrawerInformationalStep.tsx index d6cfd475960..b269b2f2e74 100644 --- a/packages/react-core/src/demos/examples/Wizard/InPageWithDrawerInformationalStep.tsx +++ b/packages/react-core/src/demos/examples/Wizard/InPageWithDrawerInformationalStep.tsx @@ -7,7 +7,6 @@ import { Drawer, DrawerActions, DrawerCloseButton, - DrawerColorVariant, DrawerContent, DrawerHead, DrawerPanelContent, @@ -120,7 +119,8 @@ export const WizardFullPageWithDrawerInfoStepDemo: React.FunctionComponent = () + // TODO: MAy need to update with issue #9979. Removed light color variant. + Drawer content: {stepName} diff --git a/packages/react-core/src/deprecated/components/Wizard/__tests__/Wizard.test.tsx b/packages/react-core/src/deprecated/components/Wizard/__tests__/Wizard.test.tsx index ef6193fa4b1..54737101689 100644 --- a/packages/react-core/src/deprecated/components/Wizard/__tests__/Wizard.test.tsx +++ b/packages/react-core/src/deprecated/components/Wizard/__tests__/Wizard.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { render, screen } from '@testing-library/react'; import { Wizard, WizardStepFunctionType, WizardStep } from '../Wizard'; -import { DrawerPanelContent, DrawerColorVariant, DrawerHead } from '../../../../../src/components/Drawer'; +import { DrawerPanelContent, DrawerHead } from '../../../../../src/components/Drawer'; import userEvent from '@testing-library/user-event'; describe('Wizard', () => { @@ -104,7 +104,8 @@ describe('Wizard', () => { test('wiz with drawer', () => { const wizDrawerPanelContent = ( - + // TODO: MAy need to update with issue #9979. Removed light color variant. + This wizard has a drawer with drawer panel content diff --git a/packages/react-core/src/deprecated/components/Wizard/examples/WizardWithDrawer.tsx b/packages/react-core/src/deprecated/components/Wizard/examples/WizardWithDrawer.tsx index 2edb633a7aa..e62b0954198 100644 --- a/packages/react-core/src/deprecated/components/Wizard/examples/WizardWithDrawer.tsx +++ b/packages/react-core/src/deprecated/components/Wizard/examples/WizardWithDrawer.tsx @@ -1,12 +1,5 @@ import React from 'react'; -import { - Button, - DrawerActions, - DrawerCloseButton, - DrawerColorVariant, - DrawerHead, - DrawerPanelContent -} from '@patternfly/react-core'; +import { Button, DrawerActions, DrawerCloseButton, DrawerHead, DrawerPanelContent } from '@patternfly/react-core'; import { Wizard as WizardDeprecated } from '@patternfly/react-core/deprecated'; export const WizardWithDrawer: React.FunctionComponent = () => { @@ -27,7 +20,8 @@ export const WizardWithDrawer: React.FunctionComponent = () => { }; const panel1Content = ( - + // TODO: MAy need to update with issue #9979. Removed light color variant. + drawer-panel-1 content @@ -40,7 +34,8 @@ export const WizardWithDrawer: React.FunctionComponent = () => { ); const panel2Content = ( - + // TODO: MAy need to update with issue #9979. Removed light color variant. + drawer-panel-2 content @@ -53,7 +48,8 @@ export const WizardWithDrawer: React.FunctionComponent = () => { ); const panel3Content = ( - + // TODO: MAy need to update with issue #9979. Removed light color variant. + drawer-panel-3 content diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index 7ced88f24aa..9bd9550f4d3 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -23,7 +23,7 @@ "test:a11y": "patternfly-a11y --config patternfly-a11y.config" }, "dependencies": { - "@patternfly/patternfly": "6.0.0-alpha.51", + "@patternfly/patternfly": "6.0.0-alpha.63", "@patternfly/react-charts": "^8.0.0-alpha.7", "@patternfly/react-code-editor": "^6.0.0-alpha.15", "@patternfly/react-core": "^6.0.0-alpha.15", diff --git a/packages/react-icons/package.json b/packages/react-icons/package.json index 97a4ae16057..c7b6c6403d0 100644 --- a/packages/react-icons/package.json +++ b/packages/react-icons/package.json @@ -33,7 +33,7 @@ "@fortawesome/free-brands-svg-icons": "^5.14.0", "@fortawesome/free-regular-svg-icons": "^5.14.0", "@fortawesome/free-solid-svg-icons": "^5.14.0", - "@patternfly/patternfly": "6.0.0-alpha.51", + "@patternfly/patternfly": "6.0.0-alpha.63", "fs-extra": "^11.1.1", "glob": "^7.1.2", "rimraf": "^2.6.2", diff --git a/packages/react-integration/cypress/integration/card.spec.ts b/packages/react-integration/cypress/integration/card.spec.ts index 3d7701566c7..d554a39a1dd 100644 --- a/packages/react-integration/cypress/integration/card.spec.ts +++ b/packages/react-integration/cypress/integration/card.spec.ts @@ -23,7 +23,8 @@ describe('Card Demo Test', () => { cy.focused().should('not.have.class', 'pf-m-selected'); }); - it('Verify that selectableRaised card can be selected and unselected with keyboard input', () => { + // TODO: update it issue #9991 + xit('Verify that selectableRaised card can be selected and unselected with keyboard input', () => { cy.get('#selectableCardRaised').focus(); cy.focused().should('have.class', 'pf-m-selectable-raised'); cy.focused().should('not.have.class', 'pf-m-selected-raised'); diff --git a/packages/react-integration/cypress/integration/drawer.spec.ts b/packages/react-integration/cypress/integration/drawer.spec.ts index 04171b9de83..5ee9dad85fa 100644 --- a/packages/react-integration/cypress/integration/drawer.spec.ts +++ b/packages/react-integration/cypress/integration/drawer.spec.ts @@ -32,7 +32,8 @@ describe('Drawer Demo Test', () => { cy.get('#toggleButton').click(); }); - it('Verify bottom drawer with background variant', () => { + // TODO: update it issue #9979 + xit('Verify bottom drawer with background variant', () => { cy.get('#basic-drawer.pf-v5-c-drawer').should('have.class', 'pf-m-panel-bottom'); cy.get('#basic-drawer .pf-v5-c-drawer__panel').should('have.class', 'pf-m-light-200'); }); 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 922f01a8383..ed5a02b34e6 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 @@ -1,4 +1,4 @@ -import React from 'react'; +import React, { Component } from 'react'; import { Button, Drawer, @@ -19,7 +19,7 @@ export interface DrawerDemoState { isCustomFocusExpanded: boolean; } -export class DrawerDemo extends React.Component { +export class DrawerDemo extends Component { static displayName = 'DrawerDemo'; state = { isExpanded: false, @@ -65,6 +65,7 @@ export class DrawerDemo extends React.Component { render() { const { isExpanded, isFocusTrapExpanded, isCustomFocusExpanded } = this.state; const panelContent = ( + // TODO: MAy need to update with issue #9979. Removed light color variant. { xl: 'width_33', '2xl': 'width_25' }} - colorVariant={DrawerColorVariant.light200} > @@ -85,12 +85,9 @@ export class DrawerDemo extends React.Component { ); + // TODO: MAy need to update with issue #9979. Removed light color variant. const focusTrapPanelContent = ( - + drawer-panel @@ -101,10 +98,10 @@ export class DrawerDemo extends React.Component { ); const customFocusPanelContent = ( + // TODO: MAy need to update with issue #9979. Removed light color variant. drawer-panel diff --git a/packages/react-styles/package.json b/packages/react-styles/package.json index f727a43b559..902cd2bdc90 100644 --- a/packages/react-styles/package.json +++ b/packages/react-styles/package.json @@ -19,7 +19,7 @@ "clean": "rimraf dist css" }, "devDependencies": { - "@patternfly/patternfly": "6.0.0-alpha.51", + "@patternfly/patternfly": "6.0.0-alpha.63", "camel-case": "^3.0.0", "css": "^2.2.3", "fs-extra": "^11.1.1", diff --git a/packages/react-tokens/package.json b/packages/react-tokens/package.json index e3020f65728..ec9af6751f5 100644 --- a/packages/react-tokens/package.json +++ b/packages/react-tokens/package.json @@ -29,7 +29,7 @@ "clean": "rimraf dist" }, "devDependencies": { - "@patternfly/patternfly": "6.0.0-alpha.51", + "@patternfly/patternfly": "6.0.0-alpha.63", "css": "^2.2.3", "fs-extra": "^11.1.1", "glob": "^7.1.2", diff --git a/yarn.lock b/yarn.lock index f337c0441fb..1166a33dec8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3975,10 +3975,10 @@ puppeteer-cluster "^0.23.0" xmldoc "^1.1.2" -"@patternfly/patternfly@6.0.0-alpha.51": - version "6.0.0-alpha.51" - resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-6.0.0-alpha.51.tgz#6e05c05133b1b08a1b85d649c592fc8b677d95d8" - integrity sha512-prdIaaoIkIazjbStqx0SvtrDSVElzdx/iERbo+OfZFoyd3tIuGOSFbrGIdiozF7wK5JWpCpQKkTuJXKiXcGqGw== +"@patternfly/patternfly@6.0.0-alpha.63": + version "6.0.0-alpha.63" + resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-6.0.0-alpha.63.tgz#8342777ebc70be8ebc9c5e18be3bc9818d70044d" + integrity sha512-RlgJcurd4lvqH98uZx+hrj+AY5gq5MRyXtSo/M6fEdW0LREi2xhHv4XeXD+f2npWk9VKTLzUl2AcxwzKMG4p/Q== "@pkgjs/parseargs@^0.11.0": version "0.11.0"