Merge pull request #2195 from IgniteUI/vNext-copy

Merge master

Author: zdrawku

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "igniteui-live-editing-samples"]
 	path = igniteui-live-editing-samples
 	url = https://github.com/IgniteUI/igniteui-live-editing-samples
-    branch = master
+    branch = master

angular.json

@@ -32,7 +32,7 @@
               "budgets": [
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "500kb"
+                  "maximumWarning": "700kb"
                 }
               ],
               "optimization": true,
@@ -55,7 +55,7 @@
               "budgets": [
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "500kb"
+                  "maximumWarning": "700kb"
                 }
               ],
               "tsConfig": "src/tsconfig-es5.app.json"
@@ -167,16 +167,16 @@
                 },
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "500kb",
-                  "maximumError": "500kb"
+                  "maximumWarning": "700kb",
+                  "maximumError": "700kb"
                 }
               ]
             },
             "es5": {
               "budgets": [
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "500kb"
+                  "maximumWarning": "700kb"
                 }
               ],
               "tsConfig": "projects/app-lob/tsconfig-es5.app.json"

live-editing/configs/GridConfigGenerator.ts

@@ -51,6 +51,7 @@ import { GridFilteringStyleComponent } from "../../src/app/grid/grid-filtering-s
 import { FilteringTemplateSampleComponent } from "../../src/app/grid/grid-filtering-template-sample/grid-filtering-template-sample.component";
 import { GridGroupByPagingSampleComponent } from "../../src/app/grid/grid-group-by-paging-sample/grid-group-by-paging-sample.component";
 import { GridGroupBySampleComponent } from "../../src/app/grid/grid-groupby-sample/grid-groupby-sample.component";
+import { GridGroupByCustomSampleComponent } from "../../src/app/grid/grid-groupby-custom-sample/grid-groupby-custom-sample.component";
 import { GridGroupByStyling } from "../../src/app/grid/grid-groupby-styling/grid-groupby-styling.component";
 import { GridGroupBySummarySampleComponent } from "../../src/app/grid/grid-groupby-summary-sample/grid-groupby-summary-sample.component";
 import { GridGroupBySummaryStylingSampleComponent } from "../../src/app/grid/grid-groupby-summary-styling-sample/grid-groupby-summary-styling-sample.component";
@@ -65,6 +66,7 @@ import { GridMultiRowLayoutStylingComponent } from "../../src/app/grid/grid-mult
 import { GridMultiRowLayoutComponent } from "../../src/app/grid/grid-multi-row-layout/grid-multi-row-layout.component";
 import { GridMultipleRowDragComponent } from "../../src/app/grid/grid-multiple-row-drag/grid-multiple-row-drag.component";
 import { GridNestedDataBindComponent } from "../../src/app/grid/grid-nested-data-binding/grid-nested-data-bind";
+import { GridNestedDataBindAminoacidComponent } from "../../src/app/grid/grid-nested-data-binding-2/grid-nested-data-bind2";
 import { GridPagerSampleComponent } from "../../src/app/grid/grid-pager-sample/grid-pager-sample.component";
 import { PagingSampleComponent } from "../../src/app/grid/grid-paging-sample/grid-paging-sample.component";
 import { RemoteFilteringSampleComponent } from "../../src/app/grid/grid-remote-filtering-sample/remote-filtering-sample.component";
@@ -114,7 +116,7 @@ import { RemoteServiceVirt } from "../../src/app/grid/services/remoteService";
 import { AppModuleConfig } from "./core/AppModuleConfig";
 import { Config } from "./core/Config";
 import { IConfigGenerator } from "./core/IConfigGenerator";
-
+import {GridSortingIndicatorsComponent} from '../../src/app/grid/grid-sorting-indicators/grid-sorting-indicators.component'
 export class GridConfigGenerator implements IConfigGenerator {
     public generateConfigs(): Config[] {
         const configs = new Array<Config>();
@@ -146,6 +148,17 @@ export class GridConfigGenerator implements IConfigGenerator {
             })
         }));
 
