ng-virtual-list 20.11.5 → 20.11.7

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 });
@@ -1339,7 +1342,7 @@ class TrackBox extends CacheMap {
                     }
                 }
             }
-            let y = this._scrollStartOffset, stickyCollectionItem = undefined, stickyComponentSize = 0;
+            let y = this._scrollStartOffset, stickyComponentSize = 0;
             for (let i = 0, l = collection.length; i < l; i++) {
                 const ii = i + 1, collectionItem = collection[i], id = collectionItem[trackBy];
                 let componentSize = 0, componentSizeDelta = 0, itemDisplayMethod = ItemDisplayMethods.NOT_CHANGED;
@@ -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;
@@ -1385,7 +1388,6 @@ class TrackBox extends CacheMap {
                     if (itemById === undefined) {
                         if (id !== fromItemId && id === stickyItemId && itemConfigMap?.[id]?.sticky === 1) {
                             stickyComponentSize = componentSize;
-                            stickyCollectionItem = collectionItem;
                             y -= stickyComponentSize;
                         }
                         if (id === fromItemId) {
@@ -1529,9 +1531,6 @@ class TrackBox extends CacheMap {
     refreshCache(cache) {
         this._prerenderedCache = cache;
     }
-    clearDeltaDirection() {
-        this.clearScrollDirectionCache();
-    }
     clearDelta(clearDirectionDetector = false) {
         this._delta = this._deltaOfNewItems = 0;
         if (clearDirectionDetector) {
@@ -1854,18 +1853,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();
@@ -5749,8 +5738,8 @@ class NgVirtualListComponent {
         $fireUpdate.pipe(takeUntilDestroyed(), tap(userAction => {
             hasUserAction = userAction;
         })).subscribe();
-        let renderStabilizerPrevScrollStateVersion = EMPTY_SCROLL_STATE_VERSION, renderStabilizerUpdateIterations = 0;
         const $update = this.$update, renderStabilizer = (options) => {
+            let renderStabilizerPrevScrollStateVersion = EMPTY_SCROLL_STATE_VERSION, renderStabilizerUpdateIterations = 0;
             const prepareIterations = options?.prepareIterations ?? PREPARE_ITERATIONS, prepareReupdateLength = options?.prepareReupdateLength ?? PREPARATION_REUPDATE_LENGTH;
             return of(null).pipe(takeUntilDestroyed(this._destroyRef), switchMap$1(() => {
                 renderStabilizerPrevScrollStateVersion = EMPTY_SCROLL_STATE_VERSION;
@@ -5970,6 +5959,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 +6048,26 @@ class NgVirtualListComponent {
                 this._$fireUpdate.next(true);
             }));
         })).subscribe();
-        let chunkLoaded = false;
+        let isChunkLoading = false;
         const $loading = toObservable(this.loading);
         $loading.pipe(takeUntilDestroyed(), distinctUntilChanged(), skip(1), filter$1(v => !v), switchMap$1(() => {
-            chunkLoaded = true;
+            isChunkLoading = 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), tap(() => {
+                this._$fireUpdateNextFrame.next(true);
+            }), switchMap$1(() => $chunkLoadingRenderStabilizer.pipe(takeUntilDestroyed(this._destroyRef), take(1), tap(() => {
+                isChunkLoading = false;
+                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) {
@@ -6094,7 +6085,7 @@ class NgVirtualListComponent {
             const scroller = this._scrollerComponent();
             let totalSize = 0;
             if (scroller) {
-                const collapsable = collapsedIds.length > 0, cachable = this.cachable, cached = this._cached, waitingCache = cachable && !cached, emitUpdate = !this._readyForShow || waitingCache || collapsable;
+                const collapsable = collapsedIds.length > 0, cachable = this.cachable, cached = this._cached, waitingCache = cachable && !cached, emitUpdate = !this._readyForShow || waitingCache || collapsable || isChunkLoading;
                 if (this._readyForShow || (cachable && cached)) {
                     const currentScrollSize = (isVertical ? scroller.scrollTop ?? 0 : scroller.scrollLeft ?? 0), fireUpdate = emitUpdate || reupdate || (!optimization && !userAction) || this._$scrollingTo.getValue();
                     let actualScrollSize = !this._readyForShow && snapScrollToEnd ? (isVertical ? scroller.scrollHeight ?? 0 : scroller.scrollWidth ?? 0) :
@@ -6168,23 +6159,22 @@ class NgVirtualListComponent {
                         this._trackBox.isScrollEnd;
                         return;
                     }
-                    if (scrollPositionAfterUpdate >= 0 && scrollPositionAfterUpdate < roundedMaxPositionAfterUpdate) {
-                        if (scrollSize !== roundedMaxPositionAfterUpdate || currentScrollSize !== scrollPositionAfterUpdate) {
-                            this._trackBox.clearDelta();
-                            if (this._readyForShow) {
-                                this.emitScrollEvent(true, false, userAction);
-                            }
-                            const params = {
-                                [isVertical ? TOP_PROP_NAME : LEFT_PROP_NAME]: scrollPositionAfterUpdate, blending: true, userAction,
-                                fireUpdate, behavior: BEHAVIOR_INSTANT, duration: this.animationParams().scrollToItem,
-                            };
-                            scroller.scrollTo(params);
-                            if (emitUpdate) {
-                                this._$update.next(this.getScrollStateVersion(totalSize, this._isVertical ? scroller.scrollTop : scroller.scrollLeft, cacheVersion));
-                            }
+                    if ((scrollPositionAfterUpdate >= 0 && scrollPositionAfterUpdate < roundedMaxPositionAfterUpdate) ||
+                        (scrollSize !== roundedMaxPositionAfterUpdate || currentScrollSize !== scrollPositionAfterUpdate)) {
+                        this._trackBox.clearDelta();
+                        if (this._readyForShow) {
+                            this.emitScrollEvent(true, false, userAction);
+                        }
+                        const params = {
+                            [isVertical ? TOP_PROP_NAME : LEFT_PROP_NAME]: scrollPositionAfterUpdate, blending: true, userAction,
+                            fireUpdate, behavior: BEHAVIOR_INSTANT, duration: this.animationParams().scrollToItem,
+                        };
+                        scroller.scrollTo(params);
+                        if (emitUpdate) {
+                            this._$update.next(this.getScrollStateVersion(totalSize, this._isVertical ? scroller.scrollTop : scroller.scrollLeft, cacheVersion));
                         }
-                        return;
                     }
+                    return;
                 }
                 if (emitUpdate) {
                     this._$update.next(this.getScrollStateVersion(totalSize, this._isVertical ? scroller.scrollTop : scroller.scrollLeft, cacheVersion));