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

Remove unneeded tab, tablist and aria-selected roles from navigation #5075

Merged
merged 1 commit into from
Jan 19, 2024
Merged

Remove unneeded tab, tablist and aria-selected roles from navigation #5075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 4 additions & 6 deletions src/components/NcAppSettingsDialog/NcAppSettingsDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,19 +145,17 @@ export default {
@update:open="handleCloseModal">
<template v-if="hasNavigation" #navigation="{ isCollapsed }">
<ul v-if="!isCollapsed"
:aria-label="settingsNavigationAriaLabel"
class="navigation-list"
role="tablist">
class="navigation-list">
<li v-for="section in sections" :key="section.id">
<a :aria-selected="section.id === selectedSection"
<a :aria-current="`${section.id === selectedSection}`"
:class="{
'navigation-list__link': true,
'navigation-list__link--active': section.id === selectedSection,
'navigation-list__link--icon': hasNavigationIcons,
}"
role="tab"
:href="`#settings-section_${section.id}`"
tabindex="0"
@click="handleSettingsNavigationClick(section.id)"
@click.prevent="handleSettingsNavigationClick(section.id)"
@keydown.enter="handleSettingsNavigationClick(section.id)">
<div v-if="hasNavigationIcons" class="navigation-list__link-icon">
<NcVNodes v-if="section.icon" :vnodes="section.icon" />
Expand Down
22 changes: 11 additions & 11 deletions tests/unit/components/NcAppSettingsDialog/NcAppSettingsDialog.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ describe('NcAppSettingsDialog: Sections registration', () => {

await nextTick()

expect(wrapper.findAll('[role="tab"]')).toHaveLength(1)
expect(wrapper.find('[role="tab"]').text()).toBe('test_name')
expect(wrapper.findAll('nav a')).toHaveLength(1)
expect(wrapper.find('nav a').text()).toBe('test_name')
})

it('can register a new section', async () => {
Expand All @@ -70,8 +70,8 @@ describe('NcAppSettingsDialog: Sections registration', () => {

wrapper.vm.registerSection('test_id', 'test_name')
await nextTick()
expect(wrapper.findAll('[role="tab"]')).toHaveLength(1)
expect(wrapper.find('[role="tab"]').text()).toBe('test_name')
expect(wrapper.findAll('nav a')).toHaveLength(1)
expect(wrapper.find('nav a').text()).toBe('test_name')
})

it('warn on register a already registered section name', async () => {
Expand All @@ -89,13 +89,13 @@ describe('NcAppSettingsDialog: Sections registration', () => {
// First call should be OK
wrapper.vm.registerSection('test_id', 'test_name')
await nextTick()
expect(wrapper.findAll('[role="tab"]')).toHaveLength(1)
expect(wrapper.findAll('nav a')).toHaveLength(1)
expect(spy).not.toHaveBeenCalled()

// Second one should unregister first and replace with this one, but show an error
wrapper.vm.registerSection('test_id_2', 'test_name')
await nextTick()
expect(wrapper.findAll('[role="tab"]')).toHaveLength(2)
expect(wrapper.findAll('nav a')).toHaveLength(2)
expect(spy).toHaveBeenCalled()
})

Expand All @@ -111,12 +111,12 @@ describe('NcAppSettingsDialog: Sections registration', () => {
// First call should be OK
wrapper.vm.registerSection('test_id', 'test_name')
await nextTick()
expect(wrapper.findAll('[role="tab"]')).toHaveLength(1)
expect(wrapper.findAll('nav a')).toHaveLength(1)

// Second one should unregister first and replace with this one, but show an error
expect(() => wrapper.vm.registerSection('test_id', 'test_other_name')).toThrow()
await nextTick()
expect(wrapper.findAll('[role="tab"]')).toHaveLength(1)
expect(wrapper.findAll('nav a')).toHaveLength(1)
})

it('can unregister a section', async () => {
Expand All @@ -131,11 +131,11 @@ describe('NcAppSettingsDialog: Sections registration', () => {
wrapper.vm.registerSection('test_id', 'test_name')
wrapper.vm.registerSection('test_id2', 'test_name2')
await nextTick()
expect(wrapper.findAll('[role="tab"]')).toHaveLength(2)
expect(wrapper.findAll('nav a')).toHaveLength(2)

wrapper.vm.unregisterSection('test_id')
await nextTick()
expect(wrapper.findAll('[role="tab"]')).toHaveLength(1)
expect(wrapper.find('[role="tab"]').text()).toBe('test_name2')
expect(wrapper.findAll('nav a')).toHaveLength(1)
expect(wrapper.find('nav a').text()).toBe('test_name2')
})
})
Loading