Skip to content

Commit cd9b808

Browse files
committed
Merge branch 'mkirova/row-pinning-base' of https://github.com/IgniteUI/igniteui-angular into pbozhinov/row-pinning-tree-grid
2 parents c2146fc + 8044a84 commit cd9b808

File tree

5 files changed

+766
-630
lines changed

5 files changed

+766
-630
lines changed

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

Lines changed: 7 additions & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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)