ng-virtual-list 19.9.3 → 19.9.4

package/fesm2022/ng-virtual-list.mjs

@@ -3486,7 +3486,6 @@ class NgScrollerComponent {
     }
     stopScrolling() {
         cancelAnimationFrame(this._animationId);
-        cancelAnimationFrame(this._animationId1);
     }
     move(isVertical, position, blending = false, userAction = false) {
         this.scrollTo({ [isVertical ? TOP : LEFT]: position, behavior: INSTANT, blending, userAction });
@@ -3538,7 +3537,6 @@ class NgScrollerComponent {
             prevPos = currentValue;
             const scrollContent = this.scrollContent()?.nativeElement;
             if (scrollContent) {
-                cancelAnimationFrame(this._animationId1);
                 if (isVertical) {
                     this.y = currentValue;
                     scrollContent.style.transform = `translate3d(0, ${-currentValue}px, 0)`;
@@ -3570,7 +3568,7 @@ class NgScrollerComponent {
         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) {
@@ -3608,7 +3606,9 @@ class NgScrollerComponent {
                     if (this.cdkScrollable) {
                         this.cdkScrollable.getElementRef().nativeElement.dispatchEvent(SCROLL_EVENT);
                     }
-                    this.fireScrollEvent(userAction);
+                    if (fireUpdate) {
+                        this.fireScrollEvent(userAction);
+                    }
                 }
             }
             else {
@@ -3620,16 +3620,15 @@ class NgScrollerComponent {
                     if (this.cdkScrollable) {
                         this.cdkScrollable.getElementRef().nativeElement.dispatchEvent(SCROLL_EVENT);
                     }
-                    this.fireScrollEvent(userAction);
+                    if (fireUpdate) {
+                        this.fireScrollEvent(userAction);
+                    }
                 }
             }
         }
     }
     fireScrollEvent(userAction) {
-        cancelAnimationFrame(this._animationId1);
-        this._animationId1 = requestAnimationFrame(() => {
-            this._$scroll.next(userAction);
-        });
+        this._$scroll.next(userAction);
     }
     reset() {
         if (this.scrollBar) {
@@ -4750,6 +4749,7 @@ 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: true,
@@ -4759,8 +4759,8 @@ class NgVirtualListComponent {
                 }
                 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);
                 }
@@ -4769,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 => {
@@ -4927,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) {
@@ -4953,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));
                         }