Skip to content

Commit 3dd46d1

Browse files
authored
Merge branch '9.0.x' into PMiteva/disabled-textarea-v.9.0
2 parents 0f3bf79 + 357c7a6 commit 3dd46d1

File tree

5 files changed

+66
-16
lines changed

5 files changed

+66
-16
lines changed

projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-component.scss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,11 +527,15 @@
527527
@include e(group-row, $m: padding-level-#{$i}) {
528528
@extend %igx-grid__group-row--padding-level-#{$i} !optional;
529529
}
530+
}
531+
532+
@for $i from 1 through 25 {
530533
@include e(tree-cell, $m: padding-level-#{$i}) {
531534
@extend %igx-grid__tree-cell--padding-level-#{$i} !optional;
532535
}
533536
}
534537

538+
535539
@include m(cosy) {
536540
@extend %grid-display !optional;
537541

@@ -626,6 +630,9 @@
626630
@include e(group-row, $m: padding-level-#{$i}) {
627631
@extend %igx-grid__group-row--padding-cosy-level-#{$i} !optional;
628632
}
633+
}
634+
635+
@for $i from 1 through 25 {
629636
@include e(tree-cell, $m: padding-level-#{$i}) {
630637
@extend %igx-grid__tree-cell-cosy--padding-level-#{$i} !optional;
631638
}
@@ -726,6 +733,9 @@
726733
@include e(group-row, $m: padding-level-#{$i}) {
727734
@extend %igx-grid__group-row-compact--padding-level-#{$i} !optional;
728735
}
736+
}
737+
738+
@for $i from 1 through 25 {
729739
@include e(tree-cell, $m: padding-level-#{$i}) {
730740
@extend %igx-grid__tree-cell-compact--padding-level-#{$i} !optional;
731741
}

projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2073,10 +2073,6 @@
20732073
padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'comfortable')};
20742074
}
20752075

2076-
%igx-grid__tree-cell--padding-level-#{$i} {
2077-
padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'comfortable')};
2078-
}
2079-
20802076
// COSY
20812077
%igx-grid__row-indentation-cosy--level-#{$i} {
20822078
padding-#{$left}: calc(#{$i*map-get($grid-grouping-indicator-padding, 'cosy')} + #{$indicator-icon-width});
@@ -2086,10 +2082,6 @@
20862082
padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'cosy')};
20872083
}
20882084

2089-
%igx-grid__tree-cell-cosy--padding-level-#{$i} {
2090-
padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'cosy')};
2091-
}
2092-
20932085
// COMPACT
20942086
%igx-grid__row-indentation-compact--level-#{$i} {
20952087
padding-#{$left}: calc(#{$i*map-get($grid-grouping-indicator-padding, 'compact')} + #{$indicator-icon-width});
@@ -2098,6 +2090,16 @@
20982090
%igx-grid__group-row-compact--padding-level-#{$i} {
20992091
padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'compact')};
21002092
}
2093+
}
2094+
2095+
@for $i from 1 through 25 {
2096+
%igx-grid__tree-cell--padding-level-#{$i} {
2097+
padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'comfortable')};
2098+
}
2099+
2100+
%igx-grid__tree-cell-cosy--padding-level-#{$i} {
2101+
padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'cosy')};
2102+
}
21012103

21022104
%igx-grid__tree-cell-compact--padding-level-#{$i} {
21032105
padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'compact')};

projects/igniteui-angular/src/lib/grids/grid-base.directive.ts

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,16 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
445445
}
446446

447447
/**
448-
*@hidden @internal
448+
* Emitted after the current page is changed.
449+
* @example
450+
* ```html
451+
* <igx-grid (pageChange)="onPageChange($event)"></igx-grid>
452+
* ```
453+
* ```typescript
454+
* public onPageChange(page: number) {
455+
* this.currentPage = page;
456+
* }
457+
* ```
449458
*/
450459
@Output()
451460
public pageChange = new EventEmitter<number>();
@@ -477,7 +486,16 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
477486
}
478487

479488
/**
480-
*@hidden @internal
489+
* Emitted when `perPage` property value of the grid is changed.
490+
* @example
491+
* ```html
492+
* <igx-grid #grid (perPageChange)="onPerPageChange($event)" [autoGenerate]="true"></igx-grid>
493+
* ```
494+
* ```typescript
495+
* public onPerPageChange(perPage: number) {
496+
* this.perPage = perPage;
497+
* }
498+
* ```
481499
*/
482500
@Output()
483501
public perPageChange = new EventEmitter<number>();

projects/igniteui-angular/src/lib/paginator/paginator.component.ts

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,31 @@ export class IgxPaginatorComponent extends DisplayDensityBase {
169169
public selectLabel = CurrentResourceStrings.PaginatorResStrings.igx_paginator_label;
170170

171171
/**
172-
*An event that is emitted when the select in the `IgxPaginatorComponent` changes its value.
173-
*/
172+
* Emitted when `perPage` property value of the paginator is changed.
173+
* @example
174+
* ```html
175+
* <igx-paginator (perPageChange)="onPerPageChange($event)"></igx-paginator>
176+
* ```
177+
* ```typescript
178+
* public onPerPageChange(perPage: number) {
179+
* this.perPage = perPage;
180+
* }
181+
* ```
182+
*/
174183
@Output()
175184
public perPageChange = new EventEmitter<number>();
176185
/**
177-
*An event that is emitted when the paginating is used.
178-
*/
186+
* Emitted after the current page is changed.
187+
* @example
188+
* ```html
189+
* <igx-paginator (pageChange)="onPageChange($event)"></igx-paginator>
190+
* ```
191+
* ```typescript
192+
* public onPageChange(page: number) {
193+
* this.currentPage = page;
194+
* }
195+
* ```
196+
*/
179197
@Output()
180198
public pageChange = new EventEmitter<number>();
181199

projects/igniteui-angular/src/lib/slider/slider.component.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -624,6 +624,8 @@ export class IgxSliderComponent implements
624624
} else {
625625
this._value = value;
626626
}
627+
628+
this._onChangeCallback(value);
627629
}
628630

629631
/**
@@ -1344,6 +1346,8 @@ export class IgxSliderComponent implements
13441346
} else {
13451347
this.value = (value as number) - ((value as number) % this.step);
13461348
}
1349+
1350+
this._cdr.detectChanges();
13471351
}
13481352

13491353
private updateTrack() {
@@ -1413,8 +1417,6 @@ export class IgxSliderComponent implements
14131417
this.upperValue = (value as IRangeSliderValue).upper;
14141418
this.lowerValue = (value as IRangeSliderValue).lower;
14151419
}
1416-
1417-
this._onChangeCallback(this.value);
14181420
}
14191421

14201422
private emitValueChanged(oldValue: number | IRangeSliderValue) {

0 commit comments

Comments
 (0)