Skip to content

Commit 395c9b4

Browse files
Merge branch 'master' into ikitanov/fix-13961-master
2 parents f3c1ef2 + 2423d8f commit 395c9b4

Some content is hidden

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

51 files changed

+8314
-7484
lines changed

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"@types/source-map": "0.5.2",
7171
"express": "^4.18.2",
7272
"fflate": "^0.8.1",
73-
"igniteui-theming": "^4.4.0",
73+
"igniteui-theming": "^5.0.1",
7474
"igniteui-trial-watermark": "^3.0.2",
7575
"lodash-es": "^4.17.21",
7676
"rxjs": "^7.8.0",

projects/igniteui-angular/migrations/migration-collection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,11 @@
166166
"version": "17.1.0",
167167
"description": "Updates Ignite UI for Angular from v17.0.x to v17.1.0",
168168
"factory": "./update-17_1_0"
169+
},
170+
"migration-34": {
171+
"version": "17.1.4",
172+
"description": "Updates Ignite UI for Angular from v17.1.x to v17.1.4",
173+
"factory": "./update-17_1_4"
169174
}
170175
}
171176
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"$schema": "../../common/schema/theme-changes.schema.json",
3+
"changes": [
4+
{
5+
"name": "$disabled-color",
6+
"replaceWith": "$disabled-text-color",
7+
"owner": "expansion-panel-theme",
8+
"type": "property"
9+
}
10+
]
11+
}
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
import * as path from 'path';
2+
3+
import { EmptyTree } from '@angular-devkit/schematics';
4+
import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
5+
6+
const version = '17.1.4';
7+
8+
describe(`Update to ${version}`, () => {
9+
let appTree: UnitTestTree;
10+
const schematicRunner = new SchematicTestRunner('ig-migrate', path.join(__dirname, '../migration-collection.json'));
11+
12+
const configJson = {
13+
projects: {
14+
testProj: {
15+
root: '/',
16+
sourceRoot: '/testSrc'
17+
}
18+
},
19+
schematics: {
20+
'@schematics/angular:component': {
21+
prefix: 'appPrefix'
22+
}
23+
}
24+
};
25+
26+
beforeEach(() => {
27+
appTree = new UnitTestTree(new EmptyTree());
28+
appTree.create('/angular.json', JSON.stringify(configJson));
29+
});
30+
31+
const migrationName = 'migration-34';
32+
33+
it('should rename the expansion-panel $disabled-color property to $disabled-text-color', async () => {
34+
appTree.create(
35+
`/testSrc/appPrefix/component/test.component.scss`,
36+
`$custom-expansion-panel: expansion-panel-theme($disabled-color: color($default-palette, 'gray', 200));`
37+
);
38+
39+
const tree = await schematicRunner.runSchematic(migrationName, { shouldInvokeLS: false }, appTree);
40+
41+
expect(tree.readContent('/testSrc/appPrefix/component/test.component.scss')).toEqual(
42+
`$custom-expansion-panel: expansion-panel-theme($disabled-text-color: color($default-palette, 'gray', 200));`
43+
);
44+
});
45+
});
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import {
2+
Rule,
3+
SchematicContext,
4+
Tree
5+
} from '@angular-devkit/schematics';
6+
import { UpdateChanges } from '../common/UpdateChanges';
7+
8+
const version = '17.1.4';
9+
10+
export default (): Rule => async (host: Tree, context: SchematicContext) => {
11+
context.logger.info(`Applying migration for Ignite UI for Angular to version ${version}`);
12+
const update = new UpdateChanges(__dirname, host, context);
13+
update.applyChanges();
14+
};

projects/igniteui-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"igniteui-trial-watermark": "^3.0.2",
7575
"lodash-es": "^4.17.21",
7676
"uuid": "^9.0.0",
77-
"igniteui-theming": "^4.4.0",
77+
"igniteui-theming": "^5.0.1",
7878
"@igniteui/material-icons-extended": "^3.0.0"
7979
},
8080
"peerDependencies": {

projects/igniteui-angular/src/lib/banner/banner.component.spec.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -551,10 +551,8 @@ export class IgxBannerSampleComponent {
551551
<igx-avatar
552552
src="https://www.infragistics.com/angular-demos/assets/images/card/avatars/brad_stanley.jpg">
553553
</igx-avatar>
554-
<div class="igx-card-header__tgroup">
555-
<h3 class="igx-card-header__title--small">Brad Stanley</h3>
556-
<h5 class="igx-card-header__subtitle">Audi AG</h5>
557-
</div>
554+
<h3 class="igx-card-header__title--small">Brad Stanley</h3>
555+
<h5 class="igx-card-header__subtitle">Audi AG</h5>
558556
</igx-card-header>
559557
<igx-card-content>
560558
<p class="igx-card-content__text">Brad Stanley has requested to follow you.</p>

projects/igniteui-angular/src/lib/card/card-header.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
[igxCardHeaderTitle],
88
[igxCardHeaderSubtitle],
99
.igx-card-header__title,
10+
.igx-card-header__title--small,
1011
.igx-card-header__subtitle">
1112
</ng-content>
1213
</div>

projects/igniteui-angular/src/lib/carousel/carousel.component.html

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,20 @@
1818
</span>
1919
</ng-template>
2020

21+
<ng-template #indigoPrevButton let-disabled>
22+
<span class="igx-nav-arrow"
23+
[class.igx-nav-arrow--disabled]="disabled">
24+
<igx-icon>chevron_left</igx-icon>
25+
</span>
26+
</ng-template>
27+
28+
<ng-template #indigoNextButton let-disabled>
29+
<span class="igx-nav-arrow"
30+
[class.igx-nav-arrow--disabled]="disabled">
31+
<igx-icon>chevron_right</igx-icon>
32+
</span>
33+
</ng-template>
34+
2135
<div *ngIf="showIndicators" [ngClass]="indicatorsOrientationClass" [attr.role]="'tablist'">
2236
<div *ngFor="let slide of slides"
2337
class="igx-carousel-indicators__indicator"
@@ -46,6 +60,3 @@
4660
<div *ngIf="navigation && slides.length" role="button" tabindex="0" class="igx-carousel__arrow--next" [attr.aria-label]="resourceStrings.igx_carousel_next_slide" (keydown.enter)="next()" (click)="next()">
4761
<ng-container *ngTemplateOutlet="getNextButtonTemplate; context: {$implicit: nextButtonDisabled};"></ng-container>
4862
</div>
49-
50-
51-

0 commit comments

Comments
 (0)