Skip to content

Commit f3e7f82

Browse files
DiyanDimitrovDiyanDimitrov
authored
Merge branch 'vNext' into teodosiah/add-multiplecascade-to-tree-grid-selection-sample
2 parents 8088824 + d42944c commit f3e7f82

File tree

158 files changed

+8981
-268
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+8981
-268
lines changed

‎live-editing/configs/AvatarConfigGenerator.ts

+10
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,16 @@ export class AvatarConfigGenerator implements IConfigGenerator {
2626
shortenComponentPathBy: "/layouts/avatar/"
2727
}));
2828

29+
configs.push(new Config({
30+
component: 'AvatarCSSVariablesComponent',
31+
appModuleConfig: new AppModuleConfig({
32+
imports: ['IgxAvatarModule', 'AvatarCSSVariablesComponent'],
33+
ngDeclarations: ['AvatarCSSVariablesComponent'],
34+
ngImports: ['IgxAvatarModule']
35+
}),
36+
shortenComponentPathBy: "/layouts/avatar/"
37+
}));
38+
2939
return configs;
3040
}
3141
}

‎live-editing/configs/ExportExcelConfigGenerator.ts

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ export class ExportExcelConfigGenerator implements IConfigGenerator {
2424

2525
configs.push(new Config({
2626
component: 'ExcelExportSample1Component',
27+
additionalFiles: ["/src/app/services/export-excel/data/invoiceData.ts"],
2728
appModuleConfig: new AppModuleConfig({
2829
imports: ['IgxGridModule', 'IgxExcelExporterService', 'ExcelExportSample1Component', 'IgxButtonModule'],
2930
ngDeclarations: ['ExcelExportSample1Component'],

‎live-editing/configs/GridConfigGenerator.ts

+20
Original file line numberDiff line numberDiff line change
@@ -1224,6 +1224,26 @@ export class GridConfigGenerator implements IConfigGenerator {
12241224
})
12251225
}));
12261226

1227+
configs.push(new Config({
1228+
component: 'GridSelectComponent',
1229+
additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/grid/grid-select/data.ts", "/src/app/grid/grid-select/characters.ts"],
1230+
appModuleConfig: new AppModuleConfig({
1231+
imports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxSelectModule', 'GridSelectComponent' ],
1232+
ngDeclarations: ['GridSelectComponent'],
1233+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxSelectModule'],
1234+
})
1235+
}));
1236+
1237+
configs.push(new Config({
1238+
component: 'GridFormattedFilteringStrategyComponent',
1239+
additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/data/nwindData.ts"],
1240+
appModuleConfig: new AppModuleConfig({
1241+
imports: ['GridFormattedFilteringStrategyComponent', 'IgxGridModule', 'IgxPreventDocumentScrollModule'],
1242+
ngDeclarations: ['GridFormattedFilteringStrategyComponent'],
1243+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule']
1244+
})
1245+
}));
1246+
12271247
return configs;
12281248
}
12291249
}

‎live-editing/configs/HierarchicalGridConfigGenerator.ts

+13-2
Original file line numberDiff line numberDiff line change
@@ -719,15 +719,15 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
719719

720720
const hGridSaveStateSampleConfig = new Config({
721721
additionalFiles: [
722-
"/src/app/directives/prevent-scroll.directive.ts",
722+
"/src/app/directives/prevent-scroll.directive.ts",
723723
"/src/app/hierarchical-grid/data.ts",
724724
"/src/app/hierarchical-grid/hierarchical-grid-save-state/about.component.ts",
725725
"/src/app/hierarchical-grid/hierarchical-grid-save-state/about.component.html"
726726
],
727727
appModuleConfig: new AppModuleConfig({
728728
imports: ['IgxHierarchicalGridModule', 'HGridSaveStateComponent', 'HGridAboutComponent', 'IgxPreventDocumentScrollModule', 'Router', 'RouterModule'],
729729
ngDeclarations: ['HGridSaveStateComponent', 'HGridAboutComponent'],
730-
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule',
730+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule',
731731
"RouterModule.forRoot([\{component: HGridAboutComponent, path: 'hGrid-state-about'},\{component: HGridSaveStateComponent, path: 'hGrid-state'},\{ path: '', redirectTo: '/hGrid-state', pathMatch: 'full' }])"]
732732
}),
733733
component: 'HGridSaveStateComponent'
@@ -781,6 +781,17 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
781781
component: 'HGridAddRowSampleComponent'
782782
}));
783783