+        configs.push(new Config({
+            component: GridGroupByCustomSampleComponent,
+            additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/data/invoiceData.ts"],
+            appModuleConfig: new AppModuleConfig({
+                imports: [IgxButtonModule, IgxGridModule,
+                    IgxSwitchModule, GridGroupBySampleComponent, IgxIconModule, IgxBadgeModule, IgxPreventDocumentScrollModule],
+                ngDeclarations: [GridGroupBySampleComponent],
+                ngImports: [IgxPreventDocumentScrollModule, IgxButtonModule, IgxGridModule, IgxIconModule, IgxBadgeModule]
+            })
+        }));
+
         configs.push(new Config({
             component: GridGroupBySampleComponent,
             additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/data/invoiceData.ts"],
@@ -162,10 +175,10 @@ export class GridConfigGenerator implements IConfigGenerator {
             additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/data/invoiceData.ts"],
             appModuleConfig: new AppModuleConfig({
                 imports: [IgxButtonModule, IgxButtonGroupModule, IgxGridModule,
-                    IgxSwitchModule, GridGroupBySummarySampleComponent, IgxIconModule, IgxBadgeModule, IgxPreventDocumentScrollModule],
+                    IgxSwitchModule, GridGroupBySummarySampleComponent, IgxIconModule, IgxBadgeModule, IgxPreventDocumentScrollModule, IgxSwitchModule],
                 ngDeclarations: [GridGroupBySummarySampleComponent],
                 ngImports: [IgxPreventDocumentScrollModule, IgxButtonModule, IgxButtonGroupModule, IgxGridModule,
-                    IgxIconModule, IgxBadgeModule]
+                    IgxIconModule, IgxBadgeModule, IgxSwitchModule]
             })
         }));
 
@@ -628,7 +641,7 @@ export class GridConfigGenerator implements IConfigGenerator {
             })
         }));
 
-        //Grid with Action Strip
+        // Grid with Action Strip
         configs.push(new Config({
             component: GridActionStripSampleComponent,
             additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/data/nwindData.ts", "/src/app/data/utils.ts",
@@ -838,6 +851,16 @@ export class GridConfigGenerator implements IConfigGenerator {
             })
         }));
 
+        configs.push(new Config({
+            component: GridNestedDataBindAminoacidComponent,
+            additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/grid/grid-nested-data-binding-2/data.ts"],
+            appModuleConfig: new AppModuleConfig({
+                imports: [GridNestedDataBindAminoacidComponent, IgxGridModule, IgxPreventDocumentScrollModule],
+                ngDeclarations: [GridNestedDataBindAminoacidComponent],
+                ngImports: [IgxPreventDocumentScrollModule, IgxGridModule]
+            })
+        }));
+
         configs.push(new Config({
             component: GridCompositeDataComponent,
             additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/data/customers.ts"],
@@ -1230,6 +1253,17 @@ export class GridConfigGenerator implements IConfigGenerator {
             })
         }));
 
+        configs.push(new Config({
+            component: GridSortingIndicatorsComponent,
+            additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/data/utils.ts", "/src/app/grid/services/financialData.ts"],
+            appModuleConfig: new AppModuleConfig({
+                imports: [GridSortingIndicatorsComponent, IgxGridModule, IgxPreventDocumentScrollModule],
+                ngDeclarations: [GridSortingIndicatorsComponent],
+                ngImports: [IgxPreventDocumentScrollModule, IgxGridModule],
+                ngProviders: []
+            })
+        }));
+
         return configs;
     }
 }

live-editing/configs/HierarchicalGridConfigGenerator.ts

@@ -73,6 +73,8 @@ import { RemoteLoDService } from "../../src/app/hierarchical-grid/services/remot
 import { AppModuleConfig } from "./core/AppModuleConfig";
 import { Config } from "./core/Config";
 import { IConfigGenerator } from "./core/IConfigGenerator";
+import { HGridSaveStateComponent } from "../../src/app/hierarchical-grid/hierarchical-grid-save-state/hGrid-state.component";
+import { HGridAboutComponent } from "../../src/app/hierarchical-grid/hierarchical-grid-save-state/about.component";
 import { HierarchicalGridExternalOutletComponent } from "../../src/app/hierarchical-grid/hierarchical-grid-external-outlet/hierarchical-grid-external-outlet-sample.component";
 
 export class HierarchicalGridConfigGenerator implements IConfigGenerator {
@@ -763,6 +765,17 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
             component: HGridRemotePagingDefaultTemplateComponent
         }));
 
