Throttle infinite scroller
This commit is contained in:
parent
1f30a1853e
commit
a9ca764e7e
|
@ -59,14 +59,6 @@ function immutableAssign <A, B> (target: A, source: B) {
|
||||||
return Object.assign({}, target, source)
|
return Object.assign({}, target, source)
|
||||||
}
|
}
|
||||||
|
|
||||||
function isInSmallView () {
|
|
||||||
return window.innerWidth < 600
|
|
||||||
}
|
|
||||||
|
|
||||||
function isInMobileView () {
|
|
||||||
return window.innerWidth < 500
|
|
||||||
}
|
|
||||||
|
|
||||||
// Thanks: https://gist.github.com/ghinda/8442a57f22099bdb2e34
|
// Thanks: https://gist.github.com/ghinda/8442a57f22099bdb2e34
|
||||||
function objectToFormData (obj: any, form?: FormData, namespace?: string) {
|
function objectToFormData (obj: any, form?: FormData, namespace?: string) {
|
||||||
let fd = form || new FormData()
|
let fd = form || new FormData()
|
||||||
|
@ -94,6 +86,18 @@ function lineFeedToHtml (obj: object, keyToNormalize: string) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Try to cache a little bit window.innerWidth
|
||||||
|
let windowInnerWidth = window.innerWidth
|
||||||
|
setInterval(() => windowInnerWidth = window.innerWidth, 500)
|
||||||
|
|
||||||
|
function isInSmallView () {
|
||||||
|
return windowInnerWidth < 600
|
||||||
|
}
|
||||||
|
|
||||||
|
function isInMobileView () {
|
||||||
|
return windowInnerWidth < 500
|
||||||
|
}
|
||||||
|
|
||||||
export {
|
export {
|
||||||
viewportHeight,
|
viewportHeight,
|
||||||
getParameterByName,
|
getParameterByName,
|
||||||
|
|
|
@ -5,6 +5,7 @@ import 'rxjs/add/operator/distinctUntilChanged'
|
||||||
import 'rxjs/add/operator/filter'
|
import 'rxjs/add/operator/filter'
|
||||||
import 'rxjs/add/operator/map'
|
import 'rxjs/add/operator/map'
|
||||||
import 'rxjs/add/operator/startWith'
|
import 'rxjs/add/operator/startWith'
|
||||||
|
import 'rxjs/add/operator/throttleTime'
|
||||||
import { fromEvent } from 'rxjs/observable/fromEvent'
|
import { fromEvent } from 'rxjs/observable/fromEvent'
|
||||||
|
|
||||||
@Directive({
|
@Directive({
|
||||||
|
@ -37,6 +38,7 @@ export class InfiniteScrollerDirective implements OnInit {
|
||||||
initialize () {
|
initialize () {
|
||||||
const scrollObservable = fromEvent(window, 'scroll')
|
const scrollObservable = fromEvent(window, 'scroll')
|
||||||
.startWith(true)
|
.startWith(true)
|
||||||
|
.throttleTime(200)
|
||||||
.map(() => ({ current: window.scrollY, maximumScroll: document.body.clientHeight - window.innerHeight }))
|
.map(() => ({ current: window.scrollY, maximumScroll: document.body.clientHeight - window.innerHeight }))
|
||||||
|
|
||||||
// Scroll Down
|
// Scroll Down
|
||||||
|
@ -49,7 +51,6 @@ export class InfiniteScrollerDirective implements OnInit {
|
||||||
return res
|
return res
|
||||||
})
|
})
|
||||||
.filter(({ current, maximumScroll }) => maximumScroll <= 0 || (current / maximumScroll) > this.decimalLimit)
|
.filter(({ current, maximumScroll }) => maximumScroll <= 0 || (current / maximumScroll) > this.decimalLimit)
|
||||||
.debounceTime(200)
|
|
||||||
.distinct()
|
.distinct()
|
||||||
.subscribe(() => this.nearOfBottom.emit())
|
.subscribe(() => this.nearOfBottom.emit())
|
||||||
|
|
||||||
|
@ -65,13 +66,11 @@ export class InfiniteScrollerDirective implements OnInit {
|
||||||
.filter(({ current, maximumScroll }) => {
|
.filter(({ current, maximumScroll }) => {
|
||||||
return current !== 0 && (1 - (current / maximumScroll)) > this.decimalLimit
|
return current !== 0 && (1 - (current / maximumScroll)) > this.decimalLimit
|
||||||
})
|
})
|
||||||
.debounceTime(200)
|
|
||||||
.distinct()
|
.distinct()
|
||||||
.subscribe(() => this.nearOfTop.emit())
|
.subscribe(() => this.nearOfTop.emit())
|
||||||
|
|
||||||
// Page change
|
// Page change
|
||||||
scrollObservable
|
scrollObservable
|
||||||
.debounceTime(500)
|
|
||||||
.distinct()
|
.distinct()
|
||||||
.map(({ current }) => Math.max(1, Math.round((current + InfiniteScrollerDirective.PAGE_VIEW_TOP_MARGIN) / this.pageHeight)))
|
.map(({ current }) => Math.max(1, Math.round((current + InfiniteScrollerDirective.PAGE_VIEW_TOP_MARGIN) / this.pageHeight)))
|
||||||
.distinctUntilChanged()
|
.distinctUntilChanged()
|
||||||
|
|
Loading…
Reference in New Issue
Block a user