Skip to content

Commit 7e6053d

Browse files
LipataLipata
authored
Merge branch 'master' into amarinov/setOffset_docs
2 parents c0290fd + fdb261d commit 7e6053d

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

+614
-191
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@
5757
"factory": "./update-8_2_3"
5858
},
5959
"migration-12": {
60+
"version": "8.2.6",
61+
"description": "Updates Ignite UI for Angular from v8.2.3 to v8.2.6",
62+
"factory": "./update-8_2_6"
63+
},
64+
"migration-13": {
6065
"version": "9.0.0",
6166
"description": "Updates Ignite UI for Angular from v8.2.x to v9.2.0",
6267
"factory": "./update-9_0_0"

‎projects/igniteui-angular/migrations/update-8_2_6/changes/theme-props.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"$schema": "../../common/schema/theme-props.schema.json",
3+
"changes": [
4+
{
5+
"name": "$button-background",
6+
"remove": true,
7+
"owner": "igx-grid-toolbar-theme"
8+
},
9+
{
10+
"name": "$button-text-color",
11+
"remove": true,
12+
"owner": "igx-grid-toolbar-theme"
13+
},
14+
{
15+
"name": "$button-hover-background",
16+
"remove": true,
17+
"owner": "igx-grid-toolbar-theme"
18+
},
19+
{
20+
"name": "$button-hover-text-color",
21+
"remove": true,
22+
"owner": "igx-grid-toolbar-theme"
23+
},
24+
{
25+
"name": "$button-focus-background",
26+
"remove": true,
27+
"owner": "igx-grid-toolbar-theme"
28+
},
29+
{
30+
"name": "$button-focus-text-color",
31+
"remove": true,
32+
"owner": "igx-grid-toolbar-theme"
33+
}
34+
]
35+
}

