Skip to content

Commit 328f28d

Browse files
committed
chore(*): Post-merge fixes
* Group area consolidation and fixes * Some typings for grid outlets * Prevented circular dep for the row directive from the services barrel file
1 parent 99352a2 commit 328f28d

File tree

7 files changed

+8
-201
lines changed

7 files changed

+8
-201
lines changed

projects/igniteui-angular/src/lib/directives/notification/notifications.directive.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export abstract class IgxNotificationsDirective extends IgxToggleDirective
3737
* `outlet` is an instance of `IgxOverlayOutletDirective` or an `ElementRef`.
3838
*/
3939
@Input()
40-
public outlet: IgxOverlayOutletDirective | ElementRef;
40+
public outlet: IgxOverlayOutletDirective | ElementRef<HTMLElement>;
4141

4242
/**
4343
* Enables/Disables the visibility of the element.

projects/igniteui-angular/src/lib/directives/toggle/toggle.directive.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ export class IgxToggleActionDirective implements OnInit {
511511
selector: '[igxOverlayOutlet]'
512512
})
513513
export class IgxOverlayOutletDirective {
514-
constructor(public element: ElementRef) { }
514+
constructor(public element: ElementRef<HTMLElement>) { }
515515

516516
/** @hidden */
517517
public get nativeElement() {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ import { IgxGridHeaderRowComponent } from './headers/grid-header-row.component';
153153
import { RowType } from './common/row.interface';
154154
import { IgxGridRowComponent } from './grid/grid-row.component';
155155
import { IPageEventArgs } from '../paginator/paginator_interfaces';
156-
import { IgxGridGroupByAreaComponent } from './group-by-area/group-by-area.component';
156+
import { IgxGridGroupByAreaComponent } from './grouping/grid-group-by-area.component';
157157

158158
let FAKE_ROW_ID = -1;
159159

projects/igniteui-angular/src/lib/grids/group-by-area/group-by-area.component.html

-33
This file was deleted.

projects/igniteui-angular/src/lib/grids/group-by-area/group-by-area.component.ts

-160
This file was deleted.

projects/igniteui-angular/src/lib/grids/grouping/group-by-area.directive.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ export abstract class IgxGroupByAreaDirective {
3737
@Input()
3838
public density: DisplayDensity = DisplayDensity.comfortable;
3939

40-
@HostBinding('class.igx-grid__grouparea')
40+
@HostBinding('class.igx-grid-grouparea')
4141
public defaultClass = true;
4242

43-
@HostBinding('class.igx-grid__grouparea--cosy')
43+
@HostBinding('class.igx-grid-grouparea--cosy')
4444
public get cosyStyle() {
4545
return this.density === 'cosy';
4646
}
4747

48-
@HostBinding('class.igx-grid__grouparea--compact')
48+
@HostBinding('class.igx-grid-grouparea--compact')
4949
public get compactStyle() {
5050
return this.density === 'compact';
5151
}
@@ -102,7 +102,7 @@ export abstract class IgxGroupByAreaDirective {
102102

103103

104104
public get dropAreaVisible(): boolean {
105-
return (this.grid.draggedColumn && this.grid.draggedColumn.groupable) ||
105+
return (this.grid.columnInDrag && this.grid.columnInDrag.groupable) ||
106106
!this.expressions.length;
107107
}
108108

projects/igniteui-angular/src/lib/grids/row.directive.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { IgxCheckboxComponent } from '../checkbox/checkbox.component';
1919
import { IgxGridForOfDirective } from '../directives/for-of/for_of.directive';
2020
import { GridBaseAPIService } from './api.service';
2121
import { IgxColumnComponent } from './columns/column.component';
22-
import { TransactionType } from '../services/public_api';
22+
import { TransactionType } from '../services/transaction/transaction';
2323
import { IgxGridBaseDirective } from './grid-base.directive';
2424
import { IgxGridSelectionService } from './selection/selection.service';
2525
import { IgxRow } from './common/crud.service';

0 commit comments

Comments
 (0)