Skip to content

Commit 5ac8768

Browse files
committed
Merge branch 'master' into mvenkov/do-not-move-overlay-element-from-its-position
2 parents 5dee6e6 + ef85d87 commit 5ac8768

File tree

9 files changed

+18
-18
lines changed

9 files changed

+18
-18
lines changed

.github/workflows/trigger-licensed-release.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
name: Trigger Licensed Release
22

3-
permissions: {}
3+
permissions:
4+
id-token: write
5+
contents: read
46

57
on:
68
release:
7-
types: [published]
9+
types: [created]
810
workflow_dispatch:
911
inputs:
1012
release_tag:

projects/igniteui-angular/core/src/services/overlay/position/container-position-strategy.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ export class ContainerPositionStrategy extends GlobalPositionStrategy {
2525
this.io = Util.setupIntersectionObserver(
2626
outletElement || target as HTMLElement,
2727
contentElement.ownerDocument,
28-
() => this.updatePosition(contentElement, target as HTMLElement)
28+
() => this.updatePosition(contentElement, outletElement || target as HTMLElement)
2929
);
30-
this.internalPosition(contentElement, target as HTMLElement);
30+
this.internalPosition(contentElement, outletElement || target as HTMLElement);
3131
}
3232

3333
/**
@@ -42,8 +42,7 @@ export class ContainerPositionStrategy extends GlobalPositionStrategy {
4242
contentElement.classList.add('igx-overlay__content--relative');
4343
contentElement.parentElement.classList.add('igx-overlay__wrapper--flex-container');
4444
this.setPosition(contentElement);
45-
const outletElement = contentElement.parentElement?.parentElement;
46-
this.updatePosition(contentElement, outletElement ?? targetElement);
45+
this.updatePosition(contentElement, targetElement);
4746
}
4847

4948
private updatePosition(contentElement: HTMLElement, targetElement: HTMLElement): void {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6209,6 +6209,7 @@ export abstract class IgxGridBaseDirective implements GridType,
62096209
*/
62106210
public showSnackbarFor(index: number) {
62116211
this.addRowSnackbar.actionText = index === -1 ? '' : this.resourceStrings.igx_grid_snackbar_addrow_actiontext;
6212+
this.addRowSnackbar.container = this.tbodyContainer.nativeElement;
62126213
this.lastAddedRowIndex = index;
62136214
this.addRowSnackbar.open();
62146215
}

projects/igniteui-angular/grids/grid/src/grid-filtering-ui.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2732,19 +2732,19 @@ describe('IgxGrid - Filtering Row UI actions #grid', () => {
27322732
fix.detectChanges();
27332733

27342734
const thead = GridFunctions.getGridHeader(grid).nativeElement;
2735-
expect(thead.getBoundingClientRect().height).toEqual(grid.defaultRowHeight * 4 + 1);
2735+
expect(thead.getBoundingClientRect().height).toBeCloseTo(grid.defaultRowHeight * 4 + 1, 0);
27362736

27372737
setElementSize(grid.nativeElement, ɵSize.Medium);
27382738
fix.detectChanges();
27392739
await wait(100); // needed because the resize observer handler for --ig-size is called inside an angular zone
27402740
fix.detectChanges();
2741-
expect(thead.getBoundingClientRect().height).toEqual(grid.defaultRowHeight * 4 + 1);
2741+
expect(thead.getBoundingClientRect().height).toBeCloseTo(grid.defaultRowHeight * 4 + 1, 0);
27422742

27432743
setElementSize(grid.nativeElement, ɵSize.Small);
27442744
fix.detectChanges();
27452745
await wait(100); // needed because the resize observer handler for --ig-size is called inside an angular zone
27462746
fix.detectChanges();
2747-
expect(thead.getBoundingClientRect().height).toEqual(grid.defaultRowHeight * 4 + 1);
2747+
expect(thead.getBoundingClientRect().height).toBeCloseTo(grid.defaultRowHeight * 4 + 1, 0);
27482748

27492749
});
27502750

projects/igniteui-angular/grids/grid/src/grid.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
>
3131
</igx-grid-header-row>
3232

33-
<div #gridBody igxGridBody (keydown.control.c)="copyHandler($event)" (copy)="copyHandler($event)" class="igx-grid__tbody" role="rowgroup">
33+
<div igxGridBody (keydown.control.c)="copyHandler($event)" (copy)="copyHandler($event)" class="igx-grid__tbody" role="rowgroup">
3434
<div class="igx-grid__tbody-content" tabindex="0" [attr.role]="dataView.length ? null : 'row'" (keydown)="navigation.handleNavigation($event)" (focus)="navigation.focusTbody($event)"
3535
(dragStop)="selectionService.dragMode = $event" (scroll)="preventContainerScroll($event)"
3636
(dragScroll)="dragScroll($event)" [igxGridDragSelect]="selectionService.dragMode"
@@ -179,7 +179,7 @@
179179
</div>
180180

