ng-virtual-list 20.11.5 → 20.11.6

package/fesm2022/ng-virtual-list.mjs

@@ -1079,6 +1079,7 @@ class TrackBox extends CacheMap {
     _resetBufferSizeTimer;
     _isReseted = true;
     _prerenderedCache = null;
+    _newItems = [];
     lifeCircle() {
         this.fireChangeIfNeed();
         this.fireTick();
@@ -1105,6 +1106,7 @@ class TrackBox extends CacheMap {
     updateCache(previousCollection, currentCollection, itemSize) {
         const trackBy = this._trackingPropertyName;
         let crudDetected = false;
+        this._newItems = [];
         if (!currentCollection || currentCollection.length === 0) {
             if (previousCollection) {
                 // deleted
@@ -1172,6 +1174,7 @@ class TrackBox extends CacheMap {
             const item = currentCollection[i], id = item[trackBy];
             if (item && !deletedMap.hasOwnProperty(id) && !updatedMap.hasOwnProperty(id) &&
                 !notChangedMap.hasOwnProperty(id)) {
+                this._newItems.push(id);
                 // added
                 crudDetected = true;
                 this._map.set(id, { width: itemSize, height: itemSize, method: ItemDisplayMethods.CREATE });
@@ -1347,7 +1350,7 @@ class TrackBox extends CacheMap {
                     const cache = map.get(id);
                     componentSize = cache[sizeProperty] > 0 ? cache[sizeProperty] : typicalItemSize;
                     itemDisplayMethod = cache?.method ?? ItemDisplayMethods.UPDATE;
-                    const isItemNew = cache?.[IS_NEW] ?? (this._isLazy && isStart && !this._isReseted);
+                    const isItemNew = this._newItems.indexOf(id) > -1 || (this._isLazy && isStart && !this._isReseted);
                     isNew = isItemNew;
                     if (isNew) {
                         isUpdating = true;
@@ -1356,7 +1359,7 @@ class TrackBox extends CacheMap {
                     componentSizeDelta = componentSnapshotSize;
                     switch (itemDisplayMethod) {
                         case ItemDisplayMethods.UPDATE: {
-                            map.set(id, { ...cache, method: isNew ? ItemDisplayMethods.UPDATE : ItemDisplayMethods.NOT_CHANGED, [IS_NEW]: isNew });
+                            map.set(id, { ...cache, method: isNew ? ItemDisplayMethods.UPDATE : ItemDisplayMethods.NOT_CHANGED });
                             if (isNew && y <= (scrollSize + size + deltaFromStartCreation + componentSize)) {
                                 deltaFromStartCreation += componentSizeDelta;
                                 componentSizeDelta = 0;
@@ -1854,18 +1857,8 @@ class TrackBox extends CacheMap {
             this._prerenderedCache = null;
         }
     }
-    resetCacheFlags() {
-        const cache = this._map.toObject();
-        if (!!cache) {
-            for (const id in cache) {
-                const cacheItem = cache[id];
-                if (!!cacheItem) {
-                    const { width, height, method } = cacheItem;
-                    this.set(id, { width, height, method });
-                }
-            }
-            this._prerenderedCache = null;
-        }
+    resetCacheChunkInfo() {
+        this._newItems = [];
     }
     cacheClean() {
         this._map.clear();
@@ -5970,6 +5963,38 @@ class NgVirtualListComponent {
                 return of({ items, collapsedIds, itemConfigMap, trackBy });
             }));
         }));
+        $itemsComposition.pipe(takeUntilDestroyed(), switchMap$1(({ items, collapsedIds, itemConfigMap, trackBy }) => {
+            if (items.length === 0 || !this._readyForShow || !(this.cachable && !this._cached &&
+                !this._trackBox.isSnappedToStart && this._trackBox.isSnappedToEnd)) {
+                return of({ items, collapsedIds, itemConfigMap, trackBy });
+            }
+            return $updateItemsRenderStabilizer.pipe(takeUntilDestroyed(this._destroyRef), take(1), debounceTime(0), switchMap$1(() => {
+                return of({ items, collapsedIds, itemConfigMap, trackBy });
+            }));
+        }), tap(({ items, collapsedIds, itemConfigMap, trackBy }) => {
+            const hiddenItems = new CMap();
+            let isCollapsed = false;
+            for (let i = 0, l = items.length; i < l; i++) {
+                const item = items[i], id = item[trackBy], group = (itemConfigMap[id]?.sticky ?? 0) > 0, collapsed = collapsedIds.includes(id);
+                if (group) {
+                    isCollapsed = collapsed;
+                }
+                else {
+                    if (isCollapsed) {
+                        hiddenItems.set(id, true);
+                    }
+                }
+            }
+            const actualItems = [];
+            for (let i = 0, l = items.length; i < l; i++) {
+                const item = items[i], id = item[trackBy];
+                if (hiddenItems.has(id)) {
+                    continue;
+                }
+                actualItems.push(item);
+            }
+            this._actualItems.set(actualItems);
+        })).subscribe();
         $isVertical.pipe(takeUntilDestroyed(), tap(v => {
             this._isVertical = v;
             const el = this._elementRef.nativeElement;
@@ -6027,56 +6052,22 @@ class NgVirtualListComponent {
                 this._$fireUpdate.next(true);
             }));
         })).subscribe();
-        let chunkLoaded = false;
         const $loading = toObservable(this.loading);
         $loading.pipe(takeUntilDestroyed(), distinctUntilChanged(), skip(1), filter$1(v => !v), switchMap$1(() => {
-            chunkLoaded = true;
             const scrollbar = this._scrollerComponent();
             if (!!scrollbar) {
                 scrollbar.stopScrollbar();
                 scrollbar.refreshScrollbar();
             }
-            return $chunkLoadingRenderStabilizer.pipe(takeUntilDestroyed(this._destroyRef), take(1), tap(() => {
+            return $actualItems.pipe(takeUntilDestroyed(this._destroyRef), take(1), switchMap$1(() => $chunkLoadingRenderStabilizer.pipe(takeUntilDestroyed(this._destroyRef), take(1), tap(() => {
+                console.log('reset');
+                this._trackBox.resetCacheChunkInfo();
                 const scrollbar = this._scrollerComponent();
                 if (!!scrollbar) {
                     scrollbar.stopScrollbar();
                     scrollbar.refreshScrollbar();
                 }
-                chunkLoaded = false;
-                this._trackBox.resetCacheFlags();
-            }));
-        })).subscribe();
-        $itemsComposition.pipe(takeUntilDestroyed(), switchMap$1(({ items, collapsedIds, itemConfigMap, trackBy }) => {
-            if (chunkLoaded || items.length === 0 || !this._readyForShow || !(this.cachable && !this._cached &&
-                !this._trackBox.isSnappedToStart && this._trackBox.isSnappedToEnd)) {
-                return of({ items, collapsedIds, itemConfigMap, trackBy });
-            }
-            return $updateItemsRenderStabilizer.pipe(takeUntilDestroyed(this._destroyRef), take(1), debounceTime(0), switchMap$1(() => {
-                return of({ items, collapsedIds, itemConfigMap, trackBy });
-            }));
-        }), tap(({ items, collapsedIds, itemConfigMap, trackBy }) => {
-            const hiddenItems = new CMap();
-            let isCollapsed = false;
-            for (let i = 0, l = items.length; i < l; i++) {
-                const item = items[i], id = item[trackBy], group = (itemConfigMap[id]?.sticky ?? 0) > 0, collapsed = collapsedIds.includes(id);
-                if (group) {
-                    isCollapsed = collapsed;
-                }
-                else {
-                    if (isCollapsed) {
-                        hiddenItems.set(id, true);
-                    }
-                }
-            }
-            const actualItems = [];
-            for (let i = 0, l = items.length; i < l; i++) {
-                const item = items[i], id = item[trackBy];
-                if (hiddenItems.has(id)) {
-                    continue;
-                }
-                actualItems.push(item);
-            }
-            this._actualItems.set(actualItems);
+            }))));
         })).subscribe();
         $loading.pipe(takeUntilDestroyed(), skip(1), distinctUntilChanged(), tap(v => {
             if (v) {