Skip to content

Commit 72e1fb7

Browse files
gedinakovagedinakova
authored
Merge branch 'master' into mkirkova-fix-15113-master
2 parents c68ebed + 65dd162 commit 72e1fb7

Some content is hidden

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

49 files changed

+488
-736
lines changed

‎package-lock.json‎

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

‎package.json‎

Lines changed: 4 additions & 4 deletions
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": "^14.3.0",
77+
"igniteui-theming": "^14.3.1",
7878
"igniteui-trial-watermark": "^3.0.2",
7979
"lodash-es": "^4.17.21",
8080
"rxjs": "^7.8.0",
@@ -118,7 +118,7 @@
118118
"gulp-uglify": "^3.0.1",
119119
"hammer-simulator": "0.0.1",
120120
"hammerjs": "^2.0.8",
121-
"ig-typedoc-theme": "^5.0.4",
121+
"ig-typedoc-theme": "^6.0.0",
122122
"igniteui-dockmanager": "^1.15.2",
123123
"igniteui-sassdoc-theme": "^1.2.3",
124124
"igniteui-webcomponents": "5.1.2",
@@ -146,8 +146,8 @@
146146
"stylelint-prettier": "^5.0.2",
147147
"stylelint-scss": "^6.9.0",
148148
"ts-node": "^10.8.1",
149-
"typedoc": "^0.26.11",
150-
"typedoc-plugin-localization": "^3.0.5",
149+
"typedoc": "^0.27.0",
150+
"typedoc-plugin-localization": "^3.0.6",
151151
"typescript": "5.6.3"
152152
}
153153
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,11 @@
206206
"version": "18.2.3",
207207
"description": "Updates Ignite UI for Angular from v18.2.0 to v18.2.3",
208208
"factory": "./update-18_2_3"
209+
},
210+
"migration-42": {
211+
"version": "19.1.0",
212+
"description": "Updates Ignite UI for Angular from v18.2.3 to v19.1.0",
213+
"factory": "./update-19_1_0"
209214
}
210215
}
211216
}

‎projects/igniteui-angular/migrations/update-19_1_0/changes/theme-changes.json‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
{
2+
"$schema": "../../common/schema/theme-changes.schema.json",
3+
"changes": [
4+
{
5+
"name": "$elevations",
6+
"owner": "badge-theme",
7+
"remove": true,
8+
"type": "property"
9+
},
10+
{
11+
"name": "$elevations",
12+
"owner": "bottom-nav-theme",
13+
"remove": true,
14+
"type": "property"
15+
},
16+
{
17+
"name": "$elevations",
18+
"owner": "button-theme",
19+
"remove": true,
20+
"type": "property"
21+
},
22+
{
23+
"name": "$elevations",
24+
"owner": "card-theme",
25+
"remove": true,
26+
"type": "property"
27+
},
28+
{
29+
"name": "$elevations",
30+
"owner": "carousel-theme",
31+
"remove": true,
32+
"type": "property"
33+
},
34+
{
35+
"name": "$elevations",
36+
"owner": "chip-theme",
37+
"remove": true,
38+
"type": "property"
39+
},
40+
{
41+
"name": "$elevations",
42+
"owner": "column-actions-theme",
43+
"remove": true,
44+
"type": "property"
45+
},
46+
{
47+
"name": "$elevations",
48+
"owner": "dialog-theme",
49+
"remove": true,
50+
"type": "property"
51+
},
52+
{
53+
"name": "$elevations",
54+
"owner": "drop-down-theme",
55+
"remove": true,
56+
"type": "property"
57+
},
58+
{
59+
"name": "$elevations",
60+
"owner": "grid-toolbar-theme",
61+
"remove": true,
62+
"type": "property"
63+
},
64+
{
65+
"name": "$elevations",
66+
"owner": "grid-theme",
67+
"remove": true,
68+
"type": "property"
69+
},
70+
{
71+
"name": "$elevations",
72+
"owner": "icon-button-theme",
73+
"remove": true,
74+
"type": "property"
75+
},
76+
{
77+
"name": "$elevations",
78+
"owner": "input-group-theme",
79+
"remove": true,
80+
"type": "property"
81+
},
82+
{
83+
"name": "$elevations",
84+
"owner": "navbar-theme",
85+
"remove": true,
86+
"type": "property"
87+
},
88+
{
89+
"name": "$elevations",
90+
"owner": "navdrawer-theme",
91+
"remove": true,
92+
"type": "property"
93+
},
94+
{
95+
"name": "$elevations",
96+
"owner": "query-builder-theme",
97+
"remove": true,
98+
"type": "property"
99+
},
100+
{
101+
"name": "$elevations",
102+
"owner": "snackbar-theme",
103+
"remove": true,
104+
"type": "property"
105+
},
106+
{
107+
"name": "$elevations",
108+
"owner": "splitter-theme",
109+
"remove": true,
110+
"type": "property"
111+
},
112+
{
113+
"name": "$elevations",
114+
"owner": "time-picker-theme",
115+
"remove": true,
116+
"type": "property"
117+
}
118+
]
119+
}

