ng-virtual-list 20.10.17 → 20.10.19

package/fesm2022/ng-virtual-list.mjs

@@ -7,7 +7,7 @@ import * as i1 from '@angular/common';
 import { CommonModule } from '@angular/common';
 import { switchMap, takeUntil, filter, tap as tap$1 } from 'rxjs/operators';
 import * as i4 from '@angular/cdk/scrolling';
-import { CdkScrollable } from '@angular/cdk/scrolling';
+import { CdkScrollable, CdkScrollableModule } from '@angular/cdk/scrolling';
 
 /**
  * Action modes for collection elements.
@@ -4056,7 +4056,8 @@ class NgScrollerComponent extends NgScrollView {
     constructor() {
         super();
         this._service.$langTextDir.pipe(tap(v => {
-            this.langTextDir.set(v);
+            takeUntilDestroyed(this._destroyRef),
+                this.langTextDir.set(v);
         })).subscribe();
         const $prepare = toObservable(this.preparedSignal);
         $prepare.pipe(takeUntilDestroyed(), filter$1(v => !!v), tap(() => {
@@ -4222,6 +4223,9 @@ class NgScrollerComponent extends NgScrollView {
     onScrollBarDragHandler(event) {
         const { position, min, max, userAction } = event;
         this._isScrollbarUserAction = userAction;
+        if (!userAction) {
+            return;
+        }
         this._$scrollbarScroll.next(userAction);
         this.stopScrolling();
         const isVertical = this.isVertical(), { position: absolutePosition, } = this._scrollBox.getScrollPositionByScrollBar({
@@ -4236,10 +4240,13 @@ class NgScrollerComponent extends NgScrollView {
         this.fireUpdateIfEdgesDetected(position, min, max, true, true);
     }
     onScrollBarDragEndHandler(event) {
-        const { position, min, max } = event;
+        const { position, min, max, userAction } = event;
         this._isScrollbarUserAction = false;
         this._velocities = [0];
         this._velocity = 0;
+        if (!userAction) {
+            return;
+        }
         this.refresh(true, true);
         this.fireUpdateIfEdgesDetected(position, min, max, true, true);
         this._$scrollbarScroll.next(false);
@@ -6082,13 +6089,13 @@ class NgVirtualListComponent {
             this.listenCacheChangesIfNeed(dynamicSize);
         })).subscribe();
         const $preventScrollSnapping = this.$preventScrollSnapping;
-        $preventScrollSnapping.pipe(takeUntilDestroyed(), filter$1(v => !!v), tap((v) => {
+        $preventScrollSnapping.pipe(takeUntilDestroyed(), filter$1(v => !!v), tap(() => {
             if (this._readyForShow) {
                 this._trackBox.isScrollStart = this._trackBox.isScrollEnd = false;
                 this._isScrollStart.set(false);
                 this._isScrollEnd.set(false);
                 const scroller = this._scrollerComponent();
-                if (scroller) {
+                if (!!scroller) {
                     this._trackBox.preventScrollSnapping(true);
                 }
             }
@@ -6126,19 +6133,19 @@ class NgVirtualListComponent {
                 const isVertical = this.isVertical, maxScrollSize = Math.round(isVertical ? scroller.scrollHeight ?? 0 : scroller.scrollWidth ?? 0), scrollSize = isVertical ? scroller.scrollTop ?? 0 : scroller.scrollLeft ?? 0, actualScrollSize = Math.round(scrollSize + delta);
                 if (this._readyForShow && !isLoading) {
                     if (maxScrollSize >= 0) {
-                        const isScrollStart = actualScrollSize <= MIN_PIXELS_FOR_PREVENT_SNAPPING;
+                        const isScrollStart = (actualScrollSize <= MIN_PIXELS_FOR_PREVENT_SNAPPING);
                         if (isScrollStart) {
-                            this._trackBox.isScrollStart = true;
                             this._isScrollStart.set(true);
-                            this._trackBox.isScrollEnd = false;
                             this._isScrollEnd.set(false);
+                            this._trackBox.isScrollStart = true;
+                            this._trackBox.isScrollEnd = false;
                         }
                         else {
-                            const isScrollEnd = actualScrollSize >= (maxScrollSize - MIN_PIXELS_FOR_PREVENT_SNAPPING);
-                            this._trackBox.isScrollStart = false;
+                            const isScrollEnd = (actualScrollSize >= (maxScrollSize - MIN_PIXELS_FOR_PREVENT_SNAPPING));
                             this._isScrollStart.set(false);
-                            this._trackBox.isScrollEnd = isScrollEnd;
                             this._isScrollEnd.set(isScrollEnd);
+                            this._trackBox.isScrollStart = false;
+                            this._trackBox.isScrollEnd = isScrollEnd;
                         }
                     }
                 }
@@ -6199,10 +6206,9 @@ class NgVirtualListComponent {
                         }
                         return;
                     }
-                    if ((snapScrollToEnd && this._trackBox.isSnappedToEnd) ||
-                        (snapScrollToEnd && scrollPositionAfterUpdate > 0 &&
-                            ((roundedScrollPositionAfterUpdate >= scrollPositionAfterUpdate + MIN_PIXELS_FOR_PREVENT_SNAPPING) &&
-                                (scrollPositionAfterUpdate + MIN_PIXELS_FOR_PREVENT_SNAPPING >= roundedMaxPositionAfterUpdate)))) {
+                    if ((snapScrollToEnd && this._trackBox.isSnappedToEnd) || (!snapScrollToStart && snapScrollToEnd && !scroller.scrollable) ||
+                        (scrollPositionAfterUpdate + MIN_PIXELS_FOR_PREVENT_SNAPPING >= roundedMaxPositionAfterUpdate) ||
+                        (roundedScrollPositionAfterUpdate >= scrollPositionAfterUpdate + MIN_PIXELS_FOR_PREVENT_SNAPPING)) {
                         this._trackBox.clearDelta();
                         if (!this._trackBox.isSnappedToEnd) {
                             this._trackBox.isScrollStart = false;
@@ -6666,17 +6672,13 @@ class NgVirtualListComponent {
         validateIteration(iteration);
         const actualIteration = validateScrollIteration(iteration);
         this._elementRef.nativeElement.focus();
+        if (!this._scrollerComponent()?.scrollable) {
+            this.scrollToFinalize(id, focused, cb);
+            return;
+        }
         this._$scrollTo.next({
             id, behavior, blending, iteration: actualIteration, isLastIteration: actualIteration === MAX_SCROLL_TO_ITERATIONS, cb: () => {
-                if (focused) {
-                    const el = this.getFocusedElementById(id);
-                    if (!!el) {
-                        this._service.focus(el, FocusAlignments.NONE);
-                    }
-                }
-                if (typeof cb === 'function') {
-                    cb?.();
-                }
+                this.scrollToFinalize(id, focused, cb);
             }
         });
     }
@@ -6691,8 +6693,8 @@ class NgVirtualListComponent {
         const behavior = options?.behavior ?? BEHAVIOR_INSTANT, blending = options?.blending ?? false, focused = options?.focused ?? true, iteration = options?.iteration ?? 0;
         validateScrollBehavior(behavior);
         validateIteration(iteration);
-        const trackBy = this.trackBy(), items = this.items(), firsItem = items.length > 0 ? items[0] : undefined, id = firsItem?.[trackBy], actualIteration = validateScrollIteration(iteration);
-        if (!!firsItem) {
+        const trackBy = this.trackBy(), items = this.items(), firstItem = items.length > 0 ? items[0] ?? null : null, id = firstItem?.[trackBy] ?? null, actualIteration = validateScrollIteration(iteration);
+        if (!!firstItem) {
             this._elementRef.nativeElement.focus();
             this._$scrollTo.next({
                 id, behavior, blending, iteration: actualIteration, isLastIteration: actualIteration === MAX_SCROLL_TO_ITERATIONS, cb: () => {
@@ -6700,15 +6702,7 @@ class NgVirtualListComponent {
                     this._trackBox.isScrollStart = true;
                     this._trackBox.isScrollEnd = false;
                     this._$fireUpdate.next(true);
-                    if (focused) {
-                        const el = this.getFocusedElementById(id);
-                        if (!!el) {
-                            this._service.focus(el, FocusAlignments.NONE);
-                        }
-                    }
-                    if (typeof cb === 'function') {
-                        cb?.();
-                    }
+                    this.scrollToFinalize(id, focused, cb);
                 }
             });
         }
@@ -6733,24 +6727,31 @@ class NgVirtualListComponent {
         validateIteration(iteration);
         const trackBy = this.trackBy(), items = this.items(), latItem = items[items.length > 0 ? items.length - 1 : 0], id = latItem[trackBy], actualIteration = validateScrollIteration(iteration);
         this._elementRef.nativeElement.focus();
+        if (!this._scrollerComponent()?.scrollable) {
+            this.scrollToFinalize(id, focused, cb);
+            return;
+        }
         this._$scrollTo.next({
             id, behavior, blending, iteration: actualIteration, isLastIteration: actualIteration === MAX_SCROLL_TO_ITERATIONS, cb: () => {
                 this._isScrollEnd.set(true);
                 this._trackBox.isScrollStart = false;
                 this._trackBox.isScrollEnd = true;
                 this._$fireUpdate.next(true);
-                if (focused) {
-                    const el = this.getFocusedElementById(id);
-                    if (!!el) {
-                        this._service.focus(el, FocusAlignments.NONE);
-                    }
-                }
-                if (typeof cb === 'function') {
-                    cb?.();
-                }
+                this.scrollToFinalize(id, focused, cb);
             }
         });
     }
+    scrollToFinalize(id, focused, cb) {
+        if (focused) {
+            const el = this.getFocusedElementById(id);
+            if (!!el) {
+                this._service.focus(el, FocusAlignments.NONE);
+            }
+        }
+        if (typeof cb === 'function') {
+            cb?.();
+        }
+    }
     cleanup() {
         const displayItems = [];
         this._service.collection = displayItems;
@@ -6934,15 +6935,15 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.17", ngImpo
 
 class NgScrollerModule {
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.17", ngImport: i0, type: NgScrollerModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-    static ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.3.17", ngImport: i0, type: NgScrollerModule, declarations: [NgScrollerComponent], imports: [CommonModule, NgScrollBarModule, LocaleSensitiveModule, CdkScrollable], exports: [NgScrollerComponent] });
-    static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.3.17", ngImport: i0, type: NgScrollerModule, imports: [CommonModule, NgScrollBarModule, LocaleSensitiveModule] });
+    static ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.3.17", ngImport: i0, type: NgScrollerModule, declarations: [NgScrollerComponent], imports: [CommonModule, NgScrollBarModule, LocaleSensitiveModule, CdkScrollableModule], exports: [NgScrollerComponent] });
+    static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.3.17", ngImport: i0, type: NgScrollerModule, imports: [CommonModule, NgScrollBarModule, LocaleSensitiveModule, CdkScrollableModule] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.17", ngImport: i0, type: NgScrollerModule, decorators: [{
             type: NgModule,
             args: [{
                     declarations: [NgScrollerComponent],
                     exports: [NgScrollerComponent],
-                    imports: [CommonModule, NgScrollBarModule, LocaleSensitiveModule, CdkScrollable],
+                    imports: [CommonModule, NgScrollBarModule, LocaleSensitiveModule, CdkScrollableModule],
                     schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA],
                 }]
         }] });