Skip to content

Commit 85c3ae6

Browse files
authored
Merge pull request #275 from wise-king-sullyman/update-pf-6.5
feat(deps): update PatternFly to 6.5.1
2 parents ab3e6e3 + 25369f6 commit 85c3ae6

5 files changed

Lines changed: 186 additions & 190 deletions

File tree

package-lock.json

Lines changed: 31 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@
6868
"webpack-merge": "^6.0.1"
6969
},
7070
"dependencies": {
71-
"@patternfly/react-core": "^6.4.0",
72-
"@patternfly/react-icons": "^6.4.0",
73-
"@patternfly/react-styles": "^6.4.0",
71+
"@patternfly/react-core": "6.5.1",
72+
"@patternfly/react-icons": "6.5.1",
73+
"@patternfly/react-styles": "6.5.1",
7474
"react": "^18",
7575
"react-dom": "^18",
76-
"sirv-cli": "^3.0.0"
76+
"sirv-cli": "^3.0.1"
7777
},
7878
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
7979
}

src/app/AppLayout/AppLayout.tsx

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import * as React from 'react';
22
import { NavLink, useLocation } from 'react-router-dom';
33
import {
4-
Button,
54
Masthead,
65
MastheadBrand,
76
MastheadLogo,
@@ -14,6 +13,7 @@ import {
1413
Page,
1514
PageSidebar,
1615
PageSidebarBody,
16+
PageToggleButton,
1717
SkipToContent,
1818
} from '@patternfly/react-core';
1919
import { IAppRoute, IAppRouteGroup, routes } from '@app/routes';
@@ -24,20 +24,16 @@ interface IAppLayout {
2424
}
2525

2626
const AppLayout: React.FunctionComponent<IAppLayout> = ({ children }) => {
27-
const [sidebarOpen, setSidebarOpen] = React.useState(true);
2827
const masthead = (
2928
<Masthead>
3029
<MastheadMain>
3130
<MastheadToggle>
32-
<Button
33-
icon={<BarsIcon />}
34-
variant="plain"
35-
onClick={() => setSidebarOpen(!sidebarOpen)}
36-
aria-label="Global navigation"
37-
/>
31+
<PageToggleButton variant="plain" aria-label="Global navigation">
32+
<BarsIcon />
33+
</PageToggleButton>
3834
</MastheadToggle>
39-
<MastheadBrand data-codemods>
40-
<MastheadLogo data-codemods>
35+
<MastheadBrand>
36+
<MastheadLogo>
4137
<svg height="40px" viewBox="0 0 679 158">
4238
<title>PatternFly logo</title>
4339
<defs>
@@ -143,7 +139,8 @@ const AppLayout: React.FunctionComponent<IAppLayout> = ({ children }) => {
143139
<Page
144140
mainContainerId={pageId}
145141
masthead={masthead}
146-
sidebar={sidebarOpen && Sidebar}
142+
isManagedSidebar
143+
sidebar={Sidebar}
147144
skipToContent={PageSkipToContent}
148145
>
149146
{children}

0 commit comments

Comments
 (0)