@ethlete/query 2.7.3 → 2.8.0

package/fesm2020/ethlete-query.mjs

@@ -1,5 +1,6 @@
-import { BehaviorSubjectWithSubscriberCount, getCookie, setCookie, deleteCookie, DestroyService, equal, clone } from '@ethlete/core';
-import { Observable, filter, takeWhile, switchMap, of, BehaviorSubject, Subject, takeUntil, interval, startWith, finalize, tap, timer, map, fromEvent, debounceTime, take, concat, combineLatest, distinctUntilChanged } from 'rxjs';
+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, interval, startWith, finalize, tap, timer, map, combineLatest, 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';
@@ -1463,6 +1464,7 @@ class InfinityQueryDirective {
         this._viewContainerRef = inject(ViewContainerRef);
         this._mainTemplateRef = inject((TemplateRef));
         this._errorHandler = inject(ErrorHandler);
+        this._delayable = inject(DelayableDirective, { host: true });
         this._data$ = new BehaviorSubject([]);
         this._isMainViewCreated = false;
     }
@@ -1498,15 +1500,15 @@ class InfinityQueryDirective {
     }
     _setupInfinityQuery(config) {
         const instance = new InfinityQuery(config);
-        instance.currentQuery$
-            .pipe(switchMap((q) => q?.state$ ?? of(null)), tap((state) => {
+        combineLatest([instance.currentQuery$.pipe(switchQueryState()), this._delayable.isDelayed$])
+            .pipe(tap(([state, isDelayed]) => {
             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)) {
+            if (isQueryStateLoading(state) || isDelayed) {
                 this._viewContext.loading = true;
                 this._viewContext.error = null;
                 this._viewContext.isFirstLoad = this.context.infinityQuery === null;
@@ -1557,6 +1559,9 @@ class InfinityQueryDirective {
         if (!this._infinityQueryInstance) {
             return;
         }
+        if (this._viewContext.loading) {
+            return;
+        }
         this._infinityQueryInstance.nextPage();
     }
     reset(newConfig) {
@@ -1587,7 +1592,7 @@ class InfinityQueryDirective {
     }
 }
 InfinityQueryDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.5", ngImport: i0, type: InfinityQueryDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-InfinityQueryDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.2.5", type: InfinityQueryDirective, isStandalone: true, selector: "[infinityQuery]", inputs: { infinityQuery: "infinityQuery" }, providers: [{ provide: INFINITY_QUERY_TOKEN, useExisting: InfinityQueryDirective }, DestroyService], exportAs: ["infinityQuery"], ngImport: i0 });
+InfinityQueryDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.2.5", type: InfinityQueryDirective, isStandalone: true, selector: "[infinityQuery]", inputs: { infinityQuery: "infinityQuery" }, providers: [{ provide: INFINITY_QUERY_TOKEN, useExisting: InfinityQueryDirective }, DestroyService], exportAs: ["infinityQuery"], hostDirectives: [{ directive: i1.DelayableDirective }], ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.5", ngImport: i0, type: InfinityQueryDirective, decorators: [{
             type: Directive,
             args: [{
@@ -1596,6 +1601,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.5", ngImpor
                     exportAs: 'infinityQuery',
                     standalone: true,
                     providers: [{ provide: INFINITY_QUERY_TOKEN, useExisting: InfinityQueryDirective }, DestroyService],
+                    hostDirectives: [DelayableDirective],
                 }]
         }], propDecorators: { infinityQuery: [{
                 type: Input