‎projects/igniteui-angular/migrations/update-19_1_0/index.spec.ts‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
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.0';
7+
const themes = [
8+
'badge-theme', 'bottom-nav-theme', 'button-theme', 'card-theme', 'carousel-theme',
9+
'chip-theme', 'column-actions-theme', 'dialog-theme', 'drop-down-theme', 'grid-toolbar-theme',
10+
'grid-theme', 'icon-button-theme', 'input-group-theme', 'navbar-theme', 'navdrawer-theme',
11+
'query-builder-theme', 'snackbar-theme', 'splitter-theme', 'time-picker-theme'
12+
];
13+
const testFilePath = '/testSrc/appPrefix/component/${theme}.component.scss';
14+
15+
describe(`Update to ${version}`, () => {
16+
let appTree: UnitTestTree;
17+
const schematicRunner = new SchematicTestRunner('ig-migrate', path.join(__dirname, '../migration-collection.json'));
18+
19+
beforeEach(() => {
20+
appTree = setupTestTree();
21+
});
22+
23+
const migrationName = 'migration-42';
24+
25+
themes.forEach(theme => {
26+
it('should remove the $elevations property from all component themes', async () => {
27+
appTree.create(
28+
testFilePath,
29+
`$custom-${theme}: ${theme}($elevations: $my-elevations);`
30+
);
31+
32+
const tree = await schematicRunner.runSchematic(migrationName, {}, appTree);
33+
34+
expect(tree.readContent(testFilePath)).toEqual(
35+
`$custom-${theme}: ${theme}();`
36+
);
37+
});
38+
});
39+
});

‎projects/igniteui-angular/migrations/update-19_1_0/index.ts‎

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.0';
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
@@ -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": "^14.3.0",
76+
"igniteui-theming": "^14.3.1",
7777
"@igniteui/material-icons-extended": "^3.1.0"
7878
},
7979
"peerDependencies": {

‎projects/igniteui-angular/src/lib/accordion/accordion.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ let NEXT_ID = 0;
3535
*
3636
* @igxGroup Layouts
3737
*
38-
* @remark
38+
* @remarks
3939
* The Ignite UI for Angular Accordion component enables the user to navigate among multiple collapsing panels
4040
* displayed in a single container.
4141
* The accordion offers keyboard navigation and API to control the underlying panels' expansion state.

‎projects/igniteui-angular/src/lib/core/i18n/grid-resources.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ export const GridResourceStringsEN: IGridResourceStrings = {
235235
igx_grid_excel_custom_dialog_add: 'add filter',
236236
igx_grid_excel_custom_dialog_clear: 'Clear filter',
237237
igx_grid_excel_custom_dialog_header: 'Custom auto-filter on column: ',
238-
igx_grid_excel_cancel: 'cancel',
239-
igx_grid_excel_apply: 'apply',
238+
igx_grid_excel_cancel: 'Cancel',
239+
igx_grid_excel_apply: 'Apply',
240240
igx_grid_excel_search_placeholder: 'Search',
241241
igx_grid_excel_select_all: 'Select All',
242242
igx_grid_excel_select_all_search_results: 'Select all search results',

‎projects/igniteui-angular/src/lib/core/styles/base/_mixins.scss‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@use 'igniteui-theming/sass/color/functions' as *;
2+
@use 'igniteui-theming/sass/color/presets/light/material' as *;
23
@use 'variables' as *;
34
@use 'functions' as *;
45
@use 'sass:color';
@@ -112,7 +113,7 @@
112113
/// $suffix: 'bg'
113114
/// );
114115
/// @requires {mixin} gen-color-class
115-
@mixin gen-color-classes($prop, $prefix, $suffix, $palette: $default-palette) {
116+
@mixin gen-color-classes($prop, $prefix, $suffix) {
116117
@each $name, $color in $palette {
117118
@each $variant, $value in $color {
118119
@if meta.type-of($value) != 'map' {
@@ -140,6 +141,6 @@
140141
/// $suffix: 'bg'
141142
/// );
142143
/// @requires {mixin} gen-color-classes
143-
@mixin color-classes($prop, $suffix: null, $prefix: 'igx', $palette: $default-palette) {
144-
@include gen-color-classes($prop, $prefix, $suffix, $palette);
144+
@mixin color-classes($prop, $suffix: null, $prefix: 'igx') {
145+
@include gen-color-classes($prop, $prefix, $suffix);
145146
}

0 commit comments

Comments
 (0)