Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions projects/ngx-infinite-scroll/src/lib/services/scroll-register.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Observable, of, fromEvent } from 'rxjs';
import { map, mergeMap, tap, throttleTime, filter } from 'rxjs/operators';
import { Observable } from 'rxjs';
import { map, tap, throttleTime, filter } from 'rxjs/operators';

import * as Models from '../../models';
import { AxisResolver } from './axis-resolver';
Expand Down Expand Up @@ -32,7 +32,7 @@ export function createScroller(config: Models.IScroller) {
down: config.downDistance,
};
return attachScrollEvent(options).pipe(
mergeMap(() => of(calculatePoints(element, resolver))),
map(() => calculatePoints(element, resolver)),
map((positionStats: Models.IPositionStats) =>
toInfiniteScrollParams(
scrollState.lastScrollPosition,
Expand Down Expand Up @@ -61,7 +61,11 @@ export function createScroller(config: Models.IScroller) {
export function attachScrollEvent(
options: Models.IScrollRegisterConfig
): Observable<{}> {
let obs = fromEvent(options.container, 'scroll');
let obs = new Observable<Event>((subscriber) => {
const onScroll = (event: Event) => subscriber.next(event);
options.container.addEventListener('scroll', onScroll);
return () => options.container.removeEventListener('scroll', onScroll);
});
// For an unknown reason calling `sampleTime()` causes trouble for many users, even with `options.throttle = 0`.
// Let's avoid calling the function unless needed.
// Replacing with throttleTime seems to solve the problem
Expand Down