Skip to content

Commit a175e13

Browse files
committed
test(overlay): fix failing tests
1 parent 702c6b7 commit a175e13

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

projects/igniteui-angular/src/lib/services/overlay/overlay.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1407,7 +1407,8 @@ describe('igxOverlay', () => {
14071407
tick();
14081408

14091409
expect(lastPositionSpy).toHaveBeenCalledTimes(1);
1410-
expect(info.settings).toBe(os);
1410+
expect(info.settings.scrollStrategy).toBe(os.scrollStrategy);
1411+
expect(info.settings.positionStrategy).toBe(os.positionStrategy);
14111412
}));
14121413
});
14131414

projects/igniteui-angular/src/lib/services/overlay/overlay.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ export class IgxOverlayService implements OnDestroy {
347347
const elementRect = info.elementRef.nativeElement.getBoundingClientRect();
348348
info.initialSize = { width: elementRect.width, height: elementRect.height };
349349
// Get the size before moving the container into the overlay so that it does not forget about inherited styles.
350-
this.getComponentSize(info);
350+
this.getComponentSize(info);
351351
this.moveElementToOverlay(info);
352352
// Update the container size after moving if there is size.
353353
if (info.size) {
@@ -416,7 +416,9 @@ export class IgxOverlayService implements OnDestroy {
416416
return;
417417
}
418418
if (settings) {
419-
info.settings = settings;
419+
settings.positionStrategy ??= info.settings.positionStrategy;
420+
settings.scrollStrategy ??= info.settings.scrollStrategy;
421+
info.settings = { ...info.settings, ...settings };
420422
}
421423
this.updateSize(info);
422424
info.settings.positionStrategy.position(
@@ -597,7 +599,7 @@ export class IgxOverlayService implements OnDestroy {
597599
const createSettings = viewContainerRefOrSettings as OverlayCreateSettings | undefined;
598600
let elementInjector: Injector;
599601
if (createSettings) {
600-
({ injector: elementInjector, ...overlaySettings} = createSettings);
602+
({ injector: elementInjector, ...overlaySettings } = createSettings);
601603
}
602604
dynamicComponent = createComponent(component, { environmentInjector, elementInjector });
603605
this._appRef.attachView(dynamicComponent.hostView);
@@ -615,7 +617,7 @@ export class IgxOverlayService implements OnDestroy {
615617
info.elementRef = { nativeElement: element };
616618
info.componentRef = dynamicComponent;
617619
}
618-
info.settings = Object.assign({}, this._defaultSettings, overlaySettings);
620+
info.settings = Object.assign({}, this._defaultSettings, overlaySettings);
619621
return info;
620622
}
621623

0 commit comments

Comments
 (0)