Skip to content

Commit ba57d4f

Browse files
MKirovaMKirova
MKirova
authored and
MKirova
committed
chore(*): Renaming related templates/props.
1 parent 9eba52c commit ba57d4f

13 files changed

+51
-51
lines changed

‎projects/igniteui-angular/src/lib/grids/grid-base.component.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ import { IgxGridFilteringRowComponent } from './filtering/grid-filtering-row.com
9292
import { IgxDragDirective } from '../directives/drag-drop/drag-drop.directive';
9393
import { DeprecateProperty } from '../core/deprecateDecorators';
9494
import { CharSeparatedValueData } from '../services/csv/char-separated-value-data';
95-
import { IgxRowExpandIndicatorDirective, IgxRowCollapseIndicatorDirective,
95+
import { IgxRowExpandedIndicatorDirective, IgxRowCollapsedIndicatorDirective,
9696
IgxHeaderExpandIndicatorDirective, IgxHeaderCollapseIndicatorDirective } from './grid/grid.directives';
9797

9898
const MINIMUM_COLUMN_WIDTH = 136;
@@ -268,14 +268,14 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
268268
/**
269269
* The custom template, if any, that should be used when rendering a row expand indicator.
270270
*/
271-
@ContentChild(IgxRowExpandIndicatorDirective, { read: TemplateRef, static: false })
272-
public rowExpandIndicatorTemplate: TemplateRef<any> = null;
271+
@ContentChild(IgxRowExpandedIndicatorDirective, { read: TemplateRef, static: false })
272+
public rowExpandedIndicatorTemplate: TemplateRef<any> = null;
273273

274274
/**
275275
* The custom template, if any, that should be used when rendering a row collapse indicator.
276276
*/
277-
@ContentChild(IgxRowCollapseIndicatorDirective, { read: TemplateRef, static: false })
278-
public rowCollapseIndicatorTemplate: TemplateRef<any> = null;
277+
@ContentChild(IgxRowCollapsedIndicatorDirective, { read: TemplateRef, static: false })
278+
public rowCollapsedIndicatorTemplate: TemplateRef<any> = null;
279279

280280

281281
/**
@@ -293,14 +293,14 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
293293
/**
294294
* @hidden
295295
*/
296-
@ViewChild('defaultExpandTemplate', { read: TemplateRef, static: true })
297-
protected defaultExpandTemplate: TemplateRef<any>;
296+
@ViewChild('defaultExpandedTemplate', { read: TemplateRef, static: true })
297+
protected defaultExpandedTemplate: TemplateRef<any>;
298298

299299
/**
300300
* @hidden
301301
*/
302-
@ViewChild('defaultCollapseTemplate', { read: TemplateRef, static: true })
303-
protected defaultCollapseTemplate: TemplateRef<any>;
302+
@ViewChild('defaultCollapsedTemplate', { read: TemplateRef, static: true })
303+
protected defaultCollapsedTemplate: TemplateRef<any>;
304304

305305

306306
/**

‎projects/igniteui-angular/src/lib/grids/grid/grid.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,14 +194,14 @@
194194
<span class="igx-drop-area__text">{{dropAreaMessage}}</span>
195195
</ng-template>
196196

197-
<ng-template #defaultExpandTemplate>
197+
<ng-template #defaultExpandedTemplate>
198198
<igx-icon role="button" class="igx-grid__group-expand-btn"
199199
[ngClass]="{
200200
'igx-grid__group-expand-btn--push': filteringService.isFilterRowVisible
201201
}">unfold_less</igx-icon>
202202
</ng-template>
203203

204-
<ng-template #defaultCollapseTemplate>
204+
<ng-template #defaultCollapsedTemplate>
205205
<igx-icon role="button" class="igx-grid__group-expand-btn"
206206
[ngClass]="{
207207
'igx-grid__group-expand-btn--push': filteringService.isFilterRowVisible

‎projects/igniteui-angular/src/lib/grids/grid/grid.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -909,9 +909,9 @@ export class IgxGridComponent extends IgxGridBaseComponent implements IGridDataB
909909
*/
910910
public get iconTemplate() {
911911
if (this.groupsExpanded) {
912-
return this.headerExpandIndicatorTemplate || this.defaultExpandTemplate;
912+
return this.headerExpandIndicatorTemplate || this.defaultExpandedTemplate;
913913
} else {
914-
return this.headerCollapseIndicatorTemplate || this.defaultCollapseTemplate;
914+
return this.headerCollapseIndicatorTemplate || this.defaultCollapsedTemplate;
915915
}
916916
}
917917

‎projects/igniteui-angular/src/lib/grids/grid/grid.directives.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export class IgxGroupByRowTemplateDirective {
2323
@Directive({
2424
selector: '[igxRowExpandedIndicator]'
2525
})
26-
export class IgxRowExpandIndicatorDirective {
26+
export class IgxRowExpandedIndicatorDirective {
2727
}
2828

2929
/**
@@ -32,7 +32,7 @@ export class IgxRowExpandIndicatorDirective {
3232
@Directive({
3333
selector: '[igxRowCollapsedIndicator]'
3434
})
35-
export class IgxRowCollapseIndicatorDirective {
35+
export class IgxRowCollapsedIndicatorDirective {
3636
}
3737

3838

‎projects/igniteui-angular/src/lib/grids/grid/grid.module.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import { FormsModule } from '@angular/forms';
44
import {
55
IgxGroupAreaDropDirective,
66
IgxGroupByRowTemplateDirective,
7-
IgxRowExpandIndicatorDirective,
8-
IgxRowCollapseIndicatorDirective,
7+
IgxRowExpandedIndicatorDirective,
8+
IgxRowCollapsedIndicatorDirective,
99
IgxHeaderExpandIndicatorDirective,
1010
IgxHeaderCollapseIndicatorDirective
1111
} from './grid.directives';
@@ -33,8 +33,8 @@ import { IgxSelectModule } from '../../select/index';
3333
IgxGridRowComponent,
3434
IgxGridGroupByRowComponent,
3535
IgxGroupByRowTemplateDirective,
36-
IgxRowExpandIndicatorDirective,
37-
IgxRowCollapseIndicatorDirective,
36+
IgxRowExpandedIndicatorDirective,
37+
IgxRowCollapsedIndicatorDirective,
3838
IgxHeaderExpandIndicatorDirective,
3939
IgxHeaderCollapseIndicatorDirective,
4040
IgxGroupAreaDropDirective,
@@ -49,8 +49,8 @@ import { IgxSelectModule } from '../../select/index';
4949
IgxGridGroupByRowComponent,
5050
IgxGridRowComponent,
5151
IgxGroupByRowTemplateDirective,
52-
IgxRowExpandIndicatorDirective,
53-
IgxRowCollapseIndicatorDirective,
52+
IgxRowExpandedIndicatorDirective,
53+
IgxRowCollapsedIndicatorDirective,
5454
IgxHeaderExpandIndicatorDirective,
5555
IgxHeaderCollapseIndicatorDirective,
5656
IgxGroupAreaDropDirective,

‎projects/igniteui-angular/src/lib/grids/grid/groupby-row.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
</ng-container>
1010
</div>
1111

12-
<ng-template #defaultGroupByExpandTemplate>
12+
<ng-template #defaultGroupByExpandedTemplate>
1313
<igx-icon fontSet="material">expand_more</igx-icon>
1414
</ng-template>
1515

16-
<ng-template #defaultGroupByCollapseTemplate>
16+
<ng-template #defaultGroupByCollapsedTemplate>
1717
<igx-icon fontSet="material">chevron_right</igx-icon>
1818
</ng-template>
1919

‎projects/igniteui-angular/src/lib/grids/grid/groupby-row.component.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ export class IgxGridGroupByRowComponent {
4242
/**
4343
* @hidden
4444
*/
45-
@ViewChild('defaultGroupByExpandTemplate', { read: TemplateRef, static: true })
46-
protected defaultGroupByExpandTemplate: TemplateRef<any>;
45+
@ViewChild('defaultGroupByExpandedTemplate', { read: TemplateRef, static: true })
46+
protected defaultGroupByExpandedTemplate: TemplateRef<any>;
4747

4848
/**
4949
* @hidden
5050
*/
51-
@ViewChild('defaultGroupByCollapseTemplate', { read: TemplateRef, static: true })
52-
protected defaultGroupByCollapseTemplate: TemplateRef<any>;
51+
@ViewChild('defaultGroupByCollapsedTemplate', { read: TemplateRef, static: true })
52+
protected defaultGroupByCollapsedTemplate: TemplateRef<any>;
5353

5454
/**
5555
* @hidden
@@ -192,9 +192,9 @@ export class IgxGridGroupByRowComponent {
192192

193193
public get iconTemplate() {
194194
if (this.expanded) {
195-
return this.grid.rowExpandIndicatorTemplate || this.defaultGroupByExpandTemplate;
195+
return this.grid.rowExpandedIndicatorTemplate || this.defaultGroupByExpandedTemplate;
196196
} else {
197-
return this.grid.rowCollapseIndicatorTemplate || this.defaultGroupByCollapseTemplate;
197+
return this.grid.rowCollapsedIndicatorTemplate || this.defaultGroupByCollapsedTemplate;
198198
}
199199
}
200200

‎projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,11 @@
166166
</div>
167167
</ng-template>
168168

169-
<ng-template #defaultCollapseTemplate>
169+
<ng-template #defaultCollapsedTemplate>
170170
<igx-icon role="button" [isActive]='false' fontSet="material">unfold_less</igx-icon>
171171
</ng-template>
172172

173-
<ng-template #defaultExpandTemplate>
173+
<ng-template #defaultExpandedTemplate>
174174
<igx-icon role="button" [isActive]='true' fontSet="material" (click)="collapseAll()">unfold_less</igx-icon>
175175
</ng-template>
176176

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -377,8 +377,8 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseCompone
377377
this.toolbarCustomContentTemplates = this.parentIsland ?
378378
this.parentIsland.toolbarCustomContentTemplates :
379379
this.toolbarCustomContentTemplates;
380-
this.rowExpandIndicatorTemplate = this.rootGrid.rowExpandIndicatorTemplate;
381-
this.rowCollapseIndicatorTemplate = this.rootGrid.rowCollapseIndicatorTemplate;
380+
this.rowExpandedIndicatorTemplate = this.rootGrid.rowExpandedIndicatorTemplate;
381+
this.rowCollapsedIndicatorTemplate = this.rootGrid.rowCollapsedIndicatorTemplate;
382382
this.headerCollapseIndicatorTemplate = this.rootGrid.headerCollapseIndicatorTemplate;
383383
this.headerExpandIndicatorTemplate = this.rootGrid.headerExpandIndicatorTemplate;
384384
}
@@ -617,9 +617,9 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseCompone
617617
public get iconTemplate() {
618618
const expanded = this.hierarchicalState.length > 0 && this.hasExpandableChildren;
619619
if (expanded) {
620-
return this.headerExpandIndicatorTemplate || this.defaultExpandTemplate;
620+
return this.headerExpandIndicatorTemplate || this.defaultExpandedTemplate;
621621
} else {
622-
return this.headerCollapseIndicatorTemplate || this.defaultCollapseTemplate;
622+
return this.headerCollapseIndicatorTemplate || this.defaultCollapsedTemplate;
623623
}
624624
}
625625

‎projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-row.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<ng-container *ngTemplateOutlet="iconTemplate; context: { $implicit: this }">
33
</ng-container>
44
</div>
5-
<ng-template #defaultExpandTemplate>
5+
<ng-template #defaultExpandedTemplate>
66
<igx-icon [isActive]='!added' fontSet="material">expand_more</igx-icon>
77
</ng-template>
88

9-
<ng-template #defaultCollapseTemplate>
9+
<ng-template #defaultCollapsedTemplate>
1010
<igx-icon [isActive]='!added' fontSet="material">chevron_right</igx-icon>
1111
</ng-template>
1212
<ng-container *ngIf="rowDraggable">

0 commit comments

Comments
 (0)