784+
configs.push(new Config({
785+
additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/hierarchical-grid/data.ts"],
786+
appModuleConfig: new AppModuleConfig({
787+
imports: ['IgxHierarchicalGridModule', 'HGridFormattedFilteringStrategyComponent', 'IgxPreventDocumentScrollModule'],
788+
ngDeclarations: ['HGridFormattedFilteringStrategyComponent'],
789+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule']
790+
}),
791+
component: 'HGridFormattedFilteringStrategyComponent'
792+
}));
793+
794+
784795
return configs;
785796
}
786797
}

‎live-editing/configs/TreeGridConfigGenerator.ts

+11
Original file line numberDiff line numberDiff line change
@@ -1004,6 +1004,17 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
10041004
shortenComponentPathBy: "/tree-grid/"
10051005
}));
10061006

1007+
configs.push(new Config({
1008+
additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/tree-grid/data/foods.ts"],
1009+
appModuleConfig: new AppModuleConfig({
1010+
imports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'TreeGridFormattedFilteringStrategyComponent'],
1011+
ngDeclarations: ['TreeGridFormattedFilteringStrategyComponent'],
1012+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule']
1013+
}),
1014+
component: 'TreeGridFormattedFilteringStrategyComponent',
1015+
shortenComponentPathBy: "/tree-grid/"
1016+
}));
1017+
10071018
return configs;
10081019
}
10091020
}

‎package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"domino": "^2.1.4",
5959
"file-saver": "^2.0.2",
6060
"hammerjs": "^2.0.8",
61-
"igniteui-angular": "^11.1.0-alpha.0",
61+
"igniteui-angular": "^11.1.0-alpha.8",
6262
"igniteui-angular-charts": "^10.1.4",
6363
"igniteui-angular-core": "^10.1.4",
6464
"igniteui-angular-excel": "^9.1.2",

‎projects/app-crm/src/app/grid-crm/grid-crm.component.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@
3636
</div>
3737
<div class="caseSensitiveButton">
3838
<button igxButton="icon" igxRipple [igxRippleCentered]="true" (click)="updateSearch()" [igxButtonBackground]="caseSensitive? 'rgb(73, 180, 254)' : 'transparent'">
39-
<igx-icon class="caseSensitiveIcon" fontSet="material">text_fields</igx-icon>
39+
<igx-icon class="caseSensitiveIcon" family="material">text_fields</igx-icon>
4040
</button>
4141
</div>
4242
<div class="searchButtons">
4343
<button igxButton="icon" igxRipple [igxRippleCentered]="true" (click)="grid1.findPrev(searchText, caseSensitive)">
44-
<igx-icon fontSet="material">navigate_before</igx-icon>
44+
<igx-icon family="material">navigate_before</igx-icon>
4545
</button>
4646
<button igxButton="icon" igxRipple [igxRippleCentered]="true" (click)="grid1.findNext(searchText, caseSensitive)">
47-
<igx-icon fontSet="material">navigate_next</igx-icon>
47+
<igx-icon family="material">navigate_next</igx-icon>
4848
</button>
4949
</div>
5050
</igx-suffix>

‎projects/app-crm/src/app/grid-crm/grid-crm.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ export class GridCRMComponent implements OnInit, AfterViewInit {
133133
if (args.field === 'Deals') { args.cancel = true; }
134134
};
135135

136-
this.excelExporter.onColumnExport.subscribe(exporterCb);
137-
this.csvExporter.onColumnExport.subscribe(exporterCb);
136+
this.excelExporter.columnExporting.subscribe(exporterCb);
137+
this.csvExporter.columnExporting.subscribe(exporterCb);
138138
}
139139

