Skip to content

Commit d025ba1

Browse files
committed
test(overlay): fix failing tests
# Conflicts: # projects/igniteui-angular/src/lib/services/overlay/overlay.ts
1 parent 1d9a6f3 commit d025ba1

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
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: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,9 @@ export class IgxOverlayService implements OnDestroy {
411411
return;
412412
}
413413
if (settings) {
414-
info.settings = settings;
414+
settings.positionStrategy ??= info.settings.positionStrategy;
415+
settings.scrollStrategy ??= info.settings.scrollStrategy;
416+
info.settings = { ...info.settings, ...settings };
415417
}
416418
this.updateSize(info);
417419
info.settings.positionStrategy.position(
@@ -592,7 +594,7 @@ export class IgxOverlayService implements OnDestroy {
592594
const createSettings = viewContainerRefOrSettings as OverlayCreateSettings | undefined;
593595
let elementInjector: Injector;
594596
if (createSettings) {
595-
({ injector: elementInjector, ...overlaySettings} = createSettings);
597+
({ injector: elementInjector, ...overlaySettings } = createSettings);
596598
}
597599
dynamicComponent = createComponent(component, { environmentInjector, elementInjector });
598600
this._appRef.attachView(dynamicComponent.hostView);
@@ -610,7 +612,7 @@ export class IgxOverlayService implements OnDestroy {
610612
info.elementRef = { nativeElement: element };
611613
info.componentRef = dynamicComponent;
612614
}
613-
info.settings = Object.assign({}, this._defaultSettings, overlaySettings);
615+
info.settings = Object.assign({}, this._defaultSettings, overlaySettings);
614616
return info;
615617
}
616618

0 commit comments

Comments
 (0)