‎projects/igniteui-angular/migrations/update-8_2_6/index.spec.ts

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
import * as path from 'path';
2+
3+
// tslint:disable:no-implicit-dependencies
4+
import { virtualFs } from '@angular-devkit/core';
5+
import { EmptyTree } from '@angular-devkit/schematics';
6+
// tslint:disable-next-line:no-submodule-imports
7+
import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
8+
9+
describe('Update 8.2.6', () => {
10+
let appTree: UnitTestTree;
11+
const schematicRunner = new SchematicTestRunner('ig-migrate', path.join(__dirname, '../migration-collection.json'));
12+
const configJson = {
13+
defaultProject: 'testProj',
14+
projects: {
15+
testProj: {
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+
it('should update igx-carousel-theme prop', done => {
32+
appTree.create(
33+
'/testSrc/appPrefix/component/test.component.scss',
34+
`$my-toolbar-theme: igx-grid-toolbar-theme(
35+
$background-color: null,
36+
$button-background: null,
37+
$title-text-color: null,
38+
$button-text-color: null,
39+
$button-hover-background: null,
40+
$button-hover-text-color: null,
41+
$button-focus-background: null,
42+
$button-focus-text-color: null,
43+
$dropdown-background: null,
44+
$item-text-color: null,
45+
$item-hover-background: null,
46+
$item-hover-text-color: null,
47+
$item-focus-background: null,
48+
$item-focus-text-color: null
49+
);`
50+
);
51+
const tree = schematicRunner.runSchematic('migration-12', {}, appTree);
52+
expect(tree.readContent('/testSrc/appPrefix/component/test.component.scss'))
53+
.toEqual(
54+
`$my-toolbar-theme: igx-grid-toolbar-theme(
55+
$background-color: null,
56+
$title-text-color: null,
57+
$dropdown-background: null,
58+
$item-text-color: null,
59+
$item-hover-background: null,
60+
$item-hover-text-color: null,
61+
$item-focus-background: null,
62+
$item-focus-text-color: null
63+
);`
64+
);
65+
done();
66+
});
67+
});

‎projects/igniteui-angular/migrations/update-8_2_6/index.ts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import {
2+
Rule,
3+
SchematicContext,
4+
Tree
5+
} from '@angular-devkit/schematics';
6+
import { UpdateChanges } from '../common/UpdateChanges';
7+
8+
const version = '8.2.6';
9+
10+
export default function(): Rule {
11+
return (host: Tree, context: SchematicContext) => {
12+
context.logger.info(`Applying migration for Ignite UI for Angular to version ${version}`);
13+
14+
const update = new UpdateChanges(__dirname, host, context);
15+
update.applyChanges();
16+
};
17+
}

‎projects/igniteui-angular/migrations/update-9_0_0/changes/theme-props.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"$schema": "../../common/schema/theme-props.schema.json",
3+
"changes": [
4+
{
5+
"name": "$button-background",
6+
"remove": true,
7+
"owner": "igx-grid-toolbar-theme"
8+
},
9+
{
10+
"name": "$button-text-color",
11+
"remove": true,
12+
"owner": "igx-grid-toolbar-theme"
13+
},
14+
{
15+
"name": "$button-hover-background",
16+
"remove": true,
17+
"owner": "igx-grid-toolbar-theme"
18+
},
19+
{
20+
"name": "$button-hover-text-color",
21+
"remove": true,
22+
"owner": "igx-grid-toolbar-theme"
23+
},
24+
{
25+
"name": "$button-focus-background",
26+
"remove": true,
27+
"owner": "igx-grid-toolbar-theme"
28+
},
29+
{
30+
"name": "$button-focus-text-color",
31+
"remove": true,
32+
"owner": "igx-grid-toolbar-theme"
33+
}
34+
]
35+
}

‎projects/igniteui-angular/migrations/update-9_0_0/index.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ describe('Update 9.0.0', () => {
3535
IgxRowComponent, IgxHierarchicalGridBaseComponent } from 'igniteui-angular';
3636
`);
3737

38-
const tree = schematicRunner.runSchematic('migration-12', {}, appTree);
38+
const tree = schematicRunner.runSchematic('migration-13', {}, appTree);
3939
expect(tree.readContent('/testSrc/appPrefix/component/test.component.ts'))
4040
.toEqual(
4141
`import { IgxDropDownBaseDirective, IgxDropDownItemBaseDirective, IgxGridBaseDirective,

‎projects/igniteui-angular/src/lib/core/styles/components/avatar/_avatar-theme.scss

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,13 @@
3434
$image-background: null
3535
) {
3636
$name: 'igx-avatar';
37-
$theme: apply-palette(map-get($schema, $name), $palette);
37+
$theme: ();
38+
39+
@if map-has-key($schema, $name) {
40+
$theme: apply-palette(map-get($schema, $name), $palette);
41+
} @else {
42+
$theme: apply-palette($schema, $palette);
43+
}
3844

3945
@if not($icon-color) and $icon-background {
4046
$icon-color: text-contrast($icon-background);

‎projects/igniteui-angular/src/lib/core/styles/components/badge/_badge-theme.scss

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,16 @@
5454
$disable-border: true
5555
) {
5656
$name: 'igx-badge';
57-
$badge-schema: map-get($schema, $name);
58-
$border-width: if($disable-border == true, 0, rem(1px));
59-
$theme: apply-palette($badge-schema, $palette);
57+
$badge-schema: ();
58+
59+
@if map-has-key($schema, $name) {
60+
$badge-schema: map-get($schema, $name);
61+
} @else {
62+
$badge-schema: $schema;
63+
}
6064

65+
$theme: apply-palette($badge-schema, $palette);
66+
$border-width: if($disable-border == true, 0, rem(1px));
6167
$border-radius: round-borders(
6268
if($border-radius, $border-radius, map-get($badge-schema, 'border-radius')), 0, 11px
6369
);

‎projects/igniteui-angular/src/lib/core/styles/components/banner/_banner-theme.scss

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,15 @@
3434
$banner-illustration-color: null
3535
) {
3636
$name: 'igx-banner';
37-
$theme: apply-palette(map-get($schema, $name), $palette);
37+
$banner-schema: ();
38+
39+
@if map-has-key($schema, $name) {
40+
$banner-schema: map-get($schema, $name);
41+
} @else {
42+
$banner-schema: $schema;
43+
}
44+
45+
$theme: apply-palette($banner-schema, $palette);
3846

3947
@if not($banner-message-color) and $banner-background {
4048
$banner-message-color: text-contrast($banner-background);

‎projects/igniteui-angular/src/lib/core/styles/components/bottom-nav/_bottom-nav-theme.scss

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,13 @@
3838
$shadow: null
3939
) {
4040
$name: 'igx-bottom-nav';
41-
$bottom-nav-schema: map-get($schema, $name);
41+
$bottom-nav-schema: ();
42+
43+
@if map-has-key($schema, $name) {
44+
$bottom-nav-schema: map-get($schema, $name);
45+
} @else {
46+
$bottom-nav-schema: $schema;
47+
}
4248

4349
$theme: apply-palette($bottom-nav-schema, $palette);
4450

‎projects/igniteui-angular/src/lib/core/styles/components/button-group/_button-group-theme.scss

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,14 @@
7070
$item-selected-hover-background: null
7171
) {
7272
$name: 'igx-button-group';
73-
$button-group-schema: map-get($schema, $name);
73+
$button-group-schema: ();
74+
75+
@if map-has-key($schema, $name) {
76+
$button-group-schema: map-get($schema, $name);
77+
} @else {
78+
$button-group-schema: $schema;
79+
}
80+
7481
$theme: apply-palette($button-group-schema, $palette);
7582

7683
$border: 1px solid map-get($theme, 'item-selected-border-color');

‎projects/igniteui-angular/src/lib/core/styles/components/button/_button-theme.scss

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,14 @@
158158
$disabled-background: null
159159
) {
160160
$name: 'igx-button';
161-
$button-schema: map-get($schema, $name);
161+
$button-schema: ();
162+
163+
@if map-has-key($schema, $name) {
164+
$button-schema: map-get($schema, $name);
165+
} @else {
166+
$button-schema: $schema;
167+
}
168+
162169
$theme: apply-palette($button-schema, $palette);
163170

164171
$flat-border-radius: round-borders(
@@ -409,35 +416,35 @@
409416
cosy: rem(6px, 16px) rem(16px, 16px),
410417
compact: rem(3px, 16px) rem(16px, 16px)
411418
);
412-
419+
413420
$button-padding-fluent: (
414421
comfortable: 0 rem(16px, 16px),
415422
cosy: 0 rem(16px, 16px),
416423
compact: 0 rem(16px, 16px)
417424
);
418-
425+
419426
$button-padding: map-get((
420427
material: $button-padding-material,
421428
fluent: $button-padding-fluent
422429
), map-get($theme, variant));
423-
430+
424431
$button--size-material: (
425432
comfortable: rem(36px),
426433
cosy: rem(30px),
427434
compact: rem(24px)
428435
);
429-
436+
430437
$button--size-fluent: (
431438
comfortable: rem(32px),
432439
cosy: rem(28px),
433440
compact: rem(24px)
434441
);
435-
442+
436443
$button-size: map-get((
437444
material: $button--size-material,
438445
fluent: $button--size-fluent
439446
), map-get($theme, variant));
440-
447+
441448

442449
$button-floating-padding: (
443450
comfortable: rem(15px),
@@ -564,13 +571,13 @@
564571
color: --var($theme, 'raised-hover-text-color');
565572
background: --var($theme, 'raised-hover-background');
566573
box-shadow: --var($theme, 'raised-hover-shadow');
567-
568-
574+
575+
569576
%igx-icon-display {
570577
color: --var($theme, 'raised-hover-icon-color')
571578
}
572579
}
573-
580+
574581
&:active {
575582
color: --var($theme, 'raised-focus-text-color');
576583
background: --var($theme, 'raised-focus-background');

‎projects/igniteui-angular/src/lib/core/styles/components/calendar/_calendar-theme.scss

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,14 @@
112112
$date-disabled-background: null,
113113
) {
114114
$name: 'igx-calendar';
115-
$calendar-schema: map-get($schema, $name);
115+
$calendar-schema: ();
116+
117+
@if map-has-key($schema, $name) {
118+
$calendar-schema: map-get($schema, $name);
119+
} @else {
120+
$calendar-schema: $schema;
121+
}
122+
116123
$theme: apply-palette($calendar-schema, $palette);
117124

118125
$border-radius: round-borders(

‎projects/igniteui-angular/src/lib/core/styles/components/card/_card-theme.scss

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,14 @@
5454
$card-border-color: null
5555
) {
5656
$name: 'igx-card';
57-
$card-schema: map-get($schema, $name);
57+
$card-schema: ();
58+
59+
@if map-has-key($schema, $name) {
60+
$card-schema: map-get($schema, $name);
61+
} @else {
62+
$card-schema: $schema;
63+
}
64+
5865
$theme: apply-palette($card-schema, $palette);
5966

6067
$border-radius: round-borders(

‎projects/igniteui-angular/src/lib/core/styles/components/carousel/_carousel-theme.scss

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,14 @@
5252
$indicator-active-border-color: null,
5353
){
5454
$name: 'igx-carousel';
55-
$carousel-schema: map-get($schema, $name);
55+
$carousel-schema: ();
56+
57+
@if map-has-key($schema, $name) {
58+
$carousel-schema: map-get($schema, $name);
59+
} @else {
60+
$carousel-schema: $schema;
61+
}
62+
5663
$theme: apply-palette($carousel-schema, $palette);
5764

5865
$border-radius: round-borders(

0 commit comments

Comments
 (0)