@ethlete/query 2.9.0 → 2.9.2

package/fesm2020/ethlete-query.mjs

@@ -1,6 +1,6 @@
 import * as i1 from '@ethlete/core';
 import { BehaviorSubjectWithSubscriberCount, getCookie, setCookie, deleteCookie, DestroyService, DelayableDirective, equal, clone } from '@ethlete/core';
-import { Observable, filter, takeWhile, switchMap, of, BehaviorSubject, Subject, takeUntil, tap, interval, startWith, finalize, timer, map, combineLatest, fromEvent, debounceTime, take, concat, distinctUntilChanged } from 'rxjs';
+import { Observable, filter, takeWhile, switchMap, of, BehaviorSubject, Subject, takeUntil, tap, interval, startWith, finalize, timer, map, combineLatest, skip, fromEvent, debounceTime, take, concat, distinctUntilChanged } from 'rxjs';
 import * as i0 from '@angular/core';
 import { Directive, Input, InjectionToken, inject, ChangeDetectorRef, ViewContainerRef, TemplateRef, ErrorHandler, ElementRef } from '@angular/core';
 import { FormGroup } from '@angular/forms';
@@ -937,6 +937,9 @@ class Query {
                         }))
                             .subscribe();
                     }
+                    else {
+                        failure();
+                    }
                 }
                 else if (state.type === 'cancel') {
                     this._state$.next({
@@ -1508,6 +1511,7 @@ class InfinityQueryDirective {
         this._errorHandler = inject(ErrorHandler);
         this._delayable = inject(DelayableDirective, { host: true });
         this._data$ = new BehaviorSubject([]);
+        this._didReceiveFirstData$ = new BehaviorSubject(false);
         this._isMainViewCreated = false;
     }
     get infinityQuery() {
@@ -1542,15 +1546,19 @@ class InfinityQueryDirective {
     }
     _setupInfinityQuery(config) {
         const instance = new InfinityQuery(config);
-        combineLatest([instance.currentQuery$.pipe(switchQueryState()), this._delayable.isDelayed$])
-            .pipe(tap(([state, isDelayed]) => {
+        combineLatest([
+            instance.currentQuery$.pipe(switchQueryState()),
+            this._delayable.isDelayed$,
+            this._didReceiveFirstData$,
+        ])
+            .pipe(tap(([state, isDelayed, didReceiveFirstData]) => {
             this._viewContext.currentPage = instance.currentPage;
             this._viewContext.totalPages = instance.totalPages;
             this._viewContext.itemsPerPage = instance.itemsPerPage;
             this._viewContext.canLoadMore =
                 (instance.totalPages && instance.currentPage && instance.totalPages > instance.currentPage) || false;
             this._viewContext.currentCalculatedPage = instance.currentCalculatedPage;
-            if (isQueryStateLoading(state) || isDelayed) {
+            if (isQueryStateLoading(state) || isDelayed || (!didReceiveFirstData && isQueryStateSuccess(state))) {
                 this._viewContext.loading = true;
                 this._viewContext.error = null;
                 this._viewContext.isFirstLoad = this.context.infinityQuery === null;
@@ -1582,9 +1590,12 @@ class InfinityQueryDirective {
         }), takeUntil(this._destroy$), takeUntil(this._queryConfigChanged$))
             .subscribe();
         instance.data$
-            .pipe(tap((data) => {
+            .pipe(skip(1), tap((data) => {
             this._viewContext.infinityQuery = this._viewContext.$implicit = data;
             this._data$.next(data);
+            if (!this._didReceiveFirstData$.getValue()) {
+                this._didReceiveFirstData$.next(true);
+            }
             this._cdr.markForCheck();
         }), takeUntil(this._destroy$), takeUntil(this._queryConfigChanged$))
             .subscribe();