Skip to content

Commit ddfd02e

Browse files
authored
Merge branch 'master' into skrastev/fix-16082-master
2 parents ac2f2d7 + 1ff6dfa commit ddfd02e

24 files changed

+338
-93
lines changed

angular.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,8 @@
307307
{
308308
"type": "bundle",
309309
"name": "styles",
310-
"maximumWarning": "480kb",
311-
"maximumError": "490kb"
310+
"maximumWarning": "500kb",
311+
"maximumError": "550kb"
312312
},
313313
{
314314
"type": "anyComponentStyle",

projects/igniteui-angular/src/lib/combo/combo.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ng-content select="igx-hint, [igxHint]"></ng-content>
1010
</ng-container>
1111
<input igxInput #comboInput name="comboInput" type="text" [value]="displayValue" readonly
12-
[attr.placeholder]="placeholder" [disabled]="disabled"
12+
[attr.placeholder]="placeholder" [disabled]="disabled" [igxReadOnlyInput]="false"
1313
role="combobox" aria-haspopup="listbox"
1414
[attr.aria-expanded]="!dropdown.collapsed" [attr.aria-controls]="dropdown.listId"
1515
[attr.aria-labelledby]="ariaLabelledBy || label?.id || placeholder"

projects/igniteui-angular/src/lib/combo/combo.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import { IgxDropDownItemNavigationDirective } from '../drop-down/drop-down-navig
2525
import { IgxIconComponent } from '../icon/icon.component';
2626
import { IgxSuffixDirective } from '../directives/suffix/suffix.directive';
2727
import { IgxInputDirective } from '../directives/input/input.directive';
28+
import { IgxReadOnlyInputDirective } from '../directives/input/read-only-input.directive';
2829

2930
/** Event emitted when an igx-combo's selection is changing */
3031
export interface IComboSelectionChangingEventArgs extends IBaseCancelableEventArgs {
@@ -115,6 +116,7 @@ const diffInSets = (set1: Set<any>, set2: Set<any>): any[] => {
115116
IgxComboAddItemComponent,
116117
IgxButtonDirective,
117118
IgxRippleDirective,
119+
IgxReadOnlyInputDirective,
118120
IgxComboFilteringPipe,
119121
IgxComboGroupingPipe
120122
]

projects/igniteui-angular/src/lib/core/styles/components/combo/_combo-theme.scss

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -182,19 +182,11 @@
182182
%igx-combo__toggle-button {
183183
color: var-get($theme, 'toggle-button-foreground-focus');
184184
background: var-get($theme, 'toggle-button-background-focus');
185-
186-
&:focus {
187-
color: color($color: 'secondary');
188-
}
189185
}
190186

191187
%igx-combo__clear-button {
192188
color: var-get($theme, 'clear-button-foreground-focus');
193189
background: var-get($theme, 'clear-button-background-focus');
194-
195-
&:focus {
196-
color: color($color: 'secondary');
197-
}
198190
}
199191
}
200192

@@ -225,13 +217,29 @@
225217
}
226218

227219
.igx-input-group.igx-input-group--focused:not(.igx-input-group--box) {
228-
@if $variant != 'fluent' {
220+
@if $variant == 'material' {
229221
%igx-combo__toggle-button {
230222
background: var-get($theme, 'toggle-button-background-focus--border');
231223
}
232224
}
233225
}
234226

227+
%form-group-bundle:not(%form-group-bundle--disabled) {
228+
%igx-combo__clear-button:focus-visible,
229+
%igx-combo__toggle-button:focus-visible {
230+
color: color($color: 'secondary');
231+
background: var-get($theme, 'toggle-button-background');
232+
}
233+
}
234+
235+
//.igx-input-group:not(.igx-input-group--box) {
236+
// %igx-combo__toggle-button:focus {
237+
// @if $variant == 'material' {
238+
// background: var-get($theme, 'toggle-button-background-focus--border');
239+
// }
240+
// }
241+
//}
242+
235243
.igx-input-group--disabled {
236244
%igx-combo__toggle-button {
237245
background: var-get($theme, 'toggle-button-background-disabled') !important;

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242
}
4343

4444
@include e(notch) {
45-
@extend %igx-input-group__notch !optional;
45+
@extend %igx-input-group__notch !optional;
4646
}
4747

4848
@include e(filler) {
49-
@extend %igx-input-group__filler !optional;
49+
@extend %igx-input-group__filler !optional;
5050
}
5151

5252
@include e(input) {
@@ -111,20 +111,24 @@
111111
@extend %suffixed !optional;
112112
}
113113

114+
@include m(readonly) {
115+
@extend %form-group-display--readonly !optional;
116+
}
117+
114118
// Textarea modifier
115119
@include m(textarea-group) {
116120
@extend %textarea-group !optional;
117121

118122
@include e(bundle-main) {
119-
@extend %form-group-textarea-group-bundle-main !optional;
123+
@extend %form-group-textarea-group-bundle-main !optional;
120124
}
121125

122126
@include e(bundle) {
123-
@extend %form-group-textarea-group-bundle !optional;
127+
@extend %form-group-textarea-group-bundle !optional;
124128
}
125129

126130
@include e(label) {
127-
@extend %form-group-textarea-label !optional;
131+
@extend %form-group-textarea-label !optional;
128132
}
129133
}
130134

@@ -282,6 +286,8 @@
282286
}
283287

284288
@include m(invalid) {
289+
@extend %form-group-display--invalid !optional;
290+
285291
@include e(label) {
286292
@extend %form-group-label--error !optional;
287293
}

0 commit comments

Comments
 (0)