Add Service Navigation component, add new Mobile Navigation component #4368
+283
−64
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,111 @@ | ||||||||
| import { Component } from 'govuk-frontend' | ||||||||
|
|
||||||||
| /** | ||||||||
| * Mobile Navigation enhancement for Service Navigation component | ||||||||
| */ | ||||||||
| class MobileNavigation extends Component { | ||||||||
| static moduleName = 'app-mobile-navigation' | ||||||||
|
|
||||||||
| /** | ||||||||
| * @param {Element} $root - HTML element | ||||||||
| */ | ||||||||
| constructor($root) { | ||||||||
| super($root) | ||||||||
|
|
||||||||
| this.templates = this.$root.querySelectorAll( | ||||||||
| '.app-mobile-navigation__template' | ||||||||
| ) | ||||||||
| this.links = this.$root.querySelectorAll('a') | ||||||||
|
|
||||||||
| Array.from(this.templates).forEach((template) => { | ||||||||
| const templateClone = template.content.cloneNode(true) | ||||||||
| let link | ||||||||
|
|
||||||||
| if (template.parentNode.tagName === 'A') { | ||||||||
| link = template.parentNode | ||||||||
| link.removeChild(template) | ||||||||
| } else { | ||||||||
| link = template.parentNode.parentNode | ||||||||
| template.parentNode.removeChild(template) | ||||||||
| } | ||||||||
|
|
||||||||
| const button = document.createElement('button') | ||||||||
| button.classList.add('govuk-service-navigation__link') | ||||||||
| button.classList.add('app-mobile-navigation__toggle-button') | ||||||||
| button.setAttribute( | ||||||||
| 'aria-expanded', | ||||||||
| String( | ||||||||
| link.parentNode.classList.contains( | ||||||||
| 'govuk-service-navigation__item--active' | ||||||||
| ) | ||||||||
| ) | ||||||||
| ) | ||||||||
| button.textContent = link.textContent | ||||||||
|
|
||||||||
| link.insertAdjacentElement('afterend', templateClone.firstElementChild) | ||||||||
| link.insertAdjacentElement('afterend', button) | ||||||||
| }) | ||||||||
|
|
||||||||
| const currentLink = Array.from( | ||||||||
| this.$root.querySelectorAll( | ||||||||
| `.app-navigation__subnav-item a[href="${window.location.pathname.slice(0, -1)}"]` | ||||||||
| ) | ||||||||
| ).pop() | ||||||||
|
|
||||||||
| if (currentLink) { | ||||||||
| currentLink.classList.add('app-mobile-navigation__link--active') | ||||||||
| } | ||||||||
|
|
||||||||
| // A global const for storing a matchMedia instance which we'll use to detect when a screen size change happens | ||||||||
| // Set the matchMedia to the govuk-frontend tablet breakpoint | ||||||||
|
|
||||||||
| const breakPoint = getComputedStyle( | ||||||||
| document.documentElement | ||||||||
| ).getPropertyValue('--govuk-frontend-breakpoint-tablet') | ||||||||
|
|
||||||||
| this.mql = window.matchMedia(`(min-width: ${breakPoint})`) | ||||||||
|
|
||||||||
| // MediaQueryList.addEventListener isn't supported by Safari < 14 so we need | ||||||||
| // to be able to fall back to the deprecated MediaQueryList.addListener | ||||||||
| if ('addEventListener' in this.mql) { | ||||||||
| this.mql.addEventListener('change', () => this.setHiddenStates()) | ||||||||
| } else { | ||||||||
| // @ts-expect-error Property 'addListener' does not exist | ||||||||
| this.mql.addListener(() => this.setHiddenStates()) | ||||||||
| } | ||||||||
|
|
||||||||
| this.setHiddenStates() | ||||||||
| this.setEventListener() | ||||||||
| } | ||||||||
|
|
||||||||
| /** | ||||||||
| * Set up event delegation for button clicks | ||||||||
| */ | ||||||||
| setEventListener() { | ||||||||
| this.$root.addEventListener( | ||||||||
| 'click', | ||||||||
| (e) => { | ||||||||
| if (e.target.tagName === 'BUTTON') { | ||||||||
| e.target.setAttribute( | ||||||||
| 'aria-expanded', | ||||||||
| !(e.target.getAttribute('aria-expanded') === 'true') | ||||||||
| ) | ||||||||
| } | ||||||||
| }, | ||||||||
| { bubbles: true } | ||||||||
|
Comment on lines
+94
to
+95
There was a problem hiding this comment. issue
Suggested change
|
||||||||
| ) | ||||||||
| } | ||||||||
|
|
||||||||
| /** | ||||||||
| * Hide links if viewport is below tablet | ||||||||
| */ | ||||||||
| setHiddenStates() { | ||||||||
| if (!this.mql.matches) { | ||||||||
| this.links.forEach((a) => a.setAttribute('hidden', '')) | ||||||||
| } else { | ||||||||
| this.links.forEach((a) => a.removeAttribute('hidden')) | ||||||||
| } | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| export default MobileNavigation | ||||||||
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,69 @@ | ||||||||||||||||||||||||||||
| .app-mobile-navigation__theme { | ||||||||||||||||||||||||||||
| @include govuk-typography-common; | ||||||||||||||||||||||||||||
| position: relative; // this is to get around the artificial click area generated by the :after of the parent button | ||||||||||||||||||||||||||||
| margin: 0; | ||||||||||||||||||||||||||||
| padding: 0; | ||||||||||||||||||||||||||||
| color: govuk-colour("dark-grey"); | ||||||||||||||||||||||||||||
| // Font is defined as a hard 19px so | ||||||||||||||||||||||||||||
| // it does not re-size on mobile viewport | ||||||||||||||||||||||||||||
| font-size: 19px; | ||||||||||||||||||||||||||||
| font-size: govuk-px-to-rem(19px); | ||||||||||||||||||||||||||||
| font-weight: normal; | ||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
| .app-mobile-navigation .govuk-service-navigation__item--active { | ||||||||||||||||||||||||||||
| @include govuk-media-query($until: tablet) { | ||||||||||||||||||||||||||||
| border-color: transparent; | ||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
| .app-mobile-navigation__link--active { | ||||||||||||||||||||||||||||
| @include govuk-media-query($until: tablet) { | ||||||||||||||||||||||||||||
| border-left: 5px solid rgb(26.1, 100.8, 165.6); | ||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
| .app-mobile-navigation__toggle-button { | ||||||||||||||||||||||||||||
| @include govuk-media-query($from: tablet) { | ||||||||||||||||||||||||||||
| display: none; | ||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||
| position: relative; | ||||||||||||||||||||||||||||
| padding: 0; | ||||||||||||||||||||||||||||
| border: 0; | ||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
| background: none; | ||||||||||||||||||||||||||||
| font-size: inherit; | ||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
| .app-mobile-navigation__toggle-button::after { | ||||||||||||||||||||||||||||
| content: ""; | ||||||||||||||||||||||||||||
| box-sizing: border-box; | ||||||||||||||||||||||||||||
| display: block; | ||||||||||||||||||||||||||||
| position: absolute; | ||||||||||||||||||||||||||||
| right: govuk-px-to-rem(-14px); | ||||||||||||||||||||||||||||
| bottom: govuk-px-to-rem(10px); | ||||||||||||||||||||||||||||
| width: govuk-px-to-rem(6px); | ||||||||||||||||||||||||||||
| height: govuk-px-to-rem(6px); | ||||||||||||||||||||||||||||
| border-top: govuk-px-to-rem(2px) solid; | ||||||||||||||||||||||||||||
| border-right: govuk-px-to-rem(2px) solid; | ||||||||||||||||||||||||||||
|
Comment on lines
+47
to
+48
There was a problem hiding this comment. Solid way to have the chevron visible for people using high contrast mode 🙌🏻 |
||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
| .app-mobile-navigation__toggle-button[aria-expanded="false"]::after { | ||||||||||||||||||||||||||||
| transform: rotate(135deg); | ||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
| .app-mobile-navigation__toggle-button[aria-expanded="false"] ~ .app-navigation__list { | ||||||||||||||||||||||||||||
| display: none; | ||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||
|
Comment on lines
+55
to
+57
There was a problem hiding this comment. We may be able to let that selector go when we re-implement the current navigation feature for using |
||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
| .app-mobile-navigation__toggle-button[aria-expanded="true"]::after { | ||||||||||||||||||||||||||||
| transform: rotate(-45deg); | ||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||
|
Comment on lines
+59
to
+61
There was a problem hiding this comment. suggestion This can likely be the default state of the button and save a selector. |
||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
| .app-mobile-navigation__toggle-button[aria-expanded="true"] ~ .app-navigation__list { | ||||||||||||||||||||||||||||
| @include govuk-media-query($until: tablet) { | ||||||||||||||||||||||||||||
| display: block; | ||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
| display: none; | ||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||
|
Comment on lines
+63
to
+69
There was a problem hiding this comment. suggestion Hiding the navigation list and toggle would gain at being regrouped in a single block of code and a single media query for easier maintainability rather than split in their own selector, in the lines of:
Suggested change
This would allow the file to describe first how the different parts look, then when they're visible or not. That media query may also not be necessary once the JavaScript handles using |
||||||||||||||||||||||||||||
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
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,20 @@ | ||
| {% macro mobileNavigation(params) %} | ||
| {% if params.items %} | ||
| <ul class="app-navigation__list"> | ||
| {% for theme, items in params.items | groupby("theme") %} | ||
| {% if theme != 'undefined' %} | ||
| <li class="app-navigation__subnav-item"> | ||
| <h3 class="app-mobile-navigation__theme" >{{ theme }}</h3> | ||
| </li> | ||
| {% endif %} | ||
| {% for item in items %} | ||
| <li class="app-navigation__subnav-item"> | ||
| <a class="govuk-link govuk-link--no-visited-state govuk-link--no-underline" href="{{ item.href }}"> | ||
| {{ item.text }} | ||
| </a> | ||
| </li> | ||
| {% endfor %} | ||
| {% endfor %} | ||
| </ul> | ||
| {% endif %} | ||
| {% endmacro %} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
issue This has a risk to collect elements more broadly than we intend, if one day we add some content to the navigation through slots, for example. Would be good to limit this to links from the actual navigation using their class from the Service Navigation (unless we can set up our own
.js-prefixed class).