diff --git a/packages/react-core/package.json b/packages/react-core/package.json index 3ed55965f94..77530062a5a 100644 --- a/packages/react-core/package.json +++ b/packages/react-core/package.json @@ -53,7 +53,7 @@ "tslib": "^2.5.0" }, "devDependencies": { - "@patternfly/patternfly": "5.0.0-alpha.33", + "@patternfly/patternfly": "5.0.0-alpha.37", "@rollup/plugin-commonjs": "^24.0.0", "@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-replace": "^5.0.2", diff --git a/packages/react-core/scripts/copyStyles.js b/packages/react-core/scripts/copyStyles.js index 8dade3b8dd0..315e430c79a 100644 --- a/packages/react-core/scripts/copyStyles.js +++ b/packages/react-core/scripts/copyStyles.js @@ -24,7 +24,7 @@ copySync(join(pfDir, 'assets/fonts'), join(stylesDir, 'assets/fonts'), { // Copy css const baseCssFiles = { 'base.css': 'patternfly-base.css', - 'base-no-reset.css': 'patternfly-base-no-reset.css' + 'base-no-reset.css': 'patternfly-base-no-globals.css' }; for (const [targetCss, baseCss] of Object.entries(baseCssFiles)) { diff --git a/packages/react-core/src/components/BackgroundImage/BackgroundImage.tsx b/packages/react-core/src/components/BackgroundImage/BackgroundImage.tsx index 2ce478feef0..6016769a85f 100644 --- a/packages/react-core/src/components/BackgroundImage/BackgroundImage.tsx +++ b/packages/react-core/src/components/BackgroundImage/BackgroundImage.tsx @@ -1,10 +1,12 @@ import * as React from 'react'; -import cssVar from '@patternfly/react-tokens/dist/esm/c_background_image_BackgroundImage'; -import cssVarName2x from '@patternfly/react-tokens/dist/esm/c_background_image_BackgroundImage_2x'; -import cssVarNameSm from '@patternfly/react-tokens/dist/esm/c_background_image_BackgroundImage_sm'; -import cssVarNameSm2x from '@patternfly/react-tokens/dist/esm/c_background_image_BackgroundImage_sm_2x'; -import cssVarNameLg from '@patternfly/react-tokens/dist/esm/c_background_image_BackgroundImage_lg'; -import cssVarNameFilter from '@patternfly/react-tokens/dist/esm/c_background_image_Filter'; +// Commented imports that no longer exist. This component will be updated with issue #8452 resolution + +// import cssVar from '@patternfly/react-tokens/dist/esm/c_background_image_BackgroundImage'; +// import cssVarName2x from '@patternfly/react-tokens/dist/esm/c_background_image_BackgroundImage_2x'; +// import cssVarNameSm from '@patternfly/react-tokens/dist/esm/c_background_image_BackgroundImage_sm'; +// import cssVarNameSm2x from '@patternfly/react-tokens/dist/esm/c_background_image_BackgroundImage_sm_2x'; +// import cssVarNameLg from '@patternfly/react-tokens/dist/esm/c_background_image_BackgroundImage_lg'; +// import cssVarNameFilter from '@patternfly/react-tokens/dist/esm/c_background_image_Filter'; import { css } from '@patternfly/react-styles'; import styles from '@patternfly/react-styles/css/components/BackgroundImage/background-image'; @@ -16,17 +18,17 @@ export interface BackgroundImageSrcMap { lg: string; } -const defaultFilter = ( - - - - - - - - - -); +// const defaultFilter = ( +// +// +// +// +// +// +// +// +// +// ); export interface BackgroundImageProps extends Omit, 'src'> { /** Additional classes added to the background. */ @@ -37,41 +39,42 @@ export interface BackgroundImageProps extends Omit = ({ className, - src, - filter = defaultFilter, + // src, + // filter = defaultFilter, ...props -}: BackgroundImageProps) => { - const getUrlValue = (size: keyof BackgroundImageSrcMap) => { - if (typeof src === 'string') { - return `url(${src})`; - } else if (typeof src === 'object') { - return `url(${src[size]})`; - } +}: BackgroundImageProps) => + // const getUrlValue = (size: keyof BackgroundImageSrcMap) => { + // if (typeof src === 'string') { + // return `url(${src})`; + // } else if (typeof src === 'object') { + // return `url(${src[size]})`; + // } - return ''; - }; + // return ''; + // }; - const filterNum = React.useMemo(() => filterCounter++, []); - const filterId = `patternfly-background-image-filter-overlay${filterNum}`; - const style = { - [cssVar.name]: getUrlValue('xs'), - [cssVarName2x.name]: getUrlValue('xs2x'), - [cssVarNameSm.name]: getUrlValue('sm'), - [cssVarNameSm2x.name]: getUrlValue('sm2x'), - [cssVarNameLg.name]: getUrlValue('lg'), - [cssVarNameFilter.name]: `url(#${filterId})` - } as React.CSSProperties; + // const filterNum = React.useMemo(() => filterCounter++, []); + // const filterId = `patternfly-background-image-filter-overlay${filterNum}`; + // const style = { + // [cssVar.name]: getUrlValue('xs'), + // [cssVarName2x.name]: getUrlValue('xs2x'), + // [cssVarNameSm.name]: getUrlValue('sm'), + // [cssVarNameSm2x.name]: getUrlValue('sm2x'), + // [cssVarNameLg.name]: getUrlValue('lg'), + // [cssVarNameFilter.name]: `url(#${filterId})` + // } as React.CSSProperties; - return ( -
+ ( + // TODO: removed inline style add it back with issue #8452 resolution. Also commented out the "React.cloneElement(filter, { id: filterId })} " +
- {React.cloneElement(filter, { id: filterId })} + {/* {React.cloneElement(filter, { id: filterId })} */}
- ); -}; + ) +; BackgroundImage.displayName = 'BackgroundImage'; diff --git a/packages/react-core/src/components/BackgroundImage/__tests__/__snapshots__/BackgroundImage.test.tsx.snap b/packages/react-core/src/components/BackgroundImage/__tests__/__snapshots__/BackgroundImage.test.tsx.snap index 6d2c7cf1122..6ec23d78130 100644 --- a/packages/react-core/src/components/BackgroundImage/__tests__/__snapshots__/BackgroundImage.test.tsx.snap +++ b/packages/react-core/src/components/BackgroundImage/__tests__/__snapshots__/BackgroundImage.test.tsx.snap @@ -4,44 +4,14 @@ exports[`BackgroundImage 1`] = `
- - - - - - - - - - + />
`; @@ -50,44 +20,14 @@ exports[`allows passing in a single string as the image src 1`] = `
- - - - - - - - - - + />
`; diff --git a/packages/react-core/src/components/Icon/Icon.tsx b/packages/react-core/src/components/Icon/Icon.tsx index 019e23a07af..2fe2e127a9c 100644 --- a/packages/react-core/src/components/Icon/Icon.tsx +++ b/packages/react-core/src/components/Icon/Icon.tsx @@ -17,7 +17,7 @@ export interface IconComponentProps extends Omit { expect(Array.from(iconContainer?.classList || []).some(c => /pf-m-*/.test(c))); // Check no modifier classes have been added }); -Object.values(['default', 'info', 'success', 'warning', 'danger']).forEach(status => { +Object.values(['custom', 'info', 'success', 'warning', 'danger']).forEach(status => { test(`sets status modifier successfully - ${status}`, () => { render( - + ); diff --git a/packages/react-core/src/components/Icon/examples/IconStatus.tsx b/packages/react-core/src/components/Icon/examples/IconStatus.tsx index 2601e4d789a..f3d8321f7f8 100644 --- a/packages/react-core/src/components/Icon/examples/IconStatus.tsx +++ b/packages/react-core/src/components/Icon/examples/IconStatus.tsx @@ -20,7 +20,7 @@ export const IconStatus: React.FunctionComponent = () => ( - + diff --git a/packages/react-core/src/components/LoginPage/__tests__/__snapshots__/LoginPage.test.tsx.snap b/packages/react-core/src/components/LoginPage/__tests__/__snapshots__/LoginPage.test.tsx.snap index 3c3a455e6fb..885947b8b95 100644 --- a/packages/react-core/src/components/LoginPage/__tests__/__snapshots__/LoginPage.test.tsx.snap +++ b/packages/react-core/src/components/LoginPage/__tests__/__snapshots__/LoginPage.test.tsx.snap @@ -5,44 +5,14 @@ exports[`check loginpage example against snapshot 1`] = `
- - - - - - - - - - + />