Skip to content

Commit cda414f

Browse files
authored
Merge branch 'master' into ikitanov/fix-15306-master
2 parents 1ad1d7a + 3fb0f11 commit cda414f

29 files changed

+946
-557
lines changed

package-lock.json

Lines changed: 4 additions & 4 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
@@ -74,7 +74,7 @@
7474
"@types/source-map": "0.5.2",
7575
"express": "^4.21.1",
7676
"fflate": "^0.8.1",
77-
"igniteui-theming": "^16.0.0",
77+
"igniteui-theming": "^17.0.0",
7878
"igniteui-trial-watermark": "^3.0.2",
7979
"lodash-es": "^4.17.21",
8080
"rxjs": "^7.8.0",

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,13 @@
218218
"factory": "./update-19_1_1"
219219
},
220220
"migration-44": {
221+
"version": "19.1.4",
222+
"description": "Updates Ignite UI for Angular from v19.1.0 to v19.1.4",
223+
"factory": "./update-19_1_4"
224+
},
225+
"migration-45": {
221226
"version": "19.2.0",
222-
"description": "Updates Ignite UI for Angular from v19.1.1 to v19.2.0",
227+
"description": "Updates Ignite UI for Angular from v19.1.0 to v19.2.0",
223228
"factory": "./update-19_2_0"
224229
}
225230
}
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"$schema": "../../common/schema/theme-changes.schema.json",
3+
"changes": [
4+
{
5+
"name": "$root-summaries-background",
6+
"remove": true,
7+
"owner": "grid-theme",
8+
"type": "property"
9+
},
10+
{
11+
"name": "$root-summaries-text-color",
12+
"remove": true,
13+
"owner": "grid-theme",
14+
"type": "property"
15+
},
16+
{
17+
"name": "$body-summaries-background",
18+
"remove": true,
19+
"owner": "grid-theme",
20+
"type": "property"
21+
},
22+
{
23+
"name": "$body-summaries-text-color",
24+
"remove": true,
25+
"owner": "grid-theme",
26+
"type": "property"
27+
}
28+
]
29+
}
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
import * as path from 'path';
2+
3+
import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
4+
import { setupTestTree } from '../common/setup.spec';
5+
6+
const version = '19.1.4';
7+
const themes = [
8+
'circular-theme'
9+
];
10+
const testFilePath = '/testSrc/appPrefix/component/${theme}.component.scss';
11+
12+
describe(`Update to ${version}`, () => {
13+
let appTree: UnitTestTree;
14+
const schematicRunner = new SchematicTestRunner('ig-migrate', path.join(__dirname, '../migration-collection.json'));
15+
16+
beforeEach(() => {
17+
appTree = setupTestTree();
18+
});
19+
20+
const migrationName = 'migration-44';
21+
22+
it('should remove the summaries related properties from the grid theme', async () => {
23+
const testFilePath = `/testSrc/appPrefix/component/test.component.scss`;
24+
25+
appTree.create(
26+
testFilePath,
27+
`$my-grid-theme: grid-theme(
28+
$header-background: orange,
29+
$root-summaries-background: orange,
30+
$root-summaries-text-color: black,
31+
$body-summaries-background: orange,
32+
$body-summaries-text-color: black,
33+
);`
34+
);
35+
36+
const tree = await schematicRunner.runSchematic(migrationName, {}, appTree);
37+
38+
expect(tree.readContent(testFilePath)).toEqual(
39+
`$my-grid-theme: grid-theme(
40+
$header-background: orange,
41+
);`
42+
);
43+
});
44+
});
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import type {
2+
Rule,
3+
SchematicContext,
4+
Tree
5+
} from '@angular-devkit/schematics';
6+
import { UpdateChanges } from '../common/UpdateChanges';
7+
8+
const version = '19.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/migrations/update-19_2_0/index.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ describe(`Update to ${version}`, () => {
1313
appTree = setupTestTree();
1414
});
1515

16-
const migrationName = 'migration-44';
16+
const migrationName = 'migration-45';
1717

1818
it('should remove igx-caroursel property `keyboardSupport` in template', async () => {
1919
appTree.create(`/testSrc/appPrefix/component/test.component.html`,

projects/igniteui-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"tslib": "^2.3.0",
7474
"igniteui-trial-watermark": "^3.0.2",
7575
"lodash-es": "^4.17.21",
76-
"igniteui-theming": "^16.0.0",
76+
"igniteui-theming": "^17.0.0",
7777
"@igniteui/material-icons-extended": "^3.1.0"
7878
},
7979
"peerDependencies": {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, ViewChild, TemplateRef } from '@angular/core';
1+
import { Component, ViewChild, TemplateRef, ChangeDetectionStrategy } from '@angular/core';
22
import { TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing';
33
import { By } from '@angular/platform-browser';
44
import {
@@ -1143,7 +1143,8 @@ class CarouselTestComponent {
11431143
<igx-slide><h3>Slide4</h3></igx-slide>
11441144
</igx-carousel>
11451145
`,
1146-
imports: [IgxCarouselComponent, IgxSlideComponent]
1146+
imports: [IgxCarouselComponent, IgxSlideComponent],
1147+
changeDetection: ChangeDetectionStrategy.OnPush
11471148
})
11481149
class CarouselAnimationsComponent {
11491150
@ViewChild('carousel', { static: true }) public carousel: IgxCarouselComponent;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,6 +1048,7 @@ export class IgxCarouselComponent extends IgxCarouselComponentBase implements On
10481048
}
10491049
this.slideChanged.emit({ carousel: this, slide });
10501050
this.restartInterval();
1051+
this.cdr.markForCheck();
10511052
}
10521053
}
10531054

0 commit comments

Comments
 (0)