Skip to content

Commit 475986d

Browse files
authored
refactor(grid-action-buttons): Improve contradicting conditions in template (#9536)
1 parent dec4bac commit 475986d

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed
Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
<ng-container *ngIf="!asMenuItem">
2+
<button igxButton="icon" igxRipple (click)="handleClick($event)" (mousedown)="preventEvent($event)">
3+
<igx-icon *ngIf="iconSet" [family]="iconSet" [name]="iconName">{{iconName}}</igx-icon>
4+
<igx-icon *ngIf="!iconSet" >{{iconName}}</igx-icon>
5+
</button>
6+
</ng-container>
27

3-
<ng-container *ngIf="!asMenuItem">
4-
<button igxButton="icon" igxRipple (click)="handleClick($event)" (mousedown)="preventEvent($event)">
5-
<igx-icon *ngIf="iconSet" [family]="iconSet" [name]="iconName">{{iconName}}</igx-icon>
6-
<igx-icon *ngIf="!iconSet" >{{iconName}}</igx-icon>
7-
</button>
8-
</ng-container>
9-
8+
<ng-template #menuItemTemplate>
109
<ng-container *ngIf="asMenuItem">
1110
<div #container [className]='containerClass'>
1211
<igx-icon *ngIf="iconSet" [family]="iconSet" [name]="iconName">{{iconName}}</igx-icon>
1312
<igx-icon *ngIf="!iconSet" >{{iconName}}</igx-icon>
14-
<label *ngIf='asMenuItem' igxLabel>{{labelText}}</label>
13+
<label igxLabel>{{labelText}}</label>
1514
</div>
1615
</ng-container>
17-
</ng-container>
16+
</ng-template>

projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-action-button.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export class IgxGridActionButtonComponent {
2626
* @hidden
2727
* @internal
2828
*/
29-
@ViewChild(TemplateRef)
29+
@ViewChild('menuItemTemplate')
3030
public templateRef: TemplateRef<any>;
3131

3232
/**

0 commit comments

Comments
 (0)