ng-virtual-list 16.0.13 → 16.0.15

package/fesm2022/ng-virtual-list.mjs

@@ -2,7 +2,7 @@ import * as i0 from '@angular/core';
 import { Component, ChangeDetectionStrategy, EventEmitter as EventEmitter$1, ViewContainerRef, ElementRef, ViewEncapsulation, ViewChild, Output, Input, NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
 import * as i1 from '@angular/common';
 import { CommonModule } from '@angular/common';
-import { BehaviorSubject, filter, map, tap, combineLatest, distinctUntilChanged, debounceTime, switchMap, of } from 'rxjs';
+import { BehaviorSubject, tap, filter, map, combineLatest, distinctUntilChanged, debounceTime, switchMap, of } from 'rxjs';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 /**
@@ -60,7 +60,7 @@ const CLASS_LIST_HORIZONTAL = 'horizontal';
 
 /**
  * Virtual list item component
- * @link https://github.com/DjonnyX/ng-virtual-list/blob/16.x/projects/ng-virtual-list/src/lib/components/ng-virtual-list-item.component.ts
+ * @link https://github.com/DjonnyX/ng-virtual-list/blob/15.x/projects/ng-virtual-list/src/lib/components/ng-virtual-list-item.component.ts
  * @author Evgenii Grebennikov
  * @email djonnyx@gmail.com
  */
@@ -94,6 +94,9 @@ class NgVirtualListItemComponent {
         }
         this._cdr.detectChanges();
     }
+    get item() {
+        return this.data;
+    }
     get itemId() {
         return this.data?.id;
     }
@@ -105,6 +108,9 @@ class NgVirtualListItemComponent {
         this.itemRenderer = v;
         this._cdr.markForCheck();
     }
