From d655985b19283862670ad9d0b272b14cd8f781ff Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Fri, 21 Feb 2020 00:34:56 -0400
Subject: [PATCH 01/24] feat(b-pagination-nav): improve aria accessibility

---
 src/mixins/pagination.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/mixins/pagination.js b/src/mixins/pagination.js
index 81e5d4da46e..672d7fa2f2a 100644
--- a/src/mixins/pagination.js
+++ b/src/mixins/pagination.js
@@ -430,6 +430,8 @@ export default {
     const { showFirstDots, showLastDots } = this.paginationParams
     const currentPage = this.computedCurrentPage
     const fill = this.align === 'fill'
+    // Used to control what type of aria attributes are rendered and wrapper
+    const isNav = this.isNav
 
     // Helper function and flag
     const isActivePage = pageNum => pageNum === currentPage
@@ -448,8 +450,8 @@ export default {
           staticClass: 'page-link',
           props: isDisabled ? {} : this.linkProps(linkTo),
           attrs: {
-            role: 'menuitem',
-            tabindex: isDisabled ? null : '-1',
+            role: isNav ? null : 'menuitem',
+            tabindex: isDisabled || isNav ? null : '-1',
             'aria-label': ariaLabel,
             'aria-controls': this.ariaControls || null,
             'aria-disabled': isDisabled ? 'true' : null
@@ -472,7 +474,7 @@ export default {
           staticClass: 'page-item',
           class: [{ disabled: isDisabled, 'flex-fill': fill }, btnClass],
           attrs: {
-            role: 'presentation',
+            role: isNav ? null : 'presentation',
             'aria-hidden': isDisabled ? 'true' : null
           }
         },
@@ -504,17 +506,18 @@ export default {
       // Active page will have tabindex of 0, or if no current page and first page button
       const tabIndex = disabled ? null : active || (noCurrentPage && idx === 0) ? '0' : '-1'
       const attrs = {
-        role: 'menuitemradio',
+        role: isNav ? null : 'menuitemradio',
         'aria-disabled': disabled ? 'true' : null,
         'aria-controls': this.ariaControls || null,
         'aria-label': isFunction(this.labelPage)
           ? this.labelPage(page.number)
           : `${this.labelPage} ${page.number}`,
-        'aria-checked': active ? 'true' : 'false',
+        'aria-checked': isNav ? null : active ? 'true' : 'false',
+        'aria-current': isNav && active ? 'page' : null,
         'aria-posinset': page.number,
         'aria-setsize': numberOfPages,
-        // ARIA "roving tabindex" method
-        tabindex: tabIndex
+        // ARIA "roving tabindex" method (except in isNav mode)
+        tabindex: isNav ? null : tabIndex
       }
       const btnContent = toString(this.makePage(page.number))
       const scope = {
@@ -547,7 +550,7 @@ export default {
           key: `page-${page.number}`,
           staticClass: 'page-item',
           class: [{ disabled, active, 'flex-fill': fill }, page.classes, this.pageClass],
-          attrs: { role: 'presentation' }
+          attrs: { role: isNav ? null : 'presentation' }
         },
         [inner]
       )
@@ -641,7 +644,7 @@ export default {
         staticClass: 'pagination',
         class: ['b-pagination', this.btnSize, this.alignment, this.styleClass],
         attrs: {
-          role: 'menubar',
+          role: isNav ? null : 'menubar',
           'aria-disabled': disabled ? 'true' : 'false',
           'aria-label': this.ariaLabel || null
         },

From e82c5638fda9d6bb59c0d0b78f718a7bf5773e55 Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Fri, 21 Feb 2020 00:39:16 -0400
Subject: [PATCH 02/24] Update pagination-nav.spec.js

---
 src/components/pagination-nav/pagination-nav.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/pagination-nav/pagination-nav.spec.js b/src/components/pagination-nav/pagination-nav.spec.js
index beb80af340d..1715bfce9b5 100644
--- a/src/components/pagination-nav/pagination-nav.spec.js
+++ b/src/components/pagination-nav/pagination-nav.spec.js
@@ -41,7 +41,7 @@ describe('pagination-nav', () => {
     expect($ul.classes()).not.toContain('justify-content-center')
     expect($ul.classes()).not.toContain('justify-content-end')
     // UL Attributes
-    expect($ul.attributes('role')).toBe('menubar')
+    expect($ul.attributes('role')).not.toBe('menubar')
     expect($ul.attributes('aria-disabled')).toBe('false')
     expect($ul.attributes('aria-label')).toBe('Pagination')
 
@@ -126,7 +126,7 @@ describe('pagination-nav', () => {
     expect($ul.classes()).toContain('b-pagination')
 
     // UL Attributes
-    expect($ul.attributes('role')).toBe('menubar')
+    expect($ul.attributes('role')).not.toBe('menubar')
     expect($ul.attributes('aria-disabled')).toBe('true')
 
     // LI classes

From 2303e3d447c4fa8f5f7ef6c62d73734f62d94566 Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Fri, 21 Feb 2020 00:42:23 -0400
Subject: [PATCH 03/24] Update pagination.js

---
 src/mixins/pagination.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mixins/pagination.js b/src/mixins/pagination.js
index 672d7fa2f2a..3393e0eed48 100644
--- a/src/mixins/pagination.js
+++ b/src/mixins/pagination.js
@@ -654,7 +654,7 @@ export default {
     )
 
     // If we are `<b-pagination-nav>`, wrap in `<nav>` wrapper
-    if (this.isNav) {
+    if (isNav) {
       return h(
         'nav',
         {

From 0bc5906c54095180508fcbe8207d985f78ba5207 Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Fri, 21 Feb 2020 00:52:42 -0400
Subject: [PATCH 04/24] Update pagination.js

---
 src/mixins/pagination.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/mixins/pagination.js b/src/mixins/pagination.js
index 3393e0eed48..4b91bae0ea6 100644
--- a/src/mixins/pagination.js
+++ b/src/mixins/pagination.js
@@ -351,11 +351,21 @@ export default {
   methods: {
     handleKeyNav(evt) {
       const { keyCode, shiftKey } = evt
+      const stopIfNav = () => /* istanbul ignore next */ {
+        // We stop proagation to allow keybard nav for screen
+        // reader users when rendered in b-pagination-nav
+        if (isNav) {
+          evt.stopPropagation()
+        }
+      }
+      const isNav = this.isNav
       if (keyCode === KeyCodes.LEFT || keyCode === KeyCodes.UP) {
         evt.preventDefault()
+        stopIfNav()
         shiftKey ? this.focusFirst() : this.focusPrev()
       } else if (keyCode === KeyCodes.RIGHT || keyCode === KeyCodes.DOWN) {
         evt.preventDefault()
+        stopIfNav()
         shiftKey ? this.focusLast() : this.focusNext()
       }
     },

From 19f4f58dc03d35392091725f2b782a738a53ce98 Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Fri, 21 Feb 2020 00:53:11 -0400
Subject: [PATCH 05/24] Update pagination.js

---
 src/mixins/pagination.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mixins/pagination.js b/src/mixins/pagination.js
index 4b91bae0ea6..079647a5328 100644
--- a/src/mixins/pagination.js
+++ b/src/mixins/pagination.js
@@ -353,8 +353,8 @@ export default {
       const { keyCode, shiftKey } = evt
       const stopIfNav = () => /* istanbul ignore next */ {
         // We stop proagation to allow keybard nav for screen
-        // reader users when rendered in b-pagination-nav
-        if (isNav) {
+        // reader users when rendered as b-pagination-nav
+        if (this.isNav) {
           evt.stopPropagation()
         }
       }

From 4e25ea803bc0f9709bcbbed5c939fdea0983d523 Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Fri, 21 Feb 2020 00:54:12 -0400
Subject: [PATCH 06/24] Update pagination.js

---
 src/mixins/pagination.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mixins/pagination.js b/src/mixins/pagination.js
index 079647a5328..94051a0a43d 100644
--- a/src/mixins/pagination.js
+++ b/src/mixins/pagination.js
@@ -352,7 +352,7 @@ export default {
     handleKeyNav(evt) {
       const { keyCode, shiftKey } = evt
       const stopIfNav = () => /* istanbul ignore next */ {
-        // We stop proagation to allow keybard nav for screen
+        // We stop propagation to allow keybard nav for screen
         // reader users when rendered as b-pagination-nav
         if (this.isNav) {
           evt.stopPropagation()

From 0d8cbd2b3a2ca1a6c53b4eadabc29354db3ad7d0 Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Fri, 21 Feb 2020 00:56:52 -0400
Subject: [PATCH 07/24] lint

---
 src/mixins/pagination.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/mixins/pagination.js b/src/mixins/pagination.js
index 94051a0a43d..f2cfd1a270e 100644
--- a/src/mixins/pagination.js
+++ b/src/mixins/pagination.js
@@ -358,7 +358,6 @@ export default {
           evt.stopPropagation()
         }
       }
-      const isNav = this.isNav
       if (keyCode === KeyCodes.LEFT || keyCode === KeyCodes.UP) {
         evt.preventDefault()
         stopIfNav()

From 76ffa6a8c0eac937855a71bf21441445bf95033a Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Fri, 21 Feb 2020 01:03:44 -0400
Subject: [PATCH 08/24] Update README.md

---
 src/components/pagination-nav/README.md | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/pagination-nav/README.md b/src/components/pagination-nav/README.md
index 7c198285417..66966831047 100644
--- a/src/components/pagination-nav/README.md
+++ b/src/components/pagination-nav/README.md
@@ -515,23 +515,24 @@ recommended unless the content of the button textually conveys its purpose.
 
 ### Keyboard navigation
 
-`<b-pagination-nav>` supports keyboard navigation out of the box, and follows the
-[WAI-ARIA roving tabindex](https://www.w3.org/TR/wai-aria-practices-1.2/#kbd_roving_tabindex)
-pattern.
+`<b-pagination-nav>` supports keyboard navigation out of the box, as well as standard tabindex on
+each page link.
 
-- Tabbing into the pagination component will autofocus the current active page button
+- Tabbing into the pagination component will autofocus the current non-disabled page button
 - <kbd>LEFT</kbd> (or <kbd>UP</kbd>) and <kbd>RIGHT</kbd> (or <kbd>DOWN</kbd>) arrow keys will focus
   the previous and next buttons, respectively, in the page list
 - <kbd>ENTER</kbd> or <kbd>SPACE</kbd> keys will select (click) the currently focused page button
-- Pressing <kbd>TAB</kbd> will move to the next control or link on the page, while pressing
-  <kbd>SHIFT</kbd>+<kbd>TAB</kbd> will move to the previous control or link on the page.
+- Pressing <kbd>TAB</kbd> will move to the next page link in the pagination component or to the next
+  tabbable control or link on the page, while pressing <kbd>SHIFT</kbd>+<kbd>TAB</kbd> will move to
+  the previous link in the pagination component or to the previous tabbable control or link on the
+  page.
 
 ## See also
 
 Refer to the [Router support](/docs/reference/router-links) reference page for router-link specific
 props.
 
-For pagination control of a component (such as `<b-table>`), use the
+For pagination control of a component (such as `<b-table>`) or a pagination list, use the
 [`<b-pagination>`](/docs/components/pagination) component instead.
 
 <!-- Component reference added automatically from component package.json -->

From 36c776e827f3b089a7c3ef640d2eed57acacbc23 Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Fri, 21 Feb 2020 01:07:00 -0400
Subject: [PATCH 09/24] Update pagination.js

---
 src/mixins/pagination.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mixins/pagination.js b/src/mixins/pagination.js
index f2cfd1a270e..1402e1cfb3b 100644
--- a/src/mixins/pagination.js
+++ b/src/mixins/pagination.js
@@ -655,7 +655,7 @@ export default {
         attrs: {
           role: isNav ? null : 'menubar',
           'aria-disabled': disabled ? 'true' : 'false',
-          'aria-label': this.ariaLabel || null
+          'aria-label': isNav ? null : this.ariaLabel || null
         },
         on: { keydown: this.handleKeyNav }
       },
@@ -669,7 +669,8 @@ export default {
         {
           attrs: {
             'aria-disabled': disabled ? 'true' : null,
-            'aria-hidden': disabled ? 'true' : 'false'
+            'aria-hidden': disabled ? 'true' : 'false',
+            'aria-label': isNav ? this.ariaLabel || null : null
           }
         },
         [$pagination]

From 5f6275eb442a4e927b32b57d6c5d1e28a76f9ad8 Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Fri, 21 Feb 2020 01:12:54 -0400
Subject: [PATCH 10/24] Update pagination-nav.spec.js

---
 src/components/pagination-nav/pagination-nav.spec.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/pagination-nav/pagination-nav.spec.js b/src/components/pagination-nav/pagination-nav.spec.js
index 1715bfce9b5..80697b6755c 100644
--- a/src/components/pagination-nav/pagination-nav.spec.js
+++ b/src/components/pagination-nav/pagination-nav.spec.js
@@ -32,6 +32,7 @@ describe('pagination-nav', () => {
 
     // NAV Attributes
     expect(wrapper.attributes('aria-hidden')).toBe('false')
+    expect(wrapper.attributes('aria-label')).toBe('Pagination')
 
     // UL Classes
     expect($ul.classes()).toContain('pagination')
@@ -43,7 +44,7 @@ describe('pagination-nav', () => {
     // UL Attributes
     expect($ul.attributes('role')).not.toBe('menubar')
     expect($ul.attributes('aria-disabled')).toBe('false')
-    expect($ul.attributes('aria-label')).toBe('Pagination')
+    expect($ul.attributes('aria-label')).not.toBe('Pagination')
 
     wrapper.destroy()
   })

From efbff8eb9350798e1a058301f3ca743313df5012 Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Fri, 21 Feb 2020 01:23:44 -0400
Subject: [PATCH 11/24] Update pagination.js

---
 src/mixins/pagination.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mixins/pagination.js b/src/mixins/pagination.js
index 1402e1cfb3b..0bdcd59613e 100644
--- a/src/mixins/pagination.js
+++ b/src/mixins/pagination.js
@@ -355,6 +355,7 @@ export default {
         // We stop propagation to allow keybard nav for screen
         // reader users when rendered as b-pagination-nav
         if (this.isNav) {
+          evt.stopImmediatePropagation()
           evt.stopPropagation()
         }
       }

From 2a828b60ad9f8085fcea1244f5a0abc7b98fa04e Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Fri, 21 Feb 2020 01:33:16 -0400
Subject: [PATCH 12/24] Update pagination.js

---
 src/mixins/pagination.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/mixins/pagination.js b/src/mixins/pagination.js
index 0bdcd59613e..8ae49e9266d 100644
--- a/src/mixins/pagination.js
+++ b/src/mixins/pagination.js
@@ -351,13 +351,10 @@ export default {
   methods: {
     handleKeyNav(evt) {
       const { keyCode, shiftKey } = evt
-      const stopIfNav = () => /* istanbul ignore next */ {
-        // We stop propagation to allow keybard nav for screen
-        // reader users when rendered as b-pagination-nav
-        if (this.isNav) {
-          evt.stopImmediatePropagation()
-          evt.stopPropagation()
-        }
+      /* istanbul ignore if */
+      if (this.isNav) {
+        // We disable left/right keyboard navigation in pagination-nav
+        return
       }
       if (keyCode === KeyCodes.LEFT || keyCode === KeyCodes.UP) {
         evt.preventDefault()
@@ -658,7 +655,8 @@ export default {
           'aria-disabled': disabled ? 'true' : 'false',
           'aria-label': isNav ? null : this.ariaLabel || null
         },
-        on: { keydown: this.handleKeyNav }
+        // We disable keyboard left/right nav when pagination-nav
+        on: isNav ? {} : { keydown: this.handleKeyNav }
       },
       buttons
     )

From 468e203c952b51392dc28788b75e9621d2230bd0 Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Fri, 21 Feb 2020 01:34:47 -0400
Subject: [PATCH 13/24] Update README.md

---
 src/components/pagination-nav/README.md | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/components/pagination-nav/README.md b/src/components/pagination-nav/README.md
index 66966831047..03cbce3f7f0 100644
--- a/src/components/pagination-nav/README.md
+++ b/src/components/pagination-nav/README.md
@@ -515,17 +515,7 @@ recommended unless the content of the button textually conveys its purpose.
 
 ### Keyboard navigation
 
-`<b-pagination-nav>` supports keyboard navigation out of the box, as well as standard tabindex on
-each page link.
-
-- Tabbing into the pagination component will autofocus the current non-disabled page button
-- <kbd>LEFT</kbd> (or <kbd>UP</kbd>) and <kbd>RIGHT</kbd> (or <kbd>DOWN</kbd>) arrow keys will focus
-  the previous and next buttons, respectively, in the page list
-- <kbd>ENTER</kbd> or <kbd>SPACE</kbd> keys will select (click) the currently focused page button
-- Pressing <kbd>TAB</kbd> will move to the next page link in the pagination component or to the next
-  tabbable control or link on the page, while pressing <kbd>SHIFT</kbd>+<kbd>TAB</kbd> will move to
-  the previous link in the pagination component or to the previous tabbable control or link on the
-  page.
+`<b-pagination-nav>` supports standard <kbd>TAB</kbd> key navigation.
 
 ## See also
 

From 96c2e87f88a588b6b2dab6073174235a0ad5662a Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Fri, 21 Feb 2020 01:37:41 -0400
Subject: [PATCH 14/24] Update pagination.js

---
 src/mixins/pagination.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/mixins/pagination.js b/src/mixins/pagination.js
index 8ae49e9266d..b1a2e359266 100644
--- a/src/mixins/pagination.js
+++ b/src/mixins/pagination.js
@@ -358,11 +358,9 @@ export default {
       }
       if (keyCode === KeyCodes.LEFT || keyCode === KeyCodes.UP) {
         evt.preventDefault()
-        stopIfNav()
         shiftKey ? this.focusFirst() : this.focusPrev()
       } else if (keyCode === KeyCodes.RIGHT || keyCode === KeyCodes.DOWN) {
         evt.preventDefault()
-        stopIfNav()
         shiftKey ? this.focusLast() : this.focusNext()
       }
     },

From 2b9eb91863837b147c59767c3cc3cafc424f5647 Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Fri, 21 Feb 2020 11:30:01 -0400
Subject: [PATCH 15/24] render button instead of link for `b-pagination`

---
 src/mixins/pagination.js | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/mixins/pagination.js b/src/mixins/pagination.js
index b1a2e359266..2966463aae3 100644
--- a/src/mixins/pagination.js
+++ b/src/mixins/pagination.js
@@ -448,14 +448,16 @@ export default {
         disabled || isActivePage(pageTest) || noCurrentPage || linkTo < 1 || linkTo > numberOfPages
       const pageNum = linkTo < 1 ? 1 : linkTo > numberOfPages ? numberOfPages : linkTo
       const scope = { disabled: isDisabled, page: pageNum, index: pageNum - 1 }
-      const btnContent = this.normalizeSlot(btnSlot, scope) || toString(btnText) || h()
-      const inner = h(
-        isDisabled ? 'span' : BLink,
+      const $btnContent = this.normalizeSlot(btnSlot, scope) || toString(btnText) || h()
+      const $inner = h(
+        isDisabled ? 'span' : isNav ? BLink : 'button',
         {
           staticClass: 'page-link',
-          props: isDisabled ? {} : this.linkProps(linkTo),
+          props: isDisabled || !isNav ? {} : this.linkProps(linkTo),
           attrs: {
             role: isNav ? null : 'menuitem',
+            type: isNav ? null : 'button',
+            disabled: isDisabled && !isNav ? true : null,
             tabindex: isDisabled || isNav ? null : '-1',
             'aria-label': ariaLabel,
             'aria-controls': this.ariaControls || null,
@@ -464,13 +466,13 @@ export default {
           on: isDisabled
             ? {}
             : {
-                click: evt => {
+                '!click': evt => {
                   this.onClick(linkTo, evt)
                 },
                 keydown: onSpaceKey
               }
         },
-        [btnContent]
+        [$btnContent]
       )
       return h(
         'li',
@@ -483,7 +485,7 @@ export default {
             'aria-hidden': isDisabled ? 'true' : null
           }
         },
-        [inner]
+        [$inner]
       )
     }
 
@@ -512,6 +514,8 @@ export default {
       const tabIndex = disabled ? null : active || (noCurrentPage && idx === 0) ? '0' : '-1'
       const attrs = {
         role: isNav ? null : 'menuitemradio',
+        type: isNav ? null : 'button',
+        disabled: disabled && !isNav ? true : null,
         'aria-disabled': disabled ? 'true' : null,
         'aria-controls': this.ariaControls || null,
         'aria-label': isFunction(this.labelPage)
@@ -532,16 +536,16 @@ export default {
         active,
         disabled
       }
-      const inner = h(
-        disabled ? 'span' : BLink,
+      const $inner = h(
+        disabled ? 'span' : isNav ? BLink : 'button',
         {
-          props: disabled ? {} : this.linkProps(page.number),
+          props: disabled || !isNav ? {} : this.linkProps(page.number),
           staticClass: 'page-link',
           attrs,
           on: disabled
             ? {}
             : {
-                click: evt => {
+                '!click': evt => {
                   this.onClick(page.number, evt)
                 },
                 keydown: onSpaceKey
@@ -557,7 +561,7 @@ export default {
           class: [{ disabled, active, 'flex-fill': fill }, page.classes, this.pageClass],
           attrs: { role: isNav ? null : 'presentation' }
         },
-        [inner]
+        [$inner]
       )
     }
 

From ed6f7f884ea075dd4537e70bae09b5f6a8140735 Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Fri, 21 Feb 2020 11:31:07 -0400
Subject: [PATCH 16/24] Update pagination.js

---
 src/components/pagination/pagination.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/pagination/pagination.js b/src/components/pagination/pagination.js
index 94c659b2d8c..ad6f0fc976b 100644
--- a/src/components/pagination/pagination.js
+++ b/src/components/pagination/pagination.js
@@ -132,8 +132,8 @@ export const BPagination = /*#__PURE__*/ Vue.extend({
       return pageNum
     },
     linkProps() {
-      // Always '#' for pagination component
-      return { href: '#' }
+      // No props, since we render a plain button
+      return {}
     }
   }
 })

From 003eb011a036a6ba6fc4d4c4ea77ca11a855e743 Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Fri, 21 Feb 2020 11:34:11 -0400
Subject: [PATCH 17/24] Update pagination.js

---
 src/mixins/pagination.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mixins/pagination.js b/src/mixins/pagination.js
index 2966463aae3..65b99271a99 100644
--- a/src/mixins/pagination.js
+++ b/src/mixins/pagination.js
@@ -366,7 +366,7 @@ export default {
     },
     getButtons() {
       // Return only buttons that are visible
-      return selectAll('a.page-link', this.$el).filter(btn => isVisible(btn))
+      return selectAll('button.page-link, a.page-link', this.$el).filter(btn => isVisible(btn))
     },
     setBtnFocus(btn) {
       btn.focus()

From 30497eae9b42b2c65bc531b86ec3d403738d9166 Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Fri, 21 Feb 2020 11:41:24 -0400
Subject: [PATCH 18/24] Update pagination.spec.js

---
 src/components/pagination/pagination.spec.js | 39 ++++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/components/pagination/pagination.spec.js b/src/components/pagination/pagination.spec.js
index 52d2b4c9bfd..91fc6409073 100644
--- a/src/components/pagination/pagination.spec.js
+++ b/src/components/pagination/pagination.spec.js
@@ -56,7 +56,7 @@ describe('pagination', () => {
       if (index === 2) {
         expect(li.classes()).toContain('active')
         expect(li.classes()).not.toContain('disabled')
-        expect(pageLink.is('a')).toBe(true)
+        expect(pageLink.is('button')).toBe(true)
       } else {
         expect(li.classes()).not.toContain('active')
         expect(li.classes()).toContain('disabled')
@@ -78,14 +78,13 @@ describe('pagination', () => {
     expect(last.find('.page-link').text()).toEqual('»')
 
     // Page button attrs
-    expect(page.find('.page-link').attributes('href')).toEqual('#')
+    expect(page.find('.page-link').attributes('type')).toEqual('button')
     expect(page.find('.page-link').attributes('role')).toEqual('menuitemradio')
     expect(page.find('.page-link').attributes('aria-checked')).toEqual('true')
     expect(page.find('.page-link').attributes('aria-posinset')).toEqual('1')
     expect(page.find('.page-link').attributes('aria-setsize')).toEqual('1')
     expect(page.find('.page-link').attributes('tabindex')).toEqual('0')
     expect(page.find('.page-link').attributes('aria-label')).toEqual('Go to page 1')
-    expect(page.find('.page-link').attributes('target')).toEqual('_self')
 
     wrapper.destroy()
   })
@@ -133,7 +132,7 @@ describe('pagination', () => {
       disabled: false
     })
 
-    const $links = wrapper.findAll('a.page-link')
+    const $links = wrapper.findAll('button.page-link')
     expect($links.length).toBe(5)
     expect($links.at(0).text()).toBe('Page 1')
     expect($links.at(1).text()).toBe('Page 2')
@@ -388,16 +387,16 @@ describe('pagination', () => {
     })
     expect(wrapper.is('ul')).toBe(true)
     expect(wrapper.findAll('li').length).toBe(5)
-    expect(wrapper.findAll('a.page-link').length).toBe(4)
-    expect(wrapper.findAll('a.page-link').is('[aria-controls="foo"]')).toBe(true)
+    expect(wrapper.findAll('button.page-link').length).toBe(4)
+    expect(wrapper.findAll('button.page-link').is('[aria-controls="foo"]')).toBe(true)
 
     wrapper.setProps({
       ariaControls: null
     })
     await waitNT(wrapper.vm)
     expect(wrapper.findAll('li').length).toBe(5)
-    expect(wrapper.findAll('a.page-link').length).toBe(4)
-    expect(wrapper.findAll('a.page-link').is('[aria-controls]')).toBe(false)
+    expect(wrapper.findAll('button.page-link').length).toBe(4)
+    expect(wrapper.findAll('button.page-link').is('[aria-controls]')).toBe(false)
 
     wrapper.destroy()
   })
@@ -414,28 +413,28 @@ describe('pagination', () => {
     })
     expect(wrapper.is('ul')).toBe(true)
     expect(wrapper.findAll('li').length).toBe(5)
-    expect(wrapper.findAll('a').length).toBe(4)
+    expect(wrapper.findAll('button').length).toBe(4)
     expect(
       wrapper
-        .findAll('a')
+        .findAll('button')
         .at(0)
         .attributes('aria-label')
     ).toBe('Go to page 1')
     expect(
       wrapper
-        .findAll('a')
+        .findAll('button')
         .at(1)
         .attributes('aria-label')
     ).toBe('Go to page 2')
     expect(
       wrapper
-        .findAll('a')
+        .findAll('button')
         .at(2)
         .attributes('aria-label')
     ).toBe('Go to page 3')
     expect(
       wrapper
-        .findAll('a')
+        .findAll('button')
         .at(3)
         .attributes('aria-label')
     ).toBe('Go to next page')
@@ -654,7 +653,7 @@ describe('pagination', () => {
     wrapper
       .findAll('li')
       .at(3)
-      .find('a')
+      .find('button')
       .trigger('click')
     await waitNT(wrapper.vm)
     expect(wrapper.vm.computedCurrentPage).toBe(2)
@@ -667,7 +666,7 @@ describe('pagination', () => {
     wrapper
       .findAll('li')
       .at(6)
-      .find('a')
+      .find('button')
       .trigger('keydown.space') // Generates a click event
     await waitNT(wrapper.vm)
     expect(wrapper.vm.computedCurrentPage).toBe(3)
@@ -678,7 +677,7 @@ describe('pagination', () => {
     wrapper
       .findAll('li')
       .at(1)
-      .find('a')
+      .find('button')
       .trigger('click')
     await waitNT(wrapper.vm)
     expect(wrapper.vm.computedCurrentPage).toBe(2)
@@ -1031,7 +1030,7 @@ describe('pagination', () => {
       expect(wrapper.is('ul')).toBe(true)
       await waitNT(wrapper.vm)
       // Grab the button links (2 bookends + 3 pages + 2 bookends)
-      const links = wrapper.findAll('a.page-link')
+      const links = wrapper.findAll('button.page-link')
       expect(links.length).toBe(7)
 
       // Sanity check for getBCR override
@@ -1091,7 +1090,7 @@ describe('pagination', () => {
       await waitNT(wrapper.vm)
       expect(wrapper.is('ul')).toBe(true)
       // Grab the button links (2 bookends + 3 pages + 2 bookends)
-      const links = wrapper.findAll('a.page-link')
+      const links = wrapper.findAll('button.page-link')
       expect(links.length).toBe(7)
 
       // Focus the last button
@@ -1121,14 +1120,14 @@ describe('pagination', () => {
       await waitNT(wrapper.vm)
       expect(wrapper.is('ul')).toBe(true)
       // Grab the button links (2 disabled bookends + 4 pages + (-ellipsis) + 2 bookends)
-      links = wrapper.findAll('a.page-link')
+      links = wrapper.findAll('button.page-link')
       expect(links.length).toBe(6)
 
       // Click on the 4th button (page 4, index 3)
       links.at(3).element.click()
       await waitNT(wrapper.vm)
       // Links re-rendered with first bookends enabled and an ellipsis
-      links = wrapper.findAll('a.page-link')
+      links = wrapper.findAll('button.page-link')
       // The 4th link should be page 4, and retain focus
       expect(document.activeElement).toEqual(links.at(3).element)
 

From b3f54dc493df67be6ed8e7ec8346db608772257f Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Fri, 21 Feb 2020 11:55:08 -0400
Subject: [PATCH 19/24] Update pagination.js

---
 src/mixins/pagination.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/mixins/pagination.js b/src/mixins/pagination.js
index 65b99271a99..1a31d01a677 100644
--- a/src/mixins/pagination.js
+++ b/src/mixins/pagination.js
@@ -456,8 +456,7 @@ export default {
           props: isDisabled || !isNav ? {} : this.linkProps(linkTo),
           attrs: {
             role: isNav ? null : 'menuitem',
-            type: isNav ? null : 'button',
-            disabled: isDisabled && !isNav ? true : null,
+            type: isNav || isDisabled ? null : 'button',
             tabindex: isDisabled || isNav ? null : '-1',
             'aria-label': ariaLabel,
             'aria-controls': this.ariaControls || null,

From 25cae913f866e72581f6ea5459426b9ea5b1b40e Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Fri, 21 Feb 2020 12:08:16 -0400
Subject: [PATCH 20/24] Update pagination.js

---
 src/mixins/pagination.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/mixins/pagination.js b/src/mixins/pagination.js
index 1a31d01a677..73c43a74c7e 100644
--- a/src/mixins/pagination.js
+++ b/src/mixins/pagination.js
@@ -513,8 +513,7 @@ export default {
       const tabIndex = disabled ? null : active || (noCurrentPage && idx === 0) ? '0' : '-1'
       const attrs = {
         role: isNav ? null : 'menuitemradio',
-        type: isNav ? null : 'button',
-        disabled: disabled && !isNav ? true : null,
+        type: isNav || disabled ? null : 'button',
         'aria-disabled': disabled ? 'true' : null,
         'aria-controls': this.ariaControls || null,
         'aria-label': isFunction(this.labelPage)

From 4704ef833f7319a4730d1a554300ed8d99408a65 Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Fri, 21 Feb 2020 12:29:37 -0400
Subject: [PATCH 21/24] Update pagination.js

---
 src/mixins/pagination.js | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/mixins/pagination.js b/src/mixins/pagination.js
index 73c43a74c7e..abf8436cc1b 100644
--- a/src/mixins/pagination.js
+++ b/src/mixins/pagination.js
@@ -453,6 +453,7 @@ export default {
         isDisabled ? 'span' : isNav ? BLink : 'button',
         {
           staticClass: 'page-link',
+          class: { 'flex-grow-1': !isNav && !isDisabled && fill },
           props: isDisabled || !isNav ? {} : this.linkProps(linkTo),
           attrs: {
             role: isNav ? null : 'menuitem',
@@ -478,7 +479,14 @@ export default {
         {
           key,
           staticClass: 'page-item',
-          class: [{ disabled: isDisabled, 'flex-fill': fill }, btnClass],
+          class: [
+            {
+              disabled: isDisabled,
+              'flex-fill': fill,
+              'd-flex': fill && !isNav && !isDisabled
+            },
+            btnClass
+          ],
           attrs: {
             role: isNav ? null : 'presentation',
             'aria-hidden': isDisabled ? 'true' : null
@@ -539,6 +547,7 @@ export default {
         {
           props: disabled || !isNav ? {} : this.linkProps(page.number),
           staticClass: 'page-link',
+          class: { 'flex-grow-1': !isNav && !disabled && fill },
           attrs,
           on: disabled
             ? {}
@@ -556,7 +565,16 @@ export default {
         {
           key: `page-${page.number}`,
           staticClass: 'page-item',
-          class: [{ disabled, active, 'flex-fill': fill }, page.classes, this.pageClass],
+          class: [
+            {
+              disabled,
+              active,
+              'flex-fill': fill,
+              'd-flex': fill && !isNav && !disabled
+            },
+            page.classes,
+            this.pageClass
+          ],
           attrs: { role: isNav ? null : 'presentation' }
         },
         [$inner]

From bf0108b9a2b8666c52fbf9d924be02fd09f9c9ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacob=20M=C3=BCller?= <jacob.mueller.elz@gmail.com>
Date: Sat, 22 Feb 2020 09:47:55 +0100
Subject: [PATCH 22/24] Update pagination.js

---
 src/mixins/pagination.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mixins/pagination.js b/src/mixins/pagination.js
index abf8436cc1b..5cceed09373 100644
--- a/src/mixins/pagination.js
+++ b/src/mixins/pagination.js
@@ -353,7 +353,7 @@ export default {
       const { keyCode, shiftKey } = evt
       /* istanbul ignore if */
       if (this.isNav) {
-        // We disable left/right keyboard navigation in pagination-nav
+        // We disable left/right keyboard navigation in <b-pagination-nav>
         return
       }
       if (keyCode === KeyCodes.LEFT || keyCode === KeyCodes.UP) {
@@ -439,15 +439,15 @@ export default {
     const isNav = this.isNav
 
     // Helper function and flag
-    const isActivePage = pageNum => pageNum === currentPage
+    const isActivePage = pageNumber => pageNumber === currentPage
     const noCurrentPage = this.currentPage < 1
 
     // Factory function for prev/next/first/last buttons
     const makeEndBtn = (linkTo, ariaLabel, btnSlot, btnText, btnClass, pageTest, key) => {
       const isDisabled =
         disabled || isActivePage(pageTest) || noCurrentPage || linkTo < 1 || linkTo > numberOfPages
-      const pageNum = linkTo < 1 ? 1 : linkTo > numberOfPages ? numberOfPages : linkTo
-      const scope = { disabled: isDisabled, page: pageNum, index: pageNum - 1 }
+      const pageNumber = linkTo < 1 ? 1 : linkTo > numberOfPages ? numberOfPages : linkTo
+      const scope = { disabled: isDisabled, page: pageNumber, index: pageNumber - 1 }
       const $btnContent = this.normalizeSlot(btnSlot, scope) || toString(btnText) || h()
       const $inner = h(
         isDisabled ? 'span' : isNav ? BLink : 'button',

From dbef70e539415c2e94de4cdb23ccc0fb96c549ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacob=20M=C3=BCller?= <jacob.mueller.elz@gmail.com>
Date: Sat, 22 Feb 2020 09:50:51 +0100
Subject: [PATCH 23/24] Update pagination.js

---
 src/mixins/pagination.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mixins/pagination.js b/src/mixins/pagination.js
index 5cceed09373..8746873f075 100644
--- a/src/mixins/pagination.js
+++ b/src/mixins/pagination.js
@@ -353,7 +353,7 @@ export default {
       const { keyCode, shiftKey } = evt
       /* istanbul ignore if */
       if (this.isNav) {
-        // We disable left/right keyboard navigation in <b-pagination-nav>
+        // We disable left/right keyboard navigation in `<b-pagination-nav>`
         return
       }
       if (keyCode === KeyCodes.LEFT || keyCode === KeyCodes.UP) {
@@ -673,7 +673,7 @@ export default {
           'aria-disabled': disabled ? 'true' : 'false',
           'aria-label': isNav ? null : this.ariaLabel || null
         },
-        // We disable keyboard left/right nav when pagination-nav
+        // We disable keyboard left/right nav when `<b-pagination-nav>`
         on: isNav ? {} : { keydown: this.handleKeyNav }
       },
       buttons

From 1ae267ff0ad8e639522b6ebd3977c5e50df55173 Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Sun, 23 Feb 2020 01:14:25 -0400
Subject: [PATCH 24/24] Update README.md

---
 src/components/form-tags/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/form-tags/README.md b/src/components/form-tags/README.md
index fd46df3e95f..1fa1ca09100 100644
--- a/src/components/form-tags/README.md
+++ b/src/components/form-tags/README.md
@@ -1,4 +1,4 @@
-# Form tags
+# Form Tags
 
 > Lightweight custom tagged input form control, with options for customized interface rendering,
 > duplicate tag detection and optional tag validation.