Skip to content

Commit df9c2c8

Browse files
authored
Merge pull request #427 from youda97/table-expand-hover
fix(table): Hover over expandable row does not highlight parent row
2 parents 8a18fec + 54bab7f commit df9c2c8

File tree

4 files changed

+30
-4
lines changed

4 files changed

+30
-4
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import {
2+
Directive,
3+
HostListener
4+
} from "@angular/core";
5+
6+
@Directive({
7+
selector: "[ibmExpandedRowHover]"
8+
})
9+
export class ExpandedRowHover {
10+
@HostListener("mouseenter", ["$event"])
11+
addHoverClass(event) {
12+
event.target.previousElementSibling.classList.add("bx--expandable-row--hover-v2");
13+
}
14+
15+
@HostListener("mouseleave", ["$event"])
16+
removeHoverClass(event) {
17+
event.target.previousElementSibling.classList.remove("bx--expandable-row--hover-v2");
18+
}
19+
}

src/table/table.component.spec.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import {
77
TableModel,
88
TableHeaderItem,
99
TableItem,
10-
DataGridFocus
10+
DataGridFocus,
11+
ExpandedRowHover
1112
} from "./table.module";
1213
import { Table } from "./table.component";
1314
import { StaticIconModule } from "./../icon/static-icon.module";
@@ -49,7 +50,8 @@ describe("Table", () => {
4950
declarations: [
5051
Table,
5152
TableTest,
52-
DataGridFocus
53+
DataGridFocus,
54+
ExpandedRowHover
5355
]
5456
});
5557

src/table/table.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,7 @@ import { I18n } from "./../i18n/i18n.module";
370370
<tr
371371
*ngIf="model.rowsExpanded[i] && !model.isRowFiltered(i)"
372372
class="bx--expandable-row-v2"
373+
ibmExpandedRowHover
373374
[attr.data-child-row]="(model.rowsExpanded[i] ? 'true' : null)">
374375
<td
375376
[ibmDataGridFocus]="isDataGrid"

src/table/table.module.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { TableToolbarActions } from "./toolbar/table-toolbar-actions.component";
1111
import { TableToolbarSearch } from "./toolbar/table-toolbar-search.component";
1212
import { TableToolbarContent } from "./toolbar/table-toolbar-content.component";
1313
import { DataGridFocus } from "./data-grid-focus.directive";
14+
import { ExpandedRowHover } from "./expanded-row-hover.directive";
1415

1516
import { IconModule } from "./../icon/icon.module";
1617
import { StaticIconModule } from "..";
@@ -26,6 +27,7 @@ export { TableToolbarActions } from "./toolbar/table-toolbar-actions.component";
2627
export { TableToolbarSearch } from "./toolbar/table-toolbar-search.component";
2728
export { TableToolbarContent } from "./toolbar/table-toolbar-content.component";
2829
export { DataGridFocus } from "./data-grid-focus.directive";
30+
export { ExpandedRowHover } from "./expanded-row-hover.directive";
2931

3032
@NgModule({
3133
declarations: [
@@ -34,15 +36,17 @@ export { DataGridFocus } from "./data-grid-focus.directive";
3436
TableToolbarActions,
3537
TableToolbarSearch,
3638
TableToolbarContent,
37-
DataGridFocus
39+
DataGridFocus,
40+
ExpandedRowHover
3841
],
3942
exports: [
4043
Table,
4144
TableToolbar,
4245
TableToolbarActions,
4346
TableToolbarSearch,
4447
TableToolbarContent,
45-
DataGridFocus
48+
DataGridFocus,
49+
ExpandedRowHover
4650
],
4751
imports: [
4852
CommonModule,

0 commit comments

Comments
 (0)