Skip to content

Commit db072cf

Browse files
committed
Merge branch 'master' of https://github.com/IgniteUI/igniteui-webcomponents into dmdimitrov/chat-ai-component
2 parents a35ce69 + f2abd36 commit db072cf

12 files changed

Lines changed: 170 additions & 227 deletions

package-lock.json

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

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"prepare": "husky"
5353
},
5454
"dependencies": {
55-
"@floating-ui/dom": "^1.7.0",
55+
"@floating-ui/dom": "^1.7.2",
5656
"@lit-labs/virtualizer": "^2.1.0",
5757
"@lit/context": "^1.1.5",
5858
"lit": "^3.3.0"
@@ -62,10 +62,10 @@
6262
"@custom-elements-manifest/analyzer": "^0.10.4",
6363
"@igniteui/material-icons-extended": "^3.1.0",
6464
"@open-wc/testing": "^4.0.0",
65-
"@storybook/addon-a11y": "^9.0.13",
66-
"@storybook/addon-docs": "^9.0.13",
67-
"@storybook/addon-links": "^9.0.13",
68-
"@storybook/web-components-vite": "^9.0.13",
65+
"@storybook/addon-a11y": "^9.0.15",
66+
"@storybook/addon-docs": "^9.0.15",
67+
"@storybook/addon-links": "^9.0.15",
68+
"@storybook/web-components-vite": "^9.0.15",
6969
"@types/mocha": "^10.0.10",
7070
"@web/dev-server-esbuild": "^1.0.4",
7171
"@web/test-runner": "^0.20.2",
@@ -85,13 +85,13 @@
8585
"lit-analyzer": "^2.0.3",
8686
"madge": "^8.0.0",
8787
"node-watch": "^0.7.4",
88-
"playwright": "^1.53.1",
88+
"playwright": "^1.53.2",
8989
"postcss": "^8.5.6",
9090
"prettier": "^3.6.2",
9191
"rimraf": "^6.0.1",
9292
"sass-embedded": "~1.78.0",
9393
"sinon": "^21.0.0",
94-
"storybook": "^9.0.13",
94+
"storybook": "^9.0.15",
9595
"stylelint": "^16.21.0",
9696
"stylelint-config-standard-scss": "^15.0.1",
9797
"stylelint-prettier": "^5.0.3",
@@ -101,7 +101,7 @@
101101
"typedoc": "~0.27.9",
102102
"typedoc-plugin-localization": "^3.0.6",
103103
"typescript": "^5.8.3",
104-
"vite": "^6.3.5"
104+
"vite": "^7.0.0"
105105
},
106106
"peerDependencies": {
107107
"@supabase/supabase-js": "^2.49.4",

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,29 @@ $material: map.merge($material, (
1515
content-background: map.get(calendar-theme.$material, 'content-background'),
1616
actions-divider-color: map.get(calendar-theme.$material, 'actions-divider-color'),
1717
));
18+
$material-calendar-border-color: map.get(calendar-theme.$material, 'border-color');
1819
$bootstrap: map.merge($bootstrap, (
1920
default-size: map.get(calendar-theme.$bootstrap, 'default-size'),
2021
border-radius: map.get(calendar-theme.$bootstrap, 'border-radius'),
2122
border-color: map.get(calendar-theme.$bootstrap, 'border-color'),
2223
content-background: map.get(calendar-theme.$bootstrap, 'content-background'),
2324
actions-divider-color: map.get(calendar-theme.$bootstrap, 'actions-divider-color'),
2425
));
26+
$bootstrap-calendar-border-color: map.get(calendar-theme.$bootstrap, 'border-color');
2527
$fluent: map.merge($fluent, (
2628
default-size: map.get(calendar-theme.$fluent, 'default-size'),
2729
border-radius: map.get(calendar-theme.$fluent, 'border-radius'),
2830
border-color: map.get(calendar-theme.$fluent, 'border-color'),
2931
content-background: map.get(calendar-theme.$fluent, 'content-background'),
3032
actions-divider-color: map.get(calendar-theme.$fluent, 'actions-divider-color'),
3133
));
34+
$fluent-calendar-border-color: map.get(calendar-theme.$fluent, 'border-color');
3235
$indigo: map.merge($indigo, (
3336
default-size: map.get(calendar-theme.$indigo, 'default-size'),
3437
border-radius: map.get(calendar-theme.$indigo, 'border-radius'),
3538
border-color: map.get(calendar-theme.$indigo, 'border-color'),
3639
content-background: map.get(calendar-theme.$indigo, 'content-background'),
3740
actions-divider-color: map.get(calendar-theme.$indigo, 'actions-divider-color'),
3841
));
42+
$indigo-calendar-border-color: map.get(calendar-theme.$indigo, 'border-color');
43+

src/components/date-range-picker/themes/dark/date-range-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-daterangepicker');
7+
8+
--calendar-border-color: #{$bootstrap-calendar-border-color};
79
}

