Skip to content

Commit 7885c6a

Browse files
Vasil MihalkovVasil Mihalkov
Vasil Mihalkov
authored and
Vasil Mihalkov
committed
Merge branch 'mkirova/row-pinning-base' into vmihalkov/groupby
2 parents d44b29c + 2e72fae commit 7885c6a

File tree

6 files changed

+772
-634
lines changed

6 files changed

+772
-634
lines changed

CHANGELOG.md

+6-4
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,6 @@ All notable changes for each version of this project will be documented in this
108108
- `IgxGridExcelStyleFilteringComponent` and `IgxAdvancedFilteringDialogComponent` can now be hosted outside of the grid in order to provide the same experience as the built-in filtering UI.
109109
- `expandRow(rowID)`/`collapseRow(rowID)`/`toggleRow(rowID)` API methods are added for the `igxHierarchicalGrid`. They allow expanding/collapsing a row by its id.
110110
- `onRowToggle` event is added for the `igxHierarchicalGrid`. It is emitted when the expanded state of a row is changed.
111-
- `IgxOverlayService`:
112-
- `setOffset` method added. It offsets the content along the corresponding axis by the provided amount.
113-
- `IgxToggleDirective`:
114-
- `setOffset` method added. It offsets the content along the corresponding axis by the provided amount.
115111
- `IgxRowDragGhost` directive is added. It allows providing a custom template for the drag ghost when dragging a row.
116112
```html
117113
<igx-grid #grid1 [data]="remote | async" primaryKey="ProductID"
@@ -171,6 +167,12 @@ All notable changes for each version of this project will be documented in this
171167
- `IgxDropDown`:
172168
- `clearSelection` method is added, which can be used to deselect the selected dropdown item
173169

170+
- `IgxToggleDirective`:
171+
- `setOffset` method added. It offsets the content along the corresponding axis by the provided amount.
172+
173+
- `IgxOverlayService`:
174+
- `setOffset` method added. It offsets the content along the corresponding axis by the provided amount.
175+
174176
- `IgxCircularProgressBar`:
175177
- added `IgxProgressBarGradientDirective` to allow providing custom circular progress SVG gradients. Providing a custom gradient via a template is as easy as writing:
176178
```html

projects/igniteui-angular/src/lib/core/styles/themes/schemas/dark/_toast.scss

+7-1
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,11 @@ $_dark-fluent-toast: extend($_fluent-toast);
2323
/// @type {Map}
2424
/// @requires {function} extend
2525
/// @requires $_bootstrap-toast
26-
$_dark-bootstrap-toast: extend($_bootstrap-toast);
26+
$_dark-bootstrap-toast: extend(
27+
$_bootstrap-toast, (
28+
text-color: (
29+
igx-contrast-color: ('grays', 600)
30+
)
31+
)
32+
);
2733

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4047,7 +4047,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
40474047
* @param rowID The row id - primaryKey value or the data record instance.
40484048
* @param index The index at which to insert the row in the pinned collection.
40494049
*/
4050-
public pinRow(rowID, index?): boolean {
4050+
public pinRow(rowID: any, index?: number): boolean {
40514051
const rec = this.gridAPI.get_rec_by_id(rowID);
40524052
if (!rec || this.pinnedRecords.indexOf(rec) !== -1 || this.data.indexOf(rec) === -1) {
40534053
return false;
@@ -4079,7 +4079,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
40794079
* ```
40804080
* @param rowID The row id - primaryKey value or the data record instance.
40814081
*/
4082-
public unpinRow(rowID) {
4082+
public unpinRow(rowID: any) {
40834083
const rec = this.gridAPI.get_rec_by_id(rowID);
40844084
const index = this.pinnedRecords.indexOf(rec);
40854085
if (index === -1 || !rec) {

projects/igniteui-angular/src/lib/grids/grid/grid.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ export class IgxGridComponent extends IgxGridBaseDirective implements GridType,
826826
/**
827827
* @hidden @internal
828828
*/
829-
public getContext(rowData, rowIndex, pinned?): any {
829+
public getContext(rowData: any, rowIndex: number, pinned?: boolean): any {
830830
if (pinned && !this.isRowPinningToTop) {
831831
rowIndex = rowIndex + this.dataView.length;
832832
}

0 commit comments

Comments
 (0)