+        configs.push(new Config({
+            additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/hierarchical-grid/data.ts"],
+            appModuleConfig: new AppModuleConfig({
+                imports: [IgxHierarchicalGridModule, HGridSaveStateComponent, HGridAboutComponent, IgxPreventDocumentScrollModule],
+                ngDeclarations: [HGridSaveStateComponent, HGridAboutComponent],
+                ngImports: [IgxPreventDocumentScrollModule, IgxHierarchicalGridModule, HttpClientModule,
+                    "RouterModule.forRoot([\{component: HGridAboutComponent, path: 'hGrid-state-about'},\{component: HGridSaveStateComponent, path: 'hGrid-state'},\{ path: '', redirectTo: '/hGrid-state', pathMatch: 'full' }])]"]
+            }),
+            component: HGridSaveStateComponent
+        }));
+
         configs.push(new Config({
             additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/hierarchical-grid/data.ts"],
             appModuleConfig: new AppModuleConfig({

live-editing/configs/NavbarConfigGenerator.ts

@@ -8,6 +8,7 @@ import { NavbarComponent } from "../../src/app/menus/navbar/navbar.component";
 import { AppModuleConfig } from "./core/AppModuleConfig";
 import { Config } from "./core/Config";
 import { IConfigGenerator } from "./core/IConfigGenerator";
+import { NavbarCustomTitleComponent } from "../../src/app/menus/navbar/navbar-custom-title/navbar-custom-title.component";
 
 export class NavbarConfigGenerator implements IConfigGenerator {
     public generateConfigs(): Config[] {
@@ -63,6 +64,16 @@ export class NavbarConfigGenerator implements IConfigGenerator {
             shortenComponentPathBy: "/menus/navbar/"
         }));
 
+        configs.push(new Config({
+            component: NavbarCustomTitleComponent,
+            appModuleConfig: new AppModuleConfig({
+                imports: [IgxIconModule, IgxNavbarModule, NavbarCustomTitleComponent],
+                ngDeclarations: [NavbarCustomTitleComponent],
+                ngImports: [IgxIconModule, IgxNavbarModule]
+            }),
+            shortenComponentPathBy: "/menus/navbar/"
+        }));
+
         return configs;
     }
 }

live-editing/configs/TreeGridConfigGenerator.ts

@@ -64,6 +64,8 @@ import { TreeGridRowPinningStylingSampleComponent } from "../../src/app/tree-gri
 import { TreeGridRowPinningSampleComponent } from "../../src/app/tree-grid/tree-grid-row-pinning/tree-grid-row-pinning.component";
 import { TreeGridRowReorderComponent } from "../../src/app/tree-grid/tree-grid-row-reorder/tree-grid-row-reorder.component";
 import { TreeGridRightPinningSampleComponent } from "../../src/app/tree-grid/tree-grid-sample-right-pinning/tree-grid-right-pinning.component";
+import { TGridSaveStateComponent } from "../../src/app/tree-grid/tree-grid-save-state/tGrid-state.component";
+import { TGridAboutComponent } from "../../src/app/tree-grid/tree-grid-save-state/about.component";
 import { TreeGridSearchSampleComponent } from "../../src/app/tree-grid/tree-grid-search-sample/tree-grid-search-sample.component";
 import { TreeGridSelectionSampleComponent } from "../../src/app/tree-grid/tree-grid-selection-sample/tree-grid-selection-sample.component";
 import { TreeGridSelectionTemplateNumbersSampleComponent } from "../../src/app/tree-grid/tree-grid-selection-template-numbers/tree-grid-selection-template-numbers.component";
@@ -521,7 +523,7 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
             shortenComponentPathBy: "/tree-grid/"
         }));
 
