Skip to content

Commit 2b9751e

Browse files
committed
fix(input): hover styles and warning state
1 parent d658f64 commit 2b9751e

File tree

2 files changed

+94
-22
lines changed

2 files changed

+94
-22
lines changed

projects/igniteui-angular/src/lib/core/styles/components/input/_input-group-component.scss

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,24 @@
244244
}
245245
}
246246

247+
@include m(warning) {
248+
@include e(label) {
249+
@extend %form-group-label--warning !optional;
250+
}
251+
252+
@include e(line) {
253+
@extend %form-group-line--warning !optional;
254+
}
255+
256+
@include e(hint) {
257+
@extend %form-group-helper--warning !optional;
258+
}
259+
260+
@include e(bundle) {
261+
@extend %form-group-bundle--warning !optional;
262+
}
263+
}
264+
247265
@include m(invalid) {
248266
@include e(label) {
249267
@extend %form-group-label--error !optional;
@@ -407,10 +425,6 @@
407425

408426
@include e(bundle) {
409427
@extend %form-group-bundle--border !optional;
410-
411-
&:hover {
412-
@extend %form-group-bundle--border--hover !optional;
413-
}
414428
}
415429

416430
@include e(bundle-main) {

projects/igniteui-angular/src/lib/core/styles/components/input/_input-group-theme.scss

Lines changed: 76 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,7 @@
512512
}
513513

514514
%form-group-display--disabled {
515+
pointer-events: none;
515516
user-select: none;
516517
color: var-get($theme, 'disabled-text-color') !important;
517518

@@ -613,6 +614,13 @@
613614
caret-color: initial;
614615
}
615616

617+
%form-group-bundle--warning {
618+
&::after {
619+
border-block-end-color: var-get($theme, 'warning-secondary-color');
620+
}
621+
caret-color: initial;
622+
}
623+
616624
%form-group-bundle--error {
617625
&::after {
618626
border-block-end-color: var-get($theme, 'error-secondary-color');
@@ -803,24 +811,24 @@
803811
&::after {
804812
display: none;
805813
}
806-
}
807-
808-
%form-group-bundle--border--hover {
809-
%form-group-bundle-start {
810-
border-color: var-get($theme, 'hover-border-color');
811-
}
812814

813-
%igx-input-group__filler {
814-
border-color: var-get($theme, 'hover-border-color');
815-
}
816-
817-
%igx-input-group__notch {
818-
border-block-start-color: var-get($theme, 'hover-border-color');
819-
border-block-end-color: var-get($theme, 'hover-border-color');
820-
}
821-
822-
%form-group-bundle-end {
823-
border-color: var-get($theme, 'hover-border-color');
815+
&:hover {
816+
%form-group-bundle-start {
817+
border-color: var-get($theme, 'hover-border-color');
818+
}
819+
820+
%igx-input-group__filler {
821+
border-color: var-get($theme, 'hover-border-color');
822+
}
823+
824+
%igx-input-group__notch {
825+
border-block-start-color: var-get($theme, 'hover-border-color');
826+
border-block-end-color: var-get($theme, 'hover-border-color');
827+
}
828+
829+
%form-group-bundle-end {
830+
border-color: var-get($theme, 'hover-border-color');
831+
}
824832
}
825833
}
826834

@@ -1000,6 +1008,21 @@
10001008
}
10011009
}
10021010

1011+
%form-group-label--focused-border:not(:is(
1012+
%form-group-border--error,
1013+
%form-group-border--warning,
1014+
%form-group-border--success))
1015+
{
1016+
&:hover {
1017+
%form-group-bundle-start,
1018+
%form-group-bundle-end,
1019+
%igx-input-group__filler,
1020+
%igx-input-group__notch {
1021+
border-color: var-get($theme, 'focused-border-color');
1022+
}
1023+
}
1024+
}
1025+
10031026
%form-group-label--float-border {
10041027
--label-position: #{sizable(18px, 22px, 26px)};
10051028

@@ -1083,6 +1106,10 @@
10831106
color: var-get($theme, 'focused-secondary-color');
10841107
}
10851108

1109+
%form-group-label--warning {
1110+
color: var-get($theme, 'warning-secondary-color');
1111+
}
1112+
10861113
%form-group-label--success {
10871114
color: var-get($theme, 'success-secondary-color');
10881115
}
@@ -1324,10 +1351,19 @@
13241351
%igx-input-group__filler {
13251352
border-block-color: var-get($theme, 'success-secondary-color');
13261353
}
1354+
1355+
%form-group-bundle--border:hover {
1356+
%form-group-bundle-start,
1357+
%form-group-bundle-end,
1358+
%igx-input-group__filler,
1359+
%igx-input-group__notch {
1360+
border-color: var-get($theme, 'success-secondary-color');
1361+
}
1362+
}
13271363
}
13281364

13291365
%form-group-line--warning {
1330-
background: var-get($theme, 'error-secondary-color');
1366+
background: var-get($theme, 'warning-secondary-color');
13311367
}
13321368

13331369
%form-group-border--warning {
@@ -1347,6 +1383,15 @@
13471383
%igx-input-group__filler {
13481384
border-block-color: var-get($theme, 'warning-secondary-color');
13491385
}
1386+
1387+
%form-group-bundle--border:hover {
1388+
%form-group-bundle-start,
1389+
%form-group-bundle-end,
1390+
%igx-input-group__filler,
1391+
%igx-input-group__notch {
1392+
border-color: var-get($theme, 'warning-secondary-color');
1393+
}
1394+
}
13501395
}
13511396

13521397
%form-group-line--error {
@@ -1370,6 +1415,15 @@
13701415
%igx-input-group__filler {
13711416
border-block-color: var-get($theme, 'error-secondary-color');
13721417
}
1418+
1419+
%form-group-bundle--border:hover {
1420+
%form-group-bundle-start,
1421+
%form-group-bundle-end,
1422+
%igx-input-group__filler,
1423+
%igx-input-group__notch {
1424+
border-color: var-get($theme, 'error-secondary-color');
1425+
}
1426+
}
13731427
}
13741428

13751429
%form-group-border--disabled {
@@ -1432,6 +1486,10 @@
14321486
color: var-get($theme, 'success-secondary-color');
14331487
}
14341488

1489+
%form-group-helper--warning {
1490+
color: var-get($theme, 'warning-secondary-color');
1491+
}
1492+
14351493
%form-group-helper--error {
14361494
color: var-get($theme, 'error-secondary-color');
14371495
}

0 commit comments

Comments
 (0)