Handle resizes on videos list

[github/Chocobozzz/PeerTube.git] / client / src / app / shared / video / infinite-scroller.directive.ts

diff --git a/client/src/app/shared/video/infinite-scroller.directive.ts b/client/src/app/shared/video/infinite-scroller.directive.ts
index 52d8b2b3718b8b144baf64b77df4184e97117082..e0f9f4f836fc74b89ec96adc963bc6e44e2bda33 100644 (file)
--- a/client/src/app/shared/video/infinite-scroller.directive.ts
+++ b/client/src/app/shared/video/infinite-scroller.directive.ts
@@ -1,10 +1,13 @@
 import { Directive, EventEmitter, Input, 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/startWith'
+import 'rxjs/add/operator/throttleTime'
 import { fromEvent } from 'rxjs/observable/fromEvent'
+import 'rxjs/add/operator/share'
 
 @Directive({
   selector: '[myInfiniteScroller]'
@@ -34,9 +37,15 @@ export class InfiniteScrollerDirective implements OnInit {
   }
 
   initialize () {
+    // Emit the last value
+    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()
 
     // Scroll Down
     scrollObservable
@@ -48,8 +57,6 @@ export class InfiniteScrollerDirective implements OnInit {
         return res
       })
       .filter(({ current, maximumScroll }) => maximumScroll <= 0 || (current / maximumScroll) > this.decimalLimit)
-      .debounceTime(200)
-      .distinct()
       .subscribe(() => this.nearOfBottom.emit())
 
     // Scroll up
@@ -64,17 +71,17 @@ export class InfiniteScrollerDirective implements OnInit {
       .filter(({ current, maximumScroll }) => {
         return current !== 0 && (1 - (current / maximumScroll)) > this.decimalLimit
       })
-      .debounceTime(200)
-      .distinct()
       .subscribe(() => this.nearOfTop.emit())
 
     // Page change
     scrollObservable
-      .debounceTime(500)
       .distinct()
-      .map(({ current }) => Math.max(1, Math.round((current + InfiniteScrollerDirective.PAGE_VIEW_TOP_MARGIN) / this.pageHeight)))
+      .map(({ current }) => this.calculateCurrentPage(current))
       .distinctUntilChanged()
       .subscribe(res => this.pageChanged.emit(res))
   }
 
+  private calculateCurrentPage (current: number) {
+    return Math.max(1, Math.round((current + InfiniteScrollerDirective.PAGE_VIEW_TOP_MARGIN) / this.pageHeight))
+  }
 }