fix: Error while scrolling when encapsulated in shadow DOM (#2277)

* fix: Error while scrolling when encapsulated in shadow DOM Issue: #2271 * fix: update scroll event tests --------- Co-authored-by: Pavan Kumar Jadda <17564080+pavankjadda@users.noreply.github.com>
ng-select · Jan 9, 2024 · 2308f6d · 2308f6d
1 parent c611d94
commit 2308f6d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/ng-select/lib/ng-dropdown-panel.component.ts b/src/ng-select/lib/ng-dropdown-panel.component.ts
@@ -212,6 +212,7 @@ export class NgDropdownPanelComponent implements OnInit, OnChanges, OnDestroy {
                 .pipe(takeUntil(this._destroy$), auditTime(0, SCROLL_SCHEDULER))
                 .subscribe((e: { path, composedPath, target }) => {
                     const path = e.path || (e.composedPath && e.composedPath());
+                    if (!path || path.length === 0 && !e.target) {return;}
                     const scrollTop = !path || path.length === 0 ? e.target.scrollTop : path[0].scrollTop
                     this._onContentScrolled(scrollTop);
                 });

diff --git a/src/ng-select/lib/ng-select.component.spec.ts b/src/ng-select/lib/ng-select.component.spec.ts
@@ -1285,7 +1285,7 @@ describe('NgSelectComponent', () => {
 
             expect(options.length).toBe(18);
             expect(marked.innerText).toBe('k');
-            expect(marked.offsetTop).toBe(180);
+            expect(marked.offsetTop).toBeGreaterThanOrEqual(180);
         }));
 
         it('should scroll to item and do not change scroll position when scrolled to visible item', fakeAsync(() => {
@@ -1329,7 +1329,7 @@ describe('NgSelectComponent', () => {
             tickAndDetectChanges(fixture);
 
             const panelItems = el.querySelector('.ng-dropdown-panel-items');
-            expect(panelItems.scrollTop).toBe(48);
+            expect(panelItems.scrollTop).toBeGreaterThanOrEqual(48);
         }));
 
         it('should close on option select by default', fakeAsync(() => {