+    get element() {
+        return this._elementRef.nativeElement;
+    }
     constructor(_cdr, _elementRef) {
         this._cdr = _cdr;
         this._elementRef = _elementRef;
@@ -201,7 +207,7 @@ const toggleClassName = (el, className, remove = false) => {
 
 /**
  * Tracks display items by property
- * @link https://github.com/DjonnyX/ng-virtual-list/blob/16.x/projects/ng-virtual-list/src/lib/utils/tracker.ts
+ * @link https://github.com/DjonnyX/ng-virtual-list/blob/15.x/projects/ng-virtual-list/src/lib/utils/tracker.ts
  * @author Evgenii Grebennikov
  * @email djonnyx@gmail.com
  */
@@ -227,6 +233,9 @@ class Tracker {
         return this._trackMap;
     }
     _trackingPropertyName;
+    set trackingPropertyName(v) {
+        this._trackingPropertyName = v;
+    }
     constructor(trackingPropertyName) {
         this._trackingPropertyName = trackingPropertyName;
     }
@@ -244,17 +253,17 @@ class Tracker {
                 const diId = this._trackMap[itemTrackingProperty];
                 if (this._trackMap.hasOwnProperty(itemTrackingProperty)) {
                     const lastIndex = this._displayObjectIndexMapById[diId], el = components[lastIndex];
-                    this._checkComponentProperty(el?.instance);
-                    const elId = el?.instance?.[itemTrackingProperty];
+                    const elId = el?.instance?.id;
                     if (el && elId === diId) {
                         const indexByUntrackedItems = untrackedItems.findIndex(v => {
-                            this._checkComponentProperty(v.instance);
-                            return v.instance[itemTrackingProperty] === elId;
+                            return v.instance.id === elId;
                         });
                         if (indexByUntrackedItems > -1) {
-                            el.instance.item = item;
-                            if (afterComponentSetup !== undefined) {
-                                afterComponentSetup(el.instance, item);
+                            if (el.instance.item !== item) {
+                                el.instance.item = item;
+                                if (afterComponentSetup !== undefined) {
+                                    afterComponentSetup(el.instance, item);
+                                }
                             }
                             untrackedItems.splice(indexByUntrackedItems, 1);
                             continue;
@@ -266,13 +275,14 @@ class Tracker {
             if (untrackedItems.length > 0) {
                 const el = untrackedItems.shift(), item = items[i];
                 if (el) {
-                    el.instance.item = item;
-                    if (this._trackMap) {
-                        this._checkComponentProperty(el.instance);
-                        this._trackMap[itemTrackingProperty] = el.instance[itemTrackingProperty];
-                    }
-                    if (afterComponentSetup !== undefined) {
-                        afterComponentSetup(el.instance, item);
+                    if (el.instance.item !== item) {
+                        el.instance.item = item;
+                        if (this._trackMap) {
+                            this._trackMap[itemTrackingProperty] = el.instance.id;
+                        }
+                        if (afterComponentSetup !== undefined) {
+                            afterComponentSetup(el.instance, item);
+                        }
                     }
                 }
             }
@@ -286,23 +296,10 @@ class Tracker {
             return;
         }
         const propertyIdName = this._trackingPropertyName;
-        this._checkComponentProperty(component);
         if (this._trackMap && component[propertyIdName] !== undefined) {
             delete this._trackMap[propertyIdName];
         }
     }
-    _checkComponentProperty(component) {
-        if (!component) {
-            return;
-        }
-        const propertyIdName = this._trackingPropertyName;
-        try {
-            component[propertyIdName];
-        }
-        catch (err) {
-            throw Error(`Property ${propertyIdName} does not exist.`);
-        }
-    }
     dispose() {
         this._trackMap = null;
     }
@@ -417,7 +414,7 @@ const MAX_SCROLL_DIRECTION_POOL = 8, CLEAR_SCROLL_DIRECTION_TO = 0;
 /**
  * Cache map.
  * Emits a change event on each mutation.
- * @link https://github.com/DjonnyX/ng-virtual-list/blob/16.x/projects/ng-virtual-list/src/lib/utils/cacheMap.ts
+ * @link https://github.com/DjonnyX/ng-virtual-list/blob/15.x/projects/ng-virtual-list/src/lib/utils/cacheMap.ts
  * @author Evgenii Grebennikov
  * @email djonnyx@gmail.com
  */
@@ -481,7 +478,11 @@ class CacheMap extends EventEmitter {
         this.dispatch('change', this.version);
     }
     set(id, bounds) {
-        if (this._map.has(id) && JSON.stringify(this._map.get(id)) === JSON.stringify(bounds)) {
+        if (this._map.has(id)) {
+            const b = this._map.get(id), bb = bounds;
+            if (b.width === bb.width && b.height === bb.height) {
+                return this._map;
+            }
             return this._map;
         }
         const v = this._map.set(id, bounds);
@@ -508,56 +509,6 @@ class CacheMap extends EventEmitter {
     }
 }
 
-/**
- * Returns the removed or updated elements of a collection.
- * @link https://github.com/DjonnyX/ng-virtual-list/blob/16.x/projects/ng-virtual-list/src/lib/utils/collection.ts
- * @author Evgenii Grebennikov
- * @email djonnyx@gmail.com
- */
-const getCollectionRemovedOrUpdatedItems = (previousCollection, currentCollection) => {
-    const result = { deleted: new Array(), updated: new Array(), added: new Array(), notChanged: new Array() };
-    if (!currentCollection || currentCollection.length === 0) {
-        return { deleted: (previousCollection ? [...previousCollection] : []), updated: [], added: [], notChanged: [] };
-    }
-    if (!previousCollection || previousCollection.length === 0) {
-        return { deleted: [], updated: [], added: (currentCollection ? [...currentCollection] : []), notChanged: [] };
-    }
-    const collectionDict = {};
-    for (let i = 0, l = currentCollection.length; i < l; i++) {
-        const item = currentCollection[i];
-        if (item) {
-            collectionDict[item.id] = item;
-        }
-    }
-    const notChangedMap = {}, deletedMap = {}, updatedMap = {};
-    for (let i = 0, l = previousCollection.length; i < l; i++) {
-        const item = previousCollection[i], id = item.id;
-        if (item) {
-            if (collectionDict.hasOwnProperty(id)) {
-                if (item === collectionDict[id]) {
-                    result.notChanged.push(item);
-                    notChangedMap[item.id] = item;
-                    continue;
-                }
-                else {
-                    result.updated.push(item);
-                    updatedMap[item.id] = item;
-                    continue;
-                }
-            }
-            result.deleted.push(item);
-            deletedMap[item.id] = item;
-        }
-    }
-    for (let i = 0, l = currentCollection.length; i < l; i++) {
-        const item = currentCollection[i], id = item.id;
-        if (item && !deletedMap.hasOwnProperty(id) && !updatedMap.hasOwnProperty(id) && !notChangedMap.hasOwnProperty(id)) {
-            result.added.push(item);
-        }
-    }
-    return result;
-};
-
 const TRACK_BOX_CHANGE_EVENT_NAME = 'change';
 var ItemDisplayMethods;
 (function (ItemDisplayMethods) {
@@ -568,7 +519,7 @@ var ItemDisplayMethods;
 })(ItemDisplayMethods || (ItemDisplayMethods = {}));
 /**
  * An object that performs tracking, calculations and caching.
- * @link https://github.com/DjonnyX/ng-virtual-list/blob/16.x/projects/ng-virtual-list/src/lib/utils/trackBox.ts
+ * @link https://github.com/DjonnyX/ng-virtual-list/blob/15.x/projects/ng-virtual-list/src/lib/utils/trackBox.ts
  * @author Evgenii Grebennikov
  * @email djonnyx@gmail.com
  */
@@ -588,13 +539,22 @@ class TrackBox extends CacheMap {
         }
         this._displayComponents = v;
     }
+    /**
+     * Set the trackBy property
+     */
+    set trackingPropertyName(v) {
+        this._tracker.trackingPropertyName = v;
+    }
     constructor(trackingPropertyName) {
         super();
         this._tracker = new Tracker(trackingPropertyName);
     }
     set(id, bounds) {
-        if (this._map.has(id) && JSON.stringify(this._map.get(id)) === JSON.stringify(bounds)) {
-            return this._map;
+        if (this._map.has(id)) {
+            const b = this._map.get(id);
+            if (b?.width === bounds.width && b.height === bounds.height) {
+                return this._map;
+            }
         }
         const v = this._map.set(id, bounds);
         this.bumpVersion();
@@ -617,31 +577,69 @@ class TrackBox extends CacheMap {
             console.warn('Attention! The collection must be immutable.');
             return;
         }
-        const { deleted, updated, added } = getCollectionRemovedOrUpdatedItems(this._previousCollection, currentCollection);
-        this.clearCache(deleted, updated, added, itemSize);
+        this.updateCache(this._previousCollection, currentCollection, itemSize);
         this._previousCollection = currentCollection;
     }
     /**
-     * Clears the cache of items from the list
+     * Update the cache of items from the list
      */
-    clearCache(deleted, updated, added, itemSize) {
-        if (deleted) {
-            for (let i = 0, l = deleted.length; i < l; i++) {
-                const item = deleted[i], id = item.id;
-                if (this._map.has(id)) {
-                    this._map.delete(id);
+    updateCache(previousCollection, currentCollection, itemSize) {
+        if (!currentCollection || currentCollection.length === 0) {
+            if (previousCollection) {
+                // deleted
+                for (let i = 0, l = previousCollection.length; i < l; i++) {
+                    const item = previousCollection[i], id = item.id;
+                    if (this._map.has(id)) {
+                        this._map.delete(id);
+                    }
                 }
             }
+            return;
         }
-        if (updated) {
-            for (let i = 0, l = updated.length; i < l; i++) {
-                const item = updated[i], id = item.id;
-                this._map.set(id, { ...(this._map.get(id) || { x: 0, y: 0, width: itemSize, height: itemSize }), method: ItemDisplayMethods.UPDATE });
+        if (!previousCollection || previousCollection.length === 0) {
+            if (currentCollection) {
+                // added
+                for (let i = 0, l = currentCollection.length; i < l; i++) {
+                    const item = currentCollection[i], id = item.id;
+                    this._map.set(id, { x: 0, y: 0, width: itemSize, height: itemSize, method: ItemDisplayMethods.CREATE });
+                }
+            }
+            return;
+        }
+        const collectionDict = {};
+        for (let i = 0, l = currentCollection.length; i < l; i++) {
+            const item = currentCollection[i];
+            if (item) {
+                collectionDict[item.id] = item;
             }
         }
-        if (added) {
-            for (let i = 0, l = added.length; i < l; i++) {
-                const item = added[i], id = item.id;
+        const notChangedMap = {}, deletedMap = {}, updatedMap = {};
+        for (let i = 0, l = previousCollection.length; i < l; i++) {
+            const item = previousCollection[i], id = item.id;
+            if (item) {
+                if (collectionDict.hasOwnProperty(id)) {
+                    if (item === collectionDict[id]) {
+                        // not changed
+                        notChangedMap[item.id] = item;
+                        this._map.set(id, { ...(this._map.get(id) || { x: 0, y: 0, width: itemSize, height: itemSize }), method: ItemDisplayMethods.NOT_CHANGED });
+                        continue;
+                    }
+                    else {
+                        // updated
+                        updatedMap[item.id] = item;
+                        this._map.set(id, { ...(this._map.get(id) || { x: 0, y: 0, width: itemSize, height: itemSize }), method: ItemDisplayMethods.UPDATE });
+                        continue;
+                    }
+                }
+                // deleted
+                deletedMap[item.id] = item;
+                this._map.delete(id);
+            }
+        }
+        for (let i = 0, l = currentCollection.length; i < l; i++) {
+            const item = currentCollection[i], id = item.id;
+            if (item && !deletedMap.hasOwnProperty(id) && !updatedMap.hasOwnProperty(id) && !notChangedMap.hasOwnProperty(id)) {
+                // added
                 this._map.set(id, { x: 0, y: 0, width: itemSize, height: itemSize, method: ItemDisplayMethods.CREATE });
             }
         }
@@ -913,6 +911,10 @@ class TrackBox extends CacheMap {
             this.clearScrollDirectionCache();
         }
     }
+    changes() {
+        this.bumpVersion();
+        this.fireChange();
+    }
     generateDisplayCollection(items, stickyMap, metrics) {
         const { normalizedItemWidth, normalizedItemHeight, dynamicSize, itemsFromStartToScrollEnd, isVertical, renderItems: renderItemsLength, scrollSize, sizeProperty, snap, snippedPos, startPosition, totalLength, startIndex, typicalItemSize, } = metrics, displayItems = [];
         if (items.length) {
@@ -1264,6 +1266,19 @@ class NgVirtualListComponent {
     }
     ;
     get itemsOffset() { return this._$itemsOffset.getValue(); }
+    _$trackBy = new BehaviorSubject(TRACK_BY_PROPERTY_NAME);
+    $trackBy = this._$trackBy.asObservable();
+    /**
+     * The name of the property by which tracking is performed
+     */
+    set trackBy(v) {
+        if (this._$trackBy.getValue() === v) {
+            return;
+        }
+        this._$trackBy.next(v);
+    }
+    ;
+    get trackBy() { return this._$trackBy.getValue(); }
     _isVertical = this.getIsVertical();
     _displayComponents = [];
     _$bounds = new BehaviorSubject(null);
@@ -1277,13 +1292,14 @@ class NgVirtualListComponent {
     _onResizeHandler = () => {
         this._$bounds.next(this._container?.nativeElement?.getBoundingClientRect() ?? null);
     };
+    _scrolls = new Map();
     _onScrollHandler = (e) => {
         this._isScrollingDebounces.dispose();
         this.clearScrollToRepeatExecutionTimeout();
         const container = this._container?.nativeElement;
         if (container) {
             const dynamicSize = this.dynamicSize, delta = this._trackBox.delta, scrollSize = (this._isVertical ? container.scrollTop : container.scrollLeft);
-            let actualScrollSize = scrollSize, isImmediateScroll = false;
+            let actualScrollSize = scrollSize, isScrollIUmmediate = false;
             if (dynamicSize && delta !== 0) {
                 actualScrollSize = scrollSize + delta;
                 const params = {
@@ -1292,48 +1308,45 @@ class NgVirtualListComponent {
                 };
                 const container = this._container;
                 if (container) {
-                    isImmediateScroll = true;
+                    isScrollIUmmediate = true;
                     this.scrollImmediately(container, params);
-                    this._trackBox.clearDelta();
                 }
             }
-            this._$scrollSize.next(actualScrollSize);
+            if (!isScrollIUmmediate) {
+                this._$scrollSize.next(actualScrollSize);
+            }
         }
     };
     scrollImmediately(container, params, cb) {
-        this.clearScrollImmediately();
+        if (this._scrolls.size > 0) {
+            container.nativeElement.scrollTo(params);
+            return;
+        }
+        this._trackBox.clearDelta();
         container.nativeElement.removeEventListener(SCROLL_END, this._onScrollEndHandler);
+        container.nativeElement.removeEventListener(SCROLL, this._onScrollHandler);
         const handler = () => {
+            const container = this._container;
             if (container) {
                 container.nativeElement.removeEventListener(SCROLL_END, handler);
-                container.nativeElement.scroll(params);
+                this._scrolls.delete(handler);
+                container.nativeElement.addEventListener(SCROLL_END, this._onScrollEndHandler);
+                container.nativeElement.addEventListener(SCROLL, this._onScrollHandler);
                 if (cb !== undefined) {
                     cb();
                 }
-                container.nativeElement.addEventListener(SCROLL_END, this._onScrollEndHandler);
             }
         };
+        this._scrolls.set(handler, true);
         container.nativeElement.addEventListener(SCROLL_END, handler);
-        container.nativeElement.scroll(params);
-        this._scrollImmediatelyHandler = handler;
-    }
-    _scrollImmediatelyHandler = undefined;
-    clearScrollImmediately() {
-        if (this._scrollImmediatelyHandler === undefined) {
-            return;
-        }
-        const container = this._container;
-        if (container) {
-            container.nativeElement.removeEventListener(SCROLL_END, this._scrollImmediatelyHandler);
-        }
+        container.nativeElement.scrollTo(params);
     }
     _onScrollEndHandler = (e) => {
         const container = this._container;
         if (container) {
-            this._trackBox.clearDelta();
-            this._trackBox.clearDeltaDirection();
             const itemSize = this.itemSize, snapToItem = this.snapToItem, dynamicSize = this.dynamicSize, delta = this._trackBox.delta, scrollSize = (this._isVertical ? container.nativeElement.scrollTop : container.nativeElement.scrollLeft);
             let actualScrollSize = scrollSize;
+            this._trackBox.clearDeltaDirection();
             if (dynamicSize) {
                 actualScrollSize = scrollSize + delta;
                 if (snapToItem) {
@@ -1341,15 +1354,17 @@ class NgVirtualListComponent {
                     if (targetItem) {
                         this.scrollTo(targetItem.id, BEHAVIOR_INSTANT);
                     }
+                    this._trackBox.clearDelta();
                 }
                 else if (scrollSize !== actualScrollSize) {
                     const params = {
                         [this._isVertical ? TOP_PROP_NAME : LEFT_PROP_NAME]: actualScrollSize,
                         behavior: BEHAVIOR_INSTANT
                     };
-                    this._$scrollSize.next(actualScrollSize);
-                    container.nativeElement.scroll(params);
-                    return;
+                    const container = this._container;
+                    if (container) {
+                        this.scrollImmediately(container, params);
+                    }
                 }
             }
             else {
@@ -1360,10 +1375,12 @@ class NgVirtualListComponent {
                         [this._isVertical ? TOP_PROP_NAME : LEFT_PROP_NAME]: actualScrollSize,
                         behavior: BEHAVIOR_INSTANT
                     };
-                    container.nativeElement.scroll(params);
+                    const container = this._container;
+                    if (container) {
+                        this.scrollImmediately(container, params);
+                    }
                 }
             }
-            this._$scrollSize.next(actualScrollSize);
         }
     };
     _$initialized = new BehaviorSubject(false);
@@ -1371,7 +1388,7 @@ class NgVirtualListComponent {
     /**
      * Dictionary of element sizes by their id
      */
-    _trackBox = new TrackBox(TRACK_BY_PROPERTY_NAME);
+    _trackBox = new TrackBox(this.trackBy);
     _onTrackBoxChangeHandler = (v) => {
         this._$cacheVersion.next(v);
     };
@@ -1386,6 +1403,10 @@ class NgVirtualListComponent {
         this._$initialized = new BehaviorSubject(false);
         this.$initialized = this._$initialized.asObservable();
         this._trackBox.displayComponents = this._displayComponents;
+        const $trackBy = this.$trackBy;
+        $trackBy.pipe(takeUntilDestroyed(), tap(v => {
+            this._trackBox.trackingPropertyName = v;
+        })).subscribe();
         const $bounds = this._$bounds.asObservable().pipe(filter(b => !!b)), $items = this.$items.pipe(map(i => !i ? [] : i)), $scrollSize = this._$scrollSize.asObservable(), $itemSize = this.$itemSize.pipe(map(v => v <= 0 ? DEFAULT_ITEM_SIZE : v)), $itemsOffset = this.$itemsOffset.pipe(map(v => v < 0 ? DEFAULT_ITEMS_OFFSET : v)), $stickyMap = this.$stickyMap.pipe(map(v => !v ? {} : v)), $snap = this.$snap, $snapToItem = this.$snapToItem, $isVertical = this.$direction.pipe(map(v => this.getIsVertical(v || DEFAULT_DIRECTION))), $dynamicSize = this.$dynamicSize, $enabledBufferOptimization = this.$enabledBufferOptimization, $cacheVersion = this.$cacheVersion;
         $isVertical.pipe(takeUntilDestroyed(), tap(v => {
             this._isVertical = v;
@@ -1404,7 +1425,7 @@ class NgVirtualListComponent {
                 bounds: { width, height }, collection: items, dynamicSize, isVertical, itemSize,
                 itemsOffset, scrollSize: scrollSize, snap, enabledBufferOptimization,
             };
-            const { displayItems, totalSize, delta } = this._trackBox.updateCollection(items, stickyMap, {
+            const { displayItems, totalSize } = this._trackBox.updateCollection(items, stickyMap, {
                 ...opts, scrollSize: actualScrollSize,
             });
             this.resetBoundsSize(isVertical, totalSize);
@@ -1412,17 +1433,20 @@ class NgVirtualListComponent {
             this.tracking();
             const container = this._container;
             if (!this.isScrolling && dynamicSize && container) {
-                actualScrollSize = scrollSize + delta;
+                actualScrollSize = scrollSize + this._trackBox.delta;
                 if (snapToItem) {
-                    // etc
+                    const items = this.items, isVertical = this._isVertical, targetItem = this._trackBox.getNearestItem(actualScrollSize, items, itemSize, isVertical);
+                    if (targetItem) {
+                        this.scrollTo(targetItem.id, BEHAVIOR_INSTANT);
+                    }
                 }
                 else if (scrollSize !== actualScrollSize) {
                     const params = {
                         [this._isVertical ? TOP_PROP_NAME : LEFT_PROP_NAME]: actualScrollSize,
                         behavior: BEHAVIOR_INSTANT
                     };
-                    this.scrollImmediately(container, params);
                     this._trackBox.clearDelta();
+                    container.nativeElement.scrollTo(params);
                 }
             }
             return of(displayItems);
@@ -1450,6 +1474,9 @@ class NgVirtualListComponent {
         const dir = d || this.direction;
         return isDirection(dir, Directions.VERTICAL);
     }
+    _componentsResizeObserver = new ResizeObserver(() => {
+        this._trackBox.changes();
+    });
     createDisplayComponentsIfNeed(displayItems) {
         if (!displayItems || !this._listContainerRef) {
             this._trackBox.setDisplayObjectIndexMapById({});
@@ -1461,15 +1488,19 @@ class NgVirtualListComponent {
             if (_listContainerRef) {
                 const comp = _listContainerRef.createComponent(NgVirtualListItemComponent);
                 this._displayComponents.push(comp);
+                this._componentsResizeObserver.observe(comp.instance.element);
             }
         }
         const maxLength = displayItems.length;
         while (this._displayComponents.length > maxLength) {
             const comp = this._displayComponents.pop();
-            comp?.destroy();
-            const id = comp?.instance.item?.id;
-            if (id !== undefined) {
-                this._trackBox.untrackComponentByIdProperty(comp?.instance);
+            if (comp) {
+                this._componentsResizeObserver.unobserve(comp.instance.element);
+                comp.destroy();
+                const id = comp?.instance.item?.id;
+                if (id !== undefined) {
+                    this._trackBox.untrackComponentByIdProperty(comp?.instance);
+                }
             }
         }
         this.resetRenderers();
@@ -1558,12 +1589,12 @@ class NgVirtualListComponent {
                     };
                     container.nativeElement.addEventListener(SCROLL_END, handler);
                 }
-                container.nativeElement.scroll(params);
+                container.nativeElement.scrollTo(params);
             }
             else {
                 const index = items.findIndex(item => item.id === id), scrollSize = index * this.itemSize;
                 const params = { [this._isVertical ? TOP_PROP_NAME : LEFT_PROP_NAME]: scrollSize, behavior };
-                container.nativeElement.scroll(params);
+                container.nativeElement.scrollTo(params);
             }
         }
     }
@@ -1612,23 +1643,36 @@ class NgVirtualListComponent {
             this._onResizeHandler();
         }
     }
+    clearScrollImmediately() {
+        const container = this._container;
+        if (container) {
+            this._scrolls.forEach((_, handler) => {
+                container.nativeElement.removeEventListener(SCROLL_END, handler);
+            });
+        }
+        this._scrolls.clear();
+    }
     ngOnDestroy() {
         this.clearScrollToRepeatExecutionTimeout();
+        this.clearScrollImmediately();
         if (this._trackBox) {
             this._trackBox.dispose();
         }
         if (this._isScrollingDebounces) {
             this._isScrollingDebounces.dispose();
         }
+        if (this._componentsResizeObserver) {
+            this._componentsResizeObserver.disconnect();
+        }
+        if (this._resizeObserver) {
+            this._resizeObserver.disconnect();
+        }
         const containerEl = this._container;
         if (containerEl) {
             containerEl.nativeElement.removeEventListener(SCROLL, this._onScrollHandler);
             containerEl.nativeElement.removeEventListener(SCROLL_END, this._onScrollEndHandler);
             containerEl.nativeElement.removeEventListener(SCROLL, this._onContainerScrollHandler);
             containerEl.nativeElement.removeEventListener(SCROLL_END, this._onContainerScrollEndHandler);
-            if (this._resizeObserver) {
-                this._resizeObserver.unobserve(containerEl.nativeElement);
-            }
         }
         if (this._displayComponents) {
             while (this._displayComponents.length > 0) {
@@ -1638,7 +1682,7 @@ class NgVirtualListComponent {
         }
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: NgVirtualListComponent, deps: [{ token: i0.ChangeDetectorRef }, { token: i0.ElementRef }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.12", type: NgVirtualListComponent, selector: "ng-virtual-list", inputs: { items: "items", snap: "snap", snapToItem: "snapToItem", enabledBufferOptimization: "enabledBufferOptimization", itemRenderer: "itemRenderer", stickyMap: "stickyMap", itemSize: "itemSize", dynamicSize: "dynamicSize", direction: "direction", itemsOffset: "itemsOffset" }, outputs: { onScroll: "onScroll", onScrollEnd: "onScrollEnd" }, viewQueries: [{ propertyName: "_listContainerRef", first: true, predicate: ["renderersContainer"], descendants: true, read: ViewContainerRef }, { propertyName: "_container", first: true, predicate: ["container"], descendants: true, read: (ElementRef) }, { propertyName: "_list", first: true, predicate: ["list"], descendants: true, read: (ElementRef) }], ngImport: i0, template: "<div #container part=\"scroller\" class=\"ngvl__container\">\r\n  <ul #list part=\"list\" class=\"ngvl__list\">\r\n    <ng-container #renderersContainer></ng-container>\r\n  </ul>\r\n</div>", styles: [":host{display:block;width:400px;overflow:hidden}:host(.horizontal){height:48px}:host(.vertical){height:320px}.ngvl__container{overflow:auto;width:100%;height:100%}.ngvl__list{position:relative;list-style:none;padding:0;margin:0;width:100%;height:100%}\n"], changeDetection: i0.ChangeDetectionStrategy.OnPush, encapsulation: i0.ViewEncapsulation.ShadowDom });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.12", type: NgVirtualListComponent, selector: "ng-virtual-list", inputs: { items: "items", snap: "snap", snapToItem: "snapToItem", enabledBufferOptimization: "enabledBufferOptimization", itemRenderer: "itemRenderer", stickyMap: "stickyMap", itemSize: "itemSize", dynamicSize: "dynamicSize", direction: "direction", itemsOffset: "itemsOffset", trackBy: "trackBy" }, outputs: { onScroll: "onScroll", onScrollEnd: "onScrollEnd" }, viewQueries: [{ propertyName: "_listContainerRef", first: true, predicate: ["renderersContainer"], descendants: true, read: ViewContainerRef }, { propertyName: "_container", first: true, predicate: ["container"], descendants: true, read: (ElementRef) }, { propertyName: "_list", first: true, predicate: ["list"], descendants: true, read: (ElementRef) }], ngImport: i0, template: "<div #container part=\"scroller\" class=\"ngvl__container\">\r\n  <ul #list part=\"list\" class=\"ngvl__list\">\r\n    <ng-container #renderersContainer></ng-container>\r\n  </ul>\r\n</div>", styles: [":host{display:block;width:400px;overflow:hidden}:host(.horizontal){height:48px}:host(.vertical){height:320px}.ngvl__container{overflow:auto;width:100%;height:100%}.ngvl__list{position:relative;list-style:none;padding:0;margin:0;width:100%;height:100%}\n"], changeDetection: i0.ChangeDetectionStrategy.OnPush, encapsulation: i0.ViewEncapsulation.ShadowDom });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: NgVirtualListComponent, decorators: [{
             type: Component,
@@ -1676,6 +1720,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
                 type: Input
             }], itemsOffset: [{
                 type: Input
+            }], trackBy: [{
+                type: Input
             }] } });
 
 class NgVirtualListModule {