stream-chat-angular 2.6.1 → 2.6.2

package/assets/version.d.ts

@@ -1 +1 @@
-export declare const version = "2.6.1";
+export declare const version = "2.6.2";

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

@@ -353,7 +353,7 @@
         return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
     }
 
-    var version = '2.6.1';
+    var version = '2.6.2';
 
     var NotificationService = /** @class */ (function () {
         function NotificationService() {
@@ -826,10 +826,7 @@
                                 return [2 /*return*/, []];
                             }
                             return [4 /*yield*/, activeChannel.queryMembers({
-                                    $or: [
-                                        { id: { $autocomplete: searchTerm } },
-                                        { name: { $autocomplete: searchTerm } },
-                                    ],
+                                    name: { $autocomplete: searchTerm },
                                     id: { $ne: this.chatClientService.chatClient.userID },
                                 })];
                         case 2:
@@ -3272,24 +3269,28 @@
             this.send = new i0.EventEmitter();
             this.userMentions = new i0.EventEmitter();
             this.labelKey = 'autocompleteLabel';
-            this.triggerChar = '@';
+            this.mentionTriggerChar = '@';
             this.autocompleteConfig = {
                 mentions: [],
             };
             this.subscriptions = [];
             this.mentionedUsers = [];
             this.userMentionConfig = {
-                triggerChar: this.triggerChar,
+                triggerChar: this.mentionTriggerChar,
                 dropUp: true,
                 labelKey: this.labelKey,
                 returnTrigger: true,
                 mentionFilter: function (searchString, items) { return _this.filter(searchString, items); },
-                mentionSelect: function (item, triggerChar) { return _this.mentioned(item, triggerChar); },
+                mentionSelect: function (item, triggerChar) { return _this.itemSelectedFromAutocompleteList(item, triggerChar); },
             };
             this.searchTerm$ = new rxjs.BehaviorSubject('');
             this.searchTerm$
                 .pipe(operators.debounceTime(300), operators.distinctUntilChanged())
-                .subscribe(function (searchTerm) { return void _this.updateMentionOptions(searchTerm); });
+                .subscribe(function (searchTerm) {
+                if (searchTerm.startsWith(_this.mentionTriggerChar)) {
+                    void _this.updateMentionOptions(searchTerm);
+                }
+            });
             this.subscriptions.push(this.channelService.activeChannel$.subscribe(function () {
                 _this.mentionedUsers = [];
                 _this.userMentions.next(__spreadArray([], __read(_this.mentionedUsers)));
@@ -3315,18 +3316,20 @@
             var _this = this;
             return items.filter(function (item) { return _this.transliterate(item.autocompleteLabel.toLowerCase()).includes(_this.transliterate(searchString.toLowerCase())); });
         };
-        AutocompleteTextareaComponent.prototype.mentioned = function (item, triggerChar) {
+        AutocompleteTextareaComponent.prototype.itemSelectedFromAutocompleteList = function (item, triggerChar) {
             if (triggerChar === void 0) { triggerChar = ''; }
-            this.mentionedUsers.push((item.user ? item.user : item));
-            this.userMentions.next(__spreadArray([], __read(this.mentionedUsers)));
+            if (triggerChar === this.mentionTriggerChar) {
+                this.mentionedUsers.push((item.user ? item.user : item));
+                this.userMentions.next(__spreadArray([], __read(this.mentionedUsers)));
+            }
             return triggerChar + item.autocompleteLabel;
         };
         AutocompleteTextareaComponent.prototype.autcompleteSearchTermChanged = function (searchTerm) {
-            if (searchTerm === this.triggerChar) {
+            if (searchTerm === this.mentionTriggerChar) {
                 void this.updateMentionOptions();
             }
             else {
-                this.searchTerm$.next(searchTerm.replace(this.triggerChar, ''));
+                this.searchTerm$.next(searchTerm);
             }
         };
         AutocompleteTextareaComponent.prototype.inputChanged = function () {
@@ -3358,6 +3361,7 @@
                             if (!this.areMentionsEnabled) {
                                 return [2 /*return*/];
                             }
+                            searchTerm = searchTerm === null || searchTerm === void 0 ? void 0 : searchTerm.replace(this.mentionTriggerChar, '');
                             request = this.mentionScope === 'application'
                                 ? function (s) { return _this.chatClientService.autocompleteUsers(s); }
                                 : function (s) { return _this.channelService.autocompleteMembers(s); };
@@ -3381,7 +3385,7 @@
             var updatedMentionedUsers = [];
             this.mentionedUsers.forEach(function (u) {
                 var key = u.name || u.id;
-                if (_this.value.includes("" + _this.triggerChar + key)) {
+                if (_this.value.includes("" + _this.mentionTriggerChar + key)) {
                     updatedMentionedUsers.push(u);
                 }
             });