From d48a7f530682d1edb9bfcd2722a1eddfc27a0139 Mon Sep 17 00:00:00 2001 From: Ess Bidali <51133968+Ess-Bidali@users.noreply.github.com> Date: Wed, 8 Sep 2021 12:32:47 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20wrong=20import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../infinite-scroll/src/lib/model/paginated-scroll.model.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ngfire/infinite-scroll/src/lib/model/paginated-scroll.model.ts b/ngfire/infinite-scroll/src/lib/model/paginated-scroll.model.ts index 5aac8c1..bb04614 100644 --- a/ngfire/infinite-scroll/src/lib/model/paginated-scroll.model.ts +++ b/ngfire/infinite-scroll/src/lib/model/paginated-scroll.model.ts @@ -1,11 +1,11 @@ -import { CollectionReference } from '@firebase/firestore-types'; +import { CollectionReference, QuerySnapshot } from '@firebase/firestore-types'; import { Injectable } from '@angular/core'; import { BehaviorSubject } from 'rxjs'; import { filter } from 'rxjs/operators'; import * as _ from 'lodash'; -import { AngularFirestore, AngularFirestoreCollection, DocumentData, QuerySnapshot } from '@angular/fire/firestore'; +import { AngularFirestore, AngularFirestoreCollection, DocumentData } from '@angular/fire/firestore'; import { IObject } from '@iote/bricks'; import { __DateFromStorage } from '@ngfire/time'; From 1f7e00eb8c50c8c9f1ddd09728d0dea8ee0757c6 Mon Sep 17 00:00:00 2001 From: Ess Bidali <51133968+Ess-Bidali@users.noreply.github.com> Date: Wed, 8 Sep 2021 13:07:20 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=93=A6=20Added=20pageSize=20option=20?= =?UTF-8?q?when=20loading=20more=20records?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../infinite-scroll/src/lib/model/paginated-scroll.model.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ngfire/infinite-scroll/src/lib/model/paginated-scroll.model.ts b/ngfire/infinite-scroll/src/lib/model/paginated-scroll.model.ts index bb04614..0d5d0a8 100644 --- a/ngfire/infinite-scroll/src/lib/model/paginated-scroll.model.ts +++ b/ngfire/infinite-scroll/src/lib/model/paginated-scroll.model.ts @@ -71,14 +71,14 @@ export class PaginatedScroll return this.docs$$.asObservable().pipe(filter(o => o != null)); } - more() : void + more(newPageSize?: number) : void { const collection = this._getMessageCollection(); // 1. Configure next query behaviour const docs$ = collection.orderBy(this._opts.orderByField, this._opts.reverse ? 'desc' : 'asc') .startAt(this.start) - .limit(this._opts.limit).get(); + .limit(newPageSize ?? this._opts.limit).get(); // 2. Get the next snapshot. Will only fire once on get! docs$.then((snapshots) => {