+import { distinct, distinctUntilChanged, filter, map, share, startWith, throttleTime } from 'rxjs/operators'
import { Directive, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'
-import 'rxjs/add/operator/debounceTime'
-import 'rxjs/add/operator/distinct'
-import 'rxjs/add/operator/distinctUntilChanged'
-import 'rxjs/add/operator/filter'
-import 'rxjs/add/operator/map'
-import 'rxjs/add/operator/share'
-import 'rxjs/add/operator/startWith'
-import 'rxjs/add/operator/throttleTime'
-import { fromEvent } from 'rxjs/observable/fromEvent'
-import { Subscription } from 'rxjs/Subscription'
+import { fromEvent, Subscription } from 'rxjs'
@Directive({
selector: '[myInfiniteScroller]'
const throttleOptions = { leading: true, trailing: true }
const scrollObservable = fromEvent(window, 'scroll')
- .startWith(true)
- .throttleTime(200, undefined, throttleOptions)
- .map(() => ({ current: window.scrollY, maximumScroll: document.body.clientHeight - window.innerHeight }))
- .distinctUntilChanged((o1, o2) => o1.current === o2.current)
- .share()
+ .pipe(
+ startWith(null),
+ throttleTime(200, undefined, throttleOptions),
+ map(() => ({ current: window.scrollY, maximumScroll: document.body.clientHeight - window.innerHeight })),
+ distinctUntilChanged((o1, o2) => o1.current === o2.current),
+ share()
+ )
// Scroll Down
this.scrollDownSub = scrollObservable
- // Check we scroll down
- .filter(({ current }) => {
- const res = this.lastCurrentBottom < current
+ .pipe(
+ // Check we scroll down
+ filter(({ current }) => {
+ const res = this.lastCurrentBottom < current
- this.lastCurrentBottom = current
- return res
- })
- .filter(({ current, maximumScroll }) => maximumScroll <= 0 || (current / maximumScroll) > this.decimalLimit)
+ this.lastCurrentBottom = current
+ return res
+ }),
+ filter(({ current, maximumScroll }) => maximumScroll <= 0 || (current / maximumScroll) > this.decimalLimit)
+ )
.subscribe(() => this.nearOfBottom.emit())
// Scroll up
this.scrollUpSub = scrollObservable
- // Check we scroll up
- .filter(({ current }) => {
- const res = this.lastCurrentTop > current
+ .pipe(
+ // Check we scroll up
+ filter(({ current }) => {
+ const res = this.lastCurrentTop > current
- this.lastCurrentTop = current
- return res
- })
- .filter(({ current, maximumScroll }) => {
- return current !== 0 && (1 - (current / maximumScroll)) > this.decimalLimit
- })
+ this.lastCurrentTop = current
+ return res
+ }),
+ filter(({ current, maximumScroll }) => {
+ return current !== 0 && (1 - (current / maximumScroll)) > this.decimalLimit
+ })
+ )
.subscribe(() => this.nearOfTop.emit())
// Page change
this.pageChangeSub = scrollObservable
- .distinct()
- .map(({ current }) => this.calculateCurrentPage(current))
- .distinctUntilChanged()
+ .pipe(
+ distinct(),
+ map(({ current }) => this.calculateCurrentPage(current)),
+ distinctUntilChanged()
+ )
.subscribe(res => this.pageChanged.emit(res))
}