Skip to content

Commit a4c3f29

Browse files
Merge branch 'master' into ibarakov/fix-7899-master
2 parents 888bd87 + 4712026 commit a4c3f29

File tree

83 files changed

+2204
-627
lines changed

Some content is hidden

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

83 files changed

+2204
-627
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ All notable changes for each version of this project will be documented in this
1717
- **Breaking Changes** - The `igx-action-icon` has been renamed to `igx-navbar-action`. It should get renamed in your components via `ng update`;
1818
- `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
1919
- **Breaking Change** - The `selectedRows` method is now an `@Input` property. Setting it to an array of Row IDs will update the grid's selection state, any previous selection will be cleared. Setting it to an empty array will clear the selection entirely.
20+
- **Breaking Change** - `IgxColumnHiding` and `IgxColumnPinning` components have been deprecated in favor of a component combining the their functionality - `IgxColumnActions` which is used with either of the new `IgxColumnPinning` and `IgxColumnHiding` directives that specify the action to be triggered through the UI.
2021
- `igxGrid`
22+
- **Behavioral Change** - For numeric columns, the onCellEdit arguments' newValue will now contain the numeric value that will be committed instead of the string input.
2123
- Added `onScroll` event, which is emitted when the grid is scrolled vertically or horizontally.
2224
- Each grid now expose a default handling for boolean column types. The column will display `check` or `close` icon, instead of true/false by default.
2325
- `igxTreeGrid`
@@ -53,6 +55,9 @@ The following example shows how you can use the Indigo theme:
5355
- `igxButton` directive
5456
- Added styles to support extended fab buttons.
5557
- `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
58+
- Exposed new `cellEditDone` and `rowEditDone` non cancelable events. The arguments contain `rowData` that is the committed `newValue`.
59+
- `cellEditDone` - Emitted after a cell has been edited and editing has been committed.
60+
- `rowEditDone` - Emitted after exiting edit mode for a row and editing has been committed.
5661
- Introduced `showSummaryOnCollapse` grid property which allows you to control whether the summary row stays visible when the groupBy / parent row is collapsed.
5762
- Added support for tooltips on data cells default template and summary cells.
5863
- Added support for binding columns to properties in nested data objects.

package-lock.json

Lines changed: 34 additions & 6 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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
"gulp-util": "^3.0.8",
9696
"hammer-simulator": "0.0.1",
9797
"igniteui-sassdoc-theme": "^1.1.2",
98-
"igniteui-typedoc-theme": "^1.3.6",
98+
"igniteui-typedoc-theme": "^2.0.5",
9999
"jasmine": "~3.5.0",
100100
"jasmine-core": "~3.5.0",
101101
"jasmine-spec-reporter": "~5.0.2",

projects/igniteui-angular/src/lib/core/deprecateDecorators.ts

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
11
import { isDevMode } from '@angular/core';
22

3+
/**
4+
* @hidden
5+
*/
6+
export function DeprecateClass(message: string) {
7+
let isMessageShown = false;
8+
9+
return function<T extends new(...args: any[]) => {} >(originalClass: T) {
10+
return class extends originalClass {
11+
constructor(...args) {
12+
const target: any = originalClass;
13+
const targetName = typeof target === 'function' ? target.name : target.constructor.name;
14+
isMessageShown = showMessage(`${targetName}: ${message}`, isMessageShown);
15+
16+
super(...args);
17+
}
18+
};
19+
};
20+
}
21+
322
/**
423
* @hidden
524
*/

projects/igniteui-angular/src/lib/core/i18n/grid-resources.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,11 @@ export interface IGridResourceStrings {
9191
igx_grid_advanced_filter_column_placeholder?: string;
9292
igx_grid_advanced_filter_value_placeholder?: string;
9393
igx_grid_pinned_row_indicator?: string;
94+
igx_grid_hiding_check_all_label?: string;
95+
igx_grid_hiding_uncheck_all_label?: string;
96+
igx_grid_pinning_check_all_label?: string;
97+
igx_grid_pinning_uncheck_all_label?: string;
98+
igx_grid_toolbar_actions_filter_prompt?: string;
9499
}
95100

