Skip to content

Commit a651b99

Browse files
authored
Merge pull request #3757 from IgniteUI/vnext
Updating prod with fixes from vnext
2 parents 8830f04 + 7686060 commit a651b99

File tree

136 files changed

+2408
-27
lines changed

Some content is hidden

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

136 files changed

+2408
-27
lines changed

azure-devops/app-cd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ steps:
2424
fetchTags: true
2525

2626
- task: NodeTool@0
27-
displayName: Use Node 20.x
27+
displayName: Use Node 22.x
2828
inputs:
29-
versionSpec: 20.x
29+
versionSpec: 22.x
3030

3131
- task: PowerShell@2
3232
displayName: 'Replace with licensed angular-extras'

azure-devops/app-crm-cd-yml renamed to azure-devops/app-crm-cd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ steps:
2424
fetchTags: true
2525

2626
- task: NodeTool@0
27-
displayName: Use Node 20.x
27+
displayName: Use Node 22.x
2828
inputs:
29-
versionSpec: 20.x
29+
versionSpec: 22.x
3030

3131
- task: PowerShell@2
3232
displayName: 'Replace with licensed angular-extras'

azure-devops/app-lob-cd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ steps:
2424
fetchTags: true
2525

2626
- task: NodeTool@0
27-
displayName: Use Node 20.x
27+
displayName: Use Node 22.x
2828
inputs:
29-
versionSpec: 20.x
29+
versionSpec: 22.x
3030

3131
- task: PowerShell@2
3232
displayName: 'Replace with licensed angular-extras'

live-editing/configs/TooltipConfigGenerator.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,20 @@ export class TooltipConfigGenerator implements IConfigGenerator {
2424
shortenComponentPathBy: "/interactions/tooltip/"
2525
}));
2626

27+
// Placement Tooltip Sample
28+
configs.push(new Config({
29+
component: 'TooltipPlacementComponent',
30+
appConfig: BaseAppConfig,
31+
shortenComponentPathBy: "/interactions/tooltip/"
32+
}));
33+
34+
// Advanced Tooltip Sample
35+
configs.push(new Config({
36+
component: 'TooltipAdvancedComponent',
37+
appConfig: BaseAppConfig,
38+
shortenComponentPathBy: "/interactions/tooltip/"
39+
}));
40+
2741
// Style Tooltip Sample
2842
configs.push(new Config({
2943
component: 'TooltipStyleComponent',

package-lock.json

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@
7272
"express": "^4.18.2",
7373
"file-saver": "^2.0.2",
7474
"hammerjs": "^2.0.8",
75-
"igniteui-angular": "^20.1.0",
75+
"igniteui-angular": "^20.1.4",
7676
"igniteui-angular-charts": "^19.0.1",
7777
"igniteui-angular-core": "^19.0.1",
7878
"igniteui-angular-extras": "^20.0.0",
79-
"igniteui-angular-i18n": "^20.1.0",
79+
"igniteui-angular-i18n": "^20.1.4",
8080
"igniteui-dockmanager": "^1.17.0",
8181
"igniteui-live-editing": "^3.1.1",
8282
"igniteui-webcomponents": "^6.2.0",
@@ -106,7 +106,7 @@
106106
"@angular/compiler": "^20.2.2"
107107
},
108108
"igniteui-angular-extras": {
109-
"igniteui-angular": "^20.1.0"
109+
"igniteui-angular": "^20.1.4"
110110
}
111111
},
112112
"devDependencies": {

src/app/app.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { provideHttpClient, withInterceptorsFromDi } from "@angular/common/http";
1+
import { provideHttpClient, withFetch, withInterceptorsFromDi } from "@angular/common/http";
22
import { ApplicationConfig, importProvidersFrom } from "@angular/core";
33
import { FormsModule } from "@angular/forms";
44
import { BrowserModule, HammerModule, provideClientHydration, withEventReplay } from "@angular/platform-browser";
@@ -16,7 +16,7 @@ export const AppConfig: ApplicationConfig = {
1616
HammerModule,
1717
NgbModule
1818
),
19-
provideHttpClient(withInterceptorsFromDi()),
19+
provideHttpClient(withInterceptorsFromDi(), withFetch()),
2020
provideAnimations(),
2121
provideRouter(AppRoutes),
2222
OverflowService, provideClientHydration(withEventReplay())
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<igx-list>
2+
<igx-list-item [isHeader]="true">
3+
Team Members (4)
4+
</igx-list-item>
5+
@for (member of members; track member) {
6+
<igx-list-item>
7+
<div class="wrapper">
8+
<div>
9+
<igx-avatar icon="person" shape="circle" size="small"></igx-avatar>
10+
<igx-badge [icon]="member.icon" shape="square" class="badge-style !light-badge ![--background-color:#FF4E00] ![--border-radius:4px]"></igx-badge>
11+
</div>
12+
<div class="contact-container">
13+
<span class="contact-name">{{ member.name }}</span>
14+
</div>
15+
</div>
16+
</igx-list-item>
17+
}
18+
</igx-list>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@use "layout.scss";
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import { Component } from '@angular/core';
2+
import { Member } from '../model/member.model';
3+
import { IgxListComponent, IgxListItemComponent, IgxAvatarComponent, IgxBadgeComponent } from 'igniteui-angular';
4+
5+
6+
@Component({
7+
selector: 'app-badge-tailwind-styling-sample',
8+
styleUrls: ['./badge-tailwind-styling-sample.component.scss'],
9+
templateUrl: './badge-tailwind-styling-sample.component.html',
10+
imports: [IgxListComponent, IgxListItemComponent, IgxAvatarComponent, IgxBadgeComponent]
11+
})
12+
export class BadgeTailwindStylingSampleComponent {
13+
public members: Member[] = [
14+
new Member('Terrance Orta', 'online'),
15+
new Member('Donna Price', 'online'),
16+
new Member('Lisa Landers', 'away'),
17+
new Member('Dorothy H. Spencer', 'offline')
18+
];
19+
}

0 commit comments

Comments
 (0)