fix(scroll dispatcher): emit scroll events from cdkScrollable directi…

…ve (#2714)
akveo · May 14, 2021 · f715e97 · f715e97
1 parent dd0c88e
commit f715e97
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/framework/theme/components/cdk/adapter/scroll-dispatcher-adapter.ts b/src/framework/theme/components/cdk/adapter/scroll-dispatcher-adapter.ts
@@ -1,6 +1,6 @@
 import { Inject, Injectable, NgZone } from '@angular/core';
 import { CdkScrollable, ScrollDispatcher } from '@angular/cdk/overlay';
-import { Observable } from 'rxjs';
+import { merge, Observable } from 'rxjs';
 
 import { NbPlatform } from '../platform/platform-service';
 import { NbLayoutScrollService } from '../../../services/scroll.service';
@@ -16,7 +16,10 @@ export class NbScrollDispatcherAdapter extends ScrollDispatcher {
  }
 
  scrolled(auditTimeInMs?: number): Observable<CdkScrollable | void> {
- return this.scrollService.onScroll();
+ return merge(
+ super.scrolled(auditTimeInMs),
+ this.scrollService.onScroll(),
+ );
  }
 }