Skip to content

Commit 7f60979

Browse files
ChronosSFChronosSF
authored
Merge branch 'master' into sstoychev/touch-scroll-time-picker
2 parents 81d24d1 + 405960d commit 7f60979

File tree

19 files changed

+175
-66
lines changed

19 files changed

+175
-66
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": "^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.2",

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,30 @@
3030
"remove": true,
3131
"owner": "switch-theme",
3232
"type": "property"
33+
},
34+
{
35+
"name": "$date-selected-current-outline",
36+
"remove": true,
37+
"owner": "calendar-theme",
38+
"type": "property"
39+
},
40+
{
41+
"name": "$date-selected-current-hover-outline",
42+
"remove": true,
43+
"owner": "calendar-theme",
44+
"type": "property"
45+
},
46+
{
47+
"name": "$date-selected-current-focus-outline",
48+
"remove": true,
49+
"owner": "calendar-theme",
50+
"type": "property"
51+
},
52+
{
53+
"name": "$date-special-current-border-color",
54+
"remove": true,
55+
"owner": "calendar-theme",
56+
"type": "property"
3357
}
3458
]
3559
}

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,27 @@ describe(`Update to ${version}`, () => {
5858
);`
5959
);
6060
});
61+
62+
it('should remove unused properties from the calendar theme', async () => {
63+
const testFilePath = `/testSrc/appPrefix/component/test.component.scss`;
64+
65+
appTree.create(
66+
testFilePath,
67+
`$calendar-theme: calendar-theme(
68+
$date-special-current-border-color: orange,
69+
$date-selected-current-outline: orange,
70+
$date-selected-current-hover-outline: orange,
71+
$date-selected-current-focus-outline: orange,
72+
$content-background: black
73+
);`
74+
);
75+
76+
const tree = await schematicRunner.runSchematic(migrationName, {}, appTree);
77+
78+
expect(tree.readContent(testFilePath)).toEqual(
79+
`$calendar-theme: calendar-theme(
80+
$content-background: black
81+
);`
82+
);
83+
});
6184
});

‎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: 4 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
}

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

Lines changed: 6 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,6 @@
108108
/// @param {Color} $date-selected-current-range-focus-foreground [null] - The :focus foreground of the current date in the selected range.
109109
/// @param {Color} $date-selected-current-range-focus-background [null] - The :focus background of the current date in the selected range.
110110
///
111-
/// @param {Color} $date-selected-current-outline [null] - The outline of the current selected date.
112-
/// @param {Color} $date-selected-current-hover-outline [null] - The :hover outline of the current selected date.
113-
/// @param {Color} $date-selected-current-focus-outline [null] - The :focus outline of the current selected date.
114-
///
115111
/// @param {Color} $date-selected-special-border-color: [null] - The border color of the selected special date,
116112
/// @param {Color} $date-selected-special-hover-border-color: [null] - The :hover border color of the selected special date,
117113
/// @param {Color} $date-selected-special-focus-border-color: [null] - The :focus border color of the selected special date,
@@ -137,8 +133,6 @@
137133
/// @param {Color} $date-special-range-foreground [null] - The foreground of the dates inside a range and marked as special.
138134
/// @param {Color} $date-special-range-border-color [null] - The outline of the dates inside a range and marked as special.
139135
///
140-
/// @param {Color} $date-special-current-border-color [null] - The outline color of a special current date.
141-
///
142136
/// @param {Color} $border-color [null] - The calendar border color.
143137
///
144138
/// @param {Color} $date-border-color [null] - The border color of the date.
@@ -282,10 +276,6 @@
282276
$date-selected-current-hover-border-color: null,
283277
$date-selected-current-focus-border-color: null,
284278
285-
$date-selected-current-outline: null,
286-
$date-selected-current-hover-outline: null,
287-
$date-selected-current-focus-outline: null,
288-
289279
$date-selected-special-border-color: null,
290280
$date-selected-special-hover-border-color: null,
291281
$date-selected-special-focus-border-color: null,
@@ -310,7 +300,6 @@
310300
$date-special-range-focus-background: null,
311301
$date-special-range-foreground: null,
312302
$date-special-range-border-color: null,
313-
$date-special-current-border-color: null,
314303
$date-disabled-foreground: null,
315304
$date-disabled-range-foreground: null,
316305
@@ -400,26 +389,6 @@
400389
}
401390
}
402391

403-
@if $variant == 'material' or $variant == 'indigo' {
404-
@if not($date-selected-current-outline) and $content-background {
405-
@if meta.type-of($content-background) == 'color' {
406-
$date-selected-current-outline: $content-background;
407-
}
408-
}
409-
410-
@if not($date-selected-current-hover-outline) and $content-background {
411-
@if meta.type-of($content-background) == 'color' {
412-
$date-selected-current-hover-outline: $content-background;
413-
}
414-
}
415-
416-
@if not($date-selected-current-focus-outline) and $content-background {
417-
@if meta.type-of($content-background) == 'color' {
418-
$date-selected-current-focus-outline: $content-background;
419-
}
420-
}
421-
}
422-
423392
@if not($content-foreground) and $content-background {
424393
@if meta.type-of($content-background) == 'color' {
425394
$content-foreground: text-contrast($content-background);
@@ -640,10 +609,6 @@
640609
date-selected-current-hover-foreground: $date-selected-current-hover-foreground,
641610
date-selected-current-focus-foreground: $date-selected-current-focus-foreground,
642611

643-
date-selected-current-outline: $date-selected-current-outline,
644-
date-selected-current-hover-outline: $date-selected-current-hover-outline,
645-
date-selected-current-focus-outline: $date-selected-current-focus-outline,
646-
647612
date-selected-special-border-color: $date-selected-special-border-color,
648613
date-selected-special-hover-border-color: $date-selected-special-hover-border-color,
649614
date-selected-special-focus-border-color: $date-selected-special-focus-border-color,
@@ -2389,6 +2354,12 @@
23892354
}
23902355
}
23912356

2357+
%date-range-preview-inactive {
2358+
%date-inner {
2359+
color: var-get($theme, 'inactive-color');
2360+
}
2361+
}
2362+
23922363
%date-range-preview-current {
23932364
%date-inner {
23942365
color: var-get($theme, 'date-selected-current-range-foreground');

‎projects/igniteui-angular/src/lib/core/styles/components/chip/_chip-theme.scss‎

Lines changed: 38 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -268,14 +268,14 @@
268268
$box-shadow-focus: map.get((
269269
'material': null,
270270
'fluent': null,
271-
'bootstrap': 0 0 0 rem(2px) var-get($theme, 'focus-outline-color'),
271+
'bootstrap': 0 0 0 rem(4px) var-get($theme, 'focus-outline-color'),
272272
'indigo': 0 0 0 rem(3px) var-get($theme, 'focus-outline-color')
273273
), $variant);
274274

275275
$box-shadow-focus-selected: map.get((
276276
'material': null,
277277
'fluent': null,
278-
'bootstrap': 0 0 0 rem(2px) var-get($theme, 'focus-selected-outline-color'),
278+
'bootstrap': 0 0 0 rem(4px) var-get($theme, 'focus-selected-outline-color'),
279279
'indigo': 0 0 0 rem(3px) var-get($theme, 'focus-selected-outline-color')
280280
), $variant);
281281

@@ -429,9 +429,17 @@
429429
%igx-chip%igx-chip--primary {
430430
&:focus {
431431
%igx-chip__item {
432-
color: contrast-color($color: 'primary', $variant: 800);
433-
background: color($color: 'primary', $variant: 800);
434-
border-color: color($color: 'primary', $variant: 800);
432+
@if $variant != 'bootstrap' and $variant != 'indigo' {
433+
color: contrast-color($color: 'primary', $variant: 800);
434+
background: color($color: 'primary', $variant: 800);
435+
border-color: color($color: 'primary', $variant: 800);
436+
}
437+
438+
@if $variant == "bootstrap" {
439+
color: contrast-color($color: 'primary', $variant: 500);
440+
background: color($color: 'primary', $variant: 500);
441+
border-color: color($color: 'primary', $variant: 500);
442+
}
435443

436444
@if $variant == 'indigo' {
437445
color: contrast-color($color: 'primary', $variant: 900);
@@ -441,7 +449,7 @@
441449
}
442450

443451
@if $variant == 'bootstrap' {
444-
box-shadow: 0 0 0 rem(2px) color($color: 'primary', $variant: 200);
452+
box-shadow: 0 0 0 rem(4px) color($color: 'primary', $variant: 500, $opacity: .38);
445453
}
446454
}
447455
}
@@ -474,15 +482,18 @@
474482
background: color($color: 'info', $variant: 800);
475483
border-color: color($color: 'info', $variant: 800);
476484

477-
@if $variant == 'indigo' {
485+
@if $variant == 'indigo' or $variant == 'bootstrap' {
478486
color: contrast-color($color: 'info', $variant: 500);
479487
background: color($color: 'info', $variant: 500);
480488
border-color: color($color: 'info', $variant: 500);
489+
}
490+
491+
@if $variant == 'indigo' {
481492
box-shadow: 0 0 0 rem(3px) color($color: 'info', $variant: if($theme-variant == 'light', 100, 800));
482493
}
483494

484495
@if $variant == 'bootstrap' {
485-
box-shadow: 0 0 0 rem(2px) color($color: 'info', $variant: 200);
496+
box-shadow: 0 0 0 rem(4px) color($color: 'info', $variant: 500, $opacity: .38);
486497
}
487498
}
488499
}
@@ -519,15 +530,19 @@
519530
background: color($color: 'success', $variant: 800);
520531
border-color: color($color: 'success', $variant: 800);
521532

522-
@if $variant == 'indigo' {
523-
color: contrast-color($color: 'success', $variant: 900);
533+
@if $variant == 'indigo' or $variant == 'bootstrap' {
524534
background: color($color: 'success', $variant: 500);
525535
border-color: color($color: 'success', $variant: 500);
526536
box-shadow: 0 0 0 rem(3px) color($color: 'success', $variant: if($theme-variant == 'light', 200, 800));
527537
}
528538

539+
@if $variant == 'indigo' {
540+
color: contrast-color($color: 'success', $variant: 900);
541+
}
542+
529543
@if $variant == 'bootstrap' {
530-
box-shadow: 0 0 0 rem(2px) color($color: 'success', $variant: 200);
544+
color: contrast-color($color: 'success', $variant: 600);
545+
box-shadow: 0 0 0 rem(4px) color($color: 'success', $variant: 500, $opacity: .38);
531546
}
532547
}
533548
}
@@ -560,15 +575,18 @@
560575
background: color($color: 'warn', $variant: 800);
561576
border-color: color($color: 'warn', $variant: 800);
562577

563-
@if $variant == 'indigo' {
578+
@if $variant == 'indigo' or $variant == 'bootstrap' {
564579
color: contrast-color($color: 'warn', $variant: 900);
565580
background: color($color: 'warn', $variant: 500);
566581
border-color: color($color: 'warn', $variant: 500);
582+
}
583+
584+
@if $variant == 'indigo' {
567585
box-shadow: 0 0 0 rem(3px) color($color: 'warn', $variant: if($theme-variant == 'light', 100, 900));
568586
}
569587

570588
@if $variant == 'bootstrap' {
571-
box-shadow: 0 0 0 rem(2px) color($color: 'warn', $variant: 200);
589+
box-shadow: 0 0 0 rem(4px) color($color: 'warn', $variant: 500, $opacity: .38);
572590
}
573591
}
574592
}
@@ -605,15 +623,19 @@
605623
background: color($color: 'error', $variant: 800);
606624
border-color: color($color: 'error', $variant: 800);
607625

608-
@if $variant == 'indigo' {
609-
color: contrast-color($color: 'error', $variant: 900);
626+
@if $variant == 'indigo' or $variant == 'bootstrap' {
610627
background: color($color: 'error', $variant: 500);
611628
border-color: color($color: 'error', $variant: 500);
629+
}
630+
631+
@if $variant == 'indigo' {
632+
color: contrast-color($color: 'error', $variant: 900);
612633
box-shadow: 0 0 0 rem(3px) color($color: 'error', $variant: if($theme-variant == 'light', 100, 900));
613634
}
614635

615636
@if $variant == 'bootstrap' {
616-
box-shadow: 0 0 0 rem(2px) color($color: 'error', $variant: 200);
637+
color: contrast-color($color: 'error', $variant: 600);
638+
box-shadow: 0 0 0 rem(4px) color($color: 'error', $variant: 500, $opacity: .38);
617639
}
618640
}
619641
}

‎projects/igniteui-angular/src/lib/core/styles/components/tree/_tree-theme.scss‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -288,9 +288,7 @@
288288
}
289289

290290
igx-circular-bar {
291-
--circular-bar: #{sizable(#{map.get($circular-bar-size, 'compact')}, #{map.get($circular-bar-size, 'cosy')}, #{map.get($circular-bar-size, 'comfortable')})};
292-
width: var(--circular-bar);
293-
height: var(--circular-bar);
291+
--diameter: #{sizable(#{map.get($circular-bar-size, 'compact')}, #{map.get($circular-bar-size, 'cosy')}, #{map.get($circular-bar-size, 'comfortable')})};
294292
}
295293
}
296294

‎projects/igniteui-angular/src/lib/data-operations/filtering-expressions-tree.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ export enum FilteringExpressionsTreeType {
88
Advanced
99
}
1010

11+
/* marshalByValue */
1112
export declare interface IExpressionTree {
1213
filteringOperands: (IExpressionTree | IFilteringExpression)[];
1314
operator: FilteringLogic;

0 commit comments

Comments
 (0)