Skip to content

Commit 90a4026

Browse files
committed
fix(PageSidebar): sidebar flash on non-mobile
Signed-off-by: gitdallas <5322142+gitdallas@users.noreply.github.com>
1 parent ce02202 commit 90a4026

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

packages/react-core/src/components/Page/Page.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ class Page extends Component<PageProps, PageState> {
266266
isManagedSidebar,
267267
onSidebarToggle: mobileView ? this.onSidebarToggleMobile : this.onSidebarToggleDesktop,
268268
isSidebarOpen: mobileView ? mobileIsSidebarOpen : desktopIsSidebarOpen,
269+
isMobile: mobileView,
269270
width,
270271
height,
271272
getBreakpoint,

packages/react-core/src/components/Page/PageContext.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export interface PageContextProps {
66
isManagedSidebar: boolean;
77
onSidebarToggle: () => void;
88
isSidebarOpen: boolean;
9+
isMobile: boolean;
910
width: number;
1011
height: number;
1112
getBreakpoint: (width: number | null) => 'default' | 'sm' | 'md' | 'lg' | 'xl' | '2xl';
@@ -16,6 +17,7 @@ export const pageContextDefaults: PageContextProps = {
1617
isManagedSidebar: false,
1718
isSidebarOpen: false,
1819
onSidebarToggle: () => null,
20+
isMobile: false,
1921
width: null,
2022
height: null,
2123
getBreakpoint,

packages/react-core/src/components/Page/PageSidebar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ export const PageSidebar: React.FunctionComponent<PageSidebarProps> = ({
3535
...props
3636
}: PageSidebarProps) => (
3737
<PageContextConsumer>
38-
{({ isManagedSidebar, isSidebarOpen: managedIsNavOpen }: PageSidebarProps) => {
38+
{({ isManagedSidebar, isSidebarOpen: managedIsNavOpen, isMobile }) => {
3939
const sidebarOpen = isManagedSidebar ? managedIsNavOpen : isSidebarOpen;
4040

4141
return (
4242
<div
4343
id={id}
4444
className={css(
4545
styles.pageSidebar,
46-
sidebarOpen && styles.modifiers.expanded,
46+
sidebarOpen && isMobile && styles.modifiers.expanded,
4747
!sidebarOpen && styles.modifiers.collapsed,
4848
className
4949
)}

0 commit comments

Comments
 (0)