Skip to content

Commit 2c8e3cb

Browse files
authored
Merge branch 'master' into mpopov/calendar/refactoring
2 parents e7fb41d + 361e013 commit 2c8e3cb

File tree

15 files changed

+108
-398
lines changed

15 files changed

+108
-398
lines changed

package-lock.json

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

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,16 @@
8282
"husky": "^9.1.7",
8383
"ig-typedoc-theme": "^7.0.0",
8484
"igniteui-i18n-resources": "0.7.0-alpha.8",
85-
"igniteui-theming": "^23.1.1",
85+
"igniteui-theming": "^23.2.0",
8686
"keep-a-changelog": "^2.7.1",
87-
"lint-staged": "^16.2.6",
87+
"lint-staged": "^16.2.7",
8888
"lit-analyzer": "^2.0.3",
8989
"madge": "^8.0.0",
9090
"node-watch": "^0.7.4",
9191
"playwright": "^1.56.1",
9292
"postcss": "^8.5.6",
9393
"prettier": "^3.6.2",
94-
"rimraf": "^6.1.0",
94+
"rimraf": "^6.1.2",
9595
"sass-embedded": "~1.93.3",
9696
"sinon": "^21.0.0",
9797
"storybook": "^10.0.8",
@@ -104,11 +104,11 @@
104104
"typedoc": "~0.28.14",
105105
"typedoc-plugin-localization": "^3.1.0",
106106
"typescript": "^5.9.3",
107-
"vite": "^7.2.2"
107+
"vite": "^7.2.4"
108108
},
109109
"peerDependencies": {
110110
"dompurify": "^3.3.0",
111-
"marked": "^17.0.0",
111+
"marked": "^17.0.1",
112112
"marked-shiki": "^1.2.1",
113113
"shiki": "^3.15.0"
114114
},

src/components/checkbox/themes/shared/switch/switch.bootstrap.scss

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,6 @@ $theme: $bootstrap;
5656

5757
:host(:not([disabled]):hover),
5858
:host(:not(:disabled):hover) {
59-
[part~='control'] {
60-
border-color: var-get($theme, 'border-hover-color');
61-
}
62-
63-
[part~='control'][part~='checked'] {
64-
background: var-get($theme, 'track-on-hover-color');
65-
border-color: var-get($theme, 'border-on-hover-color');
66-
}
67-
6859
[part~='thumb'][part~='checked'] {
6960
background: var-get($theme, 'thumb-on-color');
7061
}

src/components/checkbox/themes/shared/switch/switch.common.scss

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,18 @@ $theme: $material;
2020
}
2121
}
2222

23+
:host(:not([disabled]):hover),
24+
:host(:not(:disabled):hover) {
25+
[part~='control'] {
26+
border-color: var-get($theme, 'border-hover-color');
27+
}
28+
29+
[part~='control'][part~='checked'] {
30+
background: var-get($theme, 'track-on-hover-color');
31+
border-color: var-get($theme, 'border-on-hover-color');
32+
}
33+
}
34+
2335
:host([disabled]),
2436
:host(:disabled) {
2537
[part~='label'] {

src/components/checkbox/themes/shared/switch/switch.fluent.scss

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,14 @@ $theme: $fluent;
6161

6262
:host(:not([disabled]):hover),
6363
:host(:not(:disabled):hover) {
64-
[part~='control'] {
65-
border-color: var-get($theme, 'border-hover-color');
64+
[part~='thumb'][part~='checked'] {
65+
background: var-get($theme, 'thumb-on-color');
6666
}
67+
}
6768

69+
:host([disabled]),
70+
:host(:disabled) {
6871
[part~='control'][part~='checked'] {
69-
background: var-get($theme, 'track-on-hover-color');
70-
border-color: var-get($theme, 'border-on-hover-color');
71-
}
72-
73-
[part~='thumb'][part~='checked'] {
74-
background: var-get($theme, 'thumb-on-color');
72+
border-color: var-get($theme, 'track-on-disabled-color');
7573
}
7674
}

src/components/checkbox/themes/shared/switch/switch.indigo.scss

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,6 @@ $border-width: rem(1px);
1919
@include type-style('body-2');
2020
}
2121

22-
:host(:hover) {
23-
[part~='control'] {
24-
border-color: var-get($theme, 'border-hover-color');
25-
}
26-
27-
[part~='control'][part~='checked'] {
28-
background: var-get($theme, 'track-on-hover-color');
29-
border-color: var-get($theme, 'border-on-hover-color');
30-
}
31-
}
32-
3322
[part~='control'][part~='focused'] {
3423
box-shadow: 0 0 0 rem(3px) var-get($theme, 'focus-outline-color');
3524
}

src/components/checkbox/themes/shared/switch/switch.material.scss

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,6 @@ $ripple-radius: calc(#{$ripple-size} / 2);
3232
background: var-get($theme, 'thumb-on-color');
3333
}
3434
}
35-
36-
[part~='control'] {
37-
border-color: var-get($theme, 'border-hover-color');
38-
}
39-
40-
[part~='control'][part~='checked'] {
41-
border-color: var-get($theme, 'border-on-hover-color');
42-
}
4335
}
4436

4537
&:focus-visible,
@@ -98,6 +90,10 @@ $ripple-radius: calc(#{$ripple-size} / 2);
9890
overflow: hidden;
9991
z-index: -1;
10092
}
93+
94+
&:hover {
95+
box-shadow: var-get($theme, 'hover-elevation');
96+
}
10197
}
10298

10399
[part~='thumb'][part~='checked'] {
@@ -107,3 +103,10 @@ $ripple-radius: calc(#{$ripple-size} / 2);
107103
animation-duration: .2s;
108104
animation-fill-mode: forwards;
109105
}
106+
107+
:host([disabled]),
108+
:host(:disabled) {
109+
[part~='thumb'] {
110+
box-shadow: var-get($theme, 'disabled-elevation');
111+
}
112+
}

src/components/date-picker/date-picker-form.spec.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,7 @@ describe('igc-datepicker form integration', () => {
229229

230230
describe('Validation', () => {
231231
const spec = createFormAssociatedTestBed<IgcDatePickerComponent>(html`
232-
<igc-date-picker
233-
name="datePicker"
234-
.defaultValue=${null}
235-
></igc-date-picker>
232+
<igc-date-picker name="datePicker"></igc-date-picker>
236233
`);
237234

238235
beforeEach(async () => {

src/components/date-picker/date-picker.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -927,7 +927,7 @@ describe('Date picker', () => {
927927
simulateClick(lastOfMay);
928928
await elementUpdated(picker);
929929

930-
expect(checkDatesEqual(picker.value!, targetDate));
930+
checkDatesEqual(picker.value!, targetDate);
931931

932932
// Open the picker and switch to months view
933933
await picker.show();

src/components/date-time-input/date-time-input.spec.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1102,10 +1102,7 @@ describe('Date Time Input component', () => {
11021102

11031103
describe('Validation', () => {
11041104
const spec = createFormAssociatedTestBed<IgcDateTimeInputComponent>(html`
1105-
<igc-date-time-input
1106-
name="date-time"
1107-
.defaultValue=${null}
1108-
></igc-date-time-input>
1105+
<igc-date-time-input name="date-time"></igc-date-time-input>
11091106
`);
11101107

11111108
beforeEach(async () => {

0 commit comments

Comments
 (0)