Skip to content

Commit 651a12d

Browse files
authored
Merge branch 'vNext' into fix-pinning-sample
2 parents e915095 + 45971e0 commit 651a12d

3 files changed

Lines changed: 9 additions & 6 deletions

File tree

live-editing/configs/GridConfigGenerator.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,9 +506,10 @@ export class GridConfigGenerator implements IConfigGenerator {
506506
component: 'GridMultiColumnHeadersExportComponent',
507507
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/customers.ts'],
508508
appModuleConfig: new AppModuleConfig({
509-
imports: ['GridMultiColumnHeadersExportComponent', 'IgxGridModule', 'IgxPreventDocumentScrollModule'],
509+
imports: ['GridMultiColumnHeadersExportComponent', 'IgxGridModule', 'IgxPreventDocumentScrollModule', 'IgxExcelExporterService'],
510510
ngDeclarations: ['GridMultiColumnHeadersExportComponent'],
511-
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule']
511+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule'],
512+
ngProviders: ['IgxExcelExporterService']
512513
})
513514
}));
514515

live-editing/configs/HierarchicalGridConfigGenerator.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,9 +415,10 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
415415
configs.push(new Config({
416416
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/hierarchical-data.ts'],
417417
appModuleConfig: new AppModuleConfig({
418-
imports: ['IgxHierarchicalGridModule', 'HGridMultiColumnHeadersExportComponent', 'IgxPreventDocumentScrollModule'],
418+
imports: ['IgxHierarchicalGridModule', 'HGridMultiColumnHeadersExportComponent', 'IgxPreventDocumentScrollModule', 'IgxExcelExporterService'],
419419
ngDeclarations: ['HGridMultiColumnHeadersExportComponent'],
420-
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule']
420+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule'],
421+
ngProviders: ['IgxExcelExporterService']
421422
}),
422423
component: 'HGridMultiColumnHeadersExportComponent'
423424
}));

live-editing/configs/TreeGridConfigGenerator.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,9 +382,10 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
382382
component: 'TreeGridMultiColumnHeadersExportComponent',
383383
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/tree-grid/data/employees-flat-detailed.ts'],
384384
appModuleConfig: new AppModuleConfig({
385-
imports: ['TreeGridMultiColumnHeadersExportComponent', 'IgxTreeGridModule', 'IgxPreventDocumentScrollModule'],
385+
imports: ['TreeGridMultiColumnHeadersExportComponent', 'IgxTreeGridModule', 'IgxPreventDocumentScrollModule', 'IgxExcelExporterService'],
386386
ngDeclarations: ['TreeGridMultiColumnHeadersExportComponent'],
387-
ngImports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule']
387+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule'],
388+
ngProviders: ['IgxExcelExporterService']
388389
})
389390
}));
390391

0 commit comments

Comments
 (0)