Merge branch 'dev' into table-header-context-click

dflock · web-flow · commit 17017a82b8d7 · 2021-05-10T14:35:13.000-07:00
diff --git a/package.json b/package.json
@@ -110,9 +110,9 @@
     "clean-css-cli": "^4.3.0",
     "codemirror": "^5.61.0",
     "codesandbox": "^2.2.3",
-    "core-js": "^3.12.0",
+    "core-js": "^3.12.1",
     "cross-env": "^7.0.3",
-    "eslint": "^7.25.0",
+    "eslint": "^7.26.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-config-standard": "^16.0.2",
     "eslint-config-vue": "^2.0.2",
@@ -130,11 +130,11 @@
     "husky": "^6.0.0",
     "improved-yarn-audit": "^2.3.2",
     "jest": "^26.6.3",
-    "lint-staged": "^10.5.4",
+    "lint-staged": "^11.0.0",
     "loader-utils": "^2.0.0",
     "lodash": "^4.17.21",
     "marked": "^2.0.3",
-    "nuxt": "^2.15.4",
+    "nuxt": "^2.15.5",
     "postcss": "^8.2.14",
     "postcss-cli": "^8.3.1",
     "prettier": "1.14.3",
diff --git a/src/components/table/helpers/mixin-sorting.js b/src/components/table/helpers/mixin-sorting.js
@@ -235,15 +235,19 @@ export const sortingMixin = Vue.extend({
       }
     },
     sortTheadThAttrs(key, field, isFoot) {
-      if (!this.isSortable || (isFoot && this.noFooterSorting)) {
+      const { isSortable, noFooterSorting, localSortDesc, localSortBy, localSorting } = this
+      if (!isSortable || (isFoot && noFooterSorting)) {
         // No attributes if not a sortable table
         return {}
       }
+
       const sortable = field.sortable
+      const sortKey = !localSorting ? field.sortKey ?? key : key
+
       // Assemble the aria-sort attribute value
       const ariaSort =
-        sortable && this.localSortBy === key
-          ? this.localSortDesc
+        sortable && localSortBy === sortKey
+          ? localSortDesc
             ? 'descending'
             : 'ascending'
           : sortable
diff --git a/src/components/table/table-sorting.spec.js b/src/components/table/table-sorting.spec.js
@@ -63,6 +63,25 @@ describe('table > sorting', () => {
     expect(wrapper.emitted('sort-changed')[0][0].sortBy).toEqual('non-local')
   })
 
+  it('should set `aria-sort` when `field.sortKey` and `no-local-sorting` is used', async () => {
+    const wrapper = mount(BTable, {
+      propsData: {
+        fields: [...testFields, { key: 'd', label: 'D', sortable: true, sortKey: 'non-local' }],
+        items: testItems,
+        noLocalSorting: true
+      }
+    })
+
+    expect(wrapper).toBeDefined()
+    const $header = wrapper.findAll('thead > tr > th').at(3)
+
+    await $header.trigger('keydown.enter')
+    expect(wrapper.emitted('sort-changed').length).toBe(1)
+    expect(wrapper.emitted('sort-changed')[0][0].sortBy).toEqual('non-local')
+
+    expect($header.attributes('aria-sort')).toBe('ascending')
+  })
+
   it('should sort column descending when sortBy set and sortDesc changed, with proper attributes', async () => {
     const wrapper = mount(BTable, {
       propsData: {
diff --git a/yarn.lock b/yarn.lock
