stream-chat-angular 4.47.3 → 4.48.0

package/assets/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.47.3";
+export declare const version = "4.48.0";

package/bundles/stream-chat-angular.umd.js

@@ -356,7 +356,7 @@
         return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
     }
 
-    var version = '4.47.3';
+    var version = '4.48.0';
 
     /**
      * The `NotificationService` can be used to add or remove notifications. By default the [`NotificationList`](../components/NotificationListComponent.mdx) component displays the currently active notifications.
@@ -1036,8 +1036,8 @@
                     switch (_h.label) {
                         case 0:
                             this.filters = filters;
-                            this.options = Object.assign({ offset: 0, limit: 25, state: true, presence: true, watch: true, message_limit: this.messagePageSize }, options);
-                            this.sort = sort || { last_message_at: -1, updated_at: -1 };
+                            this.options = Object.assign({ limit: 25, state: true, presence: true, watch: true, message_limit: this.messagePageSize }, options);
+                            this.sort = sort || { last_message_at: -1 };
                             this.shouldSetActiveChannel = shouldSetActiveChannel;
                             this.clientEventsSubscription = this.chatClientService.events$.subscribe(function (notification) { return void _this.handleNotification(notification); });
                             _h.label = 1;
@@ -1081,9 +1081,7 @@
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_h) {
                     switch (_h.label) {
-                        case 0:
-                            this.options.offset = this.channels.length;
-                            return [4 /*yield*/, this.queryChannels(false)];
+                        case 0: return [4 /*yield*/, this.queryChannels(false)];
                         case 1:
                             _h.sent();
                             return [2 /*return*/];
@@ -1566,9 +1564,7 @@
                                     _h.label = 1;
                                 case 1:
                                     _h.trys.push([1, 3, , 4]);
-                                    if (this.options) {
-                                        this.options.offset = 0;
-                                    }
+                                    this.nextPageConfiguration = undefined;
                                     shoulSetActiveChannel = this.shouldSetActiveChannel &&
                                         !this.activeChannelSubject.getValue();
                                     return [4 /*yield*/, this.queryChannels(shoulSetActiveChannel || false, true)];
@@ -1811,6 +1807,26 @@
                 });
             });
         };
+        Object.defineProperty(ChannelService.prototype, "channels", {
+            /**
+             * The current list of channels
+             */
+            get: function () {
+                return this.channelsSubject.getValue() || [];
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(ChannelService.prototype, "activeChannel", {
+            /**
+             * The current active channel
+             */
+            get: function () {
+                return this.activeChannelSubject.getValue() || undefined;
+            },
+            enumerable: false,
+            configurable: true
+        });
         ChannelService.prototype.messageUpdated = function (event) {
             var _this = this;
             this.ngZone.run(function () {
@@ -1891,30 +1907,48 @@
             if (recoverState === void 0) { recoverState = false; }
             var _a, _b;
             return __awaiter(this, void 0, void 0, function () {
-                var channels, prevChannels, currentActiveChannel_1, error_6;
+                var filters, options, channels, prevChannels_1, filteredChannels, currentActiveChannel_1, error_6;
                 var _this = this;
                 return __generator(this, function (_h) {
                     switch (_h.label) {
                         case 0:
                             _h.trys.push([0, 2, , 3]);
                             this.channelQueryStateSubject.next({ state: 'in-progress' });
-                            return [4 /*yield*/, this.chatClientService.chatClient.queryChannels(this.filters, this.sort || {}, this.options)];
+                            filters = void 0;
+                            options = void 0;
+                            if (this.nextPageConfiguration) {
+                                if (this.nextPageConfiguration.type === 'filter') {
+                                    filters = Object.assign(Object.assign({}, this.filters), this.nextPageConfiguration.paginationFilter);
+                                    options = this.options;
+                                }
+                                else {
+                                    options = Object.assign(Object.assign({}, this.options), { offset: this.nextPageConfiguration.offset });
+                                    filters = this.filters;
+                                }
+                            }
+                            else {
+                                filters = this.filters;
+                                options = this.options;
+                            }
+                            return [4 /*yield*/, this.chatClientService.chatClient.queryChannels(filters, this.sort || {}, options)];
                         case 1:
                             channels = _h.sent();
+                            this.setNextPageConfiguration(channels);
                             channels.forEach(function (c) { return _this.watchForChannelEvents(c); });
-                            prevChannels = recoverState
+                            prevChannels_1 = recoverState
                                 ? []
                                 : this.channelsSubject.getValue() || [];
-                            this.channelsSubject.next(__spreadArray(__spreadArray([], __read(prevChannels)), __read(channels)));
+                            filteredChannels = channels.filter(function (channel) { return !prevChannels_1.find(function (existingChannel) { return existingChannel.cid === channel.cid; }); });
+                            this.channelsSubject.next(__spreadArray(__spreadArray([], __read(prevChannels_1)), __read(filteredChannels)));
                             currentActiveChannel_1 = this.activeChannelSubject.getValue();
-                            if (channels.length > 0 &&
+                            if (filteredChannels.length > 0 &&
                                 !currentActiveChannel_1 &&
                                 shouldSetActiveChannel) {
-                                this.setAsActiveChannel(channels[0]);
+                                this.setAsActiveChannel(filteredChannels[0]);
                                 currentActiveChannel_1 = this.activeChannelSubject.getValue();
                             }
                             if (recoverState &&
-                                !channels.find(function (c) { return c.cid === (currentActiveChannel_1 === null || currentActiveChannel_1 === void 0 ? void 0 : currentActiveChannel_1.cid); })) {
+                                !filteredChannels.find(function (c) { return c.cid === (currentActiveChannel_1 === null || currentActiveChannel_1 === void 0 ? void 0 : currentActiveChannel_1.cid); })) {
                                 this.deselectActiveChannel();
                             }
                             this.hasMoreChannelsSubject.next(channels.length >= this.options.limit);
@@ -2082,13 +2116,6 @@
                 }
             }
         };
-        Object.defineProperty(ChannelService.prototype, "channels", {
-            get: function () {
-                return this.channelsSubject.getValue() || [];
-            },
-            enumerable: false,
-            configurable: true
-        });
         Object.defineProperty(ChannelService.prototype, "canSendReadEvents", {
             get: function () {
                 var _a;
@@ -2215,6 +2242,20 @@
                 void channel.markRead();
             }
         };
+        ChannelService.prototype.setNextPageConfiguration = function (channelQueryResult) {
+            var _a;
+            if (this.customPaginator) {
+                this.nextPageConfiguration = this.customPaginator(channelQueryResult);
+            }
+            else {
+                this.nextPageConfiguration = {
+                    type: 'offset',
+                    offset: (((_a = this.nextPageConfiguration) === null || _a === void 0 ? void 0 : _a.type) === 'offset'
+                        ? this.nextPageConfiguration.offset
+                        : 0) + channelQueryResult.length,
+                };
+            }
+        };
         return ChannelService;
     }());
     ChannelService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.5", ngImport: i0__namespace, type: ChannelService, deps: [{ token: ChatClientService }, { token: i0__namespace.NgZone }, { token: NotificationService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });