Skip to content

Commit e15ba2a

Browse files
author
Konstantin Dinev
authored
Merge branch 'vNext' into kdragieva/3170-calendar-localization-sample-on-vNext
2 parents 11c41fd + f0c7dd0 commit e15ba2a

33 files changed

Lines changed: 543 additions & 266 deletions

File tree

‎live-editing/configs/GridConfigGenerator.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1356,9 +1356,9 @@ export class GridConfigGenerator implements IConfigGenerator {
13561356

13571357
],
13581358
appModuleConfig: new AppModuleConfig({
1359-
imports: ['GridValidatorServiceComponent', 'IgxGridModule', 'IgxFocusModule', 'IgxPreventDocumentScrollModule'],
1359+
imports: ['GridValidatorServiceComponent', 'IgxGridModule', 'IgxFocusModule', 'IgxPreventDocumentScrollModule', 'IgxSwitchModule'],
13601360
ngDeclarations: ['GridValidatorServiceComponent'],
1361-
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxFocusModule']
1361+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxFocusModule', 'IgxSwitchModule']
13621362
})
13631363
}));
13641364

@@ -1416,7 +1416,7 @@ export class GridConfigGenerator implements IConfigGenerator {
14161416
appModuleConfig: new AppModuleConfig({
14171417
imports: ['IgxGridModule', 'GridSummaryExportComponent', 'IgxPreventDocumentScrollModule', 'IgxExcelExporterService'],
14181418
ngDeclarations: ['GridSummaryExportComponent'],
1419-
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxExcelExporterService'],
1419+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule'],
14201420
ngProviders: ['IgxExcelExporterService']
14211421
})
14221422
}));

‎live-editing/configs/HierarchicalGridConfigGenerator.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
342342
}));
343343

344344
configs.push(new Config({
345-
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/hierarchical-data.ts'],
345+
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/hierarchical-data.ts', '/src/app/services/svgIcons.ts'],
346346
appModuleConfig: new AppModuleConfig({
347347
imports: ['IgxHierarchicalGridModule', 'HGridPinningSampleComponent', 'IgxPreventDocumentScrollModule'],
348348
ngDeclarations: ['HGridPinningSampleComponent'],
@@ -942,9 +942,9 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
942942
'/src/app/data/hierarchical-data.ts'
943943
],
944944
appModuleConfig: new AppModuleConfig({
945-
imports: ['HierarchicalGridValidatorServiceComponent', 'IgxHierarchicalGridModule', 'IgxPreventDocumentScrollModule'],
945+
imports: ['HierarchicalGridValidatorServiceComponent', 'IgxHierarchicalGridModule', 'IgxPreventDocumentScrollModule', 'IgxSwitchModule'],
946946
ngDeclarations: ['HierarchicalGridValidatorServiceComponent'],
947-
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule']
947+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'IgxSwitchModule']
948948
})
949949
}));
950950

@@ -1005,7 +1005,7 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
10051005
appModuleConfig: new AppModuleConfig({
10061006
imports: ['IgxHierarchicalGridModule', 'HGridSummaryExportComponent', 'IgxPreventDocumentScrollModule', 'IgxExcelExporterService'],
10071007
ngDeclarations: ['HGridSummaryExportComponent'],
1008-
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'IgxExcelExporterService'],
1008+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule'],
10091009
ngProviders: ['IgxExcelExporterService']
10101010
}),
10111011
component: 'HGridSummaryExportComponent'

‎live-editing/configs/TreeGridConfigGenerator.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
221221

222222
// TreeGrid Column Pinning sample
223223
configs.push(new Config({
224-
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/tree-grid/data/employees-flat-detailed.ts'],
224+
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/tree-grid/data/employees-flat-detailed.ts', '/src/app/services/svgIcons.ts'],
225225
appModuleConfig: new AppModuleConfig({
226226
imports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'TreeGridColumnPinningSampleComponent', 'IgxIconModule'],
227227
ngDeclarations: ['TreeGridColumnPinningSampleComponent'],
@@ -1155,9 +1155,9 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
11551155
],
11561156
appModuleConfig: new AppModuleConfig({
11571157
imports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'TreeGridValidatorServiceComponent',
1158-
'IgxButtonModule'],
1158+
'IgxButtonModule', 'IgxSwitchModule'],
11591159
ngDeclarations: ['TreeGridValidatorServiceComponent'],
1160-
ngImports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'IgxButtonModule']
1160+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'IgxButtonModule', 'IgxSwitchModule']
11611161
})
11621162
}));
11631163

@@ -1206,7 +1206,7 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
12061206
appModuleConfig: new AppModuleConfig({
12071207
imports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'TreeGridSummaryExportComponent', 'IgxIconModule', 'IgxExcelExporterService'],
12081208
ngDeclarations: ['TreeGridSummaryExportComponent'],
1209-
ngImports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'IgxIconModule', 'IgxExcelExporterService'],
1209+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'IgxIconModule'],
12101210
ngProviders: ['IgxExcelExporterService']
12111211
}),
12121212
component: 'TreeGridSummaryExportComponent',

‎package-lock.json‎

Lines changed: 46 additions & 46 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@
6363
"domino": "^2.1.4",
6464
"file-saver": "^2.0.2",
6565
"hammerjs": "^2.0.8",
66-
"igniteui-angular": "^15.0.0-rc.0",
66+
"igniteui-angular": "^15.0.0",
6767
"igniteui-angular-charts": "^14.0.0",
6868
"igniteui-angular-core": "^14.0.0",
6969
"igniteui-angular-i18n": "^14.2.0",
7070
"igniteui-dockmanager": "^1.8.0",
71-
"igniteui-live-editing": "^2.0.4",
72-
"igniteui-theming": "^1.1.3",
71+
"igniteui-live-editing": "^2.0.5",
72+
"igniteui-theming": "^1.1.4",
7373
"igniteui-webcomponents": "^3.4.0",
7474
"immediate": "^3.2.3",
7575
"intl": "^1.2.5",
@@ -90,7 +90,7 @@
9090
"@angular/cli": "^15.0.0",
9191
"@angular/compiler-cli": "^15.0.0",
9292
"@angular/language-service": "^15.0.0",
93-
"@igniteui/angular-schematics": "^14.0.1001",
93+
"@igniteui/angular-schematics": "15.0.1100",
9494
"@juggle/resize-observer": "^3.3.1",
9595
"@types/jasmine": "^3.10.2",
9696
"@types/jasminewd2": "^2.0.9",

‎src/app/grid/grid-sample-pinning/grid-pinning.component.html‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
<div class="grid__wrapper" style='width: 100%;'>
22
<igx-grid [igxPreventDocumentScroll]="true" #grid1 [data]="data" [width]="'100%'" [height]="'480px'">
3-
<igx-column #col *ngFor="let c of columns" [field]="c.field" [header]="c.header" [width]="c.width" [pinned]='c.pinned'
4-
[hidden]='c.hidden' [headerClasses]="'customHeaderSyle'">
3+
<igx-column #col *ngFor="let c of columns" [field]="c.field" [header]="c.header" [width]="c.width"
4+
[pinned]='c.pinned' [hidden]='c.hidden' [headerClasses]="'customHeaderSyle'">
55
<ng-template igxHeader>
66
<div class="title-inner">
7-
<span style="float:left">{{col.header}}</span>
8-
<igx-icon class="pin-icon" family="filtering-icons" name="{{col.pinned ? 'unpin' : 'pin'}}" (click)="toggleColumn(col)"></igx-icon>
7+
<span class="header-text">{{col.header}}</span>
8+
<igx-icon class="pin-icon" [class.pinned]="col.pinned" [class.unpinned]="!col.pinned"
9+
family="filtering-icons" name="{{col.pinned ? 'unpin' : 'pin'}}" (click)="toggleColumn(col)">
10+
</igx-icon>
911
</div>
1012
</ng-template>
1113
</igx-column>
1214
</igx-grid>
13-
</div>
15+
</div>

0 commit comments

Comments
 (0)