140140
public ngOnInit() {

‎projects/app-lob/src/app/grid-dynamic-chart-data/data-analysis-dock-manager/data-analysis-dock-manager.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
<span *ngIf="contextmenu" class="analytics-btn" [ngStyle]="{'left.px': contextmenuX, 'top.px': contextmenuY}"
129129
(click)="toggleContextDialog(button)">
130130
<button #button igxButton="icon">
131-
<igx-icon #icon style="pointer-events: none;" class="icon" fontSet="material">insert_chart_outlined</igx-icon>
131+
<igx-icon #icon style="pointer-events: none;" class="icon" family="material">insert_chart_outlined</igx-icon>
132132
</button>
133133
</span>
134134

‎projects/app-lob/src/app/grid-dynamic-chart-data/data-analysis-dock-manager/data-analysis-dock-manager.component.ts

-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@ export class DataAnalysisDockManagerComponent implements OnInit, AfterViewInit {
194194

195195
this.gridEventEmitters = merge(this.grid.onFilteringDone,
196196
this.grid.onSortingDone,
197-
this.grid.onPagingDone,
198197
this.grid.onColumnMoving,
199198
this.grid.onColumnPinning,
200199
this.grid.onColumnResized,

‎projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.component.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100

101101
<span *ngIf="contextmenu" class="analytics-btn" [ngStyle]="{'left.px': contextmenuX, 'top.px': contextmenuY}">
102102
<button igxButton="icon" (click)="toggleChartSelectionDialog($event)">
103-
<igx-icon #icon style="pointer-events: none;" class="icon" fontSet="material">insert_chart_outlined</igx-icon>
103+
<igx-icon #icon style="pointer-events: none;" class="icon" family="material">insert_chart_outlined</igx-icon>
104104
</button>
105105
</span>
106106
<!-- this block can be moved in another component -->
@@ -149,7 +149,7 @@
149149
igxButtonBackground="#EBEBEB"
150150
igxButtonColor="black"
151151
style="width: 36px; height: 36px; border-radius: 50px; align-self: center;">
152-
<igx-icon class="icon" style="pointer-events: none;" fontSet="material">more_horiz</igx-icon>
152+
<igx-icon class="icon" style="pointer-events: none;" family="material">more_horiz</igx-icon>
153153
</button>
154154
<span class="name">More...</span>
155155
</div>
@@ -188,7 +188,7 @@ <h5 igxCardHeaderTitle style="justify-self: center;">Preview Chart</h5>
188188
</div>
189189
<span>
190190
<button igxButton="icon" igxRipple (click)="toggle()">
191-
<igx-icon fontSet="material">chevron_{{ opened ? 'right': 'left'}}</igx-icon>
191+
<igx-icon family="material">chevron_{{ opened ? 'right': 'left'}}</igx-icon>
192192
</button>
193193
</span>
194194
<div #configArea class="chart-config-area {{chartCondigAreaState}}">

‎projects/app-lob/src/app/grid-finjs/controllers.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</div>
2222
</div>
2323
<div class="control-item finjs-play-controls">
24-
<igx-buttongroup class="finjssample-btn-group" #buttonGroup1 [multiSelection]="false" [values]="controls" (onSelect)="onButtonSelected($event)"></igx-buttongroup>
24+
<igx-buttongroup class="finjssample-btn-group" #buttonGroup1 [multiSelection]="false" [values]="controls" (selected)="onButtonSelected($event)"></igx-buttongroup>
2525
</div>
2626
</div>
2727
<div class="sample-toolbar">

‎projects/app-lob/src/app/grid-finjs/grid-finjs.component.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<igx-column [field]="'Chart'" [width]="'60px'" [hidden]="false" [filterable]='false'>
6767
<ng-template igxCell let-cell="cell" class="center-text">
6868
<button class="button-icon" igxButton="icon" igxRippleCentered="true" tabindex="-1">
69-
<igx-icon fontSet="material" (click)="chartColumnAction(cell)">insert_chart_outlined</igx-icon>
69+
<igx-icon family="material" (click)="chartColumnAction(cell)">insert_chart_outlined</igx-icon>
7070
</button>
7171
</ng-template>
7272
</igx-column>
@@ -100,7 +100,7 @@
100100
<!-- <igx-column [field]="'Grid'" [width]="'80px'" [hidden]="false" [filterable]='false'>
101101
<ng-template igxCell let-cell="cell" class="center-text">
102102
<button class="button-icon" igxButton="icon" igxRippleCentered="true">
103-
<igx-icon (click)="chartClick(cell)" fontSet="material">table_charttable_chart</igx-icon>
103+
<igx-icon (click)="chartClick(cell)" family="material">table_charttable_chart</igx-icon>
104104
</button>
105105
</ng-template>
106106
</igx-column> -->

‎projects/app-lob/src/app/index/index.component.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<!-- Home -->
1111
<span igxDrawerItem igxRipple routerLink="{{homeRouteItem.path}}" routerLinkActive="igx-nav-drawer__item--active">
1212
<button igxButton="icon" igxRipple igxRippleCentered="true">
13-
<igx-icon fontSet="material">home</igx-icon>
13+
<igx-icon family="material">home</igx-icon>
1414
</button>
1515
{{homeRouteItem.displayName}}
1616
</span>
@@ -30,7 +30,7 @@
3030
<!-- Header -->
3131
<span igxDrawerItem igxRipple routerLinkActive="igx-nav-drawer__item--active" (click)="toggleParent('header' + navItem.name)">
3232
<button igxButton="icon" igxRipple igxRippleCentered="true" style="vertical-align: middle">
33-
<igx-icon fontSet="material">{{convertNodeStateToIcon('header' + navItem.name)}}</igx-icon>
33+
<igx-icon family="material">{{convertNodeStateToIcon('header' + navItem.name)}}</igx-icon>
3434
</button>
3535
<span style="vertical-align: middle">{{navItem.name}}</span>
3636
</span>
@@ -47,7 +47,7 @@
4747
</igx-nav-drawer>
4848

4949
<div igxFlex class="main">
50-
<igx-navbar [title]="selectedDisplayName" actionButtonIcon="menu" (onAction)="navdrawer.toggle()"></igx-navbar>
50+
<igx-navbar [title]="selectedDisplayName" actionButtonIcon="menu" (action)="navdrawer.toggle()"></igx-navbar>
5151
<div class="content">
5252
<router-outlet></router-outlet>
5353
</div>

‎projects/app-lob/src/app/treegrid-finjs/tree-grid-finjs-sample.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</div>
2424
<div class="control-item finjs-play-controls">
2525
<igx-buttongroup class="finjssample-btn-group" #buttonGroup1 [multiSelection]="false" [values]="controls"
26-
(onSelect)="onButtonAction($event)"></igx-buttongroup>
26+
(selected)="onButtonAction($event)"></igx-buttongroup>
2727
</div>
2828

2929
</div>

‎src/app/data-display/chip/chip-area-sample/chip-area-sample.component.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<div class="sample-container">
2-
<igx-chips-area (onReorder)="chipsOrderChanged($event)">
2+
<igx-chips-area (reorder)="chipsOrderChanged($event)">
33
<igx-chip
44
*ngFor="let chip of chipList"
55
[id]="chip.id"
66
[selectable]="true"
77
[selectIcon]="mySelectIcon"
88
[removable]="true"
99
[removeIcon]="myRemoveIcon"
10-
(onRemove)="chipRemoved($event)"
10+
(remove)="chipRemoved($event)"
1111
[draggable]="'true'">
1212
<igx-avatar
1313
class="chip-avatar-resized"

‎src/app/data-display/chip/chip-simple/chip-simple.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[id]="chip.id"
55
[selectable]="true"
66
[removable]="true"
7-
(onRemove)="chipRemoved($event)"
7+
(remove)="chipRemoved($event)"
88
>
99
<igx-icon igxPrefix>{{chip.icon}}</igx-icon>
1010
{{chip.text}}

‎src/app/data-display/chip/chip-styling/chip-styling.component.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<igx-chips-area (onReorder)="chipsOrderChanged($event)">
1+
<igx-chips-area (reorder)="chipsOrderChanged($event)">
22
<igx-chip
33
*ngFor="let chip of chipList"
44
[id]="chip.id"
55
[selectable]="true"
66
[selectIcon]="mySelectIcon"
77
[removable]="true"
88
[removeIcon]="myRemoveIcon"
9-
(onRemove)="chipRemoved($event)"
9+
(remove)="chipRemoved($event)"
1010
[draggable]="'true'">
1111
<igx-icon igxPrefix>{{chip.icon}}</igx-icon>
1212
{{chip.text}}

‎src/app/data-display/circular-progressbar/circular-dynamic-sample/circular-dynamic-sample.component.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
<div class="button-container">
1919
<button igxButton="icon" (click)="decrementProgress()">
20-
<igx-icon fontSet="material">remove</igx-icon>
20+
<igx-icon family="material">remove</igx-icon>
2121
</button>
2222
<button igxButton="icon" (click)="incrementProgress()">
23-
<igx-icon fontSet="material">add</igx-icon>
23+
<igx-icon family="material">add</igx-icon>
2424
</button>
2525
</div>
2626
</div>

‎src/app/data-display/icon/icon-sample-1/icon-sample-1.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
</div>
1717

1818
<div class="icon-sample">
19-
<igx-icon [isActive]="false">search</igx-icon>
19+
<igx-icon [active]="false">search</igx-icon>
2020
</div>
2121
</div>

‎src/app/data-display/icon/icon-sample-4/icon-sample-4.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<igx-icon [isActive]="false">volume_off</igx-icon>
1+
<igx-icon [active]="false">volume_off</igx-icon>

‎src/app/data-display/icon/icon-styling-sample/icon-styling-sample.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
<igx-icon>pin_drop</igx-icon>
1313
</div>
1414
<div class="icon-sample">
15-
<igx-icon [isActive]="false">cloud</igx-icon>
15+
<igx-icon [active]="false">cloud</igx-icon>
1616
</div>
1717
</div>

‎src/app/data-display/icon/material-icons-extended/material-icons-extended.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<div class="sample__grid-item-content">
5656
<igx-icon
5757
class="sample__grid-icon"
58-
fontSet="imx-icons"
58+
family="imx-icons"
5959
name="{{ icon.name }}"
6060
></igx-icon>
6161
<span

‎src/app/data-display/icon/svg-icon-sample/svg-icon-sample.component.html

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<div class="wrapper">
22
<div class="icon-sample">
3-
<igx-icon fontSet="filter-icons" name="contains"></igx-icon>
3+
<igx-icon family="filter-icons" name="contains"></igx-icon>
44
</div>
55
<div class="icon-sample">
6-
<igx-icon fontSet="filter-icons" name="does_not_contain"></igx-icon>
6+
<igx-icon family="filter-icons" name="does_not_contain"></igx-icon>
77
</div>
88
<div class="icon-sample">
9-
<igx-icon fontSet="filter-icons" name="does_not_equal"></igx-icon>
9+
<igx-icon family="filter-icons" name="does_not_equal"></igx-icon>
1010
</div>
1111
<div class="icon-sample">
12-
<igx-icon fontSet="filter-icons" name="ends_with"></igx-icon>
12+
<igx-icon family="filter-icons" name="ends_with"></igx-icon>
1313
</div>
1414
<div class="icon-sample">
15-
<igx-icon fontSet="filter-icons" name="equals"></igx-icon>
15+
<igx-icon family="filter-icons" name="equals"></igx-icon>
1616
</div>
1717
<div class="icon-sample">
18-
<igx-icon fontSet="filter-icons" name="is_empty"></igx-icon>
18+
<igx-icon family="filter-icons" name="is_empty"></igx-icon>
1919
</div>
2020
<div class="icon-sample">
21-
<igx-icon fontSet="filter-icons" name="starts_with"></igx-icon>
21+
<igx-icon family="filter-icons" name="starts_with"></igx-icon>
2222
</div>
2323
</div>

‎src/app/data-display/linear-progressbar/linear-dynamic-sample/linear-dynamic-sample.component.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
<div class="button-container">
88
<button igxButton="icon" (click)="decrementProgress()">
9-
<igx-icon fontSet="material">remove</igx-icon>
9+
<igx-icon family="material">remove</igx-icon>
1010
</button>
1111
<button igxButton="icon" (click)="incrementProgress()">
12-
<igx-icon fontSet="material">add</igx-icon>
12+
<igx-icon family="material">add</igx-icon>
1313
</button>
1414
</div>
1515
</div>

0 commit comments

Comments
 (0)