Skip to content

Commit adbffe2

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Merge from master.
2 parents 35b3378 + e0af43d commit adbffe2

File tree

58 files changed

+2053
-396
lines changed

Some content is hidden

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

58 files changed

+2053
-396
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ script:
2222
- npm run lint:lib
2323
- ng build igniteui-angular --prod
2424
- npm run build:style
25+
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib:perf; fi
2526
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib:others; fi
2627
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib:grid; fi
2728
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib:tgrid; fi

CHANGELOG.md

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,37 @@ For more information about the theming please read our [documentation](https://w
3232
- `uniqueColumnValuesStrategy` input is added. This property provides a callback for loading unique column values on demand. If this property is provided, the unique values it generates will be used by the Excel Style Filtering (instead of using the unique values from the data that is bound to the grid).
3333
- `igxExcelStyleLoading` directive is added, which can be used to provide a custom loading template for the Excel Style Filtering. If this property is not provided, a default loading template will be used instead.
3434
- introduced new properties `cellSelection` and `rowSelection` which accept GridSelection mode enumeration. Grid selection mode could be none, single or multiple. Also `hideRowSelectors` property is added, which allows you to show and hide row selectors when row selection is enabled.
35+
- introduced functionality for templating row and header selectors - [spec](https://github.com/IgniteUI/igniteui-angular/wiki/Row-Selection-Templating-(Grid-feature))
36+
```html
37+
<igx-grid [data]="data", [rowSelection]="'multiple'" primaryKey="ID">
38+
<igx-column field="Name"></igx-column>
39+
<igx-column field="Age"></igx-column>
40+
41+
<ng-template igxHeadSelector let-headSelector>
42+
<igx-icon>done_all</igx-icon>
43+
</ng-template>
44+
<ng-template igxRowSelector let-rowContext>
45+
<igx-switch [checked]="rowContext.selected"></igx-switch>
46+
</ng-template>
47+
</igx-grid>
48+
```
3549
- `IgxHierarchicalGrid`
3650
- Row Islands now emit child grid events with an additional argument - `owner`, which holds reference to the related child grid component instance.
3751
- `IgxDrag`
3852
- Dragging without ghost. Now it is possible to drag the base element `igxDrag` is instanced on by setting the new input `ghost` to false.
3953
- Ghost template. A custom ghost template reference can be provided on the new `ghostTemplate` input.
40-
- Dragging using a single or multiple handles. New `igxDragHandle` directive is exposed to specify a handle by which and element can be interacted with instead of the whole element `igxDrag` is instanced on.
54+
- Dragging using a single or multiple handles. New `igxDragHandle` directive is exposed to specify a handle by which an element can be interacted with instead of the whole element `igxDrag` is instanced on.
4155
- Linking of drag and drop elements. This can be achieved by using the new provided `dragChannel` input, specifying each element to which channel it corresponds.
4256
- Drag animation improvements. Three new methods have been exposed in place of the old `animateToOrigin` input in order to provide more flexibility when wanting to have transition animation to specific position when dropping. `setLocation`, `transitionToOrigin` and `transitionTo` are all methods that provide a various way to animate a transition to a specific location for the dragged element.
4357
- New getters - `location` and `originLocation` to aid in applying transition animations.
4458
- New outputs - `dragMove`, `ghostCreate` and `ghostDestroy`
4559
- `IgxDrop`
4660
- Linking of drag and drop elements. This can be achieved by using the new provided `dropChannel` input, specifying each drop area to which channel it corresponds.
4761
- Drop strategies. Three new drop strategies have been provided - Append, Prepend and Insert. Also an input `dropStrategy` to the `igxDrop` which specify which strategy should be used when dropping an element inside the drop area. Custom one can be specified as well.
62+
- `IgxCheckbox`
63+
- introduced a new `readonly` property that doesn't allow user interaction to change the state, but keeps the default active style. Intended for integration in complex controls that handle the interaction and control the checkbox instead through binding.
64+
- `IgxOverlay`
65+
- introduced a new `ContainerPositionStrategy`. The new strategy positions the element inside the containing outlet based on the directions passed in trough PositionSettings.
4866

4967
### General
5068
- `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
@@ -76,10 +94,6 @@ For more information about the theming please read our [documentation](https://w
7694
```
7795
- **Breaking Change** When using `[valueKey]`, combo methods, events and outputs **cannot** be handled with *data item references*.
7896
- For more information, visit the component's [readme](https://github.com/IgniteUI/igniteui-angular/tree/master/projects/igniteui-angular/src/lib/combo/README.md)
79-
80-
## 8.1.4
81-
- `IgxDialog` new @Input `positionSettings` is now available. It provides the ability to get/set both position and animation settings of the Dialog component.
82-
8397
- `IgxDrag`
8498
- Deprecated inputs - `hideBaseOnDrag`, `animateOnRelease`, `visible`.
8599
- Deprecated methods - `dropFinished`.
@@ -95,10 +109,13 @@ For more information about the theming please read our [documentation](https://w
95109
- **Breaking Change** `onOver` output is renamed to `over`.
96110
- **Breaking Change** `onLeave` output is renamed to `leave`.
97111
- **Breaking Change** `onDrop` output is renamed to `dropped`.
98-
- **Breaking Change** Interfaces `IgxDropEnterEventArgs`, `IgxDropLeaveEventArgs` are both now called `IDragBaseEventArgs`.
112+
- **Breaking Change** Interfaces `IgxDropEnterEventArgs`, `IgxDropLeaveEventArgs` are both now called `IDropBaseEventArgs`.
99113
- **Breaking Change** Interfaces `IgxDropEventArgs` is renamed to `IDropDroppedEventArgs`.
100114
- **Breaking Change** Outputs `enter`, `over`, `leave`(former `onEnter`, `onOver`, `onLeave`) now have arguments of type `IDropBaseEventArgs`
101115
- **Breaking Change** Output `dropped` (former `onDrop`) now have arguments of type `IDropDroppedEventArgs`
116+
117+
## 8.1.4
118+
- `IgxDialog` new @Input `positionSettings` is now available. It provides the ability to get/set both position and animation settings of the Dialog component.
102119

103120
## 8.1.3
104121
- `IgxCombo`

package-lock.json

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

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"lint": "ng lint",
1010
"e2e": "ng e2e",
1111
"test:lib": "ng test igniteui-angular --watch=false --no-progress --code-coverage",
12+
"test:lib:perf": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.test-perf.conf.js",
1213
"test:lib:azure": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.conf.js",
1314
"test:lib:grid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.grid.conf.js",
1415
"test:lib:tgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.tree-grid.conf.js",

projects/igniteui-angular/karma.azure.conf.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
module.exports = function (config) {
55
config.set({
66
basePath: '',
7-
frameworks: ['jasmine', '@angular-devkit/build-angular'],
7+
frameworks: ['jasmine', 'jasmine-spec-tags', '@angular-devkit/build-angular'],
88
files: [
99
{ pattern: '../../node_modules/hammerjs/hammer.min.js', watched: false },
1010
{ pattern: '../../node_modules/hammer-simulator/index.js', watched: false },
@@ -14,6 +14,7 @@ module.exports = function (config) {
1414
plugins: [
1515
require('karma-jasmine'),
1616
require('karma-chrome-launcher'),
17+
require('karma-jasmine-spec-tags'),
1718
require('karma-junit-reporter'),
1819
require('karma-coverage-istanbul-reporter'),
1920
require('karma-spec-reporter'),
@@ -23,7 +24,9 @@ module.exports = function (config) {
2324
clearContext: false, // leave Jasmine Spec Runner output visible in browser
2425
jasmine: {
2526
random: false
26-
}
27+
},
28+
tagPrefix: '#',
29+
skipTags: 'perf'
2730
},
2831
coverageIstanbulReporter: {
2932
dir: require('path').join(__dirname, '../../coverage'),

projects/igniteui-angular/karma.azure.grid.conf.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ module.exports = function (config) {
2626
random: false
2727
},
2828
tagPrefix: '#',
29-
tags: 'grid'
29+
tags: 'grid',
30+
skipTags: 'perf'
3031
},
3132
coverageIstanbulReporter: {
3233
dir: require('path').join(__dirname, '../../coverage/grid'),

projects/igniteui-angular/karma.azure.non-grid.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ module.exports = function (config) {
2626
random: false
2727
},
2828
tagPrefix: '#',
29-
skipTags: 'hGrid,tGrid,grid'
29+
skipTags: 'hGrid,tGrid,grid,perf'
3030
},
3131
coverageIstanbulReporter: {
3232
dir: require('path').join(__dirname, '../../coverage/non-grid'),

projects/igniteui-angular/karma.conf.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
module.exports = function (config) {
55
config.set({
66
basePath: '',
7-
frameworks: ['jasmine', '@angular-devkit/build-angular'],
7+
frameworks: ['jasmine', 'jasmine-spec-tags', '@angular-devkit/build-angular'],
88
files: [
99
{ pattern: '../../node_modules/hammerjs/hammer.min.js', watched: false },
1010
{ pattern: '../../node_modules/hammer-simulator/index.js', watched: false },
@@ -14,6 +14,7 @@ module.exports = function (config) {
1414
plugins: [
1515
require('karma-jasmine'),
1616
require('karma-chrome-launcher'),
17+
require('karma-jasmine-spec-tags'),
1718
require('karma-jasmine-html-reporter'),
1819
require('karma-coverage-istanbul-reporter'),
1920
require('karma-spec-reporter'),
@@ -23,7 +24,9 @@ module.exports = function (config) {
2324
clearContext: false, // leave Jasmine Spec Runner output visible in browser
2425
jasmine: {
2526
random: false
26-
}
27+
},
28+
tagPrefix: '#',
29+
skipTags: 'perf'
2730
},
2831
coverageIstanbulReporter: {
2932
dir: require('path').join(__dirname, '../../coverage'),

projects/igniteui-angular/karma.grid.conf.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ module.exports = function (config) {
2626
random: false
2727
},
2828
tagPrefix: '#',
29-
tags: 'grid'
29+
tags: 'grid',
30+
skipTags: 'perf'
3031
},
3132
coverageIstanbulReporter: {
3233
dir: require('path').join(__dirname, '../../coverage/grid'),

projects/igniteui-angular/karma.non-grid.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ module.exports = function (config) {
2626
random: false
2727
},
2828
tagPrefix: '#',
29-
skipTags: 'hGrid,tGrid,grid'
29+
skipTags: 'hGrid,tGrid,grid,perf'
3030
},
3131
coverageIstanbulReporter: {
3232
dir: require('path').join(__dirname, '../../coverage/non-grid'),

0 commit comments

Comments
 (0)