diff --git a/packages/react-core/package.json b/packages/react-core/package.json index d78d0c8593c..029cdff08f7 100644 --- a/packages/react-core/package.json +++ b/packages/react-core/package.json @@ -54,7 +54,7 @@ "tslib": "^2.7.0" }, "devDependencies": { - "@patternfly/patternfly": "6.0.0-prerelease.5", + "@patternfly/patternfly": "6.0.0-prerelease.7", "case-anything": "^2.1.13", "css": "^3.0.0", "fs-extra": "^11.2.0" diff --git a/packages/react-core/src/demos/JumpLinks.md b/packages/react-core/src/demos/JumpLinks.md index f5f30e79195..f861d488a4a 100644 --- a/packages/react-core/src/demos/JumpLinks.md +++ b/packages/react-core/src/demos/JumpLinks.md @@ -4,6 +4,7 @@ section: components --- import mastheadStyles from '@patternfly/react-styles/css/components/Masthead/masthead'; +import breadcrumbStyles from '@patternfly/react-styles/css/components/Breadcrumb/breadcrumb'; import { DashboardWrapper } from '@patternfly/react-core/dist/js/demos/DashboardWrapper'; ## Demos diff --git a/packages/react-core/src/demos/examples/JumpLinks/JumpLinksWithDrawer.js b/packages/react-core/src/demos/examples/JumpLinks/JumpLinksWithDrawer.js index fecce0e8359..c7a3b2a16ec 100644 --- a/packages/react-core/src/demos/examples/JumpLinks/JumpLinksWithDrawer.js +++ b/packages/react-core/src/demos/examples/JumpLinks/JumpLinksWithDrawer.js @@ -21,6 +21,7 @@ import { } from '@patternfly/react-core'; import { DashboardWrapper } from '@patternfly/react-core/dist/js/demos/DashboardWrapper'; import mastheadStyles from '@patternfly/react-styles/css/components/Masthead/masthead'; +import breadcrumbStyles from '@patternfly/react-styles/css/components/Breadcrumb/breadcrumb'; const JumpLinksWrapper = ({ offsetHeight, headings }) => { const { drawerContentRef } = React.useContext(DrawerContext); @@ -52,12 +53,14 @@ export const JumpLinksWithDrawer = () => { React.useEffect(() => { const masthead = document.getElementsByClassName(mastheadStyles.masthead)[0]; + const breadcrumb = document.getElementsByClassName(breadcrumbStyles.breadcrumb)[0]; const drawerToggleSection = document.getElementById('drawer-toggle'); + setOffsetHeight(masthead.offsetHeight + breadcrumb.offsetHeight + drawerToggleSection.offsetHeight); getResizeObserver( masthead, () => { - setOffsetHeight(masthead.offsetHeight + drawerToggleSection.offsetHeight); + setOffsetHeight(masthead.offsetHeight + breadcrumb.offsetHeight + drawerToggleSection.offsetHeight); }, true ); diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index 63a48bdd87c..ea8a0bc5bbe 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-prerelease.5", + "@patternfly/patternfly": "6.0.0-prerelease.7", "@patternfly/react-charts": "workspace:^", "@patternfly/react-code-editor": "workspace:^", "@patternfly/react-core": "workspace:^", diff --git a/packages/react-icons/package.json b/packages/react-icons/package.json index 495b0959964..15cc82e3ac5 100644 --- a/packages/react-icons/package.json +++ b/packages/react-icons/package.json @@ -33,7 +33,7 @@ "@fortawesome/free-brands-svg-icons": "^5.15.4", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@patternfly/patternfly": "6.0.0-prerelease.5", + "@patternfly/patternfly": "6.0.0-prerelease.7", "fs-extra": "^11.2.0", "tslib": "^2.7.0" }, diff --git a/packages/react-integration/cypress/integration/codeeditor.spec.ts b/packages/react-integration/cypress/integration/codeeditor.spec.ts index 2a4f43e9a11..9b734131e1f 100644 --- a/packages/react-integration/cypress/integration/codeeditor.spec.ts +++ b/packages/react-integration/cypress/integration/codeeditor.spec.ts @@ -1,4 +1,4 @@ -describe('Context Selector Demo Test', () => { +describe('Code Editor Demo Test', () => { it('Navigate to demo section', () => { cy.visit('http://localhost:3000/code-editor-demo-nav-link'); }); diff --git a/packages/react-integration/cypress/integration/jumplinks.spec.ts b/packages/react-integration/cypress/integration/jumplinks.spec.ts index efb24d900ed..7b3d6918fd0 100644 --- a/packages/react-integration/cypress/integration/jumplinks.spec.ts +++ b/packages/react-integration/cypress/integration/jumplinks.spec.ts @@ -9,10 +9,8 @@ describe('Jump Link Demo Test', () => { expect(firstScroll).to.eq(0); }); cy.get('#heading-3').click(); - cy.get('#ts-demo-app-page-id') - .parent() - .then((el) => { - expect(el.scrollTop()).to.not.eq(0); - }); + cy.get('#ts-demo-app-page-id').then((el) => { + expect(el.scrollTop()).to.not.eq(0); + }); }); }); diff --git a/packages/react-styles/package.json b/packages/react-styles/package.json index 99fc34513c1..8e12f26f2df 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-prerelease.5", + "@patternfly/patternfly": "6.0.0-prerelease.7", "change-case": "^5.4.4", "fs-extra": "^11.2.0" }, diff --git a/packages/react-tokens/package.json b/packages/react-tokens/package.json index ebc2b0a2199..ad8aad24397 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-prerelease.5", + "@patternfly/patternfly": "6.0.0-prerelease.7", "css": "^3.0.0", "fs-extra": "^11.2.0" } diff --git a/yarn.lock b/yarn.lock index 2a8b77070f1..eae30eafcee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3140,10 +3140,10 @@ __metadata: languageName: node linkType: hard -"@patternfly/patternfly@npm:6.0.0-prerelease.5": - version: 6.0.0-prerelease.5 - resolution: "@patternfly/patternfly@npm:6.0.0-prerelease.5" - checksum: 10c0/540b18d35a3e465328c1d4f029d9a9a86f0250f18a698d156805b6c0f382309f61bc842f9ef9e3a83cf0c3870ef7f537c2bec6c4e56f00638c71d3914b73f3c6 +"@patternfly/patternfly@npm:6.0.0-prerelease.7": + version: 6.0.0-prerelease.7 + resolution: "@patternfly/patternfly@npm:6.0.0-prerelease.7" + checksum: 10c0/4d9f115cecdb69d50cf5e4a060d51fc6bcc33ee8b9a432e99b3844fc169b387ac98c97aed232e28be3e2ea1b74bf2ab1e5e63ce8e01b755a8237b990432a9a74 languageName: node linkType: hard @@ -3202,7 +3202,7 @@ __metadata: version: 0.0.0-use.local resolution: "@patternfly/react-core@workspace:packages/react-core" dependencies: - "@patternfly/patternfly": "npm:6.0.0-prerelease.5" + "@patternfly/patternfly": "npm:6.0.0-prerelease.7" "@patternfly/react-icons": "workspace:^" "@patternfly/react-styles": "workspace:^" "@patternfly/react-tokens": "workspace:^" @@ -3223,7 +3223,7 @@ __metadata: resolution: "@patternfly/react-docs@workspace:packages/react-docs" dependencies: "@patternfly/documentation-framework": "npm:^6.0.0-alpha.99" - "@patternfly/patternfly": "npm:6.0.0-prerelease.5" + "@patternfly/patternfly": "npm:6.0.0-prerelease.7" "@patternfly/patternfly-a11y": "npm:4.3.1" "@patternfly/react-charts": "workspace:^" "@patternfly/react-code-editor": "workspace:^" @@ -3261,7 +3261,7 @@ __metadata: "@fortawesome/free-brands-svg-icons": "npm:^5.15.4" "@fortawesome/free-regular-svg-icons": "npm:^5.15.4" "@fortawesome/free-solid-svg-icons": "npm:^5.15.4" - "@patternfly/patternfly": "npm:6.0.0-prerelease.5" + "@patternfly/patternfly": "npm:6.0.0-prerelease.7" fs-extra: "npm:^11.2.0" tslib: "npm:^2.7.0" peerDependencies: @@ -3344,7 +3344,7 @@ __metadata: version: 0.0.0-use.local resolution: "@patternfly/react-styles@workspace:packages/react-styles" dependencies: - "@patternfly/patternfly": "npm:6.0.0-prerelease.5" + "@patternfly/patternfly": "npm:6.0.0-prerelease.7" change-case: "npm:^5.4.4" fs-extra: "npm:^11.2.0" languageName: unknown @@ -3385,7 +3385,7 @@ __metadata: version: 0.0.0-use.local resolution: "@patternfly/react-tokens@workspace:packages/react-tokens" dependencies: - "@patternfly/patternfly": "npm:6.0.0-prerelease.5" + "@patternfly/patternfly": "npm:6.0.0-prerelease.7" css: "npm:^3.0.0" fs-extra: "npm:^11.2.0" languageName: unknown