Skip to content

Commit dc7a116

Browse files
ChronosSFChronosSF
authored
Merge pull request #3445 from IgniteUI/vnext
Merging vnext to master
2 parents 08123f4 + 1b6bc0c commit dc7a116

File tree

246 files changed

+9266
-9421
lines changed

Some content is hidden

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

246 files changed

+9266
-9421
lines changed

‎.github/workflows/build-app-crm.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
strategy:
3131
matrix:
32-
node-version: [18.x, 20.5.x]
32+
node-version: [18.x, 20.x]
3333

3434
# Steps represent a sequence of tasks that will be executed as part of the job
3535
steps:

‎.github/workflows/build-app-lob.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
strategy:
3636
matrix:
37-
node-version: [18.x, 20.5.x]
37+
node-version: [18.x, 20.x]
3838

3939
# Steps represent a sequence of tasks that will be executed as part of the job
4040
steps:

‎ignite-ui-cli.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"project": {
44
"defaultPort": 4200,
55
"framework": "angular",
6-
"projectType": "igx-ts",
6+
"projectType": "igx-ts-legacy",
77
"projectTemplate": "side-nav",
88
"theme": "Custom",
99
"isBundle": false,
@@ -16,4 +16,4 @@
1616
},
1717
"build": {},
1818
"packagesInstalled": true
19-
}
19+
}

‎live-editing/configs/GridConfigGenerator.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -585,9 +585,9 @@ export class GridConfigGenerator implements IConfigGenerator {
585585
component: 'GridConditionalCellStyle2Component',
586586
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/athletesData.ts'],
587587
appModuleConfig: new AppModuleConfig({
588-
imports: ['IgxGridModule', 'GridConditionalCellStyle2Component', 'IgxPreventDocumentScrollModule'],
588+
imports: ['IgxGridModule', 'GridConditionalCellStyle2Component', 'IgxPreventDocumentScrollModule', 'IgxButtonModule', 'IgxInputGroupModule'],
589589
ngDeclarations: ['GridConditionalCellStyle2Component'],
590-
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule']
590+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxButtonModule', 'IgxInputGroupModule']
591591
})
592592
}));
593593

@@ -1345,9 +1345,9 @@ export class GridConfigGenerator implements IConfigGenerator {
13451345
component: 'GridRowStylesComponent',
13461346
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/services/financial.service.ts', '/src/app/data/financialData.ts'],
13471347
appModuleConfig: new AppModuleConfig({
1348-
imports: ['IgxGridModule', 'GridRowStylesComponent', 'IgxPreventDocumentScrollModule', 'FinancialDataService'],
1348+
imports: ['IgxGridModule', 'GridRowStylesComponent', 'IgxPreventDocumentScrollModule', 'IgxBadgeModule', 'FinancialDataService'],
13491349
ngDeclarations: ['GridRowStylesComponent'],
1350-
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule'],
1350+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxBadgeModule'],
13511351
ngProviders: ['FinancialDataService']
13521352
})
13531353
}));

‎live-editing/configs/HierarchicalGridConfigGenerator.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -907,9 +907,9 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
907907
'/src/app/hierarchical-grid/models.ts'],
908908
component: 'HGridRowClassesSampleComponent',
909909
appModuleConfig: new AppModuleConfig({
910-
imports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'HGridRowClassesSampleComponent'],
910+
imports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'IgxIconModule', 'IgxButtonModule', 'HGridRowClassesSampleComponent'],
911911
ngDeclarations: ['HGridRowClassesSampleComponent'],
912-
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule']
912+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'IgxIconModule', 'IgxButtonModule']
913913
})
914914
}));
915915

@@ -918,9 +918,9 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
918918
'/src/app/hierarchical-grid/models.ts'],
919919
component: 'HGridRowStylesSampleComponent',
920920
appModuleConfig: new AppModuleConfig({
921-
imports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'HGridRowStylesSampleComponent'],
921+
imports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'IgxIconModule', 'IgxButtonModule', 'HGridRowStylesSampleComponent'],
922922
ngDeclarations: ['HGridRowStylesSampleComponent'],
923-
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule']
923+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'IgxIconModule', 'IgxButtonModule']
924924
})
925925
}));
926926

