Skip to content

Commit 3ba69d2

Browse files
authored
Merge branch 'master' into mtsvyatkova/feat-1379-tile-manager
2 parents 42c6ca6 + fea3e04 commit 3ba69d2

File tree

11 files changed

+88
-10
lines changed

11 files changed

+88
-10
lines changed

src/components/combo/themes/shared/combo.common.scss

+7
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ $dropdown-theme: dropdown-theme.$material;
5959
}
6060
}
6161

62+
:host(:not([disabled])[invalid]),
63+
:host(:not(:disabled)[invalid]) {
64+
::part(helper-text) {
65+
color: var-get($theme, 'error-secondary-color');
66+
}
67+
}
68+
6269
:host(:disabled),
6370
:host([disabled]) {
6471
::slotted([slot='prefix']),

src/components/combo/themes/shared/combo.fluent.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ $dropdown-theme: dropdown-theme.$fluent;
6262

6363
:host(:focus-within) {
6464
[part~='toggle-icon'] {
65-
background: var-get($theme, 'toggle-button-background-focus--border');
65+
background: var-get($theme, 'toggle-button-background-focus');
6666
color: var-get($theme, 'toggle-button-foreground-focus');
6767

6868
igc-icon {

src/components/combo/themes/shared/combo.indigo.scss

+7
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,13 @@ $dropdown-theme: dropdown-theme.$indigo;
9292
}
9393
}
9494

95+
:host(:not([disabled])[invalid]),
96+
:host(:not(:disabled)[invalid]) {
97+
::part(helper-text) {
98+
color: var-get($input-theme, 'helper-text-color');
99+
}
100+
}
101+
95102
:host(:disabled),
96103
:host([disabled]) {
97104
::slotted([slot='prefix']),

src/components/combo/themes/shared/combo.material.scss

+15-7
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,24 @@ $dropdown-theme: dropdown-theme.$material;
7575
color: var-get($theme, 'toggle-button-foreground-filled');
7676
}
7777

78-
:host(:focus-within) {
78+
:host(:not([outlined]):focus-within) {
79+
igc-input::part(container) {
80+
--_toggle-focus-background: #{var-get($theme, 'toggle-button-background')};
81+
--_toggle-focus-foreground: #{var-get($theme, 'toggle-button-foreground')};
82+
83+
&:focus-within {
84+
--_toggle-focus-background: #{var-get($theme, 'toggle-button-background-focus')};
85+
--_toggle-focus-foreground: #{var-get($theme, 'toggle-button-foreground-filled')};
86+
}
87+
}
88+
7989
[part~='toggle-icon'] {
80-
color: var-get($theme, 'toggle-button-foreground-filled');
81-
background: var-get($theme, 'toggle-button-background-focus');
90+
color: var(--_toggle-focus-foreground);
91+
background: var(--_toggle-focus-background);
8292
}
83-
}
8493

85-
:host(:not([outlined]):focus-within) {
86-
> igc-input::part(container) {
87-
background: var-get($input-theme, 'box-background-focus');
94+
[part='toggle-icon filled'] {
95+
color: var-get($theme, 'toggle-button-foreground-filled');
8896
}
8997
}
9098

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

+11
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,21 @@ igc-icon,
7373
--component-size: var(--input-size);
7474
}
7575

76+
:host(:not([disabled])[invalid]),
77+
:host(:not(:disabled)[invalid]) {
78+
::part(helper-text) {
79+
color: var-get($theme, 'error-secondary-color');
80+
}
81+
}
82+
7683
:host(:disabled),
7784
:host([disabled]) {
7885
[part='label'],
7986
igc-validator {
8087
color: var-get($input-theme, 'disabled-text-color');
8188
}
89+
90+
::part(helper-text) {
91+
color: var-get($input-theme, 'disabled-text-color');
92+
}
8293
}

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

+7
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,10 @@ $input-theme: input-theme.$indigo;
4040
color: var-get($input-theme, 'focused-secondary-color');
4141
}
4242
}
43+
44+
:host(:not([disabled])[invalid]),
45+
:host(:not(:disabled)[invalid]) {
46+
::part(helper-text) {
47+
color: var-get($input-theme, 'helper-text-color');
48+
}
49+
}

src/components/input/themes/shared/input.material.scss

+14-1
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,6 @@ input:placeholder-shown + [part='notch'] [part='label'],
380380
}
381381
}
382382

383-
384383
:host(:not([type='search'])[readonly][outlined]:focus-within) {
385384
:not([part~='filled']) {
386385
input:not(:placeholder-shown) + [part='notch'] [part='label'] {
@@ -397,6 +396,20 @@ input:placeholder-shown + [part='notch'] [part='label'],
397396
}
398397
}
399398

399+
:host(:not([type='search'])[outlined]:hover) {
400+
[part='notch'],
401+
[part='start'],
402+
[part='end'],
403+
[part='filler'] {
404+
border-color: var-get($theme, 'hover-border-color');
405+
}
406+
407+
input:placeholder-shown + [part='notch'],
408+
[part~='filled'] + [part='notch'] {
409+
@extend %floated-styles;
410+
}
411+
}
412+
400413
:host(:not([type='search'])[outlined]:focus-within) {
401414
[part='label'] {
402415
margin-block-start: calc(#{$active-border-width} / 2);

src/components/select/themes/shared/select.common.scss

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ $dropdown-theme: dropdown-theme.$material;
3232
}
3333
}
3434

35-
:host(:hover),
3635
:host(:focus-within) {
3736
[part~='toggle-icon'] {
3837
background: var-get($theme, 'toggle-button-background-focus--border');

src/components/select/themes/shared/select.fluent.scss

+4
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ $focused-border-width: rem(2px);
3636
}
3737

3838
:host(:focus-within) {
39+
[part~='toggle-icon'] {
40+
background: var-get($theme, 'toggle-button-background-focus');
41+
}
42+
3943
igc-input[readonly]:not([disabled])::part(container) {
4044
border-width: #{$focused-border-width};
4145
}

src/components/select/themes/shared/select.indigo.scss

+6
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ $input-theme: input-theme.$indigo;
3333
padding: rem(3px);
3434
}
3535

36+
:host(:hover) {
37+
[part~='toggle-icon'] {
38+
color: var-get($theme, 'toggle-button-foreground-focus');
39+
}
40+
}
41+
3642
:host(:focus-within) {
3743
igc-input::part(label) {
3844
color: var-get($input-theme, 'focused-secondary-color');

src/components/textarea/themes/shared/textarea.material.scss

+16
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,22 @@ textarea {
330330
}
331331
}
332332

333+
:host([outlined]:hover) {
334+
[part='notch'],
335+
[part='start'],
336+
[part='end'],
337+
[part='filler'] {
338+
border-color: var-get($theme, 'hover-border-color');
339+
}
340+
341+
[part~='container'][part~='filled'],
342+
[part~='container'][part~='placeholder'] {
343+
[part='notch'] {
344+
border-block-start-color: transparent;
345+
}
346+
}
347+
}
348+
333349
:host([outlined]:focus-within) {
334350
[part='filler'],
335351
[part='notch'] {

0 commit comments

Comments
 (0)