From 9e2b56ccf7dd1f6fbbd13c93bb58ae8afdc6f4c5 Mon Sep 17 00:00:00 2001 From: Jake Bassett Date: Thu, 2 Dec 2021 14:10:13 -0800 Subject: [PATCH 1/2] feat: add row highlighting to table selections --- projects/components/src/table/table.component.scss | 2 +- projects/components/src/table/table.component.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/components/src/table/table.component.scss b/projects/components/src/table/table.component.scss index 9eb63d75e..4512e6135 100644 --- a/projects/components/src/table/table.component.scss +++ b/projects/components/src/table/table.component.scss @@ -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; diff --git a/projects/components/src/table/table.component.ts b/projects/components/src/table/table.component.ts index 31b93ac76..e76ea56c8 100644 --- a/projects/components/src/table/table.component.ts +++ b/projects/components/src/table/table.component.ts @@ -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 ); From 23bb3ff9dcacf3f3836977d8681cc2b186bb3ca5 Mon Sep 17 00:00:00 2001 From: Jake Bassett Date: Thu, 2 Dec 2021 14:22:11 -0800 Subject: [PATCH 2/2] test: fix --- projects/components/src/table/table.component.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/components/src/table/table.component.test.ts b/projects/components/src/table/table.component.test.ts index 2ca704b10..7a1cea6a7 100644 --- a/projects/components/src/table/table.component.test.ts +++ b/projects/components/src/table/table.component.test.ts @@ -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); @@ -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(); });