Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Accessible sort buttons #12217

Merged
merged 7 commits into from
Jun 20, 2017
Merged

Accessible sort buttons #12217

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d05e8ee
First pass at creating accessible sort buttons
aphelionz Jun 7, 2017
9c6acbf
A better scope function
aphelionz Jun 8, 2017
e78300b
Applying to other elements, fixing CSS
aphelionz Jun 8, 2017
27e6afc
Better class implementation
aphelionz Jun 8, 2017
8327d76
Updating buttons to use opacity
aphelionz Jun 20, 2017
fe46d06
Adding aria-labels
aphelionz Jun 20, 2017
84bb7e4
Fixing typo
aphelionz Jun 20, 2017
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
69 changes: 45 additions & 24 deletions src/ui/public/doc_table/components/table_header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,55 @@
<tr>
<th width="1%"></th>
<th ng-if="indexPattern.timeFieldName" data-test-subj="docTableHeaderField">
<span>Time <i ng-class="headerClass(indexPattern.timeFieldName)" ng-click="cycleSortOrder(indexPattern.timeFieldName)" tooltip="Sort by time"></i></span>
<span>Time <button
id="docTableHeaderFieldSort{{indexPattern.timeFieldName}}"
tabindex="0"
aria-label="{{ getAriaLabelForColumn(indexPattern.timeFieldName) }}"
class="docTableHeaderButton"
ng-class="headerClass(indexPattern.timeFieldName)"
role="button"
ng-click="cycleSortOrder(indexPattern.timeFieldName)"
tooltip="Sort by time"
></button>
</span>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice solution! A few lines below, I think we also need to update this markup similarly:

    <span class="table-header-name">
      {{name | shortDots}} <i ng-class="headerClass(name)" ng-click="cycleSortOrder(name)" tooltip="{{tooltip(name)}}" tooltip-append-to-body="1"></i>
    </span>

I think this is what drives the appearance of the sort button for a non-time columns (e.g. geo.srcdest). To show this column in the table header, just expand open a row and click this icon:

image

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was addressed.

</th>
<th ng-repeat="name in columns" data-test-subj="docTableHeaderField">
<span class="table-header-name">
{{name | shortDots}} <i ng-class="headerClass(name)" ng-click="cycleSortOrder(name)" tooltip="{{tooltip(name)}}" tooltip-append-to-body="1"></i>
</span>
<span class="table-header-move">
<i
class="fa fa-remove"
ng-click="onRemoveColumn(name)"
ng-if="canRemoveColumn(name)"
tooltip-append-to-body="1"
tooltip="Remove column"
></i>
<i
class="fa fa-angle-double-left"
ng-click="moveColumnLeft(name)"
ng-if="canMoveColumnLeft(name)"
tooltip-append-to-body="1"
tooltip="Move column to the left"
></i>
<i
class="fa fa-angle-double-right"
ng-click="moveColumnRight(name)"
ng-if="canMoveColumnRight(name)"
{{name | shortDots}}
<button
id="docTableHeaderFieldSort{{name}}"
tabindex="0"
aria-label="{{ getAriaLabelForColumn(name) }}"
class="docTableHeaderButton"
ng-class="headerClass(name)"
ng-click="cycleSortOrder(name)"
tooltip="{{tooltip(name)}}"
tooltip-append-to-body="1"
tooltip="Move column to the right"
></i>
></button>
</span>
<button
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add an aria-label for this button? This should work:

aria-label="Remove {{name}} column"

class="fa fa-remove table-header-move"
ng-click="onRemoveColumn(name)"
ng-if="canRemoveColumn(name)"
tooltip-append-to-body="1"
tooltip="Remove column"
aria-label="Remove {{name}} column"
></button>
<button
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And this one:

aria-label="Move {{name}} column to the left"

class="fa fa-angle-double-left table-header-move"
ng-click="moveColumnLeft(name)"
ng-if="canMoveColumnLeft(name)"
tooltip-append-to-body="1"
tooltip="Move column to the left"
aria-label="Move {{name}} column to the left"
></button>
<button
Copy link
Contributor

@cjcenizal cjcenizal Jun 20, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This guy too:

aria-label="Move {{name}} column to the right"

class="fa fa-angle-double-right table-header-move"
ng-click="moveColumnRight(name)"
ng-if="canMoveColumnRight(name)"
tooltip-append-to-body="1"
tooltip="Move column to the right"
aria-label="Move {{name}} column to the left"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be "Move {{name}} column to the right".

></button>
</th>
</tr>
11 changes: 11 additions & 0 deletions src/ui/public/doc_table/components/table_header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,17 @@ module.directive('kbnTableHeader', function (shortDotsFilter) {

$scope.onChangeSortOrder(columnName, newDirection);
};

$scope.getAriaLabelForColumn = function getAriaLabelForColumn(name) {
if (!isSortableColumn(name)) return null;

const [currentColumnName, currentDirection = 'asc'] = $scope.sortOrder;
if(name === currentColumnName && currentDirection === 'asc') {
return `Sort ${name} descending`;
}

return `Sort ${name} ascending`;
};
}
};
});
6 changes: 6 additions & 0 deletions src/ui/public/doc_table/doc_table.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,9 @@ doc-table {
opacity: 1; /* 3 */
}
}

.docTableHeaderButton {
border: none;
background: none;
padding: 0;
}
14 changes: 12 additions & 2 deletions src/ui/public/styles/base.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,18 @@ kbn-table, .kbn-table {
white-space: nowrap;
padding-right: 10px;

.table-header-move {
border: none;
background: none;
padding: 0;
}

.table-header-move, .table-header-sortchange {
visibility: hidden;
opacity: 0;

&:focus {
opacity: 1;
}
}

.fa {
Expand All @@ -219,7 +229,7 @@ kbn-table, .kbn-table {

th:hover {
.table-header-move, .table-header-sortchange {
visibility: visible;
opacity: 1;
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/ui/public/styles/dark-theme.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,15 @@
color: @table-sort-color;
}

button.fa-sort-asc,
button.fa-sort-down,
i.fa-sort-asc,
i.fa-sort-down {
color: @table-sort-asc-color;
}

button.fa-sort-desc,
button.fa-sort-up,
i.fa-sort-desc,
i.fa-sort-up {
color: @table-sort-desc-color;
Expand Down
4 changes: 4 additions & 0 deletions src/ui/public/styles/table.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,15 @@ table {
color: @table-sort-color;
}

button.fa-sort-asc,
button.fa-sort-down,
i.fa-sort-asc,
i.fa-sort-down {
color: @table-sort-asc-color;
}

button.fa-sort-desc,
button.fa-sort-up,
i.fa-sort-desc,
i.fa-sort-up {
color: @table-sort-desc-color;
Expand Down