Skip to content

Commit b5f5281

Browse files
authored
Merge pull request #237 from ediazgallego/194-header-sidebar-ux
194: Improve responsive behavior of Header and Side Navigation Bar
2 parents defaa29 + 0c0176b commit b5f5281

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

src/components/AppLayout.tsx

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,37 @@
22
'use client';
33

44
import * as React from 'react';
5-
import { useRouter, usePathname } from 'next/navigation';
6-
import { useSession } from 'next-auth/react';
5+
6+
import { Page, PageToggleButton } from '@patternfly/react-core/dist/dynamic/components/Page';
7+
import { Text, TextContent, TextVariants } from '@patternfly/react-core/dist/dynamic/components/Text';
8+
import { usePathname, useRouter } from 'next/navigation';
9+
10+
import { BarsIcon } from '@patternfly/react-icons/dist/dynamic/icons/bars-icon';
711
import { Brand } from '@patternfly/react-core/dist/dynamic/components/Brand';
8-
import { Button } from '@patternfly/react-core/dist/dynamic/components/Button';
12+
import HelpDropdown from './HelpDropdown/HelpDropdown';
13+
import Link from 'next/link';
914
import { Masthead } from '@patternfly/react-core/dist/dynamic/components/Masthead';
1015
import { MastheadBrand } from '@patternfly/react-core/dist/dynamic/components/Masthead';
16+
import { MastheadContent } from '@patternfly/react-core/dist/dynamic/components/Masthead';
1117
import { MastheadMain } from '@patternfly/react-core/dist/dynamic/components/Masthead';
1218
import { MastheadToggle } from '@patternfly/react-core/dist/dynamic/components/Masthead';
13-
import { MastheadContent } from '@patternfly/react-core/dist/dynamic/components/Masthead';
1419
import { Nav } from '@patternfly/react-core/dist/dynamic/components/Nav';
20+
import { NavExpandable } from '@patternfly/react-core/dist/dynamic/components/Nav';
1521
import { NavItem } from '@patternfly/react-core/dist/dynamic/components/Nav';
1622
import { NavList } from '@patternfly/react-core/dist/dynamic/components/Nav';
17-
import { NavExpandable } from '@patternfly/react-core/dist/dynamic/components/Nav';
18-
import { Page } from '@patternfly/react-core/dist/dynamic/components/Page';
1923
import { PageSidebar } from '@patternfly/react-core/dist/dynamic/components/Page';
2024
import { PageSidebarBody } from '@patternfly/react-core/dist/dynamic/components/Page';
2125
import { SkipToContent } from '@patternfly/react-core/dist/dynamic/components/SkipToContent';
2226
import { Spinner } from '@patternfly/react-core/dist/dynamic/components/Spinner';
23-
import { BarsIcon } from '@patternfly/react-icons/dist/dynamic/icons/bars-icon';
24-
import { TextContent, Text, TextVariants } from '@patternfly/react-core/dist/dynamic/components/Text';
25-
import { useTheme } from '../context/ThemeContext';
26-
import Link from 'next/link';
27-
import HelpDropdown from './HelpDropdown/HelpDropdown';
2827
import UserMenu from './UserMenu/UserMenu';
28+
import { useSession } from 'next-auth/react';
29+
import { useTheme } from '../context/ThemeContext';
2930

3031
interface IAppLayout {
3132
children: React.ReactNode;
3233
}
3334

3435
const AppLayout: React.FunctionComponent<IAppLayout> = ({ children }) => {
35-
const [sidebarOpen, setSidebarOpen] = React.useState(true);
3636
const { theme } = useTheme();
3737
const { data: session, status } = useSession();
3838
const router = useRouter();
@@ -76,9 +76,9 @@ const AppLayout: React.FunctionComponent<IAppLayout> = ({ children }) => {
7676
const Header = (
7777
<Masthead>
7878
<MastheadToggle>
79-
<Button variant="plain" onClick={() => setSidebarOpen(!sidebarOpen)} aria-label="Global navigation">
79+
<PageToggleButton variant="plain" aria-label="Global navigation">
8080
<BarsIcon />
81-
</Button>
81+
</PageToggleButton>
8282
</MastheadToggle>
8383
<MastheadMain style={{ flexShrink: 1, display: 'flex', alignItems: 'center' }}>
8484
<MastheadBrand>
@@ -137,7 +137,7 @@ const AppLayout: React.FunctionComponent<IAppLayout> = ({ children }) => {
137137
const PageSkipToContent = <SkipToContent href={`#${pageId}`}>Skip to Content</SkipToContent>;
138138

139139
return (
140-
<Page mainContainerId={pageId} header={Header} sidebar={sidebarOpen && Sidebar} skipToContent={PageSkipToContent}>
140+
<Page mainContainerId={pageId} header={Header} isManagedSidebar sidebar={Sidebar} skipToContent={PageSkipToContent}>
141141
{children}
142142
</Page>
143143
);

0 commit comments

Comments
 (0)