Merge branch 'dev' into fix-tooltip-hide-when-title-empty

jacobmllr95 · web-flow · commit b4a1cfafbce8 · 2020-08-22T19:21:18.000+02:00
diff --git a/package.json b/package.json
@@ -110,7 +110,7 @@
     "@nuxtjs/pwa": "^3.0.1",
     "@nuxtjs/robots": "^2.4.2",
     "@nuxtjs/sitemap": "^2.4.0",
-    "@testing-library/jest-dom": "^5.11.3",
+    "@testing-library/jest-dom": "^5.11.4",
     "@vue/test-utils": "^1.0.4",
     "autoprefixer": "^9.8.6",
     "babel-core": "^7.0.0-bridge.0",
@@ -142,7 +142,7 @@
     "html-loader": "^1.2.1",
     "husky": "^4.2.5",
     "improved-yarn-audit": "^2.3.1",
-    "jest": "^26.4.1",
+    "jest": "^26.4.2",
     "lint-staged": "^10.2.11",
     "loader-utils": "^2.0.0",
     "lodash": "^4.17.20",
@@ -152,7 +152,7 @@
     "postcss-cli": "^7.1.1",
     "prettier": "1.14.3",
     "require-context": "^1.1.0",
-    "rollup": "^2.26.4",
+    "rollup": "^2.26.5",
     "rollup-plugin-babel": "^4.4.0",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-node-resolve": "^5.2.0",
diff --git a/src/components/pagination/pagination.spec.js b/src/components/pagination/pagination.spec.js
@@ -374,6 +374,25 @@ describe('pagination', () => {
     wrapper.destroy()
   })
 
+  it('has correct number of links when `hide-ellipsis` is enabled', async () => {
+    const wrapper = mount(BPagination, {
+      propsData: {
+        hideEllipsis: true,
+        totalRows: 100,
+        perPage: 10,
+        value: 1
+      }
+    })
+    expect(wrapper.element.tagName).toBe('UL')
+    expect(wrapper.findAll('li').length).toBe(9)
+
+    await wrapper.setProps({ value: 5 })
+    await waitNT(wrapper.vm)
+    expect(wrapper.findAll('li').length).toBe(9)
+
+    wrapper.destroy()
+  })
+
   it('has attribute aria-controls on page links when prop aria-controls is set', async () => {
     const wrapper = mount(BPagination, {
       propsData: {
diff --git a/src/mixins/pagination.js b/src/mixins/pagination.js
@@ -223,12 +223,14 @@ export default {
     },
     paginationParams() {
       // Determine if we should show the the ellipsis
-      const limit = this.localLimit
-      const numberOfPages = this.localNumberOfPages
-      const currentPage = this.computedCurrentPage
-      const hideEllipsis = this.hideEllipsis
-      const firstNumber = this.firstNumber
-      const lastNumber = this.lastNumber
+      const {
+        localLimit: limit,
+        localNumberOfPages: numberOfPages,
+        computedCurrentPage: currentPage,
+        hideEllipsis,
+        firstNumber,
+        lastNumber
+      } = this
       let showFirstDots = false
       let showLastDots = false
       let numberOfLinks = limit
@@ -252,7 +254,7 @@ export default {
       } else {
         // We are somewhere in the middle of the page list
         if (limit > ELLIPSIS_THRESHOLD) {
-          numberOfLinks = limit - 2
+          numberOfLinks = limit - (hideEllipsis ? 0 : 2)
           showFirstDots = !!(!hideEllipsis || firstNumber)
           showLastDots = !!(!hideEllipsis || lastNumber)
         }
diff --git a/yarn.lock b/yarn.lock
