Skip to content

Commit 02624ce

Browse files
Merge branch '17.2.x' into ganastasov/fix-14187-17.2.x
2 parents 3334021 + be72e9e commit 02624ce

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

+957
-269
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [ master, 17.1.x, 17.0.x, 16.1.x, 15.1.x ]
16+
branches: [ master, 17.2.x, 16.1.x, 15.1.x ]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [ master, 17.1.x, 17.0.x, 16.1.x, 15.1.x ]
19+
branches: [ master, 17.2.x, 16.1.x, 15.1.x ]
2020
schedule:
2121
- cron: '33 4 * * 4'
2222

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ All notable changes for each version of this project will be documented in this
2424
- Removed `leftButtonColor`, `leftButtonBackgroundColor` `rightButtonColor`, and `rightButtonBackgroundColor` properties.
2525
- `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
2626
- Enhanced the advanced filtering to emit the `filtering` event when filters are applied.
27+
28+
### General
29+
- `IgxSimpleCombo`
30+
- **Behavioral Change** When bound to `ngModel` and `formControlName` directives, the model would not be updated when the user types into the input and will only be updated on selection.
31+
2732

2833
## 17.1.0
2934
### New Features

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
@@ -70,7 +70,7 @@
7070
"@types/source-map": "0.5.2",
7171
"express": "^4.19.2",
7272
"fflate": "^0.8.1",
73-
"igniteui-theming": "^6.2.0",
73+
"igniteui-theming": "^6.3.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: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,16 @@
176176
"version": "17.2.0",
177177
"description": "Updates Ignite UI for Angular from v17.1.x to v17.2.0",
178178
"factory": "./update-17_2_0"
179+
},
180+
"migration-36": {
181+
"version": "17.2.2",
182+
"description": "Updates Ignite UI for Angular from v17.2.0 to v17.2.2",
183+
"factory": "./update-17_2_2"
184+
},
185+
"migration-37": {
186+
"version": "17.2.3",
187+
"description": "Updates Ignite UI for Angular from v17.2.2 to v17.2.3",
188+
"factory": "./update-17_2_3"
179189
}
180190
}
181191
}

projects/igniteui-angular/migrations/update-17_2_0/changes/inputs.json

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -18,38 +18,6 @@
1818
"type": "component"
1919
}
2020
},
21-
{
22-
"name": "color",
23-
"remove": true,
24-
"owner": {
25-
"selector": "igxButton",
26-
"type": "directive"
27-
}
28-
},
29-
{
30-
"name": "background",
31-
"remove": true,
32-
"owner": {
33-
"selector": "igxButton",
34-
"type": "directive"
35-
}
36-
},
37-
{
38-
"name": "igxButtonColor",
39-
"remove": true,
40-
"owner": {
41-
"selector": "igxButton",
42-
"type": "directive"
43-
}
44-
},
45-
{
46-
"name": "igxButtonBackground",
47-
"remove": true,
48-
"owner": {
49-
"selector": "igxButton",
50-
"type": "directive"
51-
}
52-
},
5321
{
5422
"name": "type",
5523
"remove": true,
@@ -58,14 +26,6 @@
5826
"type": "component"
5927
}
6028
},
61-
{
62-
"name": "reverse",
63-
"remove": true,
64-
"owner": {
65-
"selector": "igx-card",
66-
"type": "component"
67-
}
68-
},
6929
{
7030
"name": "leftButtonColor",
7131
"remove": true,
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"$schema": "../../common/schema/binding.schema.json",
3+
"changes": [
4+
{
5+
"name": "igxButtonColor",
6+
"replaceWith": "style.--foreground",
7+
"owner": {
8+
"selector": "igxButton",
9+
"type": "directive"
10+
}
11+
},
12+
{
13+
"name": "igxButtonBackground",
14+
"replaceWith": "style.--background",
15+
"owner": {
16+
"selector": "igxButton",
17+
"type": "directive"
18+
}
19+
},
20+
{
21+
"name": "reverse",
22+
"remove": true,
23+
"owner": {
24+
"selector": "igx-card-actions",
25+
"type": "component"
26+
}
27+
}
28+
]
29+
}
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
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.2.2';
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-36';
32+
33+
it('should replace button property `igxButtonColor` with `style.--foreground`', async () => {
34+
appTree.create(`/testSrc/appPrefix/component/test.component.html`,
35+
`
36+
<button igxButton [igxButtonColor]="red"></button>
37+
`
38+
);
39+
40+
const tree = await schematicRunner.runSchematic(migrationName, { shouldInvokeLS: false }, appTree);
41+
42+
expect(tree.readContent('/testSrc/appPrefix/component/test.component.html')).toEqual(
43+
`
44+
<button igxButton [style.--foreground]="red"></button>
45+
`
46+
);
47+
});
48+
49+
it('should replace button property `igxButtonBackground` with `style.--background`', async () => {
50+
appTree.create(`/testSrc/appPrefix/component/test.component.html`,
51+
`
52+
<button igxButton [igxButtonBackground]="red"></button>
53+
`
54+
);
55+
56+
const tree = await schematicRunner.runSchematic(migrationName, { shouldInvokeLS: false }, appTree);
57+
58+
expect(tree.readContent('/testSrc/appPrefix/component/test.component.html')).toEqual(
59+
`
60+
<button igxButton [style.--background]="red"></button>
61+
`
62+
);
63+
});
64+
65+
it('should remove igx-card-actions property `reverse`', async () => {
66+
appTree.create(`/testSrc/appPrefix/component/test.component.html`,
67+
`
68+
<igx-card>
69+
<igx-card-actions [reverse]="true"></igx-card-actions>
70+
</igx-card>
71+
`
72+
);
73+
74+
const tree = await schematicRunner.runSchematic(migrationName, { shouldInvokeLS: false }, appTree);
75+
76+
expect(tree.readContent('/testSrc/appPrefix/component/test.component.html')).toEqual(
77+
`
78+
<igx-card>
79+
<igx-card-actions></igx-card-actions>
80+
</igx-card>
81+
`
82+
);
83+
});
84+
});
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { Rule, SchematicContext, Tree } from "@angular-devkit/schematics";
2+
import { BoundPropertyObject, InputPropertyType, UpdateChanges } from "../common/UpdateChanges";
3+
4+
const version = "17.2.2";
5+
6+
export default (): Rule => async (host: Tree, context: SchematicContext) => {
7+
context.logger.info(
8+
`Applying migration for Ignite UI for Angular to version ${version}`,
9+
);
10+
const update = new UpdateChanges(__dirname, host, context);
11+
update.applyChanges();
12+
};
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"$schema": "../../common/schema/theme-changes.schema.json",
3+
"changes": [
4+
{
5+
"name": "$idle-item-color",
6+
"replaceWith": "$label-color",
7+
"owner": "bottom-nav-theme",
8+
"type": "property"
9+
},
10+
{
11+
"name": "$selected-item-color",
12+
"replaceWith": "$label-selected-color",
13+
"owner": "bottom-nav-theme",
14+
"type": "property"
15+
}
16+
]
17+
}

0 commit comments

Comments
 (0)