Skip to content

Commit 072c632

Browse files
didimmovadidimmova
authored
Merge branch '19.1.x' into didimmova/fix-chip-progress-size
2 parents 5dc1dd2 + 73fdd61 commit 072c632

25 files changed

+367
-172
lines changed

‎package-lock.json‎

Lines changed: 4 additions & 5 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": "^17.0.0",
77+
"igniteui-theming": "^17.1.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: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,11 @@
221221
"version": "19.1.4",
222222
"description": "Updates Ignite UI for Angular from v19.1.0 to v19.1.4",
223223
"factory": "./update-19_1_4"
224+
},
225+
"migration-45": {
226+
"version": "19.1.6",
227+
"description": "Updates Ignite UI for Angular from v19.1.4 to v19.1.6",
228+
"factory": "./update-19_1_6"
224229
}
225230
}
226231
}

‎projects/igniteui-angular/migrations/update-19_1_6/changes/theme-changes.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-changes.schema.json",
3+
"changes": [
4+
{
5+
"name": "$label-invalid-color",
6+
"remove": true,
7+
"owner": "switch-theme",
8+
"type": "property"
9+
},
10+
{
11+
"name": "$track-error-color",
12+
"remove": true,
13+
"owner": "switch-theme",
14+
"type": "property"
15+
},
16+
{
17+
"name": "$thumb-on-error-color",
18+
"remove": true,
19+
"owner": "switch-theme",
20+
"type": "property"
21+
},
22+
{
23+
"name": "$error-color",
24+
"remove": true,
25+
"owner": "switch-theme",
26+
"type": "property"
27+
},
28+
{
29+
"name": "$error-color-hover",
30+
"remove": true,
31+
"owner": "switch-theme",
32+
"type": "property"
33+
}
34+
]
35+
}

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

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 { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
4+
import { setupTestTree } from '../common/setup.spec';
5+
6+
const version = '19.1.6';
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-45';
21+
22+
it('should remove the properties related to invalid state from the switch theme', async () => {
23+
const testFilePath = `/testSrc/appPrefix/component/test.component.scss`;
24+
25+
appTree.create(
26+
testFilePath,
27+
`$invalid-switch-theme: switch-theme(
28+
$label-color: orange,
29+
$label-invalid-color: red,
30+
$track-error-color: red,
31+
$thumb-on-error-color: darkred,
32+
$error-color: red,
33+
$error-color-hover: darkred,
34+
);`
35+
);
36+
37+
const tree = await schematicRunner.runSchematic(migrationName, {}, appTree);
38+
39+
expect(tree.readContent(testFilePath)).toEqual(
40+
`$invalid-switch-theme: switch-theme(
41+
$label-color: orange,
42+
);`
43+
);
44+
});
45+
});

‎projects/igniteui-angular/migrations/update-19_1_6/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.6';
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": "^17.0.0",
76+
"igniteui-theming": "^17.1.0",
7777
"@igniteui/material-icons-extended": "^3.1.0"
7878
},
7979
"peerDependencies": {

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,10 @@
179179
@extend %date-range-preview !optional;
180180
}
181181

182+
@include e(date, $mods: ('range-preview', 'inactive')) {
183+
@extend %date-range-preview-inactive !optional;
184+
}
185+
182186
@include e(date, $mods: ('range-preview', 'current')) {
183187
@extend %date-range-preview-current !optional;
184188
}
@@ -389,6 +393,18 @@
389393
@extend %date-last-preview-special !optional;
390394
}
391395

396+
@include e(date, $mods: ('first', 'range-preview', 'active')) {
397+
@extend %date-first-preview-active !optional;
398+
}
399+
400+
@include e(date, $mods: ('last', 'range-preview', 'active')) {
401+
@extend %date-last-preview-active !optional;
402+
}
403+
404+
@include e(date, $mods: ('first', 'last', 'selected')) {
405+
@extend %date-first-last-selected !optional;
406+
}
407+
392408
@include e(date, $mods: ('first', 'range-preview', 'special', 'current')) {
393409
@extend %date-first-preview-special-current !optional;
394410
}

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

Lines changed: 92 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1578,7 +1578,9 @@
15781578
%date-selected-special-active {
15791579
%date-inner {
15801580
&::after {
1581-
border-color: var-get($theme, 'date-selected-special-focus-border-color');
1581+
@if $variant != 'fluent' {
1582+
border-color: var-get($theme, 'date-selected-special-focus-border-color');
1583+
}
15821584
}
15831585
}
15841586
}
@@ -1641,7 +1643,9 @@
16411643
%date-selected-special-current-first-last {
16421644
%date-inner {
16431645
&::after {
1644-
border-color: var-get($theme, 'date-selected-special-border-color');
1646+
@if $variant != 'fluent' {
1647+
border-color: var-get($theme, 'date-selected-special-border-color');
1648+
}
16451649
}
16461650
}
16471651
}
@@ -1814,7 +1818,9 @@
18141818
%date-special-current-selected-active {
18151819
%date-inner {
18161820
&::after {
1817-
border-color: var-get($theme, 'date-selected-special-border-color');
1821+
@if $variant != 'fluent' {
1822+
border-color: var-get($theme, 'date-selected-special-border-color');
1823+
}
18181824
}
18191825
}
18201826
}
@@ -1887,6 +1893,16 @@
18871893
}
18881894
}
18891895