‎live-editing/configs/IconButtonConfigGenerator.ts‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
import {IgxButtonGroupModule,
2+
IgxButtonModule,
3+
IgxIconButtonDirective,
4+
IgxIconModule,
5+
IgxRippleModule} from 'igniteui-angular';
6+
import {AppModuleConfig, Config, IConfigGenerator} from 'igniteui-live-editing'
7+
export class IconButtonConfigGenerator implements IConfigGenerator {
8+
public generateConfigs(): Config[] {
9+
const configs = new Array<Config>();
10+
11+
// icon button overview
12+
configs.push(new Config({
13+
component: 'IconButtonOverviewComponent',
14+
appModuleConfig: new AppModuleConfig({
15+
imports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective', 'IconButtonOverviewComponent'],
16+
ngDeclarations: ['IconButtonOverviewComponent'],
17+
ngImports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective']
18+
}),
19+
shortenComponentPathBy: "/data-entries/icon-button/"
20+
}));
21+
22+
// flat icon button
23+
configs.push(new Config({
24+
component: 'FlatIconButtonComponent',
25+
appModuleConfig: new AppModuleConfig({
26+
imports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective', 'FlatIconButtonComponent'],
27+
ngDeclarations: ['FlatIconButtonComponent'],
28+
ngImports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective']
29+
}),
30+
shortenComponentPathBy: "/data-entries/icon-button/"
31+
}));
32+
33+
// contained icon button
34+
configs.push(new Config({
35+
component: 'ContainedIconButtonComponent',
36+
appModuleConfig: new AppModuleConfig({
37+
imports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective', 'ContainedIconButtonComponent'],
38+
ngDeclarations: ['ContainedIconButtonComponent'],
39+
ngImports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective']
40+
}),
41+
shortenComponentPathBy: "/data-entries/icon-button/"
42+
}));
43+
44+
// outlined icon button
45+
configs.push(new Config({
46+
component: 'OutlinedIconButtonComponent',
47+
appModuleConfig: new AppModuleConfig({
48+
imports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective', 'OutlinedIconButtonComponent'],
49+
ngDeclarations: ['OutlinedIconButtonComponent'],
50+
ngImports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective']
51+
}),
52+
shortenComponentPathBy: "/data-entries/icon-button/"
53+
}));
54+
55+
// disabled icon button
56+
configs.push(new Config({
57+
component: 'DisabledIconButtonComponent',
58+
appModuleConfig: new AppModuleConfig({
59+
imports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective', 'DisabledIconButtonComponent'],
60+
ngDeclarations: ['DisabledIconButtonComponent'],
61+
ngImports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective']
62+
}),
63+
shortenComponentPathBy: "/data-entries/icon-button/"
64+
}));
65+
66+
// SVG icon button
67+
configs.push(new Config({
68+
component: 'SVGIconButtonComponent',
69+
appModuleConfig: new AppModuleConfig({
70+
imports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective', 'SVGIconButtonComponent'],
71+
ngDeclarations: ['SVGIconButtonComponent'],
72+
ngImports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective']
73+
}),
74+
shortenComponentPathBy: "/data-entries/icon-button/"
75+
}));
76+
77+
// icon button styling
78+
configs.push(new Config({
79+
component: 'IconButtonStylingComponent',
80+
appModuleConfig: new AppModuleConfig({
81+
imports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective', 'IconButtonStylingComponent'],
82+
ngDeclarations: ['IconButtonStylingComponent'],
83+
ngImports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective']
84+
}),
85+
shortenComponentPathBy: "/data-entries/icon-button/"
86+
}));
87+
88+
// icon button size
89+
configs.push(new Config({
90+
component: 'IconButtonSizeComponent',
91+
appModuleConfig: new AppModuleConfig({
92+
imports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective', 'IconButtonSizeComponent'],
93+
ngDeclarations: ['IconButtonSizeComponent'],
94+
ngImports: ['IgxButtonModule', 'IgxIconModule', 'IgxRippleModule', 'IgxIconButtonDirective']
95+
}),
96+
shortenComponentPathBy: "/data-entries/icon-button/"
97+
}));
98+
99+
return configs;
100+
}
101+
}

‎live-editing/configs/TreeGridConfigGenerator.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -866,9 +866,9 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
866866
component: 'TreeGridConditionalCellStyle2Component',
867867
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/tree-grid/data/orders.ts'],
868868
appModuleConfig: new AppModuleConfig({
869-
imports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'TreeGridConditionalCellStyle2Component'],
869+
imports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'IgxButtonModule', 'IgxInputGroupModule', 'TreeGridConditionalCellStyle2Component'],
870870
ngDeclarations: ['TreeGridConditionalCellStyle2Component'],
871-
ngImports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule']
871+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'IgxButtonModule', 'IgxInputGroupModule']
872872
})
873873
}));
874874

@@ -1072,11 +1072,9 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
10721072
configs.push(new Config({
10731073
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/tree-grid/data/employees-flat.ts', '/src/app/tree-grid/tree-grid-add-row-sample/employee.ts'],
10741074
appModuleConfig: new AppModuleConfig({
1075-
imports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'TreeGridAddRowSampleComponent', 'IgxButtonModule', 'IgxDialogModule',
1076-
'IgxInputGroupModule', 'IgxCheckboxModule', 'IgxDatePickerModule', 'IgxActionStripModule'],
1075+
imports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'TreeGridAddRowSampleComponent', 'IgxIconModule', 'IgxActionStripModule'],
10771076
ngDeclarations: ['TreeGridAddRowSampleComponent'],
1078-
ngImports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'IgxButtonModule', 'IgxDialogModule',
1079-
'IgxInputGroupModule', 'IgxCheckboxModule', 'IgxDatePickerModule', 'IgxActionStripModule']
1077+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'IgxIconModule', 'IgxActionStripModule']
10801078
}),
10811079
component: 'TreeGridAddRowSampleComponent',
10821080
shortenComponentPathBy: '/tree-grid/'

‎live-editing/generators/ConfigGenerators.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import { ForConfigGenerator } from '../configs/ForConfigGenerator';
2828
import { GridConfigGenerator } from '../configs/GridConfigGenerator';
2929
import { HierarchicalGridConfigGenerator } from '../configs/HierarchicalGridConfigGenerator';
3030
import { IconConfigGenerator } from '../configs/IconConfigGenerator';
31+
import { IconButtonConfigGenerator } from '../configs/IconButtonConfigGenerator';
3132
import { InputGroupConfigGenerator } from '../configs/InputGroupConfigGenerator';
3233
import { LayoutConfigGenerator } from '../configs/LayoutConfigGenerator';
3334
import { LinearProgressbarConfigGenerator } from '../configs/LinearProgressbarConfigGenerator';
@@ -99,6 +100,7 @@ export const CONFIG_GENERATORS =
99100
DateRangePickerConfigGenerator,
100101
DateTimeEditorConfigGenerator,
101102
DropDownConfigGenerator,
103+
IconButtonConfigGenerator,
102104
InputGroupConfigGenerator,
103105
MaskConfigGenerator,
104106
MonthPickerConfigGenerator,

0 commit comments

Comments
 (0)