-
Notifications
You must be signed in to change notification settings - Fork 6
fix: skip link without hash #2755
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.
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
Open
LeoniePeters
wants to merge
6
commits into
master
Choose a base branch
from
fix/EC-7183-skip-link-without-hash
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
45d568c
feat: new SkipLink component; set focus to main programmatically
LeoniePeters 4f30e73
test: add unit tests
LeoniePeters 7201fcd
feat: use SkipLink in ds4ch and landing layouts
LeoniePeters 7c00d53
test: update e2e test
LeoniePeters ff774ab
Merge branch master into fix/EC-7183-skip-link-without-hash
LeoniePeters 8cf4a5a
fix: do not override data-qa main content div
LeoniePeters File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 @@ | ||
| <template> | ||
| <b-button | ||
| :class="classes" | ||
| data-qa="skip to content link" | ||
| @click="handleClick" | ||
| > | ||
| {{ $t(textPath) }} | ||
| </b-button> | ||
| </template> | ||
|
|
||
| <script> | ||
| export default { | ||
| name: 'SkipLink', | ||
|
|
||
| props: { | ||
| selector: { | ||
| type: String, | ||
| default: '#main' | ||
| }, | ||
| classes: { | ||
| type: String, | ||
| default: 'skip-main' | ||
| }, | ||
| textPath: { | ||
| type: String, | ||
| default: 'layout.skipToMain' | ||
| } | ||
| }, | ||
|
|
||
| methods: { | ||
| handleClick() { | ||
| const element = document.querySelector(this.selector); | ||
| element?.setAttribute('tabindex', '-1'); | ||
| element?.focus(); | ||
| } | ||
| } | ||
| }; | ||
| </script> | ||
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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
52 changes: 52 additions & 0 deletions
52
packages/portal/tests/unit/components/generic/SkipLink.spec.js
This file contains hidden or 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,52 @@ | ||
| import { createLocalVue, shallowMount } from '@vue/test-utils'; | ||
| import sinon from 'sinon'; | ||
|
|
||
| import SkipLink from '@/components/generic/SkipLink.vue'; | ||
|
|
||
| const localVue = createLocalVue(); | ||
|
|
||
| const factory = () => { | ||
| return shallowMount(SkipLink, { | ||
| localVue, | ||
| attachTo: document.body, | ||
| mocks: { | ||
| $t: (key) => key | ||
| }, | ||
| stubs: ['b-button'] | ||
| }); | ||
| }; | ||
|
|
||
| describe('components/generic/SkipLink', () => { | ||
| it('is rendered', async() => { | ||
| const wrapper = factory(); | ||
|
|
||
| expect(wrapper.find('b-button-stub').exists()).toBe(true); | ||
| }); | ||
|
|
||
| describe('when clicked', () => { | ||
| describe('and selected element does not exist', () => { | ||
| it('does not focus to the selected element', async() => { | ||
| const wrapper = factory(); | ||
| const selectedElement = document.querySelector(wrapper.vm.selector); | ||
|
|
||
| wrapper.vm.handleClick(); | ||
|
|
||
| expect(selectedElement).toBeFalsy(); | ||
| }); | ||
| }); | ||
| describe('and selected element exists', () => { | ||
| it('sets focus to the selected element', async() => { | ||
| const wrapper = factory(); | ||
| const mainElement = document.createElement('div'); | ||
| mainElement.id = 'main'; | ||
| document.body.appendChild(mainElement); | ||
| const selectedElement = document.querySelector(wrapper.vm.selector); | ||
| selectedElement.focus = sinon.spy(); | ||
|
|
||
| wrapper.vm.handleClick(); | ||
|
|
||
| expect(selectedElement.focus.called).toBe(true); | ||
| }); | ||
| }); | ||
| }); | ||
| }); |
This file contains hidden or 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 hidden or 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
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.
When would this be changed?