1896+
@if $variant == 'fluent' {
1897+
%date-selected-current-special {
1898+
%date-inner {
1899+
&::after {
1900+
border-color: var-get($theme, 'date-selected-current-background');
1901+
}
1902+
}
1903+
}
1904+
}
1905+
18901906
%date-inactive {
18911907
cursor: default;
18921908

@@ -2042,7 +2058,7 @@
20422058
%date-selected-current-range-special-active:not(%date-selected-current-range-special-first),
20432059
%date-selected-current-range-special-active:not(%date-selected-current-range-special-last) {
20442060
%date-inner {
2045-
@if not $bootstrap-theme {
2061+
@if not $bootstrap-theme and not $variant == 'fluent' {
20462062
color: var-get($theme, 'date-special-focus-foreground');
20472063
}
20482064

@@ -2192,7 +2208,6 @@
21922208
position: absolute;
21932209
height: $date-size;
21942210
width: $date-size;
2195-
border-radius: var-get($theme, 'date-border-radius');
21962211
}
21972212
}
21982213

@@ -2218,7 +2233,32 @@
22182233
&::after {
22192234
width: $date-inner-size;
22202235
height: $date-inner-size;
2221-
border-color: var-get($theme, 'date-selected-special-border-color');
2236+
2237+
@if $variant != 'fluent' {
2238+
border-color: var-get($theme, 'date-selected-special-border-color');
2239+
}
2240+
}
2241+
}
2242+
}
2243+
2244+
@if $variant == 'fluent' {
2245+
%date-first-preview-active {
2246+
%date-inner {
2247+
background: transparent;
2248+
border-inline-end-color: transparent;
2249+
}
2250+
}
2251+
2252+
%date-last-preview-active {
2253+
%date-inner {
2254+
background: transparent;
2255+
border-inline-start-color: transparent;
2256+
}
2257+
}
2258+
2259+
%date-first-last-selected {
2260+
%date-inner {
2261+
background: transparent;
22222262
}
22232263
}
22242264
}
@@ -2338,24 +2378,61 @@
23382378
content: '';
23392379
position: absolute;
23402380
height: $date-size;
2341-
width: calc($date-size / 2 + #{$border-size});
2381+
width: $date-size;
23422382
border: rem(1px) solid var-get($theme, 'date-range-border-color');
23432383
z-index: 3;
23442384
pointer-events: none;
23452385
}
23462386
}
23472387

23482388
%date-range-selected-first {
2389+
%date-inner {
2390+
border-start-end-radius: var-get($theme, 'date-border-radius');
2391+
border-end-end-radius: var-get($theme, 'date-border-radius');
2392+
}
2393+
23492394
&::before {
2350-
inset-inline-end: calc(50% - #{$border-size});
23512395
border-inline-end-color: transparent;
2396+
border-start-start-radius: var-get($theme, 'date-range-border-radius');
2397+
border-end-start-radius: var-get($theme, 'date-range-border-radius');
23522398
}
23532399
}
23542400

23552401
%date-range-selected-last {
2402+
%date-inner {
2403+
border-start-start-radius: var-get($theme, 'date-border-radius');
2404+
border-end-start-radius: var-get($theme, 'date-border-radius');
2405+
}
2406+
23562407
&::before {
2357-
inset-inline-start: calc(50% - #{$border-size});
23582408
border-inline-start-color: transparent;
2409+
border-start-end-radius: var-get($theme, 'date-range-border-radius');
2410+
border-end-end-radius: var-get($theme, 'date-range-border-radius');
2411+
}
2412+
}
2413+
2414+
2415+
%date-first-preview {
2416+
%date-inner {
2417+
border-start-start-radius: var-get($theme, 'date-range-border-radius');
2418+
border-end-start-radius: var-get($theme, 'date-range-border-radius');
2419+
border-start-end-radius: 0;
2420+
border-end-end-radius: 0;
2421+
}
2422+
}
2423+
2424+
%date-last-preview {
2425+
%date-inner {
2426+
border-start-end-radius: var-get($theme, 'date-range-border-radius');
2427+
border-end-end-radius: var-get($theme, 'date-range-border-radius');
2428+
border-start-start-radius: 0;
2429+
border-end-start-radius: 0;
2430+
}
2431+
}
2432+
2433+
%date-first-last {
2434+
%date-inner {
2435+
border-radius: var-get($theme, 'date-range-border-radius');
23592436
}
23602437
}
23612438
}
@@ -2389,6 +2466,12 @@
23892466
}
23902467
}
23912468

2469+
%date-range-preview-inactive {
2470+
%date-inner {
2471+
color: var-get($theme, 'inactive-color');
2472+
}
2473+
}
2474+
23922475
%date-range-preview-current {
23932476
%date-inner {
23942477
color: var-get($theme, 'date-selected-current-range-foreground');

0 commit comments

Comments
 (0)