refactor(ng9): fix compilation errors

damyanpetev · damyanpetev · commit b949782550c2 · 2019-11-07T17:06:57.000+02:00
diff --git a/projects/igniteui-angular/src/lib/combo/combo.component.ts b/projects/igniteui-angular/src/lib/combo/combo.component.ts
@@ -1136,7 +1136,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
      * @hidden @internal
      */
     public ngOnInit() {
-        this.ngControl = this._injector.get<NgControl>(NgControl as Type<NgControl>, null);
+        this.ngControl = this._injector.get<NgControl>(NgControl, null);
         this._overlaySettings.positionStrategy.settings.target = this.elementRef.nativeElement;
         this.selection.set(this.id, new Set());
     }
diff --git a/projects/igniteui-angular/src/lib/select/select.component.ts b/projects/igniteui-angular/src/lib/select/select.component.ts
@@ -345,7 +345,7 @@ export class IgxSelectComponent extends IgxDropDownComponent implements IgxSelec
      * @hidden @internal
      */
     public ngOnInit() {
-        this.ngControl = this._injector.get<NgControl>(NgControl as Type<NgControl>, null);
+        this.ngControl = this._injector.get<NgControl>(NgControl, null);
     }
 
     /**
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -5,11 +5,11 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { NgModule } from '@angular/core';
 import {
     IgxIconModule, IgxGridModule, IgxExcelExporterService, IgxCsvExporterService, IgxOverlayService,
-    IgxGridTransaction, IgxTransactionService, IgxTreeGridModule,  IgxHierarchicalGridModule, IgxInputGroupModule, IgxIconService} from 'igniteui-angular';
+    IgxDragDropModule, IgxDividerModule, IgxTreeGridModule,  IgxHierarchicalGridModule, IgxInputGroupModule,
+    IgxIconService, DisplayDensityToken, DisplayDensity
+} from 'igniteui-angular';
 import { IgxColumnHidingModule } from 'igniteui-angular';
 import { SharedModule } from './shared/shared.module';
-import { IgxDragDropModule } from '../../projects/igniteui-angular/src/lib/directives/drag-drop/drag-drop.directive';
-import { IgxDividerModule } from '../../projects/igniteui-angular/src/lib/directives/divider/divider.directive';
 
 import { routing } from './routing';
 import { AppComponent } from './app.component';
@@ -84,7 +84,6 @@ import { OverlayAnimationSampleComponent } from './overlay/overlay-animation.sam
 import { RadioSampleComponent } from './radio/radio.sample';
 import { TooltipSampleComponent } from './tooltip/tooltip.sample';
 import { ExpansionPanelSampleComponent } from './expansion-panel/expansion-panel-sample';
-import { DisplayDensityToken, DisplayDensity } from 'projects/igniteui-angular/src/lib/core/displayDensity';
 import { GridRowEditSampleComponent } from './grid-row-edit/grid-row-edit-sample.component';
 import { GridWithTransactionsComponent } from './grid-row-edit/grid-with-transactions.component';
 import { TreeGridSampleComponent } from './tree-grid/tree-grid.sample';
diff --git a/src/app/chips/chips.sample.ts b/src/app/chips/chips.sample.ts
@@ -1,6 +1,8 @@
-import { Component, ViewChild, ViewChildren, ChangeDetectorRef, ElementRef } from '@angular/core';
-import { IgxChipsAreaComponent, IgxChipComponent } from 'igniteui-angular';
-import { IChipSelectEventArgs, IChipsAreaReorderEventArgs, IBaseChipEventArgs } from 'projects/igniteui-angular/src/lib/chips';
+import { Component, ViewChild, ChangeDetectorRef, ElementRef } from '@angular/core';
+import {
+    IgxChipsAreaComponent, IgxChipComponent, IChipSelectEventArgs,
+    IChipsAreaReorderEventArgs, IBaseChipEventArgs
+} from 'igniteui-angular';
 
 @Component({
     selector: 'app-chips-sample',
diff --git a/src/app/grid-external-filtering/grid-external-filtering.sample.ts b/src/app/grid-external-filtering/grid-external-filtering.sample.ts
@@ -1,7 +1,6 @@
 import { Component, ViewChild, OnInit, AfterViewInit, ChangeDetectorRef } from '@angular/core';
 import { IgxGridComponent, FilteringExpressionsTree, IgxStringFilteringOperand,
-    FilteringLogic, IgxCheckboxComponent, IChangeCheckboxEventArgs } from 'igniteui-angular';
-import { FilterMode } from 'projects/igniteui-angular/src/lib/grids/common/enums';
+    FilteringLogic, IgxCheckboxComponent, IChangeCheckboxEventArgs, FilterMode } from 'igniteui-angular';
 
 @Component({
     providers: [],
diff --git a/src/app/grid-filtering/grid-filtering.sample.ts b/src/app/grid-filtering/grid-filtering.sample.ts
@@ -1,7 +1,6 @@
 import { Component, ViewChild, OnInit, AfterViewInit } from '@angular/core';
 import { IgxGridComponent, FilteringExpressionsTree, IgxStringFilteringOperand,
-    FilteringLogic, IgxCheckboxComponent, IChangeCheckboxEventArgs } from 'igniteui-angular';
-import { FilterMode } from 'projects/igniteui-angular/src/lib/grids/common/enums';
+    FilteringLogic, IgxCheckboxComponent, IChangeCheckboxEventArgs, FilterMode } from 'igniteui-angular';
 
 @Component({
     providers: [],
diff --git a/src/app/grid-groupby/grid-groupby.sample.ts b/src/app/grid-groupby/grid-groupby.sample.ts
@@ -1,10 +1,10 @@
 import { Component, ViewChild, OnInit, Inject } from '@angular/core';
 
-import { IgxGridComponent,
-    SortingDirection,
-    ISortingExpression,
-    DefaultSortingStrategy } from 'igniteui-angular';
-import { DisplayDensity, IDisplayDensityOptions, DisplayDensityToken } from 'projects/igniteui-angular/src/lib/core/density';
+import {
+    IgxGridComponent, SortingDirection, ISortingExpression,
+    DefaultSortingStrategy, DisplayDensity, IDisplayDensityOptions, DisplayDensityToken
+} from 'igniteui-angular';
+
 @Component({
     providers: [{ provide: DisplayDensityToken, useValue: { displayDensity: DisplayDensity.compact} }],
     selector: 'app-grid-sample',
diff --git a/src/app/grid-multi-row-layout/grid-mrl.sample.html b/src/app/grid-multi-row-layout/grid-mrl.sample.html
@@ -4,9 +4,10 @@
         <div class="density-chooser" style="margin-bottom: 16px">
             <igx-buttongroup [values]="displayDensities" (onSelect)="selectDensity($event)" style="display: block; width: 500px"></igx-buttongroup>
         </div>
-        <igx-grid [showToolbar]="true"  [columnHiding] = "true" [columnPinning]='true' [rowEditable]="true" [rowSelectable]="false" [primaryKey]="'PostalCode'" #grid [data]="data" [displayDensity]="density" [width]="'100%'" [height]="'500px'" [rowEditable]="true" >
+        <igx-grid #grid [data]="data"  [showToolbar]="true"  [columnHiding] = "true" [columnPinning]='true' [rowEditable]="true" [rowSelectable]="false"
+                primaryKey="PostalCode" [displayDensity]="density" [width]="'100%'" [height]="'500px'">
             <igx-column-layout field='group1'>
-                <igx-column [groupable]="true" [rowStart]="1" [colStart]="1" [rowEnd]="4" field="ID" [width]="'800px'"  [groupable]='true' ></igx-column>
+                <igx-column [groupable]="true" [rowStart]="1" [colStart]="1" [rowEnd]="4" field="ID" [width]="'800px'"></igx-column>
             </igx-column-layout>
             <igx-column-layout field='group2'>
                 <igx-column editable="true" [rowStart]="1" [colStart]="1" [colEnd]="3" field="CompanyName" [width]="'300px'"></igx-column>
diff --git a/src/app/grid-percentage-columns/grid-percantge-widths.sample.html b/src/app/grid-percentage-columns/grid-percantge-widths.sample.html
@@ -14,7 +14,8 @@
                     {{val | date:'dd/MM/yyyy'}}
                 </ng-template>
             </igx-column>
-            <igx-column field="Discontinued" [movable]="true" [resizable]="true"  header="Discontinued" width="15%" [dataType]="'boolean'" [sortable]="false" [hasSummary]="false" [editable]="true" [filterable]="false" [resizable]="true">
+            <igx-column field="Discontinued" [movable]="true" [resizable]="true"  header="Discontinued" width="15%" [dataType]="'boolean'"
+                [sortable]="false" [hasSummary]="false" [editable]="true" [filterable]="false">
             </igx-column>
             <igx-column field="ReorderLevel" header="Reorder Level" [movable]="true" [resizable]="true" [dataType]="'number'" width="19%" [sortable]="false" [hasSummary]="false" [editable]="true" >
                 <ng-template igxCellEditor let-cell="cell">
diff --git a/src/app/grid-row-edit/grid-row-edit-sample.component.html b/src/app/grid-row-edit/grid-row-edit-sample.component.html
@@ -103,8 +103,8 @@ <h4>Cancel Grid Edit Events</h4>
                     <igx-column width="100px" field="ProductID" [editable]="false" [filterable]="true" [sortable]="true"
                         header="Product ID"></igx-column>
                     <igx-column width="100px" field="ReorderLevel" [filterable]="true" [sortable]="true" header="ReorderLever"
-                        [dataType]="'number'" [hasSummary]="summaryFlag" [hidden]="hideFlag" [filterable]="true"
-                        [sortable]="true" editable="true"></igx-column>
+                        [dataType]="'number'" [hasSummary]="summaryFlag" [hidden]="hideFlag" editable="true">
+                    </igx-column>
                     <igx-column width="100px" field="ProductName" [filterable]="true" [sortable]="true" header="ProductName"
                         [hidden]="hideFlag" [dataType]="'string'" editable="true"></igx-column>
                     <igx-column width="100px" field="UnitsInStock" header="UnitsInStock" [dataType]="'number'">
diff --git a/src/app/grid-toolbar/grid-toolbar.sample.ts b/src/app/grid-toolbar/grid-toolbar.sample.ts
@@ -1,6 +1,5 @@
 import { Component, OnInit, ViewChild  } from '@angular/core';
-import { IgxGridComponent, IgxCsvExporterService, IgxExcelExporterService, IgxColumnComponent } from 'igniteui-angular';
-import { DisplayDensity } from 'projects/igniteui-angular/src/lib/core/displayDensity';
+import { IgxGridComponent, IgxCsvExporterService, IgxExcelExporterService, IgxColumnComponent, DisplayDensity } from 'igniteui-angular';
 
 @Component({
     selector: 'app-grid-toolbar-sample',
diff --git a/src/app/hierarchical-grid/hierarchical-grid.sample.html b/src/app/hierarchical-grid/hierarchical-grid.sample.html
@@ -4,7 +4,8 @@ <h4 class="sample-title">Sample One</h4>
         <igx-buttongroup [values]="displayDensities" (onSelect)="selectDensity($event)" style="display: block; width: 500px"></igx-buttongroup>
     </div>
     <button igxButton="raised" (click)="getState()">Get state</button>
-    <igx-hierarchical-grid [(hierarchicalState)]="hgridState" [showExpandAll]='true' [hasChildrenKey]='"hasChild"' class="hgrid" [allowFiltering]='true' #grid1 [data]="localData" [displayDensity]="density" [rowSelectable]="true" [autoGenerate]="false" [allowFiltering]='true'  [paging]="true"
+    <igx-hierarchical-grid #grid1 [data]="localData" [(hierarchicalState)]="hgridState" [showExpandAll]='true' [hasChildrenKey]='"hasChild"' class="hgrid"
+        [displayDensity]="density" [rowSelectable]="true" [autoGenerate]="false" [allowFiltering]='true'  [paging]="true"
         [height]="'600px'" [width]="'800px'" [expandChildren]="rootExpanded" #hGrid>
         <igx-column field="ID" [resizable]="true" [pinned]="true" [filterable]='true'></igx-column>
         <igx-column-group header="Information">
diff --git a/src/app/input-group/input-group-child.sample.ts b/src/app/input-group/input-group-child.sample.ts
@@ -1,5 +1,5 @@
 import { Component, Inject } from '@angular/core';
-import { DisplayDensityToken, DisplayDensity, IDisplayDensityOptions } from 'projects/igniteui-angular/src/lib/core/displayDensity';
+import { DisplayDensityToken, DisplayDensity, IDisplayDensityOptions } from 'igniteui-angular';
 
 @Component({
     // tslint:disable-next-line:component-selector
diff --git a/src/app/input-group/input-group-fluent.sample.ts b/src/app/input-group/input-group-fluent.sample.ts
@@ -1,5 +1,5 @@
 import { Component, Inject } from '@angular/core';
-import { DisplayDensityToken, DisplayDensity, IDisplayDensityOptions } from 'projects/igniteui-angular/src/lib/core/displayDensity';
+import { DisplayDensityToken, DisplayDensity, IDisplayDensityOptions } from 'igniteui-angular';
 
 @Component({
     // tslint:disable-next-line:component-selector
diff --git a/tsconfig.json b/tsconfig.json
@@ -21,7 +21,8 @@
             "igniteui-angular": [
                 "projects/igniteui-angular/src/public_api.ts"
             ]
-        }
+        },
+        "rootDir": "."
     },
     "exclude": [
         "dist"
@@ -41,5 +42,8 @@
         "preserveConstEnums": true,
         "stripInternal": true,
         "readme": "none"
+    },
+    "angularCompilerOptions": {
+        "generateDeepReexports": true
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1136,7 +1136,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas`
`1136`	`1136`	`* @hidden @internal`
`1137`	`1137`	`*/`
`1138`	`1138`	`public ngOnInit() {`
`1139`		`- this.ngControl = this._injector.get<NgControl>(NgControl as Type<NgControl>, null);`
	`1139`	`+ this.ngControl = this._injector.get<NgControl>(NgControl, null);`
`1140`	`1140`	`this._overlaySettings.positionStrategy.settings.target = this.elementRef.nativeElement;`
`1141`	`1141`	`this.selection.set(this.id, new Set());`
`1142`	`1142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ export class IgxSelectComponent extends IgxDropDownComponent implements IgxSelec`
`345`	`345`	`* @hidden @internal`
`346`	`346`	`*/`
`347`	`347`	`public ngOnInit() {`
`348`		`- this.ngControl = this._injector.get<NgControl>(NgControl as Type<NgControl>, null);`
	`348`	`+ this.ngControl = this._injector.get<NgControl>(NgControl, null);`
`349`	`349`	`}`
`350`	`350`
`351`	`351`	`/**`