Skip to content
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

SideNav should overlay Content in UIShell #1585

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

SideNav should overlay Content in UIShell #1585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e9501be
SideNav should overlay Content in UIShell
jqlio18 Dec 14, 2022
717d6d8
Previous commit was removing `margin-left: 0`
jqlio18 Dec 14, 2022
0042c3c
Use variables since we have them -_-
jqlio18 Dec 14, 2022
bf639a5
Take the same approach as react
jqlio18 Dec 18, 2022
d5251ff
Fix some bugs with rail variant and fix offset
jqlio18 Dec 18, 2022
69b208a
add $$restProps.style
jqlio18 Dec 19, 2022
da7f03a
React don't have the `narrow` and `noGutter`props
jqlio18 Dec 19, 2022
6daeb5d
Remove unsued variables.
jqlio18 Dec 19, 2022
d0ead2e
Fix `HamburgerMenu` not working with
jqlio18 Dec 19, 2022
bd57078
Fix `persistentHamburgerMenu` offset behavior.
jqlio18 Dec 19, 2022
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
45 changes: 28 additions & 17 deletions src/UIShell/Content.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,34 @@
/** Specify the id for the main element */
export let id = "main-content";

import { isSideNavCollapsed, isSideNavRail } from "./navStore";

/**
* By default, the `SideNav` applies a left margin of `3rem` to `Content`
* if it's a sibling component (e.g., .bx--side-nav ~ .bx--content).
*
* We manually unset the left margin if the `SideNav`
* is collapsed and if it's not the `rail` variant.
*/
$: unsetLeftMargin = $isSideNavCollapsed && !$isSideNavRail;
import { Grid, Row, Column } from "../Grid";
import {
shouldRenderHamburgerMenu,
isPersistentHamburgerMenu,
} from "./navStore";
</script>

<main
id="{id}"
class:bx--content="{true}"
{...$$restProps}
style="{unsetLeftMargin ? 'margin-left: 0;' : ''} {$$restProps.style}"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think that this should be changed since $$restProps.style will override the attribute.

<div
style="padding: 3em; display: flex; flex-direction: column; align-items: center;"
>
<slot />
</main>
<div style="position: relative; width: 100%; z-index: 0;">
<main
id="{id}"
class:bx--content="{true}"
{...$$restProps}
style="{`height: 100%; margin: 0px; width: 100%; ${$$restProps.style}`}"
>
<Grid>
<Row>
<Column
lg="{$shouldRenderHamburgerMenu && !$isPersistentHamburgerMenu
? { span: 13, offset: 3 }
: {}}"
>
<slot />
</Column>
</Row>
</Grid>
</main>
</div>
</div>
6 changes: 5 additions & 1 deletion src/UIShell/Header.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,15 @@

import Close from "../icons/Close.svelte";
import Menu from "../icons/Menu.svelte";
import { shouldRenderHamburgerMenu } from "./navStore";
import {
shouldRenderHamburgerMenu,
isPersistentHamburgerMenu,
} from "./navStore";
import HamburgerMenu from "./HamburgerMenu.svelte";

let winWidth = undefined;

$: $isPersistentHamburgerMenu = persistentHamburgerMenu;
$: isSideNavOpen =
expandedByDefault &&
winWidth >= expansionBreakpoint &&
Expand Down
30 changes: 9 additions & 21 deletions src/UIShell/SideNav.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,31 +20,15 @@
/** Set to `true` to toggle the expanded state */
export let isOpen = false;

/**
* The window width (px) at which the SideNav is expanded and the hamburger menu is hidden
* 1056 represents the "large" breakpoint in pixels from the Carbon Design System:
* small: 320
* medium: 672
* large: 1056
* x-large: 1312
* max: 1584
*/
export let expansionBreakpoint = 1056;

import { onMount, createEventDispatcher } from "svelte";
import {
shouldRenderHamburgerMenu,
isSideNavCollapsed,
isSideNavRail,
} from "./navStore";
import { shouldRenderHamburgerMenu } from "./navStore";

const dispatch = createEventDispatcher();

let winWidth = undefined;
let railIsOpen = false;

$: dispatch(isOpen ? "open" : "close");
$: $isSideNavCollapsed = !isOpen;
$: $isSideNavRail = rail;

onMount(() => {
shouldRenderHamburgerMenu.set(true);
Expand All @@ -67,14 +51,18 @@
></div>
{/if}
<nav
on:mouseenter="{() => {
if (rail) railIsOpen = true;
}}"
on:mouseleave="{() => {
if (railIsOpen) railIsOpen = false;
}}"
aria-hidden="{!isOpen}"
aria-label="{ariaLabel}"
class:bx--side-nav__navigation="{true}"
class:bx--side-nav="{true}"
class:bx--side-nav--ux="{true}"
class:bx--side-nav--expanded="{rail && winWidth >= expansionBreakpoint
? false
: isOpen}"
class:bx--side-nav--expanded="{isOpen || railIsOpen}"
class:bx--side-nav--collapsed="{!isOpen && !rail}"
class:bx--side-nav--rail="{rail}"
{...$$restProps}
Expand Down
4 changes: 1 addition & 3 deletions src/UIShell/navStore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@ import { writable } from "svelte/store";

export const shouldRenderHamburgerMenu = writable(false);

export const isSideNavCollapsed = writable(false);

export const isSideNavRail = writable(false);
export const isPersistentHamburgerMenu = writable(false);