Skip to content

Commit 5250517

Browse files
authored
Merge branch '18.2.x' into mkirkova/fix-14906
2 parents 65787e0 + 9f3b703 commit 5250517

File tree

4 files changed

+13
-15
lines changed

4 files changed

+13
-15
lines changed

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1202,15 +1202,15 @@ export abstract class IgxComboBaseDirective implements IgxComboBase, AfterViewCh
12021202
this.searchValue = '';
12031203
if (!e.event) {
12041204
this.comboInput?.nativeElement.focus();
1205+
} else {
1206+
this._onTouchedCallback();
1207+
this.updateValidity();
12051208
}
12061209
}
12071210

12081211
/** @hidden @internal */
12091212
public handleClosed() {
12101213
this.closed.emit({ owner: this });
1211-
if(this.comboInput.nativeElement !== this.document.activeElement){
1212-
this.validateComboState();
1213-
}
12141214
}
12151215

12161216
/** @hidden @internal */
@@ -1250,15 +1250,10 @@ export abstract class IgxComboBaseDirective implements IgxComboBase, AfterViewCh
12501250
public onBlur() {
12511251
if (this.collapsed) {
12521252
this._onTouchedCallback();
1253-
this.validateComboState();
1253+
this.updateValidity();
12541254
}
12551255
}
12561256

1257-
/** @hidden @internal */
1258-
public onFocus(): void {
1259-
this._onTouchedCallback();
1260-
}
1261-
12621257
/** @hidden @internal */
12631258
public setActiveDescendant(): void {
12641259
this.activeDescendant = this.dropdown.focusedItem?.id || '';
@@ -1283,7 +1278,7 @@ export abstract class IgxComboBaseDirective implements IgxComboBase, AfterViewCh
12831278
this.manageRequiredAsterisk();
12841279
};
12851280

1286-
private validateComboState() {
1281+
private updateValidity() {
12871282
if (this.ngControl && this.ngControl.invalid) {
12881283
this.valid = IgxInputState.INVALID;
12891284
} else {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
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"
16-
(blur)="onBlur()"
17-
(focus)="onFocus()" />
16+
(blur)="onBlur()" />
1817
<ng-container ngProjectAs="igx-suffix">
1918
<ng-content select="igx-suffix"></ng-content>
2019
</ng-container>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3615,7 +3615,7 @@ describe('igxCombo', () => {
36153615
combo.open();
36163616
input.triggerEventHandler('focus', {});
36173617
fixture.detectChanges();
3618-
expect(ngModel.touched).toBeTrue();
3618+
expect(ngModel.touched).toBeFalse();
36193619
combo.searchInput.nativeElement.focus();
36203620
fixture.detectChanges();
36213621
const documentClickEvent = new MouseEvent('click', { bubbles: true });

projects/igniteui-angular/src/lib/data-operations/filtering-expressions-tree.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,17 @@ export declare interface IFilteringExpressionsTree extends IBaseEventArgs, IExpr
2020
/* alternateName: treeType */
2121
type?: FilteringExpressionsTreeType;
2222

23+
/* blazorSuppress */
2324
/**
2425
* @deprecated in version 18.2.0. Use `ExpressionsTreeUtil.find` instead.
2526
*/
26-
find(fieldName: string): IFilteringExpressionsTree | IFilteringExpression;
27+
find?: (fieldName: string) => IFilteringExpressionsTree | IFilteringExpression;
2728

29+
/* blazorSuppress */
2830
/**
2931
* @deprecated in version 18.2.0. Use `ExpressionsTreeUtil.findIndex` instead.
3032
*/
31-
findIndex(fieldName: string): number;
33+
findIndex?: (fieldName: string) => number;
3234
}
3335

3436
/* marshalByValue */
@@ -112,6 +114,7 @@ export class FilteringExpressionsTree implements IFilteringExpressionsTree {
112114
return !expressionTree || !expressionTree.filteringOperands || !expressionTree.filteringOperands.length;
113115
}
114116

117+
/* blazorSuppress */
115118
/**
116119
* Returns the filtering expression for a column with the provided fieldName.
117120
* ```typescript
@@ -125,6 +128,7 @@ export class FilteringExpressionsTree implements IFilteringExpressionsTree {
125128
return ExpressionsTreeUtil.find(this, fieldName);
126129
}
127130

131+
/* blazorSuppress */
128132
/**
129133
* Returns the index of the filtering expression for a column with the provided fieldName.
130134
* ```typescript

0 commit comments

Comments
 (0)