96101
export const GridResourceStringsEN: IGridResourceStrings = {
@@ -185,5 +190,10 @@ export const GridResourceStringsEN: IGridResourceStrings = {
185190
igx_grid_advanced_filter_initial_text: 'Start with creating a group of conditions linked with "And" or "Or"',
186191
igx_grid_advanced_filter_column_placeholder: 'Select column',
187192
igx_grid_advanced_filter_value_placeholder: 'Value',
188-
igx_grid_pinned_row_indicator: 'Pinned'
193+
igx_grid_pinned_row_indicator: 'Pinned',
194+
igx_grid_hiding_check_all_label: 'Hide All',
195+
igx_grid_hiding_uncheck_all_label: 'Show All',
196+
igx_grid_pinning_check_all_label: 'Pin All',
197+
igx_grid_pinning_uncheck_all_label: 'Unpin All',
198+
igx_grid_toolbar_actions_filter_prompt: 'Filter columns list ...'
189199
};

projects/igniteui-angular/src/lib/core/styles/base/utilities/_functions.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,8 @@
186186
}
187187
}
188188
} @else {
189-
@error 'Expected color for $background/$foreground but got #{$background}/#{$foreground}';
189+
@warn 'Expected color for $background/$foreground but got #{$background}/#{$foreground}. The contrast color can\'t be calculated automatically.';
190+
@return #fff;
190191
}
191192
}
192193

projects/igniteui-angular/src/lib/core/styles/components/charts/_gauge-component.scss

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,13 @@
66
/// @requires {mixin} bem-elem
77
/// @requires {mixin} bem-mod
88
////
9-
@include b(gauge) {
9+
@include b(linear-gauge) {
10+
// Register the component in the component registry
11+
$this: bem--selector-to-string(&);
12+
@include register-component(str-slice($this, 2, -1));
13+
}
14+
15+
@include b(radial-gauge) {
1016
// Register the component in the component registry
1117
$this: bem--selector-to-string(&);
1218
@include register-component(str-slice($this, 2, -1));

projects/igniteui-angular/src/lib/core/styles/components/charts/_graph-component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/// @requires {mixin} bem-elem
77
/// @requires {mixin} bem-mod
88
////
9-
@include b(graph) {
9+
@include b(bullet-graph) {
1010
// Register the component in the component registry
1111
$this: bem--selector-to-string(&);
1212
@include register-component(str-slice($this, 2, -1));

projects/igniteui-angular/src/lib/core/styles/components/column-hiding/_column-hiding-component.scss renamed to projects/igniteui-angular/src/lib/core/styles/components/column-actions/_column-actions-component.scss

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,33 @@
66
/// @requires {mixin} bem-elem
77
/// @requires {mixin} bem-mod
88
////
9-
@include b(igx-column-hiding) {
9+
@include b(igx-column-actions) {
1010
$block: bem--selector-to-string(&);
11-
@include register-component('igx-column-hiding');
11+
@include register-component('igx-column-actions');
1212

13-
@extend %column-hiding-display !optional;
13+
@extend %column-actions-display !optional;
1414

1515
@include e(header) {
16-
@extend %column-hiding-header !optional;
16+
@extend %column-actions-header !optional;
1717
}
1818

1919
@include e(header-title) {
20-
@extend %column-hiding-title !optional;
20+
@extend %column-actions-title !optional;
2121
}
2222

2323
@include e(header-input) {
24-
@extend %column-hiding-input !optional;
24+
@extend %column-actions-input !optional;
2525
}
2626

2727
@include e(columns) {
28-
@extend %column-hiding-columns !optional;
28+
@extend %column-actions-columns !optional;
2929
}
3030

3131
@include e(columns-item) {
32-
@extend %column-hiding-item !optional;
32+
@extend %column-actions-item !optional;
3333
}
3434

3535
@include e(buttons) {
36-
@extend %column-hiding-buttons !optional;
36+
@extend %column-actions-buttons !optional;
3737
}
3838
}

0 commit comments

Comments
 (0)