From 41d33ffee92fc30685db01eb8f4afa12d4828dcf Mon Sep 17 00:00:00 2001 From: Troy Morehouse Date: Sat, 31 Aug 2019 04:41:47 -0300 Subject: [PATCH 1/3] chore(pagination): remove `role="non presentation"` from `
  • ` elements --- src/mixins/pagination.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/mixins/pagination.js b/src/mixins/pagination.js index f03cbef327c..772c3375c82 100644 --- a/src/mixins/pagination.js +++ b/src/mixins/pagination.js @@ -393,10 +393,7 @@ export default { key, staticClass: 'page-item', class: { disabled: isDisabled, 'flex-fill': fill }, - attrs: { - role: 'none presentation', - 'aria-hidden': isDisabled ? 'true' : null - } + attrs: { 'aria-hidden': isDisabled ? 'true' : null } }, [inner] ) @@ -491,8 +488,7 @@ export default { { key: `page-${page.number}`, staticClass: 'page-item', - class: [{ disabled, active, 'flex-fill': fill }, page.classes], - attrs: { role: 'none presentation' } + class: [{ disabled, active, 'flex-fill': fill }, page.classes] }, [inner] ) From a091ba631b58688fe53785565ddcc7406005c853 Mon Sep 17 00:00:00 2001 From: Troy Morehouse Date: Sat, 31 Aug 2019 04:45:19 -0300 Subject: [PATCH 2/3] Update pagination.spec.js --- src/components/pagination/pagination.spec.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/components/pagination/pagination.spec.js b/src/components/pagination/pagination.spec.js index 2ac943a6084..ebc0ac18600 100644 --- a/src/components/pagination/pagination.spec.js +++ b/src/components/pagination/pagination.spec.js @@ -42,8 +42,6 @@ describe('pagination', () => { lis.wrappers.forEach((li, index) => { expect(li.classes()).toContain('page-item') - expect(li.attributes('role')).toContain('none') - expect(li.attributes('role')).toContain('presentation') const pageLink = li.find('.page-link') expect(pageLink).toBeDefined() if (index === 2) { @@ -462,8 +460,6 @@ describe('pagination', () => { // Grab the page buttons (includes bookends) wrapper.findAll('li').wrappers.forEach((li, index) => { expect(li.classes()).toContain('page-item') - expect(li.attributes('role')).toContain('none') - expect(li.attributes('role')).toContain('presentation') if (index === 0) { // First button expect(li.classes()).toContain('disabled') @@ -501,8 +497,6 @@ describe('pagination', () => { // Grab the page buttons (including bookends) wrapper.findAll('li').wrappers.forEach((li, index) => { expect(li.classes()).toContain('page-item') - expect(li.attributes('role')).toContain('none') - expect(li.attributes('role')).toContain('presentation') if (index === 0) { // First button expect(li.classes()).not.toContain('disabled') @@ -540,8 +534,6 @@ describe('pagination', () => { // Grab the page buttons (including bookends) wrapper.findAll('li').wrappers.forEach((li, index) => { expect(li.classes()).toContain('page-item') - expect(li.attributes('role')).toContain('none') - expect(li.attributes('role')).toContain('presentation') // Page number buttons if (index >= 2 && index <= 5) { // Pages 1 to 4 From cd7d809e45f929f585796e5d5577ed1728716948 Mon Sep 17 00:00:00 2001 From: Troy Morehouse Date: Sat, 31 Aug 2019 04:55:57 -0300 Subject: [PATCH 3/3] Update pagination.js --- src/mixins/pagination.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/mixins/pagination.js b/src/mixins/pagination.js index 772c3375c82..285785e7dd4 100644 --- a/src/mixins/pagination.js +++ b/src/mixins/pagination.js @@ -393,7 +393,10 @@ export default { key, staticClass: 'page-item', class: { disabled: isDisabled, 'flex-fill': fill }, - attrs: { 'aria-hidden': isDisabled ? 'true' : null } + attrs: { + role: 'presentation', + 'aria-hidden': isDisabled ? 'true' : null + } }, [inner] ) @@ -488,7 +491,8 @@ export default { { key: `page-${page.number}`, staticClass: 'page-item', - class: [{ disabled, active, 'flex-fill': fill }, page.classes] + class: [{ disabled, active, 'flex-fill': fill }, page.classes], + attrs: { role: 'presentation' } }, [inner] )