Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 33 additions & 9 deletions src/components/shared/Table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,13 @@ const TableHeadRows = ({ forceDeselectAll }: { forceDeselectAll: () => unknown }
dispatch(updatePages());
};

const handleSortKeyDown = (event: React.KeyboardEvent, colName: string) => {
if (event.key === "Enter" || event.key === " ") {
event.preventDefault();
sortByColumn(colName);
}
};

return (
<>
{columns.map((column, key) =>
Expand All @@ -245,17 +252,34 @@ const TableHeadRows = ({ forceDeselectAll }: { forceDeselectAll: () => unknown }
"col-sort": reverse !== "NONE" && !!sortBy && column.name === sortBy,
sortable: true,
})}
onClick={() => sortByColumn(column.name)}
aria-sort={
column.name === sortBy
? reverse === "ASC"
? "ascending"
: reverse === "DESC"
? "descending"
: "none"
: "none"
}
>
<span>
<span
role="button"
tabIndex={0}
onClick={() => sortByColumn(column.name)}
onKeyDown={event => handleSortKeyDown(event, column.name)}
>
<span>{t(column.label)}</span>
<div>
<LuChevronUp
className={cn("chevron-up", { active: reverse === "ASC" && column.name === sortBy })}
/>
<LuChevronDown
className={cn("chevron-down", { active: reverse === "DESC" && column.name === sortBy })}
/>
<div className={cn({ "chevron-pair": !(column.name === sortBy && reverse !== "NONE") })}>
{!(column.name === sortBy && reverse === "DESC") && (
<LuChevronUp
className={cn("chevron-up", { active: reverse === "ASC" && column.name === sortBy })}
/>
)}
{!(column.name === sortBy && reverse === "ASC") && (
<LuChevronDown
className={cn("chevron-down", { active: reverse === "DESC" && column.name === sortBy })}
/>
)}
</div>
</span>
</th>
Expand Down
32 changes: 28 additions & 4 deletions src/styles/components/_tables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -181,20 +181,44 @@
justify-content: center;

.chevron-up {
position: relative;
top: 3px;
color: variables.$color-gray;
}
.chevron-down {
position: relative;
top: -3px;
color: variables.$color-gray;
}
.active {
color: variables.$color-darkgray;
}

&.chevron-pair {
visibility: hidden;

.chevron-up{
position: relative;
top: 3px;
}
.chevron-down {
position: relative;
top: -3px;
}
}
}
}

&.sortable:hover div.chevron-pair,
&.sortable:focus-within div.chevron-pair {
visibility: visible;
}

&.sortable span[role="button"] {
outline: none;
}

&.sortable:focus-within {
outline-style: auto;
outline-color: -webkit-focus-ring-color;
outline-offset: -2px;
}
}

tr {
Expand Down
Loading