From cf58d352e5a889bddecca0c1abc331f0a47fb9cd Mon Sep 17 00:00:00 2001 From: IBarakov Date: Thu, 23 Jul 2020 12:17:44 +0300 Subject: [PATCH 1/2] feat(grid): create a setter for grid's outlet #7379 --- CHANGELOG.md | 6 ++++ .../src/lib/grids/cell.component.html | 2 +- .../src/lib/grids/common/grid.interface.ts | 2 +- .../advanced-filtering-dialog.component.html | 2 +- .../base/grid-filtering-row.component.html | 2 +- .../base/grid-filtering-row.component.ts | 4 +-- ...excel-style-date-expression.component.html | 2 +- .../src/lib/grids/grid-base.directive.ts | 35 +++++++++++-------- .../grids/grid/expandable-cell.component.html | 2 +- .../headers/grid-header-group.component.html | 6 ++-- .../hierarchical-grid-base.directive.ts | 15 ++++++-- .../grids/toolbar/grid-toolbar.component.ts | 6 ++-- .../grids/tree-grid/tree-cell.component.html | 2 +- .../grid-column-selection.sample.ts | 2 +- 14 files changed, 55 insertions(+), 33 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4797a6076dc..939c1b68204 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -94,6 +94,12 @@ The following example shows how you can use the Indigo theme: - `IgxSelect` support for `igxHint` directive added. - Allows the user to add `igxHint` to be displayed bellow the input element. +## 9.1.9 + +### New Features +- `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid` + - Expose a setter for grid's `outlet` property, which can be used to set the outlet used to attach the grid's overlays to. + ## 9.1.4 ### New Features diff --git a/projects/igniteui-angular/src/lib/grids/cell.component.html b/projects/igniteui-angular/src/lib/grids/cell.component.html index 0aa8c34c8c0..c00879e58fc 100644 --- a/projects/igniteui-angular/src/lib/grids/cell.component.html +++ b/projects/igniteui-angular/src/lib/grids/cell.component.html @@ -24,7 +24,7 @@ [igxFocus]="true" [disableRipple]="true"> - diff --git a/projects/igniteui-angular/src/lib/grids/common/grid.interface.ts b/projects/igniteui-angular/src/lib/grids/common/grid.interface.ts index 633691812d1..bdaa65126e6 100644 --- a/projects/igniteui-angular/src/lib/grids/common/grid.interface.ts +++ b/projects/igniteui-angular/src/lib/grids/common/grid.interface.ts @@ -30,7 +30,7 @@ export interface GridType extends IGridDataBindable { selectionService: any; navigation: any; filteringService: any; - outletDirective: any; + outlet: any; calcHeight: number; diff --git a/projects/igniteui-angular/src/lib/grids/filtering/advanced-filtering/advanced-filtering-dialog.component.html b/projects/igniteui-angular/src/lib/grids/filtering/advanced-filtering/advanced-filtering-dialog.component.html index a91a8bce823..5930fa131f6 100644 --- a/projects/igniteui-angular/src/lib/grids/filtering/advanced-filtering/advanced-filtering-dialog.component.html +++ b/projects/igniteui-angular/src/lib/grids/filtering/advanced-filtering/advanced-filtering-dialog.component.html @@ -182,7 +182,7 @@
mode="dropdown" [(ngModel)]="searchValue" [locale]="grid.locale" - [outlet]="grid.outletDirective"> + [outlet]="grid.outlet"> diff --git a/projects/igniteui-angular/src/lib/grids/filtering/base/grid-filtering-row.component.ts b/projects/igniteui-angular/src/lib/grids/filtering/base/grid-filtering-row.component.ts index e8773fa4e2a..59131ea4685 100644 --- a/projects/igniteui-angular/src/lib/grids/filtering/base/grid-filtering-row.component.ts +++ b/projects/igniteui-angular/src/lib/grids/filtering/base/grid-filtering-row.component.ts @@ -147,8 +147,8 @@ export class IgxGridFilteringRowComponent implements AfterViewInit { constructor(public filteringService: IgxFilteringService, public element: ElementRef, public cdr: ChangeDetectorRef) { } ngAfterViewInit() { - this._conditionsOverlaySettings.outlet = this.column.grid.outletDirective; - this._operatorsOverlaySettings.outlet = this.column.grid.outletDirective; + this._conditionsOverlaySettings.outlet = this.column.grid.outlet; + this._operatorsOverlaySettings.outlet = this.column.grid.outlet; const selectedItem = this.expressionsList.find(expr => expr.isSelected === true); if (selectedItem) { diff --git a/projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-date-expression.component.html b/projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-date-expression.component.html index 72c896f1d3a..d3bf79e5ddb 100644 --- a/projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-date-expression.component.html +++ b/projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-date-expression.component.html @@ -14,7 +14,7 @@ - + - diff --git a/projects/igniteui-angular/src/lib/grids/headers/grid-header-group.component.html b/projects/igniteui-angular/src/lib/grids/headers/grid-header-group.component.html index 4461b10d18d..7154ec48b62 100644 --- a/projects/igniteui-angular/src/lib/grids/headers/grid-header-group.component.html +++ b/projects/igniteui-angular/src/lib/grids/headers/grid-header-group.component.html @@ -14,7 +14,7 @@ [column]="child" [gridID]="child.grid.id" [igxColumnMovingDrag]="child" - [ghostHost]="grid.outletDirective.nativeElement" + [ghostHost]="grid.outlet.nativeElement" [attr.droppable]="true" [igxColumnMovingDrop]="child"> @@ -48,7 +48,7 @@ 'igx-grid__th--selected': selected, 'igx-grid__th--active': activeGroup}" [igxColumnMovingDrag]="column" - [ghostHost]="grid.outletDirective.nativeElement" + [ghostHost]="grid.outlet.nativeElement" [attr.droppable]="true" [igxColumnMovingDrop]="column" (pointerdown)="activate()" @@ -81,7 +81,7 @@ - + - diff --git a/src/app/grid-column-selection/grid-column-selection.sample.ts b/src/app/grid-column-selection/grid-column-selection.sample.ts index d95274b93a5..6aa2b7bdc6e 100644 --- a/src/app/grid-column-selection/grid-column-selection.sample.ts +++ b/src/app/grid-column-selection/grid-column-selection.sample.ts @@ -120,7 +120,7 @@ export class GridColumnSelectionSampleComponent implements OnInit { public toggleColumnSelection() { this._overlaySettings.positionStrategy.settings.target = this.columnSelectionButton.nativeElement; - this._overlaySettings.outlet = this.grid1.outletDirective; + this._overlaySettings.outlet = this.grid1.outlet; this.columnSelectionDropdown.toggle(this._overlaySettings); } From bd21c4e13b91fef1817e637df56cc5150097ec79 Mon Sep 17 00:00:00 2001 From: Simeon Simeonoff Date: Mon, 27 Jul 2020 15:00:07 +0300 Subject: [PATCH 2/2] Revert "fix(grid): buttons style in ExcelStyleFiltering in IE11" --- .../styles/components/button-group/_button-group-theme.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/igniteui-angular/src/lib/core/styles/components/button-group/_button-group-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/button-group/_button-group-theme.scss index 7e7dc9b2fe2..5470329f9d6 100644 --- a/projects/igniteui-angular/src/lib/core/styles/components/button-group/_button-group-theme.scss +++ b/projects/igniteui-angular/src/lib/core/styles/components/button-group/_button-group-theme.scss @@ -195,7 +195,7 @@ background: --var($theme, 'item-background'); min-width: $group-item-min-width; display: flex; - flex: 1 0 auto; + flex: 1 0 0%; justify-content: center; align-items: center; text-decoration: none;