Skip to content

chore(docs): core bump, jumplinks demo fix #10993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tlabaj merged 4 commits into from
Sep 24, 2024
Merged

chore(docs): core bump, jumplinks demo fix #10993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6cf48c2
chore(docs): core bump, jumplinks demo fix
evwilkin Sep 13, 2024
3e9839d
chore(docs): yarn lock
evwilkin Sep 13, 2024
bf80384
PR feedback - add styles import to md
evwilkin Sep 24, 2024
d2e0b05
rebase & commit yarn lock
evwilkin Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/react-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions packages/react-core/src/demos/JumpLinks.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion packages/react-core/src/demos/examples/JumpLinks/JumpLinksWithDrawer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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
);
Expand Down
2 changes: 1 addition & 1 deletion packages/react-docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:^",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-icons/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/react-integration/cypress/integration/codeeditor.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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');
});
Expand Down
8 changes: 3 additions & 5 deletions packages/react-integration/cypress/integration/jumplinks.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
});
});
2 changes: 1 addition & 1 deletion packages/react-styles/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/react-tokens/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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:^"
Expand All @@ -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:^"
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down