Skip to content

Commit 550f249

Browse files
Copilotdamyanpetev
andauthored
refactor(igx-ts): control flow and class migration (#1584)
Co-authored-by: Damyan Petev <damyanpetev@users.noreply.github.com>
1 parent 2f1bd38 commit 550f249

File tree

44 files changed

+355
-270
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+355
-270
lines changed

packages/igx-templates/igx-ts/autocomplete/autocomplete-custom/files/src/app/__path__/__filePrefix__.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@
1111
<input igxInput name="town" type="text" [igxAutocomplete]="townsPanel" [(ngModel)]="townSelected" />
1212
</igx-input-group>
1313
<igx-drop-down #townsPanel maxHeight="300px">
14-
<igx-drop-down-item *ngFor="let town of towns | <%=camelCaseName%>StartsWith:townSelected" [value]="town">
15-
{{town}}
16-
</igx-drop-down-item>
14+
@for (town of towns | <%=camelCaseName%>StartsWith:townSelected; track town) {
15+
<igx-drop-down-item [value]="town">
16+
{{town}}
17+
</igx-drop-down-item>
18+
}
1719
</igx-drop-down>
1820
</form>
1921
</article>

packages/igx-templates/igx-ts/autocomplete/autocomplete-custom/files/src/app/__path__/__filePrefix__.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { Component, Pipe, PipeTransform, forwardRef } from '@angular/core';
22
import { Towns } from './towns-data';
3-
import { NgFor } from '@angular/common';
43
import { ReactiveFormsModule, FormsModule } from '@angular/forms';
54
import {
65
IgxInputGroupComponent,
@@ -23,7 +22,6 @@ import {
2322
IgxInputDirective,
2423
IgxAutocompleteDirective,
2524
IgxDropDownComponent,
26-
NgFor,
2725
IgxDropDownItemComponent,
2826
forwardRef(() => <%=ClassName%>PipeStartsWith),
2927
],

packages/igx-templates/igx-ts/autocomplete/autocomplete-extended/files/src/app/__path__/__filePrefix__.html

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,19 @@
2222
[(ngModel)]="townSelected"/>
2323
</igx-input-group>
2424
<igx-drop-down #townsEnhancedPanel maxHeight="300px" (selectionChanging)="getPostalCode($event)">
25-
<igx-drop-down-item-group
26-
*ngFor="let eRegion of regions | <%=camelCaseName%>RegionContains:townSelected"
27-
[label]="eRegion.name">
28-
<igx-drop-down-item *ngFor="let town of eRegion.towns | <%=camelCaseName%>StartsWith:townSelected"
29-
[value]="town.name">
30-
{{town.name}}
31-
</igx-drop-down-item>
32-
</igx-drop-down-item-group>
25+
@for (eRegion of regions | <%=camelCaseName%>RegionContains:townSelected; track eRegion) {
26+
<igx-drop-down-item-group
27+
[label]="eRegion.name">
28+
@for (town of eRegion.towns | <%=camelCaseName%>StartsWith:townSelected; track town) {
29+
<igx-drop-down-item
30+
[value]="town.name">
31+
{{town.name}}
32+
</igx-drop-down-item>
33+
}
34+
</igx-drop-down-item-group>
35+
}
3336
</igx-drop-down>
3437

35-
<igx-toast #message>Postal Code: {{postalCode}}"</igx-toast>
38+
<igx-toast #message>Postal Code: {{postalCode}}</igx-toast>
3639
</div>
3740
</div>

packages/igx-templates/igx-ts/autocomplete/autocomplete-extended/files/src/app/__path__/__filePrefix__.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414
IgxLabelDirective,
1515
} from '<%=igxPackage%>';
1616
import { Region, Town, townsExtended } from './towns-data-extended';
17-
import { NgFor } from '@angular/common';
1817
import { ReactiveFormsModule, FormsModule } from '@angular/forms';
1918

2019
@Component({
@@ -29,7 +28,6 @@ import { ReactiveFormsModule, FormsModule } from '@angular/forms';
2928
IgxAutocompleteDirective,
3029
FormsModule,
3130
IgxDropDownComponent,
32-
NgFor,
3331
IgxDropDownGroupComponent,
3432
IgxDropDownItemComponent,
3533
IgxToastComponent,

packages/igx-templates/igx-ts/carousel/default/files/src/app/__path__/__filePrefix__.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
<a href="https://www.infragistics.com/products/ignite-ui-angular/angular/components/carousel" target="_blank">official documentation page</a>.</p>
55
<div class="carousel-container">
66
<igx-carousel [interval]="interval" [pause]="pause" [loop]="loop">
7-
<igx-slide *ngFor="let slide of slides;" [active]="!!slide.active">
8-
<img [src]="slide.image">
9-
</igx-slide>
7+
@for (slide of slides; track slide) {
8+
<igx-slide [active]="!!slide.active">
9+
<img [src]="slide.image">
10+
</igx-slide>
11+
}
1012
</igx-carousel>
1113
</div>

packages/igx-templates/igx-ts/carousel/default/files/src/app/__path__/__filePrefix__.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import { Component, OnInit } from '@angular/core';
2-
import { NgFor } from '@angular/common';
32
import { IgxCarouselComponent, IgxSlideComponent } from '<%=igxPackage%>';
43

54
@Component({
65
selector: 'app-<%=filePrefix%>',
76
templateUrl: './<%=filePrefix%>.html',
87
styleUrl: './<%=filePrefix%>.scss',
9-
imports: [IgxCarouselComponent, NgFor, IgxSlideComponent]
8+
imports: [IgxCarouselComponent, IgxSlideComponent]
109
})
1110
export class <%=ClassName%> implements OnInit {
1211
public slides: Slide[] = [];

packages/igx-templates/igx-ts/chip/default/files/src/app/__path__/__filePrefix__.html

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,23 @@
88
<span class="header">Selected Events</span>
99
<div class="chipsArea">
1010
<igx-chips-area #chipsArea class="chiparea">
11-
<igx-chip class="chipStyle" *ngFor="let chip of chipList" [id]="chip.id" [removable]="true" (remove)="chipRemoved($event)">
11+
@for (chip of chipList; track chip.id) {
12+
<igx-chip class="chipStyle" [id]="chip.id" [removable]="true" (remove)="chipRemoved($event)">
1213
<span #label [class]="'igx-chip__text'">{{chip.name}}</span>
13-
</igx-chip>
14+
</igx-chip>
15+
}
1416
</igx-chips-area>
1517
</div>
1618
<div class="chips">
1719
<button #openButton igxButton="raised" (click)="toggleDropDown($event)" [igxDropDownItemNavigation]="dropdown">Talks</button>
1820
<igx-drop-down #dropdown (selectionChanging)="itemSelection($event)">
19-
<igx-drop-down-item *ngFor="let item of dropDownList" [value]="item.name">
21+
@for (item of dropDownList; track item.id) {
22+
<igx-drop-down-item [value]="item.name">
2023
<div class="ig-drop-down__item-template">
2124
<span>{{item.name}}</span>
2225
</div>
23-
</igx-drop-down-item>
26+
</igx-drop-down-item>
27+
}
2428
</igx-drop-down>
2529
</div>
2630
</div>

packages/igx-templates/igx-ts/chip/default/files/src/app/__path__/__filePrefix__.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import {
1515
IgxDropDownItemNavigationDirective,
1616
IgxDropDownItemComponent,
1717
} from '<%=igxPackage%>';
18-
import { NgFor } from '@angular/common';
1918

2019
interface NamedEntry {
2120
id: string;
@@ -29,7 +28,6 @@ interface NamedEntry {
2928
imports: [
3029
IgxLayoutDirective,
3130
IgxChipsAreaComponent,
32-
NgFor,
3331
IgxChipComponent,
3432
IgxButtonDirective,
3533
IgxDropDownItemNavigationDirective,

packages/igx-templates/igx-ts/custom-templates/awesome-grid/files/src/app/__path__/__filePrefix__.html

Lines changed: 37 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,25 @@ <h5 class="switch-sample__title">Boston Marathon 2020</h5>
2020
<ng-template igxCell let-cell="cell">
2121
<div class="cell__inner">
2222
<div>{{ paginator.page * paginator.perPage + cell.row.index + 1 }}</div>
23-
<ng-container *ngIf="isTop3(cell)">
24-
<span class="cup" *ngIf="cell.row.index === 0">
25-
<img src="assets/images/trophy_gold.svg" alt="First place Trophy image" />
26-
</span>
27-
<span class="cup" *ngIf="cell.row.index === 1">
28-
<img src="assets/images/trophy_silver.svg" alt="Second place Trophy image" />
29-
</span>
30-
<span class="cup" *ngIf="cell.row.index === 2">
31-
<img src="assets/images/trophy_bronze.svg" alt="Third place Trophy image" />
32-
</span>
33-
</ng-container>
23+
@if (isTop3(cell)) {
24+
<ng-container>
25+
@if (cell.row.index === 0) {
26+
<span class="cup">
27+
<img src="assets/images/trophy_gold.svg" alt="First place Trophy image" />
28+
</span>
29+
}
30+
@if (cell.row.index === 1) {
31+
<span class="cup">
32+
<img src="assets/images/trophy_silver.svg" alt="Second place Trophy image" />
33+
</span>
34+
}
35+
@if (cell.row.index === 2) {
36+
<span class="cup">
37+
<img src="assets/images/trophy_bronze.svg" alt="Third place Trophy image" />
38+
</span>
39+
}
40+
</ng-container>
41+
}
3442
</div>
3543
</ng-template>
3644
</igx-column>
@@ -40,7 +48,9 @@ <h5 class="switch-sample__title">Boston Marathon 2020</h5>
4048
<div class="cell__inner">
4149
<igx-avatar [src]="cell.row.data.Avatar" [shape]="'square'" size="small"> </igx-avatar><span
4250
class="athlete_name">{{ cell.value }}</span>
43-
<igx-badge *ngIf="live" [type]="getBadgeType(cell)" [icon]="getIconType(cell)"></igx-badge>
51+
@if (live) {
52+
<igx-badge [type]="getBadgeType(cell)" [icon]="getIconType(cell)"></igx-badge>
53+
}
4454
</div>
4555

4656
</ng-template>
@@ -101,7 +111,7 @@ <h5 class="switch-sample__title">Boston Marathon 2020</h5>
101111
</span>
102112
</div>
103113
<div class="s-overlay__players">
104-
<div class="s-overlay__player" [ngClass]="{'s-overlay__player--winner' : hasWinner}">
114+
<div class="s-overlay__player" [class.s-overlay__player--winner]="hasWinner">
105115
<igx-avatar size="large" [shape]="'square'" [src]="winner.Avatar"></igx-avatar>
106116
<p class="s-overlay__player-name">{{ winner.Name }}</p>
107117
</div>
@@ -116,17 +126,21 @@ <h5 class="switch-sample__title">Boston Marathon 2020</h5>
116126
<span>Finish</span>
117127
</div>
118128
<div class="s-overlay__players">
119-
<ng-container *ngFor="let player of top3; let i = index">
120-
<div class="s-overlay__player"
121-
[ngClass]="i === 0 ? 's-overlay__player--winner' : i === 1 ? 's-overlay__player--second' : 's-overlay__player--third'">
122-
<div class="s-overlay__trophy">
123-
<span>{{i + 1}}</span>
124-
<img [src]="getTrophyUrl(i)" alt="First place Trophy image" />
129+
@for (player of top3; track $index; let i = $index) {
130+
<ng-container>
131+
<div class="s-overlay__player"
132+
[class.s-overlay__player--winner]="i === 0"
133+
[class.s-overlay__player--second]="i === 1"
134+
[class.s-overlay__player--third]="i === 2">
135+
<div class="s-overlay__trophy">
136+
<span>{{i + 1}}</span>
137+
<img [src]="getTrophyUrl(i)" alt="First place Trophy image" />
138+
</div>
139+
<igx-avatar [size]="i === 0 ? 'large': 'medium'" [shape]="'square'" [src]="player.Avatar"></igx-avatar>
140+
<p class="s-overlay__player-name">{{ player.Name }}</p>
125141
</div>
126-
<igx-avatar [size]="i === 0 ? 'large': 'medium'" [shape]="'square'" [src]="player.Avatar"></igx-avatar>
127-
<p class="s-overlay__player-name">{{ player.Name }}</p>
128-
</div>
129-
</ng-container>
142+
</ng-container>
143+
}
130144
</div>
131145
</div>
132146
</div>

packages/igx-templates/igx-ts/custom-templates/awesome-grid/files/src/app/__path__/__filePrefix__.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import {
3232
IgxSparklineCoreModule,
3333
} from 'igniteui-angular-charts';
3434
import { Athlete, AthletesData, SpeedEntry } from './services/data';
35-
import { NgIf, NgClass, NgFor, DecimalPipe } from '@angular/common';
35+
import { DecimalPipe } from '@angular/common';
3636
import { ReactiveFormsModule, FormsModule } from '@angular/forms';
3737

3838
@Component({
@@ -49,13 +49,10 @@ import { ReactiveFormsModule, FormsModule } from '@angular/forms';
4949
IgxPaginatorComponent,
5050
IgxColumnComponent,
5151
IgxCellTemplateDirective,
52-
NgIf,
5352
IgxAvatarComponent,
5453
IgxBadgeComponent,
5554
IgxSparklineCoreModule,
5655
IgxCircularProgressBarComponent,
57-
NgClass,
58-
NgFor,
5956
DecimalPipe,
6057
],
6158
})

0 commit comments

Comments
 (0)