Skip to content

feat: add row highlighting to table selections #1300

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

Merged
merged 2 commits into from
Dec 2, 2021
Merged

feat: add row highlighting to table selections #1300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e2b56c
feat: add row highlighting to table selections
jake-bassett Dec 2, 2021
23bb3ff
test: fix
jake-bassett Dec 2, 2021
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
2 changes: 1 addition & 1 deletion projects/components/src/table/table.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ $header-height: 32px;
}

&.selected-row {
background: $gray-1;
background: $blue-1;
border-bottom: 1px solid $blue-2;
border-top: 1px solid $blue-2;

Expand Down
4 changes: 2 additions & 2 deletions projects/components/src/table/table.component.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ describe('Table component', () => {
expect(spectator.component.shouldHighlightRowAsSelection(statefulRows[1])).toBeFalsy();
});

test('row should not be highlighted only in multi selection mode', () => {
test('row should be highlighted (even) when in multi selection mode', () => {
const columns = buildColumns();
const rows = buildData();
const statefulRows = TableCdkRowUtil.buildInitialRowStates(rows);
Expand All @@ -504,7 +504,7 @@ describe('Table component', () => {
}
);

expect(spectator.component.shouldHighlightRowAsSelection(statefulRows[0])).toBeFalsy();
expect(spectator.component.shouldHighlightRowAsSelection(statefulRows[0])).toBeTruthy();
expect(spectator.component.shouldHighlightRowAsSelection(statefulRows[1])).toBeFalsy();
});

Expand Down
1 change: 0 additions & 1 deletion projects/components/src/table/table.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,6 @@ export class TableComponent

public shouldHighlightRowAsSelection(row: StatefulTableRow): boolean {
return (
this.selectionMode !== TableSelectionMode.Multiple &&
this.selections !== undefined &&
this.selections.find(selection => TableCdkRowUtil.isEqualExceptState(selection, row)) !== undefined
);
Expand Down