Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular into rkaraivanov/column-formatters-performance

Author: rkaraivanov

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

@@ -2461,6 +2461,13 @@ describe('igxCombo', () => {
                 expect(combo.valid).toEqual(IgxComboState.INITIAL);
                 expect(combo.comboInput.valid).toEqual(IgxInputState.INITIAL);
             });
+            it('should not open on click if combo is disabled', () => {
+                combo.disabled = true;
+                fixture.detectChanges();
+                UIInteractions.simulateClickEvent(combo.comboInput.nativeElement);
+                fixture.detectChanges();
+                expect(combo.dropdown.collapsed).toBeTruthy();
+            });
             it('should be possible to be enabled/disabled when used as a form control', () => {
                 const form = fixture.componentInstance.reactiveForm;
                 const comboFormReference = form.controls.townCombo;

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

@@ -873,7 +873,9 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
     onInputClick(event: Event) {
         event.stopPropagation();
         event.preventDefault();
-        this.toggle();
+        if (!this.disabled) {
+            this.toggle();
+        }
     }
 
     /**