Skip to content

Commit bbd2654

Browse files
committed
feat(h-grid): provide injector to simplify child toolbar template setup
1 parent 1ece5cd commit bbd2654

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

projects/igniteui-angular/src/lib/grids/hierarchical-grid/row-island.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ export class IgxRowIslandComponent extends IgxHierarchicalGridBaseDirective
331331
// Create the child toolbar if the parent island has a toolbar definition
332332
this.gridCreated.pipe(pluck('grid'), takeUntil(this.destroy$)).subscribe(grid => {
333333
grid.rendered$.pipe(first(), filter(() => !!this.islandToolbarTemplate))
334-
.subscribe(() => grid.toolbarOutlet.createEmbeddedView(this.islandToolbarTemplate, { $implicit: grid }));
334+
.subscribe(() => grid.toolbarOutlet.createEmbeddedView(this.islandToolbarTemplate, { $implicit: grid }, { injector: grid.toolbarOutlet.injector }));
335335
grid.rendered$.pipe(first(), filter(() => !!this.islandPaginatorTemplate))
336336
.subscribe(() => {
337337
this.rootGrid.paginatorList.changes.pipe(takeUntil(this.destroy$)).subscribe(() => grid.setUpPaginator());

projects/igniteui-angular/src/lib/test-utils/hierarchical-grid-components.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ export class IgxHierarchicalGridCustomSelectorsComponent implements OnInit {
360360
</igx-grid-toolbar>
361361
</igx-row-island>
362362
<igx-row-island [key]="'childData2'" #rowIsland2 [primaryKey]="'ID'" [autoGenerate]="true">
363-
<igx-grid-toolbar *igxGridToolbar="let grid" [grid]="grid">
363+
<igx-grid-toolbar *igxGridToolbar>
364364
<button type="button" igxButton="contained">Child2 Button</button>
365365
</igx-grid-toolbar>
366366
</igx-row-island>

src/app/hierarchical-grid/hierarchical-grid.sample.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ <h4 class="sample-title">Sample One</h4>
6767
</igx-excel-style-filter-operations>
6868
</igx-grid-excel-style-filtering>
6969

70-
<igx-grid-toolbar [grid]="childGrid" *igxGridToolbar="let childGrid">
71-
<igx-grid-toolbar-title>Child Grid 1</igx-grid-toolbar-title>
70+
<igx-grid-toolbar *igxGridToolbar>
71+
<igx-grid-toolbar-title>{{ toolbarTitle }}</igx-grid-toolbar-title>
7272
<igx-grid-toolbar-actions>
7373
<igx-grid-toolbar-pinning></igx-grid-toolbar-pinning>
7474
<igx-grid-toolbar-hiding></igx-grid-toolbar-hiding>

src/app/hierarchical-grid/hierarchical-grid.sample.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ export class HierarchicalGridSampleComponent implements AfterViewInit {
4242
public hgridState = [];
4343
public columns;
4444
public childColumns;
45+
public toolbarTitle = 'Child Grid 1';
4546

4647
public evenCondition = (row: RowType) => parseInt(row.data['ID'], 0) % 2 === 0;
4748
public rowClasses = {

0 commit comments

Comments
 (0)