Skip to content

Commit 6941b8f

Browse files
kdinevkdinev
authored
Merge pull request #5489 from IgniteUI/8.1.x
Merging 8.1.x into master
2 parents 39b9431 + 5f47445 commit 6941b8f

Some content is hidden

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

47 files changed

+893
-330
lines changed

‎CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@ All notable changes for each version of this project will be documented in this
2626
```
2727
- `igx-paginator`
2828
- Replaces the current paginator in all grids. Can be used as a standalone component.
29+
<br/>Have in mind that if you have set the `paginationTemplate`, you may have to modify your css to display the pagination correctly. The style should be something similar to:
30+
```
31+
.pagination-container {
32+
display: flex;
33+
justify-content: center;
34+
align-items: center;
35+
}
36+
```
2937
- `IgxCombo`
3038
- Input `[overlaySettings]` - allows an object of type `OverlaySettings` to be passed. These custom overlay settings control how the drop-down list displays.
3139
- `IgxForOf` now offers usage of local variables `even`, `odd`, `first` and `last` to help with the distinction of the currently iterated element.

‎ROADMAP.md

Lines changed: 73 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,82 @@
22

33
# Current Milestone
44

5-
## Milestone 8 (Due by July, 2019)
5+
## Milestone 9 (Due by September, 2019)
6+
7+
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)
11+
12+
## Going down the road
13+
14+
1. Row-pinning
15+
2. Column Groups expand/collapse, with column grouping templates
16+
3. Visual Cell merging
17+
18+
# Previous Milestones
19+
20+
## Milestone 8 (Released July 22nd, 2019)
621

722
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)
823
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)
924
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)
10-
4. Slider custom labels #4594
11-
5. Copy data from the igxGrid #4907
12-
6. BottomNav and Tabs integration with router outlet container [#4297](https://github.com/IgniteUI/igniteui-angular/issues/4297)
25+
4. **[DONE]** Slider custom labels [#4594](https://github.com/IgniteUI/igniteui-angular/issues/4594)
26+
5. **[DONE]** Copy data from the igxGrid [#4907](https://github.com/IgniteUI/igniteui-angular/issues/4907)
27+
6. **[DONE]** BottomNav and Tabs integration with router outlet container [#4297](https://github.com/IgniteUI/igniteui-angular/issues/4297)
1328
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)
1429
8. **[DONE]** Square and oval presets in theming [#4964](https://github.com/IgniteUI/igniteui-angular/issues/4964) Released in [8.0.0](https://github.com/IgniteUI/igniteui-angular/releases/tag/8.0.0)
15-
9. Grid column group header templates [#3344](https://github.com/IgniteUI/igniteui-angular/issues/3344)
30+
9. **[DONE]** Grid column group header templates [#3344](https://github.com/IgniteUI/igniteui-angular/issues/3344)
1631

32+
## Milestone 7 (13.05.2019)
1733

18-
## Going down the road
34+
1. **[DONE]** Multi-cell Selection #3915
35+
2. **[DONE]** Grid Multi-Row Layout #4384
36+
3. **[DONE]** Grid Row Dragging #3993
37+
3. **[DONE]** List, button, button group display density support #4393 #4502 #4532
1938

20-
1. Advanced Filtering
21-
2. Row-pinning
22-
3. Column Groups expand/collapse, with column grouping templates
23-
4. Visual Cell merging
39+
## Milestone 6 (Due March 8th, 2019)
2440

41+
1. **[DONE]** Hierarchical Grid #827
42+
2. **[DROPPED]** igxGrid rendering strategies (like record-based rendering) #2384
43+
3. **[DONE]** Auto-complete (inline editable) #3585
44+
4. **[DONE]** Excel Style Filtering #3592
45+
5. **[DONE]** Inline date and time pickers (with drop down/toggle) #3034 #2337
46+
6. **[DONE]** igxSelect Component #3148
2547

26-
# Previous Milestones
48+
## Milestone 5 (14.12.2018)
2749

28-
## Milestone 1 (by January 15th, 2018)
50+
1. **[DONE]** TreeGrid summaries
51+
2. **[DONE]** Grid GroupBy summaries
52+
3. **[DONE]** Banner Component [issue](https://github.com/IgniteUI/igniteui-angular/issues/2672)
53+
4. **[DONE]** Toolbar Templatable and NavBar Templatable
54+
55+
## Milestone 4 (November 30th, 2018)
56+
57+
1. **[Done]** Tree Grid [issue](https://github.com/IgniteUI/igniteui-angular/issues/2530)
58+
2. **[Done]** Quick Per-column Search in the igxGrid [issue](https://github.com/IgniteUI/igniteui-angular/issues/542)
59+
3. **[Done]** Expandable Panel [issue](https://github.com/IgniteUI/igniteui-angular/issues/307)
60+
4. **[Done]** Conditional Cell Styling capability [issue](https://github.com/IgniteUI/igniteui-angular/issues/1079)
61+
5. **[Done]** igxTypography for theming
62+
6. **[Done]** Tooltip [issue](https://github.com/IgniteUI/igniteui-angular/issues/1710)
63+
7. **[Removed]** Vertical Tabs - material doesn't define vertical tabs
64+
8. **[Done]** Row Editing with transactions (Batch editing) [issue](https://github.com/IgniteUI/igniteui-angular/issues/566)
65+
9. **[Done]** Adding Disabled Dates and Special Dates options in igxCalander [issue](https://github.com/IgniteUI/igniteui-angular/issues/1980)
66+
10. **[Done]** Drag and Drop Directive
67+
68+
## Milestone 3 (by July 6th, 2018)
69+
70+
1. **[DONE]** Grouping
71+
2. **[DONE]** Grid Multi-column Headers [issue](https://github.com/IgniteUI/igniteui-angular/issues/488)
72+
3. **[DONE]** Combo
73+
4. **[DONE]** Column Hiding UI
74+
5. **[DONE]** Operations UI - column chooser
75+
6. **[DONE]** Advanced Filtering
76+
7. **[DONE]** Column Moving
77+
8. **[DONE]** Update to Angular 6
78+
9. **[DONE]** Design: Release Updated Design System (Sketch UI kits, UI patterns, screens, documentation)
79+
10. **[DONE]** Design: Data dense theme for data grid
2980

30-
1. **[DONE]** Row objects - 1st sprint (by November 20th, 2017) [issue](https://github.com/IgniteUI/igniteui-angular/issues/479)
31-
In order to implement virtualization in the Grid, we would need a row object to be abstracted.
32-
2. **[DONE]** Cell objects - 2nd sprint (by December 11th, 2017) [issue](https://github.com/IgniteUI/igniteui-angular/issues/480)
33-
3. **[DONE]** Grid Row virtualization - after row objects and virtualization are implemented
34-
4. **[DONE]** Grid Column virtualization - after row objects and column component refactoring are done
35-
This feature enables Grid columns to be virtualized. The feature splits records into parts, and only a certain part of the record is rendered.
36-
5. **[DONE]** Alternating row style [issue](https://github.com/IgniteUI/igniteui-angular/issues/489)
37-
6. **[DONE]** Ignite UI CLI integration [issue](https://github.com/IgniteUI/ignite-ui-cli/issues/53)
38-
Ignite UI CLI will also provide Ignite UI for Angular templates, views, and components integration. All features of the CLI will be accessible in the context of Ignite UI for Angular, as well as the full Ignite UI product suite.
39-
4081
## Milestone 2 (due April 25th, 2018)
4182

4283
1. **[DONE]** Expanding Ignite UI CLI views and templates with Ignite UI for Angular
@@ -57,52 +98,14 @@
5798
13. **[DONE]** Charting: Category Chart types Line (Area, Column, Point, StepLine, StepArea, Spline, SplineArea, Waterfall
5899
14. **[DONE]** Charting: Financial Chart types
59100

101+
## Milestone 1 (by January 15th, 2018)
60102

61-
## Milestone 3 (by July 6th, 2018)
62-
63-
1. **[DONE]** Grouping
64-
2. **[DONE]** Grid Multi-column Headers [issue](https://github.com/IgniteUI/igniteui-angular/issues/488)
65-
3. **[DONE]** Combo
66-
4. **[DONE]** Column Hiding UI
67-
5. **[DONE]** Operations UI - column chooser
68-
6. **[DONE]** Advanced Filtering
69-
7. **[DONE]** Column Moving
70-
8. **[DONE]** Update to Angular 6
71-
9. **[DONE]** Design: Release Updated Design System (Sketch UI kits, UI patterns, screens, documentation)
72-
10. **[DONE]** Design: Data dense theme for data grid
73-
74-
## Milestone 4 (November 30th, 2018)
75-
76-
1. **[Done]** Tree Grid [issue](https://github.com/IgniteUI/igniteui-angular/issues/2530)
77-
2. **[Done]** Quick Per-column Search in the igxGrid [issue](https://github.com/IgniteUI/igniteui-angular/issues/542)
78-
3. **[Done]** Expandable Panel [issue](https://github.com/IgniteUI/igniteui-angular/issues/307)
79-
4. **[Done]** Conditional Cell Styling capability [issue](https://github.com/IgniteUI/igniteui-angular/issues/1079)
80-
5. **[Done]** igxTypography for theming
81-
6. **[Done]** Tooltip [issue](https://github.com/IgniteUI/igniteui-angular/issues/1710)
82-
7. **[Removed]** Vertical Tabs - material doesn't define vertical tabs
83-
8. **[Done]** Row Editing with transactions (Batch editing) [issue](https://github.com/IgniteUI/igniteui-angular/issues/566)
84-
9. **[Done]** Adding Disabled Dates and Special Dates options in igxCalander [issue](https://github.com/IgniteUI/igniteui-angular/issues/1980)
85-
10. **[Done]** Drag and Drop Directive
86-
87-
## Milestone 5 (14.12.2018)
88-
89-
1. **[DONE]** TreeGrid summaries
90-
2. **[DONE]** Grid GroupBy summaries
91-
3. **[DONE]** Banner Component [issue](https://github.com/IgniteUI/igniteui-angular/issues/2672)
92-
4. **[DONE]** Toolbar Templatable and NavBar Templatable
93-
94-
## Milestone 6 (Due March 8th, 2019)
95-
96-
1. **[DONE]** Hierarchical Grid #827
97-
2. **[DROPPED]** igxGrid rendering strategies (like record-based rendering) #2384
98-
3. **[DONE]** Auto-complete (inline editable) #3585
99-
4. **[DONE]** Excel Style Filtering #3592
100-
5. **[DONE]** Inline date and time pickers (with drop down/toggle) #3034 #2337
101-
6. **[DONE]** igxSelect Component #3148
102-
103-
## Milestone 7 (13.05.2019)
104-
105-
1. **[DONE]** Multi-cell Selection #3915
106-
2. **[DONE]** Grid Multi-Row Layout #4384
107-
3. **[DONE]** Grid Row Dragging #3993
108-
3. **[DONE]** List, button, button group display density support #4393 #4502 #4532
103+
1. **[DONE]** Row objects - 1st sprint (by November 20th, 2017) [issue](https://github.com/IgniteUI/igniteui-angular/issues/479)
104+
In order to implement virtualization in the Grid, we would need a row object to be abstracted.
105+
2. **[DONE]** Cell objects - 2nd sprint (by December 11th, 2017) [issue](https://github.com/IgniteUI/igniteui-angular/issues/480)
106+
3. **[DONE]** Grid Row virtualization - after row objects and virtualization are implemented
107+
4. **[DONE]** Grid Column virtualization - after row objects and column component refactoring are done
108+
This feature enables Grid columns to be virtualized. The feature splits records into parts, and only a certain part of the record is rendered.
109+
5. **[DONE]** Alternating row style [issue](https://github.com/IgniteUI/igniteui-angular/issues/489)
110+
6. **[DONE]** Ignite UI CLI integration [issue](https://github.com/IgniteUI/ignite-ui-cli/issues/53)
111+
Ignite UI CLI will also provide Ignite UI for Angular templates, views, and components integration. All features of the CLI will be accessible in the context of Ignite UI for Angular, as well as the full Ignite UI product suite.

‎projects/igniteui-angular/src/lib/core/grid-selection.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ export class IgxGridCRUDService {
105105
return new IgxRow(cell.id.rowID, cell.rowIndex, cell.rowData);
106106
}
107107

108-
sameRow(rowIndex): boolean {
109-
return this.row && this.row.index === rowIndex;
108+
sameRow(rowID): boolean {
109+
return this.row && this.row.id === rowID;
110110
}
111111

112112
sameCell(cell: IgxCell): boolean {
@@ -175,7 +175,7 @@ export class IgxGridCRUDService {
175175
return;
176176
}
177177

178-
if (this.row && !this.sameRow(this.cell.rowIndex)) {
178+
if (this.row && !this.sameRow(this.cell.id.rowID)) {
179179
this.grid.endEdit(true);
180180
this.cell = this.createCell(cell);
181181
this.beginRowEdit();

‎projects/igniteui-angular/src/lib/core/styles/components/checkbox/_checkbox-theme.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@
121121
}
122122

123123
%cbx-composite-wrapper {
124+
position: relative;
124125
width: $size;
125126
height: $size;
126127
}

‎projects/igniteui-angular/src/lib/core/styles/components/icon/_icon-theme.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@
6161
width: inherit;
6262
height: inherit;
6363
fill: currentColor;
64+
65+
use {
66+
pointer-events: none;
67+
}
6468
}
6569
}
6670

‎projects/igniteui-angular/src/lib/core/styles/themes/_index.scss

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -274,17 +274,22 @@
274274
$exclude: (),
275275
$legacy-support: true
276276
) {
277-
$primary: igx-color($palette, 'primary');
278-
$secondary: igx-color($palette, 'secondary');
277+
$grays: igx-color($palette, 'grays');
279278
$surface: igx-color($palette, 'surface');
280279

280+
$light-palette: igx-palette(
281+
$primary: igx-color($palette, 'primary'),
282+
$secondary: igx-color($palette, 'secondary'),
283+
$info: igx-color($palette, 'info'),
284+
$success: igx-color($palette, 'success'),
285+
$warn: igx-color($palette, 'warn'),
286+
$error: igx-color($palette, 'error'),
287+
$surface: if($surface != #fff, $surface, #fff),
288+
$grays: if($grays != rgba(0, 0, 0, .38), $grays, #000),
289+
);
290+
281291
@include igx-theme(
282-
$palette: igx-palette(
283-
$primary,
284-
$secondary,
285-
$surface: if($surface != #fff, $surface, #fff),
286-
$grays: #000
287-
),
292+
$palette: $light-palette,
288293
$schema: $light-schema,
289294
$legacy-support: $legacy-support,
290295
$exclude: $exclude
@@ -300,17 +305,22 @@
300305
$exclude: (),
301306
$legacy-support: true
302307
) {
303-
$primary: igx-color($palette, 'primary');
304-
$secondary: igx-color($palette, 'secondary');
308+
$grays: igx-color($palette, 'grays');
305309
$surface: igx-color($palette, 'surface');
306310

311+
$dark-palette: igx-palette(
312+
$primary: igx-color($palette, 'primary'),
313+
$secondary: igx-color($palette, 'secondary'),
314+
$info: igx-color($palette, 'info'),
315+
$success: igx-color($palette, 'success'),
316+
$warn: igx-color($palette, 'warn'),
317+
$error: igx-color($palette, 'error'),
318+
$surface: if($surface != #fff, $surface, #222),
319+
$grays: if($grays != rgba(0, 0, 0, .38), $grays, #fff),
320+
);
321+
307322
@include igx-theme(
308-
$palette: igx-palette(
309-
$primary,
310-
$secondary,
311-
$surface: if($surface != #fff, $surface, #222),
312-
$grays: #fff
313-
),
323+
$palette: $dark-palette,
314324
$schema: $dark-schema,
315325
$legacy-support: $legacy-support,
316326
$exclude: $exclude

‎projects/igniteui-angular/src/lib/directives/for-of/for_of.directive.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr
679679

680680
const containerSize = parseInt(this.igxForContainerSize, 10);
681681
const maxRealScrollTop = event.target.children[0].scrollHeight - containerSize;
682-
const realPercentScrolled = event.target.scrollTop / maxRealScrollTop;
682+
const realPercentScrolled = maxRealScrollTop !== 0 ? event.target.scrollTop / maxRealScrollTop : 0;
683683
if (!this._bScrollInternal) {
684684
const maxVirtScrollTop = this._virtHeight - containerSize;
685685
this._virtScrollTop = realPercentScrolled * maxVirtScrollTop;
@@ -1512,7 +1512,7 @@ export class IgxGridForOfDirective<T> extends IgxForOfDirective<T> implements On
15121512

15131513
const containerSize = parseInt(this.igxForContainerSize, 10);
15141514
const maxRealScrollTop = event.target.children[0].scrollHeight - containerSize;
1515-
const realPercentScrolled = event.target.scrollTop / maxRealScrollTop;
1515+
const realPercentScrolled = maxRealScrollTop !== 0 ? event.target.scrollTop / maxRealScrollTop : 0;
15161516
if (!this._bScrollInternal) {
15171517
const maxVirtScrollTop = this._virtHeight - containerSize;
15181518
this._virtScrollTop = realPercentScrolled * maxVirtScrollTop;

‎projects/igniteui-angular/src/lib/grids/cell.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -594,9 +594,9 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy {
594594
return;
595595
}
596596

597-
if (editableCell && crud.sameRow(this.rowIndex)) {
597+
if (editableCell && crud.sameRow(this.cellID.rowID)) {
598598
this.gridAPI.submit_value();
599-
} else if (editMode && !crud.sameRow(this.rowIndex)) {
599+
} else if (editMode && !crud.sameRow(this.cellID.rowID)) {
600600
this.grid.endEdit(true);
601601
}
602602
}

‎projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-date-expression.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#dropdownConditions
33
[maxHeight]="'200px'"
44
[width]="getInputWidth()"
5+
[displayDensity]="displayDensity"
56
(onSelection)="onConditionsChanged($event)">
67
<igx-drop-down-item *ngFor="let condition of conditions" [value]="condition" [selected]="isConditionSelected(condition)">
78
<igx-icon fontSet="filtering-icons" [name]="getCondition(condition).iconName"></igx-icon>

‎projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-default-expression.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#dropdownConditions
33
[maxHeight]="'200px'"
44
[width]="getInputWidth()"
5+
[displayDensity]="displayDensity"
56
(onSelection)="onConditionsChanged($event)">
67
<igx-drop-down-item *ngFor="let condition of conditions" [value]="condition" [selected]="isConditionSelected(condition)">
78
<igx-icon fontSet="filtering-icons" [name]="getCondition(condition).iconName"></igx-icon>

0 commit comments

Comments
 (0)