181181
<div class="igx-grid__addrow-snackbar">
182-
<igx-snackbar #addRowSnackbar [container]="gridBody" [actionText]="resourceStrings.igx_grid_snackbar_addrow_actiontext" [displayTime]="snackbarDisplayTime">{{resourceStrings.igx_grid_snackbar_addrow_label}}</igx-snackbar>
182+
<igx-snackbar #addRowSnackbar [actionText]="resourceStrings.igx_grid_snackbar_addrow_actiontext" [displayTime]="snackbarDisplayTime">{{resourceStrings.igx_grid_snackbar_addrow_label}}</igx-snackbar>
183183
</div>
184184

185185
<div class="igx-grid__loading-outlet" #igxLoadingOverlayOutlet></div>

projects/igniteui-angular/grids/hierarchical-grid/src/hierarchical-grid.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
<div class="igx-grid__tbody-scrollbar-end" [style.height.px]="!isRowPinningToTop ? pinnedRowHeight : 0"></div>
148148
</div>
149149
<div class="igx-grid__addrow-snackbar">
150-
<igx-snackbar #addRowSnackbar [target]="gridBody" [actionText]="resourceStrings.igx_grid_snackbar_addrow_actiontext" [displayTime]="snackbarDisplayTime">{{resourceStrings.igx_grid_snackbar_addrow_label}}</igx-snackbar>
150+
<igx-snackbar #addRowSnackbar [actionText]="resourceStrings.igx_grid_snackbar_addrow_actiontext" [displayTime]="snackbarDisplayTime">{{resourceStrings.igx_grid_snackbar_addrow_label}}</igx-snackbar>
151151
</div>
152152
</div>
153153

projects/igniteui-angular/grids/pivot-grid/src/pivot-grid.component.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,8 @@
8181
</div>
8282

8383
<div class="igx-grid__addrow-snackbar">
84-
<igx-snackbar #addRowSnackbar [container]="igxBodyOverlayOutlet" [actionText]="resourceStrings.igx_grid_snackbar_addrow_actiontext" [displayTime]="snackbarDisplayTime">{{resourceStrings.igx_grid_snackbar_addrow_label}}</igx-snackbar>
84+
<igx-snackbar #addRowSnackbar [actionText]="resourceStrings.igx_grid_snackbar_addrow_actiontext" [displayTime]="snackbarDisplayTime">{{resourceStrings.igx_grid_snackbar_addrow_label}}</igx-snackbar>
8585
</div>
86-
87-
<div #igxBodyOverlayOutlet></div>
8886
</div>
8987

9088
<div class="igx-grid__scroll" [style.height.px]="scrollSize" #scr [hidden]="isHorizontalScrollHidden" (pointerdown)="$event.preventDefault()">

projects/igniteui-angular/grids/tree-grid/src/tree-grid.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
<div class="igx-grid__tbody-scrollbar-end" [style.height.px]='!isRowPinningToTop ? pinnedRowHeight : 0'></div>
139139
</div>
140140
<div class="igx-grid__addrow-snackbar">
141-
<igx-snackbar #addRowSnackbar [container]="gridBody" [actionText]="resourceStrings.igx_grid_snackbar_addrow_actiontext" [displayTime]='snackbarDisplayTime'>{{resourceStrings.igx_grid_snackbar_addrow_label}}</igx-snackbar>
141+
<igx-snackbar #addRowSnackbar [actionText]="resourceStrings.igx_grid_snackbar_addrow_actiontext" [displayTime]='snackbarDisplayTime'>{{resourceStrings.igx_grid_snackbar_addrow_label}}</igx-snackbar>
142142
</div>
143143
</div>
144144

src/app/drop-down/drop-down.sample.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
[value]="item.selected"
5151
>
5252
@if(!properties.hidePrefix) {
53-
<igx-icon slot="prefix">location_city</igx-icon>
53+
<igc-icon slot="prefix" name="location_city"></igc-icon>
5454
} {{ item.field }} @if(!properties.hideSuffix) {
55-
<igx-icon slot="suffix">location_on</igx-icon>
55+
<igc-icon slot="suffix" name="location_on"></igc-icon>
5656
}
5757
</igc-dropdown-item>
5858
} }

0 commit comments

Comments
 (0)