Skip to content

Commit 064c301

Browse files
committed
Merge branch 'rkaraivanov/multi-column-headers' of https://github.com/IgniteUI/igniteui-angular into rkaraivanov/multi-column-headers
2 parents 7295941 + d1c373c commit 064c301

File tree

126 files changed

+11521
-1339
lines changed

Some content is hidden

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

126 files changed

+11521
-1339
lines changed

CHANGELOG.md

+20-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
All notable changes for each version of this project will be documented in this file.
44
## 6.1.0
5+
- `igxOverlay` service added. **igxOverlayService** allows you to show any component above all elements in page. For more detailed information see the [official documentation](https://www.infragistics.com/products/ignite-ui-angular/angular/components/overlay.html)
56
- Added `column moving` feature to `igxGrid`, enabled on a per-column level. **Column moving** allows you to reorder the `igxGrid` columns via standard drag/drop mouse or touch gestures.
67
For more detailed information see the [official documentation](https://www.infragistics.com/products/ignite-ui-angular/angular/components/grid_column_moving.html).
78
- `igxGrid` filtering operands
@@ -47,29 +48,46 @@ export class IgxCustomFilteringOperand extends IgxFilteringOperand {
4748
}
4849
```
4950

51+
- `igxGrid` now supports grouping of columns enabling users to create critera for organizing data records. To explore the functionality start off by setting some columns as `groupable`:
52+
```html
53+
<igx-grid [data]="data">
54+
<igx-column [field]="'ProductName'"></igx-column>
55+
<igx-column [field]="'ReleaseDate'" [groupable]="true"></igx-column>
56+
</igx-grid>
57+
```
58+
For more information, please head over to `igxGrid`'s [ReadMe](https://github.com/IgniteUI/igniteui-angular/blob/master/src/grid/README.md) or the [official documentation](https://www.infragistics.com/products/ignite-ui-angular/angular/components/grid_groupby.html).
59+
60+
- `igxGrid` theme now has support for alternating grid row background and text colors.
5061
- `igxColumn` changes:
5162
- **Breaking change** filteringExpressions property is removed.
5263

64+
- `igxCell` default editing template is changed according column data type. For more information you can read the [specification](https://github.com/IgniteUI/igniteui-angular/wiki/Cell-Editing) or the [official documentation](https://www.infragistics.com/products/ignite-ui-angular/angular/components/grid_editing.html)
65+
5366
- `igxToggle` changes
5467
- `onOpening` event added.
5568
- `onClosing` event added.
5669

5770
- **Breaking changes**:
5871
- Removed submodule imports. All imports are now resolved from the top level `igniteui-angular` package.
72+
- `igxGrid` changes:
73+
- sort API now accepts params of type `ISortingExpression` or `Array<ISortingExpression>`.
5974
- `igxToggle` changes
6075
- `onOpen` event renamed to `onOpened`.
6176
- `onClose` event renamed to `onClosed`.
6277
- **Breaking change** All properties that were named `isDisabled` have been renamed to `disabled` in order to acheive consistency across our component suite. This affects: date-picker, input directive, input-group, dropdown-item, tabbar and time-picker.
6378

79+
## 6.0.3
80+
- **igxGrid** exposing the `filteredSortedData` method publicly - returns the grid data with current filtering and sorting applied.
81+
6482
## 6.0.2
6583
- **igxGrid** Improve scrolling on mac [#1563](https://github.com/IgniteUI/igniteui-angular/pull/1563)
6684
- The `ng update igniteui-angular` migration schematics now also update the theme import path in SASS files. [#1582](https://github.com/IgniteUI/igniteui-angular/issues/1582)
6785

6886
## 6.0.1
6987
- Introduced migration schematics to integrate with the Angular CLI update command. You can now run
70-
88+
7189
`ng update igniteui-angular`
72-
90+
7391
in existing projects to both update the package and apply any migrations needed to your project. Make sure to commit project state before proceeding.
7492
Currently these cover converting submodule imports as well as the deprecation of `igxForRemote` and rename of `igx-tab-bar` to `igx-bottom-nav` from 6.0.0.
7593
- **Breaking changes**:

angular.json

+156-154
Original file line numberDiff line numberDiff line change
@@ -1,162 +1,164 @@
11
{
2-
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3-
"version": 1,
4-
"newProjectRoot": "projects",
5-
"projects": {
6-
"igniteui-dev-demos": {
7-
"root": "",
8-
"sourceRoot": "src",
9-
"projectType": "application",
10-
"prefix": "app",
11-
"schematics": {},
12-
"architect": {
13-
"build": {
14-
"builder": "@angular-devkit/build-angular:browser",
15-
"options": {
16-
"outputPath": "dist/igniteui-dev-demos",
17-
"index": "src/index.html",
18-
"main": "src/main.ts",
19-
"polyfills": "src/polyfills.ts",
20-
"tsConfig": "src/tsconfig.app.json",
21-
"assets": [
22-
"src/favicon.ico",
23-
"src/assets"
24-
],
25-
"styles": [
26-
"src/styles.css"
27-
],
28-
"scripts": []
29-
},
30-
"configurations": {
31-
"production": {
32-
"fileReplacements": [
33-
{
34-
"replace": "src/environments/environment.ts",
35-
"with": "src/environments/environment.prod.ts"
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"version": 1,
4+
"newProjectRoot": "projects",
5+
"projects": {
6+
"igniteui-dev-demos": {
7+
"root": "",
8+
"sourceRoot": "src",
9+
"projectType": "application",
10+
"prefix": "app",
11+
"schematics": {
12+
"@schematics/angular:component": {
13+
"styleext": "scss"
14+
}
15+
},
16+
"architect": {
17+
"build": {
18+
"builder": "@angular-devkit/build-angular:browser",
19+
"options": {
20+
"outputPath": "dist/igniteui-dev-demos",
21+
"index": "src/index.html",
22+
"main": "src/main.ts",
23+
"polyfills": "src/polyfills.ts",
24+
"tsConfig": "src/tsconfig.app.json",
25+
"assets": [
26+
"src/favicon.ico",
27+
"src/assets"
28+
],
29+
"styles": [
30+
"src/styles/igniteui-theme.scss"
31+
],
32+
"scripts": []
33+
},
34+
"configurations": {
35+
"production": {
36+
"fileReplacements": [{
37+
"replace": "src/environments/environment.ts",
38+
"with": "src/environments/environment.prod.ts"
39+
}],
40+
"optimization": true,
41+
"outputHashing": "all",
42+
"sourceMap": false,
43+
"extractCss": true,
44+
"namedChunks": false,
45+
"aot": true,
46+
"extractLicenses": true,
47+
"vendorChunk": false,
48+
"buildOptimizer": true
49+
}
50+
}
51+
},
52+
"serve": {
53+
"builder": "@angular-devkit/build-angular:dev-server",
54+
"options": {
55+
"browserTarget": "igniteui-dev-demos:build"
56+
},
57+
"configurations": {
58+
"production": {
59+
"browserTarget": "igniteui-dev-demos:build:production"
60+
}
61+
}
62+
},
63+
"extract-i18n": {
64+
"builder": "@angular-devkit/build-angular:extract-i18n",
65+
"options": {
66+
"browserTarget": "igniteui-dev-demos:build"
67+
}
68+
},
69+
"test": {
70+
"builder": "@angular-devkit/build-angular:karma",
71+
"options": {
72+
"main": "src/test.ts",
73+
"polyfills": "src/polyfills.ts",
74+
"tsConfig": "src/tsconfig.spec.json",
75+
"karmaConfig": "src/karma.conf.js",
76+
"styles": [
77+
"src/styles.css"
78+
],
79+
"scripts": [],
80+
"assets": [
81+
"src/favicon.ico",
82+
"src/assets"
83+
]
84+
}
85+
},
86+
"lint": {
87+
"builder": "@angular-devkit/build-angular:tslint",
88+
"options": {
89+
"tsConfig": [
90+
"src/tsconfig.app.json",
91+
"src/tsconfig.spec.json"
92+
],
93+
"exclude": [
94+
"**/node_modules/**"
95+
]
96+
}
3697
}
37-
],
38-
"optimization": true,
39-
"outputHashing": "all",
40-
"sourceMap": false,
41-
"extractCss": true,
42-
"namedChunks": false,
43-
"aot": true,
44-
"extractLicenses": true,
45-
"vendorChunk": false,
46-
"buildOptimizer": true
4798
}
48-
}
4999
},
50-
"serve": {
51-
"builder": "@angular-devkit/build-angular:dev-server",
52-
"options": {
53-
"browserTarget": "igniteui-dev-demos:build"
54-
},
55-
"configurations": {
56-
"production": {
57-
"browserTarget": "igniteui-dev-demos:build:production"
100+
"igniteui-dev-demos-e2e": {
101+
"root": "e2e/",
102+
"projectType": "application",
103+
"architect": {
104+
"e2e": {
105+
"builder": "@angular-devkit/build-angular:protractor",
106+
"options": {
107+
"protractorConfig": "e2e/protractor.conf.js",
108+
"devServerTarget": "igniteui-dev-demos:serve"
109+
}
110+
},
111+
"lint": {
112+
"builder": "@angular-devkit/build-angular:tslint",
113+
"options": {
114+
"tsConfig": "e2e/tsconfig.e2e.json",
115+
"exclude": [
116+
"**/node_modules/**"
117+
]
118+
}
119+
}
58120
}
59-
}
60-
},
61-
"extract-i18n": {
62-
"builder": "@angular-devkit/build-angular:extract-i18n",
63-
"options": {
64-
"browserTarget": "igniteui-dev-demos:build"
65-
}
66-
},
67-
"test": {
68-
"builder": "@angular-devkit/build-angular:karma",
69-
"options": {
70-
"main": "src/test.ts",
71-
"polyfills": "src/polyfills.ts",
72-
"tsConfig": "src/tsconfig.spec.json",
73-
"karmaConfig": "src/karma.conf.js",
74-
"styles": [
75-
"src/styles.css"
76-
],
77-
"scripts": [],
78-
"assets": [
79-
"src/favicon.ico",
80-
"src/assets"
81-
]
82-
}
83-
},
84-
"lint": {
85-
"builder": "@angular-devkit/build-angular:tslint",
86-
"options": {
87-
"tsConfig": [
88-
"src/tsconfig.app.json",
89-
"src/tsconfig.spec.json"
90-
],
91-
"exclude": [
92-
"**/node_modules/**"
93-
]
94-
}
95-
}
96-
}
97-
},
98-
"igniteui-dev-demos-e2e": {
99-
"root": "e2e/",
100-
"projectType": "application",
101-
"architect": {
102-
"e2e": {
103-
"builder": "@angular-devkit/build-angular:protractor",
104-
"options": {
105-
"protractorConfig": "e2e/protractor.conf.js",
106-
"devServerTarget": "igniteui-dev-demos:serve"
107-
}
108121
},
109-
"lint": {
110-
"builder": "@angular-devkit/build-angular:tslint",
111-
"options": {
112-
"tsConfig": "e2e/tsconfig.e2e.json",
113-
"exclude": [
114-
"**/node_modules/**"
115-
]
116-
}
117-
}
118-
}
119-
},
120-
"igniteui-angular": {
121-
"root": "projects/igniteui-angular",
122-
"sourceRoot": "projects/igniteui-angular/src",
123-
"projectType": "library",
124-
"prefix": "lib",
125-
"architect": {
126-
"build": {
127-
"builder": "@angular-devkit/build-ng-packagr:build",
128-
"options": {
129-
"tsConfig": "projects/igniteui-angular/tsconfig.lib.json",
130-
"project": "projects/igniteui-angular/ng-package.json"
131-
},
132-
"configurations": {
133-
"production": {
134-
"project": "projects/igniteui-angular/ng-package.prod.json"
122+
"igniteui-angular": {
123+
"root": "projects/igniteui-angular",
124+
"sourceRoot": "projects/igniteui-angular/src",
125+
"projectType": "library",
126+
"prefix": "lib",
127+
"architect": {
128+
"build": {
129+
"builder": "@angular-devkit/build-ng-packagr:build",
130+
"options": {
131+
"tsConfig": "projects/igniteui-angular/tsconfig.lib.json",
132+
"project": "projects/igniteui-angular/ng-package.json"
133+
},
134+
"configurations": {
135+
"production": {
136+
"project": "projects/igniteui-angular/ng-package.prod.json"
137+
}
138+
}
139+
},
140+
"test": {
141+
"builder": "@angular-devkit/build-angular:karma",
142+
"options": {
143+
"main": "projects/igniteui-angular/src/test.ts",
144+
"tsConfig": "projects/igniteui-angular/tsconfig.spec.json",
145+
"karmaConfig": "projects/igniteui-angular/karma.conf.js"
146+
}
147+
},
148+
"lint": {
149+
"builder": "@angular-devkit/build-angular:tslint",
150+
"options": {
151+
"tsConfig": [
152+
"projects/igniteui-angular/tsconfig.lib.json",
153+
"projects/igniteui-angular/tsconfig.spec.json"
154+
],
155+
"exclude": [
156+
"**/node_modules/**"
157+
]
158+
}
159+
}
135160
}
136-
}
137-
},
138-
"test": {
139-
"builder": "@angular-devkit/build-angular:karma",
140-
"options": {
141-
"main": "projects/igniteui-angular/src/test.ts",
142-
"tsConfig": "projects/igniteui-angular/tsconfig.spec.json",
143-
"karmaConfig": "projects/igniteui-angular/karma.conf.js"
144-
}
145-
},
146-
"lint": {
147-
"builder": "@angular-devkit/build-angular:tslint",
148-
"options": {
149-
"tsConfig": [
150-
"projects/igniteui-angular/tsconfig.lib.json",
151-
"projects/igniteui-angular/tsconfig.spec.json"
152-
],
153-
"exclude": [
154-
"**/node_modules/**"
155-
]
156-
}
157161
}
158-
}
159-
}
160-
},
161-
"defaultProject": "igniteui-dev-demos"
162-
}
162+
},
163+
"defaultProject": "igniteui-dev-demos"
164+
}

0 commit comments

Comments
 (0)