Skip to content

Commit 48e3406

Browse files
didimmovasimeonoff
andauthored
fix(datepicker): fix datepicker issues (#1765)
Co-authored-by: Simeon Simeonoff <[email protected]>
1 parent d4a04cc commit 48e3406

File tree

10 files changed

+29
-13
lines changed

10 files changed

+29
-13
lines changed

src/components/date-picker/themes/dark/_themes.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
@use 'igniteui-theming/sass/themes/schemas/components/dark/input-group' as input-theme;
55

66
$material: map.merge(digest-schema($dark-material-calendar), digest-schema(input-theme.$dark-material-input-group));
7+
$material-calendar-border-color: map.get(digest-schema($dark-material-calendar), 'border-color');
78
$bootstrap: map.merge(digest-schema($dark-bootstrap-calendar), digest-schema(input-theme.$dark-bootstrap-input-group));
9+
$bootstrap-calendar-border-color: map.get(digest-schema($dark-bootstrap-calendar), 'border-color');
810
$fluent: map.merge(digest-schema($dark-fluent-calendar), digest-schema(input-theme.$dark-fluent-input-group));
11+
$fluent-calendar-border-color: map.get(digest-schema($dark-fluent-calendar), 'border-color');
912
$indigo: map.merge(digest-schema($dark-indigo-calendar), digest-schema(input-theme.$dark-indigo-input-group));
13+
$indigo-calendar-border-color: map.get(digest-schema($dark-indigo-calendar), 'border-color');

src/components/date-picker/themes/dark/date-picker.bootstrap.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@
44

55
:host {
66
@include css-vars-from-theme(diff(light.$base, $bootstrap), 'ig-datepicker');
7+
8+
--calendar-border-color: #{$bootstrap-calendar-border-color};
79
}

src/components/date-picker/themes/dark/date-picker.fluent.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@
44

55
:host {
66
@include css-vars-from-theme(diff(light.$base, $fluent), 'ig-datepicker');
7+
8+
--calendar-border-color: #{$fluent-calendar-border-color};
79
}

src/components/date-picker/themes/dark/date-picker.indigo.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,10 @@
44

55
:host {
66
@include css-vars-from-theme(diff(light.$base, $indigo), 'ig-datepicker');
7+
8+
--calendar-border-color: #{$indigo-calendar-border-color};
9+
10+
igc-dialog[open]::part(base) {
11+
box-shadow: var(--ig-elevation-7);
12+
}
713
}

src/components/date-picker/themes/dark/date-picker.material.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@
44

55
:host {
66
@include css-vars-from-theme(diff(light.$base, $material), 'ig-datepicker');
7+
8+
--calendar-border-color: #{$material-calendar-border-color};
79
}

src/components/date-picker/themes/light/_themes.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55

66
$base: digest-schema($light-calendar);
77
$material: map.merge(digest-schema($material-calendar), digest-schema(input-theme.$material-input-group));
8+
$material-calendar-border-color: map.get(digest-schema($material-calendar), 'border-color');
89
$bootstrap: map.merge(digest-schema($bootstrap-calendar), digest-schema(input-theme.$bootstrap-input-group));
10+
$bootstrap-calendar-border-color: map.get(digest-schema($bootstrap-calendar), 'border-color');
911
$fluent: map.merge(digest-schema($fluent-calendar), digest-schema(input-theme.$fluent-input-group));
12+
$fluent-calendar-border-color: map.get(digest-schema($fluent-calendar), 'border-color');
1013
$indigo: map.merge(digest-schema($indigo-calendar), digest-schema(input-theme.$indigo-input-group));
14+
$indigo-calendar-border-color: map.get(digest-schema($indigo-calendar), 'border-color');

src/components/date-picker/themes/shared/date-picker.bootstrap.scss

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,14 @@
44
$theme: $bootstrap;
55

66
:host {
7+
--calendar-border-color: #{$bootstrap-calendar-border-color};
8+
79
igc-dialog {
810
igc-calendar {
911
border: none;
1012
}
1113
}
1214

13-
igc-dialog::part(base) {
14-
border: rem(1px) solid var-get($theme, 'border-color');
15-
}
16-
17-
igc-focus-trap {
18-
box-shadow: 0 0 0 rem(1px) var-get($theme, 'border-color');
19-
}
20-
2115
[part~='label'] {
2216
@include type-style('body-1');
2317

src/components/date-picker/themes/shared/date-picker.common.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ $input-theme: input-theme.$material;
77

88
:host {
99
--component-size: var(--ig-size, #{var-get($theme, 'default-size')});
10+
--calendar-border-color: #{$material-calendar-border-color};
1011

1112
igc-dialog {
1213
box-shadow: none;
@@ -23,6 +24,7 @@ $input-theme: input-theme.$material;
2324

2425
igc-dialog[open]::part(base) {
2526
box-shadow: var(--ig-elevation-24);
27+
border: rem(1px) solid var(--calendar-border-color);
2628
}
2729

2830
igc-dialog::part(content),
@@ -42,6 +44,7 @@ $input-theme: input-theme.$material;
4244

4345
border-radius: var-get($theme, 'border-radius');
4446
background: var-get($theme, 'content-background');
47+
box-shadow: 0 0 0 rem(1px) var(--calendar-border-color);
4548
}
4649

4750
igc-popover::part(container) {

src/components/date-picker/themes/shared/date-picker.fluent.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
$theme: $fluent;
55

66
:host {
7+
--calendar-border-color: #{$fluent-calendar-border-color};
8+
79
igc-dialog[open]::part(base) {
810
border-radius: 0;
911
}

src/components/date-picker/themes/shared/date-picker.indigo.scss

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,11 @@ $theme: $indigo;
77
$input-theme: input-theme.$indigo;
88

99
:host {
10+
--calendar-border-color: #{$indigo-calendar-border-color};
11+
1012
igc-dialog[open]::part(base) {
1113
border-radius: rem(6px);
1214
box-shadow: var(--ig-elevation-5);
13-
border: rem(1px) solid var-get($theme, 'border-color');
14-
}
15-
16-
igc-focus-trap {
17-
box-shadow: 0 0 0 rem(1px) var-get($theme, 'border-color');
1815
}
1916

2017
[part~='label'] {

0 commit comments

Comments
 (0)