-        // TreeGrid Summay Styling sample
+        // TreeGrid Summary Styling sample
         configs.push(new Config({
             additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/tree-grid/data/foods.ts"],
             appModuleConfig: new AppModuleConfig({
@@ -537,9 +539,9 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
         configs.push(new Config({
             additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/tree-grid/data/foods.ts"],
             appModuleConfig: new AppModuleConfig({
-                imports: [IgxPreventDocumentScrollModule, IgxButtonModule, IgxButtonGroupModule, IgxTreeGridModule, TreeGridSummary2SampleComponent, IgxIconModule],
+                imports: [IgxPreventDocumentScrollModule, IgxButtonModule, IgxButtonGroupModule, IgxTreeGridModule, TreeGridSummary2SampleComponent, IgxIconModule, IgxSwitchModule],
                 ngDeclarations: [TreeGridSummary2SampleComponent],
-                ngImports: [IgxPreventDocumentScrollModule, IgxButtonModule, IgxButtonGroupModule, IgxTreeGridModule, IgxIconModule]
+                ngImports: [IgxPreventDocumentScrollModule, IgxButtonModule, IgxButtonGroupModule, IgxTreeGridModule, IgxIconModule, IgxSwitchModule]
             }),
             component: TreeGridSummary2SampleComponent,
             shortenComponentPathBy: "/tree-grid/"
@@ -997,6 +999,18 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
             shortenComponentPathBy: "/tree-grid/"
         }));
 
+        configs.push(new Config({
+            additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/projects/app-lob/src/app/tree-grid/tree-grid-childdatakey-sample/data.ts"],
+            appModuleConfig: new AppModuleConfig({
+                imports: [IgxPreventDocumentScrollModule, IgxTreeGridModule, TGridSaveStateComponent, TGridAboutComponent],
+                ngDeclarations: [TGridSaveStateComponent, TGridAboutComponent],
+                ngImports: [IgxPreventDocumentScrollModule, IgxTreeGridModule,
+                    "RouterModule.forRoot([\{component: TGridAboutComponent, path: 'tree-grid-about'},\{component: TGridSaveStateComponent, path: 'tree-grid-state'},\{ path: '', redirectTo: '/tree-grid-state', pathMatch: 'full' }])]"]
+            }),
+            component: TGridSaveStateComponent,
+            shortenComponentPathBy: "/tree-grid/"
+        }));
+
         configs.push(new Config({
             additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/tree-grid/data/foods.ts"],
             appModuleConfig: new AppModuleConfig({
@@ -1005,7 +1019,6 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
                 ngImports: [IgxPreventDocumentScrollModule, IgxTreeGridModule, IgxToggleModule]
             }),
             component: TreeGridExternalOutletComponent,
-
             shortenComponentPathBy: "/tree-grid/"
         }));
 

live-editing/services/DependencyResolver.ts

@@ -23,6 +23,10 @@ const SHARED_DEV_DEPENDENCIES = {
     "typescript": ""
 };
 
+const DEPENDENCIES_WITH_FIXED_VERSION = {
+    "tslib": "1.13.0"
+};
+
 const SHARED_DEPENDENCIES = [
     "@angular/common",
     "@angular/compiler",
@@ -117,7 +121,6 @@ export class DevDependencyResolver {
 
     public get devDependencies() {
         const result = {};
-        
         for (let key in this._devDependencies) {
             if (key in SHARED_DEV_DEPENDENCIES) {
                     let version = this._devDependencies[key];
@@ -207,7 +210,10 @@ export class DependencyResolver {
         for (let key in packageFileDependencies) {
             if (dependencies.has(key)) {
                 if (this._specificVersionPackages.has(key)) {
-                    let version = packageFileDependencies[key];
+                    let version =  DEPENDENCIES_WITH_FIXED_VERSION[key] ?? packageFileDependencies[key];
+                    packageFileDependencies[key] = version.replace("~", "").replace("^", "");
+                } else if (typeof DEPENDENCIES_WITH_FIXED_VERSION[key] !== "undefined") {
+                    let version =  DEPENDENCIES_WITH_FIXED_VERSION[key];
                     packageFileDependencies[key] = version.replace("~", "").replace("^", "");
                 }
             } else {

package-lock.json

@@ -55,7 +55,7 @@
     "domino": "^2.1.4",
     "file-saver": "^2.0.2",
     "hammerjs": "^2.0.8",
-    "igniteui-angular": "10.0.6",
+    "igniteui-angular": "10.1.0",
     "igniteui-angular-charts": "^9.1.2",
     "igniteui-angular-core": "^9.1.2",
     "igniteui-angular-excel": "^9.1.2",

package.json

@@ -28,7 +28,7 @@
 
 
 :host ::ng-deep {
-    @include igx-fluent-theme($fluent-excel-palette);
+    @include igx-fluent-light-theme($fluent-excel-palette);
 
     .grid-chart-contextmenu-wrapper {
         igx-grid {
@@ -226,4 +226,4 @@
 
 .more-action{
     padding-top: 0.8rem;
-}
+}