ng-virtual-list 19.9.2 → 19.9.4

package/fesm2022/ng-virtual-list.mjs

@@ -3230,7 +3230,6 @@ class NgScrollerComponent {
         this.updateScrollBar();
     }
     get y() { return this._y; }
-    _currentAnimation;
     _totalSize = 0;
     set totalSize(v) {
         this._totalSize = v;
@@ -3285,6 +3284,8 @@ class NgScrollerComponent {
         }
     };
     _updateScrollBarId;
+    _animationId = -1;
+    _animationId1 = -1;
     constructor() {
         this._service.$langTextDir.pipe(tap(v => {
             this.langTextDir.set(v);
@@ -3484,10 +3485,7 @@ class NgScrollerComponent {
         return { a0 };
     }
     stopScrolling() {
-        if (this._currentAnimation !== undefined) {
-            this._currentAnimation.cancel();
-            this._currentAnimation = undefined;
-        }
+        cancelAnimationFrame(this._animationId);
     }
     move(isVertical, position, blending = false, userAction = false) {
         this.scrollTo({ [isVertical ? TOP : LEFT]: position, behavior: INSTANT, blending, userAction });
@@ -3518,7 +3516,7 @@ class NgScrollerComponent {
                 this.x = start;
             }
         }
-        let finishedValue = endValue, isFinished = false, animationId;
+        let finishedValue = endValue, isFinished = false;
         const step = (currentTime) => {
             if (!!isCanceled) {
                 return;
@@ -3561,26 +3559,16 @@ class NgScrollerComponent {
                 this._$scrollEnd.next(userAction);
             }
             else {
-                animationId = requestAnimationFrame(step);
-            }
-        }, cancel = () => {
-            cancelAnimationFrame(animationId);
-            isCanceled = true;
-        }, to = (value) => {
-            finishedValue = value;
-        }, finished = () => { return isFinished; };
-        animationId = requestAnimationFrame(step);
-        this._currentAnimation = {
-            cancel,
-            to,
-            finished,
+                this._animationId = requestAnimationFrame(step);
+            }
         };
+        this._animationId = requestAnimationFrame(step);
     }
     updateScrollBar() {
         this._$updateScrollBar.next();
     }
     scrollTo(params) {
-        const posX = params.x || params.left || 0, posY = params.y || params.top || 0, userAction = params.userAction ?? false, x = posX, y = posY, behavior = params.behavior ?? INSTANT, blending = params.blending ?? true, scrollContent = this.scrollContent()?.nativeElement, isVertical = this.direction() === ScrollerDirection.VERTICAL;
+        const posX = params.x || params.left || 0, posY = params.y || params.top || 0, userAction = params.userAction ?? false, x = posX, y = posY, fireUpdate = params.fireUpdate ?? true, behavior = params.behavior ?? INSTANT, blending = params.blending ?? true, scrollContent = this.scrollContent()?.nativeElement, isVertical = this.direction() === ScrollerDirection.VERTICAL;
         if (this._isMoving) {
             if (isVertical) {
                 if (y < 0 || y > this.scrollHeight) {
@@ -3618,7 +3606,9 @@ class NgScrollerComponent {
                     if (this.cdkScrollable) {
                         this.cdkScrollable.getElementRef().nativeElement.dispatchEvent(SCROLL_EVENT);
                     }
-                    this._$scroll.next(userAction);
+                    if (fireUpdate) {
+                        this.fireScrollEvent(userAction);
+                    }
                 }
             }
             else {
@@ -3630,11 +3620,16 @@ class NgScrollerComponent {
                     if (this.cdkScrollable) {
                         this.cdkScrollable.getElementRef().nativeElement.dispatchEvent(SCROLL_EVENT);
                     }
-                    this._$scroll.next(userAction);
+                    if (fireUpdate) {
+                        this.fireScrollEvent(userAction);
+                    }
                 }
             }
         }
     }
+    fireScrollEvent(userAction) {
+        this._$scroll.next(userAction);
+    }
     reset() {
         if (this.scrollBar) {
             this.scrollBar.stopScrolling();
@@ -4754,17 +4749,18 @@ class NgVirtualListComponent {
                     if (roundedMaxPositionAfterUpdate > 0) {
                         const diff = roundedMaxPositionAfterUpdate - roundedScrollPositionAfterUpdate, snapToEndTransitionInstantOffset = this.snapToEndTransitionInstantOffset() || viewportSize, animated = prepared && readyToStart && diff >= 0 && diff <= snapToEndTransitionInstantOffset, params = {
                             [isVertical ? TOP_PROP_NAME : LEFT_PROP_NAME]: roundedMaxPositionAfterUpdate,
+                            fireUpdate: false,
                             behavior: (animated ?
                                 BEHAVIOR_SMOOTH : BEHAVIOR_INSTANT),
-                            blending: false,
+                            blending: true,
                         };
                         scroller?.scrollTo?.(params);
                     }
                 }
                 else if (roundedActualScrollSize !== roundedScrollPositionAfterUpdate && scrollPositionAfterUpdate > 0) {
                     const params = {
-                        [isVertical ? TOP_PROP_NAME : LEFT_PROP_NAME]: scrollPositionAfterUpdate,
-                        behavior: BEHAVIOR_INSTANT,
+                        [isVertical ? TOP_PROP_NAME : LEFT_PROP_NAME]: scrollPositionAfterUpdate, blending: true,
+                        fireUpdate: false, behavior: BEHAVIOR_INSTANT,
                     };
                     scroller.scrollTo(params);
                 }
@@ -4773,25 +4769,10 @@ class NgVirtualListComponent {
         combineLatest([$snapScrollToBottom, $bounds, $listBounds, $scrollEndOffset, $actualItems, $itemConfigMap, $scrollSize, $itemSize,
             $bufferSize, $maxBufferSize, $snap, $isVertical, $dynamicSize, $enabledBufferOptimization, $cacheVersion, this.$userScroll,
         ]).pipe(takeUntilDestroyed(), distinctUntilChanged(), tap(([snapScrollToBottom, bounds, listBounds, scrollEndOffset, items, itemConfigMap, scrollSize, itemSize, bufferSize, maxBufferSize, snap, isVertical, dynamicSize, enabledBufferOptimization, cacheVersion,]) => {
-            const updateId = this._updateId;
-            if (updateId !== undefined) {
-                cancelAnimationFrame(updateId);
-                this._updateId = undefined;
-            }
-            if (!prepared || !isResetedReachStart) {
-                update({
-                    snapScrollToBottom, bounds, listBounds, scrollEndOffset, items, itemConfigMap, scrollSize, itemSize,
-                    bufferSize, maxBufferSize, snap, isVertical, dynamicSize, enabledBufferOptimization, cacheVersion,
-                });
-            }
-            else {
-                this._updateId = requestAnimationFrame((time) => {
-                    update({
-                        snapScrollToBottom, bounds, listBounds, scrollEndOffset, items, itemConfigMap, scrollSize, itemSize,
-                        bufferSize, maxBufferSize, snap, isVertical, dynamicSize, enabledBufferOptimization, cacheVersion,
-                    });
-                });
-            }
+            update({
+                snapScrollToBottom, bounds, listBounds, scrollEndOffset, items, itemConfigMap, scrollSize, itemSize,
+                bufferSize, maxBufferSize, snap, isVertical, dynamicSize, enabledBufferOptimization, cacheVersion,
+            });
         })).subscribe();
         const $scroller = toObservable(this._scroller).pipe(takeUntilDestroyed(), filter$1(v => !!v), map(v => v.nativeElement), take(1)), $scrollerScroll = toObservable(this._scrollerComponent).pipe(takeUntilDestroyed(), filter$1(v => !!v), take(1), switchMap$1(scroller => scroller.$scroll)), $scrollerScrollEnd = toObservable(this._scrollerComponent).pipe(takeUntilDestroyed(), filter$1(v => !!v), take(1), switchMap$1(scroller => scroller.$scrollEnd)), $list = toObservable(this._list).pipe(takeUntilDestroyed(), filter$1(v => !!v), map(v => v.nativeElement), take(1));
         $scroller.pipe(takeUntilDestroyed(), distinctUntilChanged(), switchMap$1(scroller => {
@@ -4918,7 +4899,7 @@ class NgVirtualListComponent {
         })).subscribe();
         const $scrollTo = this.$scrollTo;
         combineLatest([$scroller, $trackBy, $scrollTo]).pipe(takeUntilDestroyed(), filter$1(([scroller]) => scroller !== undefined), map(([scroller, trackBy, event]) => ({ scroller: scroller, trackBy, event })), switchMap$1(({ scroller, trackBy, event }) => {
-            const scrollerComponent = this._scrollerComponent(), { id, behavior = BEHAVIOR_INSTANT, iteration = 0, isLastIteration = false, scrollCalled = false, cb, } = event;
+            const scrollerComponent = this._scrollerComponent(), { id, iteration = 0, isLastIteration = false, scrollCalled = false, cb, } = event;
             if (scrollerComponent) {
                 const items = this._actualItems();
                 if (items && items.length) {
@@ -4931,6 +4912,7 @@ class NgVirtualListComponent {
                             snap: this.snap(), fromItemId: id, enabledBufferOptimization: this.enabledBufferOptimization(),
                         }, scrollSize = this._trackBox.getItemPosition(id, itemConfigMap, opts), params = {
                             [isVertical ? TOP_PROP_NAME : LEFT_PROP_NAME]: scrollSize, behavior: BEHAVIOR_INSTANT,
+                            fireUpdate: false,
                             blending: true,
                         };
                         if (scrollSize === -1) {
@@ -4957,7 +4939,7 @@ class NgVirtualListComponent {
                         if ((!notChanged && iteration < MAX_SCROLL_TO_ITERATIONS) || iteration < MAX_SCROLL_TO_ITERATIONS) {
                             this._$scrollTo.next(params);
                             return of([false, {
-                                    id, behavior: BEHAVIOR_INSTANT, scroller: scrollerComponent, iteration: iteration + 1, blending: true,
+                                    id, scroller: scrollerComponent, iteration: iteration + 1,
                                     isLastIteration: notChanged, scrollCalled: true, cb
                                 }]).pipe(delay(1));
                         }