Skip to content

Commit b3be451

Browse files
authored
Merge branch 'master' into slider-label-ie11-master
2 parents b37b636 + bcc5ae0 commit b3be451

File tree

123 files changed

+2491
-586
lines changed

Some content is hidden

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

123 files changed

+2491
-586
lines changed

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,20 @@ 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`

ROADMAP.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
## Milestone 9 (Due by September, 2019)
66

77
1. IgxGrid Advanced Filtering [#5496](https://github.com/IgniteUI/igniteui-angular/issues/5496)
8-
2. IgxGrid row and cell selection modes [#4989](https://github.com/IgniteUI/igniteui-angular/issues/4989)
9-
3. Fluent Theme [#5335](https://github.com/IgniteUI/igniteui-angular/issues/5335)
10-
4. Drag and Drop enhancements [#5319](https://github.com/IgniteUI/igniteui-angular/issues/5319)
8+
2. **[DONE]** IgxGrid row and cell selection modes [#4989](https://github.com/IgniteUI/igniteui-angular/issues/4989)
9+
3. **[DONE]** Fluent Theme [#5335](https://github.com/IgniteUI/igniteui-angular/issues/5335)
10+
4. **[DONE]** Drag and Drop enhancements [#5319](https://github.com/IgniteUI/igniteui-angular/issues/5319)
1111
5. Multi-View Calendar + Range DatePicker [#4282](https://github.com/IgniteUI/igniteui-angular/issues/4282)
1212
6. Custom grid row selector templates [#4998](https://github.com/IgniteUI/igniteui-angular/issues/4998)
1313
7. Per-column Filtering Strategies [#5323](https://github.com/IgniteUI/igniteui-angular/issues/5323)
@@ -25,7 +25,7 @@
2525
1. **[DONE]** Grid Multi-Row Layout keyboard nav [#4708](https://github.com/IgniteUI/igniteui-angular/issues/4708) Released in [8.0.0](https://github.com/IgniteUI/igniteui-angular/releases/tag/8.0.0), [7.3.4](https://github.com/IgniteUI/igniteui-angular/releases/tag/7.3.4)
2626
2. **[DONE]** Angular 8 compatibility [#4908](https://github.com/IgniteUI/igniteui-angular/issues/4908) Released in [8.0.0](https://github.com/IgniteUI/igniteui-angular/releases/tag/8.0.0)
2727
3. **[DONE]** Display density for Drop Downs [#2960](https://github.com/IgniteUI/igniteui-angular/issues/2960) Released in [8.0.1](https://github.com/IgniteUI/igniteui-angular/releases/tag/8.0.1), [7.3.4](https://github.com/IgniteUI/igniteui-angular/releases/tag/7.3.4), [7.2.12](https://github.com/IgniteUI/igniteui-angular/releases/tag/7.2.12)
28-
4. **[DONE]** Slider custom labels [#4594](https://github.com/IgniteUI/igniteui-angular/issues/4594)
28+
4. **[DONE]** Slider custom thumb labels [#3449](https://github.com/IgniteUI/igniteui-angular/issues/3449)
2929
5. **[DONE]** Copy data from the igxGrid [#4907](https://github.com/IgniteUI/igniteui-angular/issues/4907)
3030
6. **[DONE]** BottomNav and Tabs integration with router outlet container [#4297](https://github.com/IgniteUI/igniteui-angular/issues/4297)
3131
7. **[DONE]** Date/Time pickers action buttons customization [#4647](https://github.com/IgniteUI/igniteui-angular/issues/4647) Released in [8.0.0](https://github.com/IgniteUI/igniteui-angular/releases/tag/8.0.0)

projects/igniteui-angular/src/lib/animations/fade/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { animate, animation, AnimationMetadata, AnimationReferenceMetadata, style } from '@angular/animations';
22
import { EaseOut } from '../easings';
3-
import { IAnimationParams } from '../main';
3+
import { IAnimationParams } from '../interface';
44

55
const base: AnimationMetadata[] = [
66
style({

projects/igniteui-angular/src/lib/animations/flip/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import {
66
keyframes,
77
style
88
} from '@angular/animations';
9-
import { EaseIn, EaseOut } from '../easings';
10-
import { IAnimationParams } from '../main';
9+
import { EaseOut } from '../easings';
10+
import { IAnimationParams } from '../interface';
1111

1212
const baseRecipe: AnimationMetadata[] = [
1313
style({

projects/igniteui-angular/src/lib/animations/grow/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { animate, animation, AnimationMetadata, AnimationReferenceMetadata, style } from '@angular/animations';
22
import { EaseOut, EaseIn } from '../easings';
3-
import { IAnimationParams } from '../main';
3+
import { IAnimationParams } from '../interface';
44

55
const base: AnimationMetadata[] = [
66
style({
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
export interface IAnimationParams {
2+
delay: string;
3+
duration: string;
4+
easing: any;
5+
startOpacity?: number;
6+
endOpacity?: number;
7+
startAngle?: number;
8+
endAngle?: number;
9+
startDistance?: string;
10+
endDistance?: string;
11+
fromPosition?: string;
12+
toPosition?: string;
13+
fromScale?: number;
14+
midScale?: number;
15+
toScale?: number;
16+
xPos?: string;
17+
yPos?: string;
18+
direction?: string;
19+
rotateX?: number;
20+
rotateY?: number;
21+
rotateZ?: number;
22+
startHeight?: string;
23+
endHeight?: string;
24+
}

projects/igniteui-angular/src/lib/animations/main.ts

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,4 @@
1-
export interface IAnimationParams {
2-
delay: string;
3-
duration: string;
4-
easing: any;
5-
startOpacity?: number;
6-
endOpacity?: number;
7-
startAngle?: number;
8-
endAngle?: number;
9-
startDistance?: string;
10-
endDistance?: string;
11-
fromPosition?: string;
12-
toPosition?: string;
13-
fromScale?: number;
14-
midScale?: number;
15-
toScale?: number;
16-
xPos?: string;
17-
yPos?: string;
18-
direction?: string;
19-
rotateX?: number;
20-
rotateY?: number;
21-
rotateZ?: number;
22-
startHeight?: string;
23-
endHeight?: string;
24-
}
25-
1+
export * from './interface';
262
export * from './fade/index';
273
export * from './flip/index';
284
export * from './rotate/index';

projects/igniteui-angular/src/lib/animations/misc/pulsate.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ import {
22
animate,
33
animation,
44
AnimationMetadata,
5-
AnimationReferenceMetadata,
65
keyframes,
76
style
87
} from '@angular/animations';
9-
import { IAnimationParams } from '../main';
8+
import { IAnimationParams } from '../interface';
109

1110
const heartbeatBase: AnimationMetadata[] = [
1211
style({

projects/igniteui-angular/src/lib/animations/misc/shake.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
style
88
} from '@angular/animations';
99
import { EaseInOut } from '../easings';
10-
import { IAnimationParams } from '../main';
10+
import { IAnimationParams } from '../interface';
1111

1212
const baseRecipe: AnimationMetadata[] = [
1313
animate(

projects/igniteui-angular/src/lib/animations/rotate/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { animate, animation, AnimationMetadata, AnimationReferenceMetadata, style } from '@angular/animations';
22
import { EaseIn, EaseOut } from '../easings';
3-
import { IAnimationParams } from '../main';
3+
import { IAnimationParams } from '../interface';
44

55
const baseRecipe: AnimationMetadata[] = [
66
style({

0 commit comments

Comments
 (0)