Merge branch 'master' into simeonoff/merge-sassdocs

Author: kdinev

package-lock.json

@@ -111,7 +111,6 @@
     "gulp-sourcemaps": "^2.6.4",
     "gulp-typescript": "^5.0.1",
     "gulp-uglify": "^3.0.1",
-    "gulp-util": "^3.0.8",
     "hammer-simulator": "0.0.1",
     "ig-typedoc-theme": "^4.2.0",
     "igniteui-sassdoc-theme": "^1.1.4",

package.json

@@ -15,7 +15,6 @@ describe('IgxCheckbox', () => {
             declarations: [
                 InitCheckboxComponent,
                 CheckboxSimpleComponent,
-                CheckboxDisabledComponent,
                 CheckboxReadonlyComponent,
                 CheckboxIndeterminateComponent,
                 CheckboxRequiredComponent,
@@ -26,8 +25,7 @@ describe('IgxCheckbox', () => {
                 IgxCheckboxComponent
             ],
             imports: [FormsModule, ReactiveFormsModule, IgxRippleModule, NoopAnimationsModule]
-        })
-            .compileComponents();
+        }).compileComponents();
     }));
 
     it('Initializes a checkbox', () => {
@@ -196,15 +194,11 @@ describe('IgxCheckbox', () => {
         expect(nativeCheckbox.checked).toBe(true);
     }));
 
-    it('Disabled state', fakeAsync(() => {
-        const fixture = TestBed.createComponent(CheckboxDisabledComponent);
-        // Requires two async change detection cycles to setup disabled on the component and then native element
-        fixture.detectChanges();
-        tick();
-        fixture.detectChanges();
-        tick();
-        const testInstance = fixture.componentInstance;
-        const checkboxInstance = testInstance.cb;
+    it('Disabled state', () => {
+        const fixture = TestBed.createComponent(IgxCheckboxComponent);
+
+        const checkboxInstance = fixture.componentInstance;
+        checkboxInstance.disabled = true;
         const nativeCheckbox = checkboxInstance.nativeCheckbox.nativeElement as HTMLInputElement;
         const nativeLabel = checkboxInstance.nativeLabel.nativeElement as HTMLLabelElement;
         const placeholderLabel = checkboxInstance.placeholderLabel.nativeElement;
@@ -220,7 +214,7 @@ describe('IgxCheckbox', () => {
 
         // Should not update
         expect(checkboxInstance.checked).toBe(false);
-    }));
+    });
 
     it('Readonly state', () => {
         const fixture = TestBed.createComponent(CheckboxReadonlyComponent);
@@ -374,16 +368,6 @@ class CheckboxRequiredComponent {
     @ViewChild('cb', { static: true }) public cb: IgxCheckboxComponent;
 }
 
-@Component({
-    template: `<igx-checkbox #cb
-                                [(ngModel)]="subscribed"
-                                [disabled]="true">Disabled</igx-checkbox>`})
-class CheckboxDisabledComponent {
-    @ViewChild('cb', { static: true }) public cb: IgxCheckboxComponent;
-
-    public subscribed = false;
-}
-
 @Component({
     template: `<igx-checkbox #cb
                                 [(ngModel)]="subscribed"

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

@@ -1762,5 +1762,20 @@ describe('IgxTreeGrid - Integration #tGrid', () => {
             firstRow.pinned = true;
             expect(firstRow.pinned).toBeTrue();
         });
+
+        it('should delete pinned row without errors', () => {
+            treeGrid.pinRow(147);
+            fix.detectChanges();
+            const firstRow = treeGrid.pinnedRows[0];
+
+            expect(firstRow.isRoot).toBe(true);
+            expect(firstRow.pinned).toBeTrue();
+            expect(firstRow.data.ID).toEqual(147);
+
+            treeGrid.deleteRowById(147);
+            fix.detectChanges();
+
+            expect(firstRow.isRoot).toBe(false);
+        });
     });
 });

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.spec.ts

@@ -73,7 +73,7 @@ export class IgxTreeGridRowComponent extends IgxRowDirective implements DoCheck
         if (isPinnedArea) {
             treeRec = this.grid.unpinnedRecords.find(x => x.data === this.data);
         }
-        return treeRec.level === 0;
+        return treeRec?.level === 0;
     }
 
     /**

projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-integration.spec.ts

@@ -23,8 +23,7 @@ describe('IgxRadio', () => {
                 RadioInvisibleLabelComponent
             ],
             imports: [FormsModule, IgxRippleModule, NoopAnimationsModule]
-        })
-            .compileComponents();
+        }).compileComponents();
     }));
 
     it('Init a radio', () => {
@@ -59,7 +58,6 @@ describe('IgxRadio', () => {
         fixture.detectChanges();
         expect(radio.id).toBe('customRadio');
         expect(domRadio.id).toBe('customRadio');
-
     });
 
     it('Binding to ngModel', fakeAsync(() => {
@@ -144,8 +142,8 @@ describe('IgxRadio', () => {
         const testInstance = fixture.componentInstance;
 
         // get the disabled radio button
-        const componentInstance = testInstance.radios.last;
-        const radio = componentInstance.nativeRadio.nativeElement;
+        const componentInstance = testInstance.radios.last as IgxRadioComponent;
+        const radio = componentInstance.nativeRadio.nativeElement as HTMLInputElement;
 
         expect(componentInstance.disabled).toBe(true);
         expect(radio.disabled).toBe(true);

projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-row.component.ts

@@ -1,5 +1,5 @@
 import { Component, ViewChild } from '@angular/core';
-import { fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import { TestBed, waitForAsync } from '@angular/core/testing';
 import { UntypedFormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
 import { IgxRippleModule } from '../directives/ripple/ripple.directive';
@@ -10,21 +10,20 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
 describe('IgxSwitch', () => {
     configureTestSuite();
+
     beforeAll(waitForAsync(() => {
         TestBed.configureTestingModule({
             declarations: [
                 InitSwitchComponent,
                 SwitchSimpleComponent,
                 SwitchRequiredComponent,
-                SwitchDisabledComponent,
                 SwitchExternalLabelComponent,
                 SwitchInvisibleLabelComponent,
                 SwitchFormGroupComponent,
                 IgxSwitchComponent
             ],
             imports: [FormsModule, ReactiveFormsModule, IgxRippleModule, NoopAnimationsModule]
-        })
-            .compileComponents();
+        }).compileComponents();
     }));
 
     it('Initializes', () => {
@@ -148,16 +147,11 @@ describe('IgxSwitch', () => {
         expect(nativeCheckbox.required).toBe(false);
     });
 
-    it('Disabled state', fakeAsync(() => {
-        const fixture = TestBed.createComponent(SwitchDisabledComponent);
-        // Requires two async change detection cycles to setup disabled on the component and then native element
-        fixture.detectChanges();
-        tick();
-        fixture.detectChanges();
-        tick();
-        const testInstance = fixture.componentInstance;
-        const switchInstance = testInstance.switch;
-        const nativeCheckbox = switchInstance.nativeCheckbox.nativeElement;
+    it('Disabled state', () => {
+        const fixture = TestBed.createComponent(IgxSwitchComponent);
+        const switchInstance = fixture.componentInstance;
+        switchInstance.disabled = true;
+        const nativeCheckbox = switchInstance.nativeCheckbox.nativeElement as HTMLInputElement;
         const nativeLabel = switchInstance.nativeLabel.nativeElement;
         const placeholderLabel = switchInstance.placeholderLabel.nativeElement;
         fixture.detectChanges();
@@ -172,7 +166,7 @@ describe('IgxSwitch', () => {
 
         // Should not update
         expect(switchInstance.checked).toBe(false);
-    }));
+    });
 
     it('Event handling', () => {
         const fixture = TestBed.createComponent(SwitchSimpleComponent);
@@ -250,17 +244,6 @@ class SwitchRequiredComponent {
     @ViewChild('switch', { static: true }) public switch: IgxSwitchComponent;
 }
 
-@Component({
-    template: `<igx-switch #switch
-                                [(ngModel)]="subscribed"
-                                [checked]="subscribed"
-                                [disabled]="true">Disabled</igx-switch>`})
-class SwitchDisabledComponent {
-    @ViewChild('switch', { static: true }) public switch: IgxSwitchComponent;
-
-    public subscribed = false;
-}
-
 @Component({
     template: `<p id="my-label">{{label}}</p>
     <igx-switch #switch aria-labelledby="my-label"></igx-switch>`

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

@@ -57,6 +57,7 @@ <h1 igxListLineTitle>Airplane Mode</h1>
                         </igx-switch>
                     </div>
                 </igx-list-item>
+
                 <igx-list-item *ngFor="let item of settings">
                     <igx-icon igxListThumbnail>{{item.icon}}</igx-icon>
                     <h1 igxListLineTitle>{{item.name}}</h1>