diff --git a/packages/react-core/package.json b/packages/react-core/package.json index 0576c0e99cb..6ecbb6e3198 100644 --- a/packages/react-core/package.json +++ b/packages/react-core/package.json @@ -53,7 +53,7 @@ "tslib": "^2.0.0" }, "devDependencies": { - "@patternfly/patternfly": "5.0.0-alpha.12", + "@patternfly/patternfly": "5.0.0-alpha.18", "@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/src/components/ApplicationLauncher/ApplicationLauncher.tsx b/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx index 86b99081481..fafc607ac27 100644 --- a/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx +++ b/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx @@ -61,8 +61,6 @@ export interface ApplicationLauncherProps extends React.HTMLProps, OUIAProp * appended inline, e.g. `menuAppendTo="parent"` */ isFlipEnabled?: boolean; - /** @beta Opt-in for updated popper that does not use findDOMNode. */ - removeFindDomNode?: boolean; /** z-index of the dropdown when menuAppendTo is not inline. */ zIndex?: number; /** Value to overwrite the randomly generated data-ouia-component-id.*/ @@ -76,7 +74,6 @@ export const Dropdown: React.FunctionComponent = ({ contextProps, menuAppendTo = 'inline', isFlipEnabled = true, - removeFindDomNode = false, zIndex = 9999, ...props }: DropdownProps) => ( @@ -106,7 +103,6 @@ export const Dropdown: React.FunctionComponent = ({ diff --git a/packages/react-core/src/components/EmptyState/__tests__/Generated/__snapshots__/EmptyStateIcon.test.tsx.snap b/packages/react-core/src/components/EmptyState/__tests__/Generated/__snapshots__/EmptyStateIcon.test.tsx.snap index 5ac49feafd4..37c07c09d5d 100644 --- a/packages/react-core/src/components/EmptyState/__tests__/Generated/__snapshots__/EmptyStateIcon.test.tsx.snap +++ b/packages/react-core/src/components/EmptyState/__tests__/Generated/__snapshots__/EmptyStateIcon.test.tsx.snap @@ -10,7 +10,7 @@ exports[`EmptyStateIcon should match snapshot (auto-generated) 1`] = ` height="1em" role="img" style="vertical-align: -0.125em;" - viewBox="0 0 448 512" + viewBox="0 0 830 1024" width="1em" > <path - d="M224 256c70.7 0 128-57.3 128-128S294.7 0 224 0 96 57.3 96 128s57.3 128 128 128zm89.6 32h-16.7c-22.2 10.2-46.9 16-72.9 16s-50.6-5.8-72.9-16h-16.7C60.2 288 0 348.2 0 422.4V464c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48v-41.6c0-74.2-60.2-134.4-134.4-134.4z" + d="M0,1024 C7.8,907.1 37.3,664.2 147.8,568.3 C147.8,568.3 207.5,511.5 298.4,511.996718 L530.3,511.996718 C621.3,511.996718 680.9,568.3 680.9,568.3 C680.9,568.3 813.9,680.1 830,1024 L0,1024 Z M639.4,224 C639.4,347.7 539.1,448 415.4,448 C291.7,448 191.4,347.7 191.4,224 C191.4,100.3 291.9,0 415.6,0 C539.3,0 639.4,100.3 639.4,224 L639.4,224 Z" /> </svg> </DocumentFragment> diff --git a/packages/react-core/src/components/OptionsMenu/OptionsMenu.tsx b/packages/react-core/src/components/OptionsMenu/OptionsMenu.tsx index 9a612606830..8a46726bb4c 100644 --- a/packages/react-core/src/components/OptionsMenu/OptionsMenu.tsx +++ b/packages/react-core/src/components/OptionsMenu/OptionsMenu.tsx @@ -43,8 +43,6 @@ export interface OptionsMenuProps extends React.HTMLProps<HTMLDivElement>, OUIAP * menuAppendTo={document.getElementById('target')} */ menuAppendTo?: HTMLElement | (() => HTMLElement) | 'inline' | 'parent'; - /** @beta Opt-in for updated popper that does not use findDOMNode. */ - removeFindDomNode?: boolean; /** z-index of the options menu when menuAppendTo is not inline. */ zIndex?: number; /** Value to overwrite the randomly generated data-ouia-component-id.*/ @@ -65,7 +63,6 @@ export const OptionsMenu: React.FunctionComponent<OptionsMenuProps> = ({ menuAppendTo = 'inline', ouiaId, ouiaSafe = true, - removeFindDomNode = false, zIndex = 9999, ...props }: OptionsMenuProps) => ( @@ -94,7 +91,6 @@ export const OptionsMenu: React.FunctionComponent<OptionsMenuProps> = ({ isGrouped={isGrouped} toggle={toggle} menuAppendTo={menuAppendTo} - removeFindDomNode={removeFindDomNode} zIndex={zIndex} {...props} /> diff --git a/packages/react-core/src/components/Popover/__tests__/Popover.test.tsx b/packages/react-core/src/components/Popover/__tests__/Popover.test.tsx index af1ed66c261..fff0765e7b8 100644 --- a/packages/react-core/src/components/Popover/__tests__/Popover.test.tsx +++ b/packages/react-core/src/components/Popover/__tests__/Popover.test.tsx @@ -106,7 +106,6 @@ test('popover renders in strict mode', () => { Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam id feugiat augue, nec fringilla turpis. </div> } - removeFindDomNode > <div>Toggle Popover</div> </Popover> diff --git a/packages/react-core/src/components/Tooltip/__tests__/Tooltip.test.tsx b/packages/react-core/src/components/Tooltip/__tests__/Tooltip.test.tsx index 1be872adbe0..4df37497dde 100644 --- a/packages/react-core/src/components/Tooltip/__tests__/Tooltip.test.tsx +++ b/packages/react-core/src/components/Tooltip/__tests__/Tooltip.test.tsx @@ -23,7 +23,6 @@ test('tooltip renders in strict mode', () => { const { asFragment } = render( <React.StrictMode> <Tooltip - removeFindDomNode position="top" content={ <div> diff --git a/packages/react-core/src/components/TreeView/__tests__/__snapshots__/TreeView.test.tsx.snap b/packages/react-core/src/components/TreeView/__tests__/__snapshots__/TreeView.test.tsx.snap index 4eaa9c96715..cbea3b94198 100644 --- a/packages/react-core/src/components/TreeView/__tests__/__snapshots__/TreeView.test.tsx.snap +++ b/packages/react-core/src/components/TreeView/__tests__/__snapshots__/TreeView.test.tsx.snap @@ -2309,11 +2309,11 @@ exports[`tree view renders icons successfully 1`] = ` height="1em" role="img" style="vertical-align: -0.125em;" - viewBox="0 0 576 512" + viewBox="0 0 1217 1024" width="1em" > <path - d="M572.694 292.093L500.27 416.248A63.997 63.997 0 0 1 444.989 448H45.025c-18.523 0-30.064-20.093-20.731-36.093l72.424-124.155A64 64 0 0 1 152 256h399.964c18.523 0 30.064 20.093 20.73 36.093zM152 224h328v-48c0-26.51-21.49-48-48-48H272l-64-64H48C21.49 64 0 85.49 0 112v278.046l69.077-118.418C86.214 242.25 117.989 224 152 224z" + d="M1199.6,520.6 C1187.8,514.9 1174.4,512 1159.3,512 L412.7,512 C288.5,512 236.7,593.1 236.7,593.1 L75.6,810.6 L150,552.2 C162,520.1 187.3,492.8 225.6,470.4 C263.9,448 304.1,448 345.8,448 L1089,448 L1089,256 C1089,256 1089,192 1025,192 L503.3,192 L470.6,130.1 C470.6,130.1 440,64 374.7,64 L65,64 C1,64 1,128 1,128 L1,960 L807.7,960 C837,960 868.9,952.166667 903.4,936.5 C937.9,920.8 964.6,901.5 983.7,879 L1196.4,593.2 C1210.2,577.7 1217,561.41 1217,549.3 C1217,537.19 1211.3,526.3 1199.6,520.6" /> </svg> </span> @@ -2720,11 +2720,11 @@ exports[`tree view renders individual flag options successfully 1`] = ` height="1em" role="img" style="vertical-align: -0.125em;" - viewBox="0 0 576 512" + viewBox="0 0 1217 1024" width="1em" > <path - d="M572.694 292.093L500.27 416.248A63.997 63.997 0 0 1 444.989 448H45.025c-18.523 0-30.064-20.093-20.731-36.093l72.424-124.155A64 64 0 0 1 152 256h399.964c18.523 0 30.064 20.093 20.73 36.093zM152 224h328v-48c0-26.51-21.49-48-48-48H272l-64-64H48C21.49 64 0 85.49 0 112v278.046l69.077-118.418C86.214 242.25 117.989 224 152 224z" + d="M1199.6,520.6 C1187.8,514.9 1174.4,512 1159.3,512 L412.7,512 C288.5,512 236.7,593.1 236.7,593.1 L75.6,810.6 L150,552.2 C162,520.1 187.3,492.8 225.6,470.4 C263.9,448 304.1,448 345.8,448 L1089,448 L1089,256 C1089,256 1089,192 1025,192 L503.3,192 L470.6,130.1 C470.6,130.1 440,64 374.7,64 L65,64 C1,64 1,128 1,128 L1,960 L807.7,960 C837,960 868.9,952.166667 903.4,936.5 C937.9,920.8 964.6,901.5 983.7,879 L1196.4,593.2 C1210.2,577.7 1217,561.41 1217,549.3 C1217,537.19 1211.3,526.3 1199.6,520.6" /> </svg> </span> diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index 02a55be0cf7..4c345f7bc56 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -22,7 +22,7 @@ "test:a11y": "patternfly-a11y --config patternfly-a11y.config" }, "dependencies": { - "@patternfly/patternfly": "5.0.0-alpha.12", + "@patternfly/patternfly": "5.0.0-alpha.18", "@patternfly/react-charts": "^7.0.0-alpha.6", "@patternfly/react-code-editor": "^5.0.0-alpha.11", "@patternfly/react-core": "^5.0.0-alpha.11", diff --git a/packages/react-icons/package.json b/packages/react-icons/package.json index 83e3b83346c..bf14a84a439 100644 --- a/packages/react-icons/package.json +++ b/packages/react-icons/package.json @@ -25,15 +25,15 @@ }, "homepage": "https://github.com/patternfly/patternfly-react#readme", "scripts": { - "generate": "rimraf dist/esm/icons dist/js/icons && node scripts/writeIcons.js", + "generate": "rimraf dist/esm/icons dist/js/icons && node scripts/writeIcons.mjs", "clean": "rimraf dist src/icons src/index.js src/index.d.ts" }, "devDependencies": { "@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": "5.0.0-alpha.12", - "fs-extra": "^6.0.1", + "@patternfly/patternfly": "5.0.0-alpha.18", + "fs-extra": "^11.1.0", "glob": "^7.1.2", "rimraf": "^2.6.2", "tslib": "^2.0.0", diff --git a/packages/react-icons/scripts/generateIcons.js b/packages/react-icons/scripts/generateIcons.js deleted file mode 100644 index 6a0f4b99f8b..00000000000 --- a/packages/react-icons/scripts/generateIcons.js +++ /dev/null @@ -1,18 +0,0 @@ -const faIcons = require('./icons/fontawesomeIcons'); -const patternflyIcons = require('./icons/patternflyIcons'); -const customIcons = require('./icons/customIcons'); - -/** - * Generates icons from FontAwesome, PatternFly CSS, and custom icons in this repo. - */ -function generateIcons() { - return { - ...faIcons, - ...patternflyIcons, - ...customIcons - }; -} - -module.exports = { - generateIcons -}; diff --git a/packages/react-icons/scripts/generateIcons.mjs b/packages/react-icons/scripts/generateIcons.mjs new file mode 100644 index 00000000000..ec4de31802d --- /dev/null +++ b/packages/react-icons/scripts/generateIcons.mjs @@ -0,0 +1,14 @@ +import faIcons from './icons/fontawesomeIcons.js'; +import { pfIcons } from '@patternfly/patternfly/icons/pf-icons.mjs'; +import customIcons from './icons/customIcons.js'; + +/** + * Generates icons from FontAwesome, PatternFly CSS, and custom icons in this repo. + */ +export function generateIcons() { + return { + ...faIcons, + ...pfIcons, + ...customIcons + }; +} diff --git a/packages/react-icons/scripts/icons/patternflyIcons.js b/packages/react-icons/scripts/icons/patternflyIcons.mjs similarity index 80% rename from packages/react-icons/scripts/icons/patternflyIcons.js rename to packages/react-icons/scripts/icons/patternflyIcons.mjs index 3116b2abaf3..b715701e290 100644 --- a/packages/react-icons/scripts/icons/patternflyIcons.js +++ b/packages/react-icons/scripts/icons/patternflyIcons.mjs @@ -1,4 +1,4 @@ -const pfIcons = require('@patternfly/patternfly/icons/pf-icons.json'); +import { pfIcons } from '@patternfly/patternfly/icons/pf-icons.mjs'; const renaming = { save: 'save-alt', @@ -18,7 +18,7 @@ const renaming = { /** * @param {object} icons Icons like { screen: { "width": 1024, "height": 1024, "svgPathData": "" } } */ -function convertIcons(icons) { +export function convertIcons(icons) { delete icons.history; Object.entries(renaming).forEach(([oldKey, newKey]) => { @@ -29,4 +29,3 @@ function convertIcons(icons) { return icons; } -module.exports = convertIcons(pfIcons); diff --git a/packages/react-icons/scripts/writeIcons.js b/packages/react-icons/scripts/writeIcons.mjs similarity index 93% rename from packages/react-icons/scripts/writeIcons.js rename to packages/react-icons/scripts/writeIcons.mjs index 94da1d95a9f..99853b69594 100644 --- a/packages/react-icons/scripts/writeIcons.js +++ b/packages/react-icons/scripts/writeIcons.mjs @@ -1,6 +1,9 @@ -const { join } = require('path'); -const { outputFileSync } = require('fs-extra'); -const { generateIcons } = require('./generateIcons'); +import { join } from 'path'; +import { outputFileSync } from 'fs-extra/esm'; +import { generateIcons } from './generateIcons.mjs'; + +import * as url from 'url'; +const __dirname = url.fileURLToPath(new URL('.', import.meta.url)); const outDir = join(__dirname, '../dist'); diff --git a/packages/react-integration/cypress/integration/toolbar.spec.ts b/packages/react-integration/cypress/integration/toolbar.spec.ts index a7742e4d55e..80546ca5a1e 100644 --- a/packages/react-integration/cypress/integration/toolbar.spec.ts +++ b/packages/react-integration/cypress/integration/toolbar.spec.ts @@ -39,7 +39,7 @@ describe('Data Toolbar Demo Test', () => { describe('Toggle group and filter chips are appropriately responsive', () => { context('wide viewport', () => { beforeEach(() => { - cy.viewport(1200, 800); + cy.viewport(1800, 800); }); it('displays toggle group contents', () => { diff --git a/packages/react-integration/demo-app-ts/package.json b/packages/react-integration/demo-app-ts/package.json index 389db37a562..2459394eef9 100644 --- a/packages/react-integration/demo-app-ts/package.json +++ b/packages/react-integration/demo-app-ts/package.json @@ -9,7 +9,7 @@ "serve:demo-app": "node scripts/serve" }, "dependencies": { - "@patternfly/react-core": "^5.0.0-alpha.10", + "@patternfly/react-core": "^5.0.0-alpha.11", "react": "^18", "react-dom": "^18", "react-router": "^5.3.3", diff --git a/packages/react-styles/package.json b/packages/react-styles/package.json index f79e995c175..3de6c0a3824 100644 --- a/packages/react-styles/package.json +++ b/packages/react-styles/package.json @@ -19,7 +19,7 @@ "clean": "rimraf dist css" }, "devDependencies": { - "@patternfly/patternfly": "5.0.0-alpha.12", + "@patternfly/patternfly": "5.0.0-alpha.18", "camel-case": "^3.0.0", "css": "^2.2.3", "fs-extra": "^6.0.1", diff --git a/packages/react-tokens/package.json b/packages/react-tokens/package.json index ed1bd7b268e..fc7358c82a6 100644 --- a/packages/react-tokens/package.json +++ b/packages/react-tokens/package.json @@ -29,7 +29,7 @@ "clean": "rimraf dist" }, "devDependencies": { - "@patternfly/patternfly": "5.0.0-alpha.12", + "@patternfly/patternfly": "5.0.0-alpha.18", "css": "^2.2.3", "fs-extra": "^6.0.1", "glob": "^7.1.2", diff --git a/yarn.lock b/yarn.lock index dbcc48b9b17..6506eea5e07 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3961,10 +3961,10 @@ puppeteer-cluster "^0.23.0" xmldoc "^1.1.2" -"@patternfly/patternfly@5.0.0-alpha.12": - version "5.0.0-alpha.12" - resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-5.0.0-alpha.12.tgz#252cc43acefccac781c7820f2aedeb8edeb15e7e" - integrity sha512-NIb6i3LVq0aHayLWh7wwliaPvH2oUYsrkiUYgomfOl6nuKDmpY1CAEIZFxcegfomUCmpSM44RsuPGFjMvHNoOA== +"@patternfly/patternfly@5.0.0-alpha.18": + version "5.0.0-alpha.18" + resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-5.0.0-alpha.18.tgz#f0c65d830cc47088be67408fab80a83944b7f2d9" + integrity sha512-FIJ5IXJI35CvFlOWRogERGfpCV7f9XIQwbsCDWRSjPHW941qVzdCzumiH9U5W459cQNDajCq1dBFu5hqUZJWDA== "@phenomnomnominal/tsquery@4.1.1": version "4.1.1"