Update tab focus state #1496
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,14 +5,13 @@ | |
| @include govuk-exports("govuk/component/tabs") { | ||
|
|
||
| .govuk-tabs { | ||
| @include govuk-responsive-margin(1, "top"); | ||
| @include govuk-responsive-margin(6, "bottom"); | ||
| } | ||
|
|
||
| .govuk-tabs__title { | ||
| @include govuk-font($size: 19); | ||
| @include govuk-text-colour; | ||
| margin-bottom: govuk-spacing(2); | ||
| } | ||
|
|
||
|
|
@@ -24,9 +23,11 @@ | |
| } | ||
|
|
||
| .govuk-tabs__list-item { | ||
| @include govuk-font($size: 19); | ||
| margin-left: govuk-spacing(5); | ||
|
|
||
| &::before { | ||
| @include govuk-text-colour; | ||
| content: "\2014 "; // "— " | ||
| margin-left: - govuk-spacing(5); | ||
| padding-right: govuk-spacing(1); | ||
|
|
@@ -36,28 +37,14 @@ | |
| .govuk-tabs__tab { | ||
| @include govuk-link-style-default; | ||
|
|
||
| display: inline-block; | ||
| margin-bottom: govuk-spacing(2); | ||
|
|
||
| // Focus state for mobile and when JavaScript is disabled | ||
| // It is removed for JS-enabled desktop styles | ||
| &:focus { | ||
| @include govuk-focused-text; | ||
| } | ||
| } | ||
|
|
||
| .govuk-tabs__panel { | ||
|
|
@@ -75,92 +62,80 @@ | |
| border-bottom: 1px solid $govuk-border-colour; | ||
| } | ||
|
|
||
| .govuk-tabs__title { | ||
| display: none; | ||
| } | ||
|
|
||
| .govuk-tabs__list-item { | ||
| position: relative; | ||
|
|
||
| margin-right: govuk-spacing(1); | ||
| margin-bottom: 0; | ||
| margin-left: 0; | ||
| padding: govuk-spacing(2) govuk-spacing(4); | ||
|
|
||
| float: left; | ||
| background-color: govuk-colour("light-grey", $legacy: "grey-4"); | ||
| text-align: center; | ||
|
|
||
| &::before { | ||
| content: none; | ||
| } | ||
| } | ||
|
|
||
| .govuk-tabs__list-item--selected { | ||
| $border-width: 1px; | ||
|
|
||
| position: relative; | ||
|
|
||
| margin-top: - govuk-spacing(1); | ||
|
|
||
| // Compensation for border (otherwise we get a shift) | ||
| margin-bottom: -$border-width; | ||
| padding-top: govuk-spacing(3) - $border-width; | ||
| padding-right: govuk-spacing(4) - $border-width; | ||
| padding-bottom: govuk-spacing(3) + $border-width; | ||
| padding-left: govuk-spacing(4) - $border-width; | ||
|
|
||
| border: $border-width solid $govuk-border-colour; | ||
| border-bottom: 0; | ||
|
|
||
| background-color: $govuk-body-background-colour; | ||
|
|
||
| .govuk-tabs__tab { | ||
| text-decoration: none; | ||
| } | ||
| } | ||
|
|
||
| .govuk-tabs__tab { | ||
| @include govuk-link-style-text; | ||
|
|
||
| margin-bottom: 0; | ||
|
|
||
| &::after { | ||
| content: ""; | ||
| position: absolute; | ||
| top: 0; | ||
| right: 0; | ||
| bottom: 0; | ||
| left: 0; | ||
| } | ||
| } | ||
|
|
||
| .govuk-tabs__panel { | ||
| @include govuk-responsive-margin(0, "bottom"); | ||
| padding: govuk-spacing(6) govuk-spacing(4); | ||
| border: 1px solid $govuk-border-colour; | ||
| border-top: 0; | ||
|
|
||
| & > :last-child { | ||
| margin-bottom: 0; | ||
| } | ||
| } | ||
|
|
||
| .govuk-tabs__panel--hidden { | ||
| display: none; | ||
| } | ||
| } | ||
|
|
||
| } | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -146,6 +146,7 @@ Tabs.prototype.setAttributes = function ($tab) { | |
| $tab.setAttribute('id', 'tab_' + panelId) | ||
| $tab.setAttribute('role', 'tab') | ||
| $tab.setAttribute('aria-controls', panelId) | ||
| $tab.setAttribute('aria-selected', 'false') | ||
| $tab.setAttribute('tabindex', '-1') | ||
|
|
||
| // set panel attributes | ||
|
|
@@ -160,6 +161,7 @@ Tabs.prototype.unsetAttributes = function ($tab) { | |
| $tab.removeAttribute('id') | ||
| $tab.removeAttribute('role') | ||
| $tab.removeAttribute('aria-controls') | ||
| $tab.removeAttribute('aria-selected') | ||
| $tab.removeAttribute('tabindex') | ||
|
|
||
| // unset panel attributes | ||
|
|
@@ -254,18 +256,18 @@ Tabs.prototype.hidePanel = function (tab) { | |
|
|
||
| Tabs.prototype.unhighlightTab = function ($tab) { | ||
| $tab.setAttribute('aria-selected', 'false') | ||
| $tab.parentNode.classList.remove('govuk-tabs__list-item--selected') | ||
| $tab.setAttribute('tabindex', '-1') | ||
| } | ||
|
|
||
| Tabs.prototype.highlightTab = function ($tab) { | ||
| $tab.setAttribute('aria-selected', 'true') | ||
| $tab.parentNode.classList.add('govuk-tabs__list-item--selected') | ||
| $tab.setAttribute('tabindex', '0') | ||
| } | ||
|
|
||
| Tabs.prototype.getCurrentTab = function () { | ||
| return this.$module.querySelector('.govuk-tabs__list-item--selected .govuk-tabs__tab') | ||
| } | ||
|
|
||
| // this is because IE doesn't always return the actual value but a relative full path | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -33,8 +33,8 @@ describe('/components/tabs', () => { | |
| const firstTabAriaSelected = await page.evaluate(() => document.body.querySelector('.govuk-tabs__list-item:first-child .govuk-tabs__tab').getAttribute('aria-selected')) | ||
| expect(firstTabAriaSelected).toEqual('true') | ||
|
|
||
| const firstTabClasses = await page.evaluate(() => document.body.querySelector('.govuk-tabs__list-item:first-child').className) | ||
| expect(firstTabClasses).toContain('govuk-tabs__list-item--selected') | ||
| }) | ||
|
|
||
| it('should display the first tab panel', async () => { | ||
|
|
@@ -62,8 +62,8 @@ describe('/components/tabs', () => { | |
| const secondTabAriaSelected = await page.evaluate(() => document.body.querySelector('.govuk-tabs__list-item:nth-child(2) .govuk-tabs__tab').getAttribute('aria-selected')) | ||
| expect(secondTabAriaSelected).toEqual('true') | ||
|
|
||
| const secondTabClasses = await page.evaluate(() => document.body.querySelector('.govuk-tabs__list-item:nth-child(2)').className) | ||
| expect(secondTabClasses).toContain('govuk-tabs__list-item--selected') | ||
| }) | ||
|
|
||
| it('should display the tab panel associated with the selected tab', async () => { | ||
|
|
@@ -112,8 +112,8 @@ describe('/components/tabs', () => { | |
| const secondTabAriaSelected = await page.evaluate(() => document.body.querySelector('.govuk-tabs__list-item:nth-child(2) .govuk-tabs__tab').getAttribute('aria-selected')) | ||
| expect(secondTabAriaSelected).toEqual('true') | ||
|
|
||
| const secondTabClasses = await page.evaluate(() => document.body.querySelector('.govuk-tabs__list-item:nth-child(2)').className) | ||
| expect(secondTabClasses).toContain('govuk-tabs__list-item--selected') | ||
| }) | ||
|
|
||
| it('should display the tab panel associated with the selected tab', async () => { | ||
|
|
@@ -138,8 +138,8 @@ describe('/components/tabs', () => { | |
| const currentTabAriaSelected = await page.evaluate(() => document.body.querySelector('.govuk-tabs__tab[href="#past-week"]').getAttribute('aria-selected')) | ||
| expect(currentTabAriaSelected).toEqual('true') | ||
|
|
||
| const currentTabClasses = await page.evaluate(() => document.body.querySelector('.govuk-tabs__tab[href="#past-week"]').parentNode.className) | ||
| expect(currentTabClasses).toContain('govuk-tabs__list-item--selected') | ||
|
|
||
| const currentTabPanelIsHidden = await page.evaluate(() => document.getElementById('past-week').classList.contains('govuk-tabs__panel--hidden')) | ||
| expect(currentTabPanelIsHidden).toBeFalsy() | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -192,9 +192,9 @@ examples: | |
| panel: | ||
| html: | | ||
| <h2 class="govuk-heading-l">Tab 1</h2> | ||
| <p class="govuk-body">Testing that when you click the anchor it moves to the anchor point successfully</p> | ||
| <p class="govuk-body"><a class="govuk-link" href="#anchor">Anchor</a></p> | ||
| <p class="govuk-body"><a id="anchor" tabIndex="0">Anchor Point</a></p> | ||
| - label: Tab 2 | ||
| id: tab-2 | ||
| panel: | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -10,8 +10,8 @@ | |
| <ul class="govuk-tabs__list"> | ||
| {% for item in params.items %} | ||
| {% set id = item.id if item.id else idPrefix + "-" + loop.index %} | ||
| <li class="govuk-tabs__list-item{% if loop.index == 1 %} govuk-tabs__list-item--selected{% endif %}"> | ||
| <a class="govuk-tabs__tab" href="#{{ id }}" | ||
| {%- for attribute, value in item.attributes %} {{attribute}}="{{value}}"{% endfor %}> | ||
| {{ item.label }} | ||
| </a> | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -227,22 +227,35 @@ describe('Tabs', () => { | |
| panel: { | ||
| text: 'Panel text 2' | ||
| } | ||
| } | ||
| ] | ||
| }) | ||
|
|
||
| const $tab = $('[href="#tab-1"]').parent() | ||
| expect($tab.hasClass('govuk-tabs__list-item--selected')).toBeTruthy() | ||
| }) | ||
|
|
||
| it('hides all but the first panel', () => { | ||
| const $ = render('tabs', { | ||
| items: [ | ||
| { | ||
| id: 'tab-1', | ||
| label: 'Tab 1', | ||
| panel: { | ||
| text: 'Panel text' | ||
| } | ||
| }, | ||
| { | ||
| id: 'tab-2', | ||
| label: 'Tab 2', | ||
| panel: { | ||
| text: 'Panel text 2' | ||
| } | ||
| } | ||
| ] | ||
| }) | ||
|
|
||
| expect($('#tab-2').hasClass('govuk-tabs__panel--hidden')).toBeTruthy() | ||
| }) | ||
| }) | ||
| }) | ||
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.
This looks good to me. @m-green what do you think?