-
Notifications
You must be signed in to change notification settings - Fork 42
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
33 changed files
with
1,508 additions
and
505 deletions.
There are no files selected for viewing
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
packages/components/addon/components/hds/side-nav/index.hbs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| <div class={{this.classNames}} ...attributes {{focus-trap isActive=this.shouldTrapFocus}}> | ||
| {{#if this.hasA11yRefocus}} | ||
| <NavigationNarrator | ||
| @routeChangeValidator={{@a11yRefocusRouteChangeValidator}} | ||
| @skipTo="#{{@a11yRefocusSkipTo}}" | ||
| @skipText={{@a11yRefocusSkipText}} | ||
| @navigationText={{@a11yRefocusNavigationText}} | ||
| /> | ||
| {{/if}} | ||
|
|
||
| {{#if this.isResponsive}} | ||
| {{! template-lint-disable no-invalid-interactive}} | ||
| <div class="hds-side-nav__overlay" {{on "click" this.toggleMinimizedStatus}} /> | ||
| {{/if}} | ||
|
|
||
| <div class="hds-side-nav__wrapper"> | ||
| {{#if this.isResponsive}} | ||
| <button | ||
| class="hds-side-nav__menu-toggle-button" | ||
| type="button" | ||
| {{on "click" this.toggleMinimizedStatus}} | ||
| {{! To be localized - see: https://hashicorp.atlassian.net/browse/HDS-567 }} | ||
| aria-label={{if this.isMinimized "Open menu" "Close menu"}} | ||
| > | ||
| <FlightIcon @name={{if this.isMinimized "menu" "x"}} @size="24" @stretched={{true}} /> | ||
| </button> | ||
| {{/if}} | ||
| <div class="hds-side-nav__wrapper-header"> | ||
| {{yield (hash isMinimized=this.isMinimized) to="header"}} | ||
| </div> | ||
| <div class="hds-side-nav__wrapper-body" aria-label="contents"> | ||
| {{yield (hash isMinimized=this.isMinimized) to="body"}} | ||
| </div> | ||
| <div class="hds-side-nav__wrapper-footer"> | ||
| {{yield (hash isMinimized=this.isMinimized) to="footer"}} | ||
| </div> | ||
| </div> | ||
| </div> |
88 changes: 88 additions & 0 deletions
88
packages/components/addon/components/hds/side-nav/index.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| /** | ||
| * Copyright (c) HashiCorp, Inc. | ||
| * SPDX-License-Identifier: MPL-2.0 | ||
| */ | ||
|
|
||
| import Component from '@glimmer/component'; | ||
| import { action } from '@ember/object'; | ||
| import { tracked } from '@glimmer/tracking'; | ||
| import { registerDestructor } from '@ember/destroyable'; | ||
|
|
||
| export default class HdsSideNavComponent extends Component { | ||
| @tracked isResponsive = this.args.isResponsive ?? true; | ||
| @tracked isMinimized = this.isResponsive; // we set it minimized by default so that if we switch viewport from desktop to mobile its already minimized | ||
| @tracked isDesktop = true; | ||
| hasA11yRefocus = this.args.hasA11yRefocus ?? true; | ||
|
|
||
| desktopMQVal = getComputedStyle(document.documentElement).getPropertyValue( | ||
| '--hds-app-desktop-breakpoint' | ||
| ); | ||
|
|
||
| constructor() { | ||
| super(...arguments); | ||
| this.desktopMQ = window.matchMedia(`(min-width:${this.desktopMQVal})`); | ||
| this.addEventListeners(); | ||
| registerDestructor(this, () => { | ||
| this.removeEventListeners(); | ||
| }); | ||
| } | ||
|
|
||
| addEventListeners() { | ||
| document.addEventListener('keydown', this.escapePress, true); | ||
| this.desktopMQ.addEventListener('change', this.updateDesktopVariable, true); | ||
| // set initial state based on screen | ||
| this.updateDesktopVariable({ matches: this.desktopMQ.matches }); | ||
| } | ||
|
|
||
| removeEventListeners() { | ||
| document.removeEventListener('keydown', this.escapePress, true); | ||
| this.desktopMQ.removeEventListener( | ||
| 'change', | ||
| this.updateDesktopVariable, | ||
| true | ||
| ); | ||
| } | ||
|
|
||
| get shouldTrapFocus() { | ||
| return this.isResponsive && !this.isDesktop && !this.isMinimized; | ||
| } | ||
|
|
||
| get classNames() { | ||
| let classes = ['hds-side-nav']; | ||
|
|
||
| // add specific class names for the different possible states | ||
| if (this.isDesktop) { | ||
| classes.push('hds-side-nav--is-desktop'); | ||
| } else { | ||
| classes.push('hds-side-nav--is-mobile'); | ||
| } | ||
| if (this.isResponsive) { | ||
| classes.push('hds-side-nav--is-responsive'); | ||
| } | ||
| // TODO should be moved under the `isResponsive` condition above? | ||
| if (this.isMinimized) { | ||
| classes.push('hds-side-nav--is-minimized'); | ||
| } else { | ||
| classes.push('hds-side-nav--is-not-minimized'); | ||
| } | ||
|
|
||
| return classes.join(' '); | ||
| } | ||
|
|
||
| @action | ||
| escapePress(event) { | ||
| if (event.key === 'Escape' && !this.isMinimized) { | ||
| this.isMinimized = true; | ||
| } | ||
| } | ||
|
|
||
| @action | ||
| toggleMinimizedStatus() { | ||
| this.isMinimized = !this.isMinimized; | ||
| } | ||
|
|
||
| @action | ||
| updateDesktopVariable(event) { | ||
| this.isDesktop = event.matches; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
packages/components/addon/components/hds/side-nav/portal/index.hbs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <Portal @target={{if @targetName @targetName "hds-side-nav-portal-target"}}> | ||
| <div class="hds-side-nav__content-panel" ...attributes> | ||
| <Hds::SideNav::List aria-label={{@ariaLabel}} as |ListElements|> | ||
| {{yield ListElements}} | ||
| </Hds::SideNav::List> | ||
| </div> | ||
| </Portal> |
9 changes: 9 additions & 0 deletions
9
packages/components/addon/components/hds/side-nav/portal/target.hbs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <div class="hds-side-nav__content" ...attributes> | ||
| <PortalTarget | ||
| @multiple={{true}} | ||
| @onChange={{this.panelsChanged}} | ||
| @name={{if @targetName @targetName "hds-side-nav-portal-target"}} | ||
| class="hds-side-nav__content-panels hds-side-nav-hide-when-minimized" | ||
| {{did-update this.animateSubnav this.numSubnavs}} | ||
| /> | ||
| </div> |
142 changes: 142 additions & 0 deletions
142
packages/components/addon/components/hds/side-nav/portal/target.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| import Component from '@glimmer/component'; | ||
| import { inject as service } from '@ember/service'; | ||
| import { tracked } from '@glimmer/tracking'; | ||
| import { action } from '@ember/object'; | ||
| import { DEBUG } from '@glimmer/env'; | ||
| import Ember from 'ember'; | ||
|
|
||
| export default class SidenavPortalTarget extends Component { | ||
| @service router; | ||
|
|
||
| @tracked numSubnavs = 0; | ||
|
|
||
| static get prefersReducedMotionOverride() { | ||
| return Ember.testing; | ||
| } | ||
|
|
||
| prefersReducedMotionMQ = window.matchMedia( | ||
| '(prefers-reduced-motion: reduce)' | ||
| ); | ||
|
|
||
| get prefersReducedMotion() { | ||
| return ( | ||
| this.constructor.prefersReducedMotionOverride || | ||
| (this.prefersReducedMotionMQ && this.prefersReducedMotionMQ.matches) | ||
| ); | ||
| } | ||
|
|
||
| @action | ||
| panelsChanged(portalCount) { | ||
| this.numSubnavs = portalCount; | ||
| } | ||
|
|
||
| @action | ||
| animateSubnav(element, [count]) { | ||
| /* | ||
| * Here is what the layout looks like for this setup | ||
| * | ||
| SideNav | ||
| +----------------------+ | ||
| | +------------------+ | | ||
| | | ("header") | | | ||
| | +------------------+ | | ||
| | | | ||
| | +------------------+ | | ||
| | | ("body") | | | ||
| (PortalTarget) | | | | | ||
| +----------------------------------------------+ | | | ||
| | +----------+ +----------+ | +----------+ | | | | ||
| | | (Portal) | | (Portal) | | (Portal) | | | | | ||
| | | | | | | | | | | | | ||
| | | hidden | | hidden | | *active* | | | | | ||
| | | panel | | panel | | | panel | | | | | ||
| | | | | | | | | | | | ||
| | | | | | | | | | | | | ||
| | | | | | | | | | | | ||
| | | | | | | | | | | | | ||
| | | | | | | | | | | | ||
| | | | | | | | | | | | | ||
| | | | | | | | | | | | ||
| | +----------+ +----------+ | +----------+ | | | | ||
| +----------------------------------------------+ | | | ||
| | | | | | ||
| | +------------------+ | | ||
| | | | ||
| | +------------------+ | | ||
| | | ("footer") | | | ||
| | +------------------+ | | ||
| +----------------------+ | ||
| * | ||
| * every time `HcAppFrame::SideNav::Portal` renders, it contains a portaled "panel" | ||
| * that is rendered into the `hds-side-nav__content-panels` (inside the PortalTarget). | ||
| * | ||
| * Rendering or unrendering other `HcAppFrame::SideNav::Portal`s triggers the number of | ||
| * subnavs to change (via `numSubnavs`), so this function runs and slides | ||
| * `hds-side-nav__content-panels` left or right using the `element.animate` api. | ||
| * | ||
| * */ | ||
|
|
||
| let activeIndex = count - 1; | ||
| let targetElement = element; | ||
| let { prefersReducedMotion } = this; | ||
|
|
||
| let styles = getComputedStyle(targetElement); | ||
| let columnWidth = styles.getPropertyValue( | ||
| '--hds-app-sidenav-width-expanded' | ||
| ); | ||
| let slideDuration = prefersReducedMotion ? 0 : 150; | ||
| let fadeDuration = prefersReducedMotion ? 0 : 175; | ||
| let fadeDelay = prefersReducedMotion ? 0 : 50; | ||
|
|
||
| // slide entire parent panel | ||
| let start = styles.transform; | ||
| let end = `translateX(-${activeIndex * parseInt(columnWidth, 10)}px)`; | ||
| let anim = targetElement.animate( | ||
| [{ transform: start }, { transform: end }], | ||
| { | ||
| duration: slideDuration, | ||
| easing: 'cubic-bezier(0.65, 0, 0.35, 1)', | ||
| fill: 'forwards', | ||
| } | ||
| ); | ||
| // Notice: we don't add the styles by default because it writes a `style` attribute to the element and it causes an additional re-render | ||
| if (DEBUG) { | ||
| anim.commitStyles(); | ||
| } | ||
| anim.finished.then(() => { | ||
| // TODO - this scrolls the main element too? | ||
| //targetElement.scrollIntoView(true); | ||
| if (activeIndex > 0) { | ||
| let allPrev = Array.from(targetElement.children).slice(0, activeIndex); | ||
| for (let ele of allPrev) { | ||
| ele.ariaHidden = 'true'; | ||
| ele.style.setProperty('visibility', 'hidden'); | ||
| ele.style.setProperty('opacity', '0'); | ||
| } | ||
| } | ||
| // Notice: we don't add the styles by default because it writes a `style` attribute to the element and it causes an additional re-render | ||
| if (DEBUG) { | ||
| anim.commitStyles(); | ||
| } | ||
| }); | ||
|
|
||
| // fade in next panel | ||
| let nextPanelEl = targetElement.children[activeIndex]; | ||
| if (nextPanelEl) { | ||
| nextPanelEl.ariaHidden = 'false'; | ||
| nextPanelEl.style.setProperty('visibility', 'visible'); | ||
| // this eliminates a flicker if there's only 1 subnav rendering | ||
| if (activeIndex === 0) { | ||
| fadeDelay = 0; | ||
| fadeDuration = 0; | ||
| } | ||
| nextPanelEl.animate([{ opacity: '0' }, { opacity: '1' }], { | ||
| delay: fadeDelay, | ||
| duration: fadeDuration, | ||
| fill: 'forwards', | ||
| }); | ||
| } | ||
| } | ||
| } |
18 changes: 0 additions & 18 deletions
18
packages/components/addon/components/hds/side-nav/wrapper.hbs
This file was deleted.
Oops, something went wrong.
6 changes: 6 additions & 0 deletions
6
packages/components/app/components/hds/side-nav/header/home-link.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| /** | ||
| * Copyright (c) HashiCorp, Inc. | ||
| * SPDX-License-Identifier: MPL-2.0 | ||
| */ | ||
|
|
||
| export { default } from '@hashicorp/design-system-components/components/hds/side-nav/header/home-link'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
packages/components/app/components/hds/side-nav/portal/target.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| /** | ||
| * Copyright (c) HashiCorp, Inc. | ||
| * SPDX-License-Identifier: MPL-2.0 | ||
| */ | ||
|
|
||
| export { default } from '@hashicorp/design-system-components/components/hds/side-nav/portal/target'; |
Oops, something went wrong.