Skip to content

Commit b695601

Browse files
committed
Merge branch 'rkaraivanov/grids-restructure' of https://github.com/IgniteUI/igniteui-angular into rkaraivanov/grids-restructure
2 parents 111391a + bac19c1 commit b695601

File tree

4 files changed

+9
-0
lines changed

4 files changed

+9
-0
lines changed

projects/igniteui-angular/src/lib/directives/for-of/for_of.directive.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,6 +1230,8 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr
12301230
protected removeLastElem() {
12311231
const oldElem = this._embeddedViews.pop();
12321232
this.onBeforeViewDestroyed.emit(oldElem);
1233+
// also detach from ViewContainerRef to make absolutely sure this is removed from the view container.
1234+
this.dc.instance._vcr.detach(this.dc.instance._vcr.length - 1);
12331235
oldElem.destroy();
12341236

12351237
this.state.chunkSize--;

projects/igniteui-angular/src/lib/grids/grid/grid-api.service.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ import { IGroupByExpandState } from '../../data-operations/groupby-expand-state.
55
import { DataUtil } from '../../data-operations/data-util';
66
import { cloneArray } from '../../core/utils';
77
import { IGroupingExpression } from '../../data-operations/grouping-expression.interface';
8+
import { Injectable } from '@angular/core';
89

10+
@Injectable()
911
export class IgxGridAPIService extends GridBaseAPIService<IgxGridComponent> {
1012

1113
public groupBy(expression: IGroupingExpression): void {

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid-api.service.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ import { Subject } from 'rxjs';
44
import { IPathSegment } from './hierarchical-grid-base.component';
55
import { IgxGridBaseComponent, GridBaseAPIService } from '../grid';
66
import { GridType } from '../common/grid.interface';
7+
import { Injectable } from '@angular/core';
8+
9+
@Injectable()
710
export class IgxHierarchicalGridAPIService extends GridBaseAPIService<IgxGridBaseComponent & GridType> {
811
protected childRowIslands: Map<string, IgxRowIslandComponent> = new Map<string, IgxRowIslandComponent>();
912
protected childGrids: Map<string, Map<any, IgxHierarchicalGridComponent>> =

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid-navigation.service.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ import { ISelectionNode } from '../selection/selection.service';
55
import { isIE } from '../../core/utils';
66
import { FilterMode } from '../common/enums';
77
import { IgxColumnComponent } from '../columns/column.component';
8+
import { Injectable } from '@angular/core';
89

10+
@Injectable()
911
export class IgxHierarchicalGridNavigationService extends IgxGridNavigationService {
1012
public grid: IgxHierarchicalGridComponent;
1113

0 commit comments

Comments
 (0)