Skip to content

Paginated scroll fix #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ess-Bidali wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Paginated scroll fix #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d48a7f5
🐛 Fixed wrong import
Ess-Bidali Sep 8, 2021
1f7e00e
📦 Added pageSize option when loading more records
Ess-Bidali Sep 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ngfire/infinite-scroll/src/lib/model/paginated-scroll.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';

Expand Down Expand Up @@ -71,14 +71,14 @@ export class PaginatedScroll<T extends IObject>
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) => {
Expand Down