fix(table,a11y): only apply aria-sort when sorting for V6 (#11147)

* fix(table,a11y): only apply aria-sort when sorting * fix snapshots from cherrypick
patternfly · Oct 30, 2024 · 71b9ab7 · 71b9ab7
1 parent c901a25
commit 71b9ab7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 18 deletions.
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -16,7 +16,8 @@ export default [
       'packages/react-core/src/helpers/Popper/thirdparty',
       'packages/react-docs/patternfly-docs/generated',
       '.history/*',
-      'packages/react-docs/static'
+      'packages/react-docs/static',
+      '**/.cache'
     ]
   },
   js.configs.recommended,

diff --git a/packages/react-table/src/components/Table/utils/decorators/sortable.tsx b/packages/react-table/src/components/Table/utils/decorators/sortable.tsx
@@ -53,7 +53,7 @@ export const sortable: ITransform = (
 
   return {
     className: css(styles.tableSort, isSortedBy && styles.modifiers.selected, className),
-    'aria-sort': isSortedBy ? `${sortBy.direction}ending` : 'none',
+    ...(isSortedBy && { 'aria-sort': `${sortBy.direction}ending` }),
     children: (
       <SortColumn
         isSortedBy={isSortedBy}

diff --git a/...s/react-table/src/deprecated/components/Table/__tests__/__snapshots__/Table.test.tsx.snap b/...s/react-table/src/deprecated/components/Table/__tests__/__snapshots__/Table.test.tsx.snap
@@ -20,7 +20,6 @@ exports[`Table Actions table 1`] = `
         data-ouia-safe="true"
       >
         <th
-          aria-sort="none"
           class="pf-v6-c-table__th pf-v6-c-table__sort"
           data-key="0"
           data-label="Header cell"
@@ -861,7 +860,6 @@ exports[`Table Cell header table 1`] = `
         data-ouia-safe="true"
       >
         <th
-          aria-sort="none"
           class="pf-v6-c-table__th pf-v6-c-table__sort"
           data-key="0"
           data-label="Header cell"
@@ -1433,7 +1431,6 @@ exports[`Table Collapsible nested table 1`] = `
           tabindex="-1"
         />
         <th
-          aria-sort="none"
           class="pf-v6-c-table__th pf-v6-c-table__sort"
           data-key="1"
           data-label="Header cell"
@@ -2198,7 +2195,6 @@ exports[`Table Collapsible table 1`] = `
           tabindex="-1"
         />
         <th
-          aria-sort="none"
           class="pf-v6-c-table__th pf-v6-c-table__sort"
           data-key="1"
           data-label="Header cell"
@@ -4234,7 +4230,6 @@ exports[`Table Selectable table 1`] = `
           </label>
         </th>
         <th
-          aria-sort="none"
           class="pf-v6-c-table__th pf-v6-c-table__sort"
           data-key="1"
           data-label="Header cell"
@@ -4927,7 +4922,6 @@ exports[`Table Selectable table with Radio 1`] = `
           tabindex="-1"
         />
         <th
-          aria-sort="none"
           class="pf-v6-c-table__th pf-v6-c-table__sort"
           data-key="1"
           data-label="Header cell"
@@ -5717,7 +5711,6 @@ exports[`Table Simple Actions table 1`] = `
         data-ouia-safe="true"
       >
         <th
-          aria-sort="none"
           class="pf-v6-c-table__th pf-v6-c-table__sort"
           data-key="0"
           data-label="Header cell"
@@ -6640,7 +6633,6 @@ exports[`Table Table variants Breakpoint -  1`] = `
         data-ouia-safe="true"
       >
         <th
-          aria-sort="none"
           class="pf-v6-c-table__th pf-v6-c-table__sort"
           data-key="0"
           data-label="Header cell"
@@ -7169,7 +7161,6 @@ exports[`Table Table variants Breakpoint - grid 1`] = `
         data-ouia-safe="true"
       >
         <th
-          aria-sort="none"
           class="pf-v6-c-table__th pf-v6-c-table__sort"
           data-key="0"
           data-label="Header cell"
@@ -7698,7 +7689,6 @@ exports[`Table Table variants Breakpoint - grid-2xl 1`] = `
         data-ouia-safe="true"
       >
         <th
-          aria-sort="none"
           class="pf-v6-c-table__th pf-v6-c-table__sort"
           data-key="0"
           data-label="Header cell"
@@ -8227,7 +8217,6 @@ exports[`Table Table variants Breakpoint - grid-lg 1`] = `
         data-ouia-safe="true"
       >
         <th
-          aria-sort="none"
           class="pf-v6-c-table__th pf-v6-c-table__sort"
           data-key="0"
           data-label="Header cell"
@@ -8756,7 +8745,6 @@ exports[`Table Table variants Breakpoint - grid-md 1`] = `
         data-ouia-safe="true"
       >
         <th
-          aria-sort="none"
           class="pf-v6-c-table__th pf-v6-c-table__sort"
           data-key="0"
           data-label="Header cell"
@@ -9285,7 +9273,6 @@ exports[`Table Table variants Breakpoint - grid-xl 1`] = `
         data-ouia-safe="true"
       >
         <th
-          aria-sort="none"
           class="pf-v6-c-table__th pf-v6-c-table__sort"
           data-key="0"
           data-label="Header cell"
@@ -9814,7 +9801,6 @@ exports[`Table Table variants Size - compact 1`] = `
         data-ouia-safe="true"
       >
         <th
-          aria-sort="none"
           class="pf-v6-c-table__th pf-v6-c-table__sort"
           data-key="0"
           data-label="Header cell"
@@ -10908,7 +10894,6 @@ exports[`Table simple Row click table 1`] = `
         data-ouia-safe="true"
       >
         <th
-          aria-sort="none"
           class="pf-v6-c-table__th pf-v6-c-table__sort"
           data-key="0"
           data-label="Header cell"
@@ -11437,7 +11422,6 @@ exports[`Table simple Sortable table 1`] = `
         data-ouia-safe="true"
       >
         <th
-          aria-sort="none"
           class="pf-v6-c-table__th pf-v6-c-table__sort"
           data-key="0"
           data-label="Header cell"