src/components/date-range-picker/themes/dark/date-range-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-daterangepicker');
7+
8+
--calendar-border-color: #{$fluent-calendar-border-color};
79
}

src/components/date-range-picker/themes/dark/date-range-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-daterangepicker');
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-range-picker/themes/dark/date-range-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-daterangepicker');
7+
8+
--calendar-border-color: #{$material-calendar-border-color};
79
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,28 @@ $material: map.merge($material, (
1616
content-background: map.get(calendar-theme.$material, 'content-background'),
1717
actions-divider-color: map.get(calendar-theme.$material, 'actions-divider-color'),
1818
));
19+
$material-calendar-border-color: map.get(calendar-theme.$material, 'border-color');
1920
$bootstrap: map.merge($bootstrap, (
2021
default-size: map.get(calendar-theme.$bootstrap, 'default-size'),
2122
border-radius: map.get(calendar-theme.$bootstrap, 'border-radius'),
2223
border-color: map.get(calendar-theme.$bootstrap, 'border-color'),
2324
content-background: map.get(calendar-theme.$bootstrap, 'content-background'),
2425
actions-divider-color: map.get(calendar-theme.$bootstrap, 'actions-divider-color'),
2526
));
27+
$bootstrap-calendar-border-color: map.get(calendar-theme.$bootstrap, 'border-color');
2628
$fluent: map.merge($fluent, (
2729
default-size: map.get(calendar-theme.$fluent, 'default-size'),
2830
border-radius: map.get(calendar-theme.$fluent, 'border-radius'),
2931
border-color: map.get(calendar-theme.$fluent, 'border-color'),
3032
content-background: map.get(calendar-theme.$fluent, 'content-background'),
3133
actions-divider-color: map.get(calendar-theme.$fluent, 'actions-divider-color'),
3234
));
35+
$fluent-calendar-border-color: map.get(calendar-theme.$fluent, 'border-color');
3336
$indigo: map.merge($indigo, (
3437
default-size: map.get(calendar-theme.$indigo, 'default-size'),
3538
border-radius: map.get(calendar-theme.$indigo, 'border-radius'),
3639
border-color: map.get(calendar-theme.$indigo, 'border-color'),
3740
content-background: map.get(calendar-theme.$indigo, 'content-background'),
3841
actions-divider-color: map.get(calendar-theme.$indigo, 'actions-divider-color')
3942
));
43+
$indigo-calendar-border-color: map.get(calendar-theme.$indigo, 'border-color');

src/components/date-range-picker/themes/shared/date-range-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(helper-text) {
2216
@include type-style('body-2');
2317

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

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

66
:host {
77
--component-size: var(--ig-size, #{var-get($theme, 'default-size')});
8+
--calendar-border-color: #{$material-calendar-border-color};
89

910
igc-dialog {
1011
box-shadow: none;
@@ -21,6 +22,7 @@ $theme: $material;
2122

2223
igc-dialog[open]::part(base) {
2324
box-shadow: var(--ig-elevation-24);
25+
border: rem(1px) solid var(--calendar-border-color);
2426
}
2527

2628
igc-dialog::part(content) {
@@ -40,6 +42,7 @@ $theme: $material;
4042

4143
border-radius: var-get($theme, 'border-radius');
4244
background: var-get($theme, 'content-background');
45+
box-shadow: 0 0 0 rem(1px) var(--calendar-border-color);
4346
}
4447

4548
igc-popover::part(container) {

0 commit comments

Comments
 (0)