Merge branch 'master' into feat/offline-support-rework

# Conflicts:
#	src/channel_manager.ts

Author: isekovanic

src/channel_manager.ts

@@ -26,6 +26,7 @@ import {
   DEFAULT_QUERY_CHANNELS_RETRY_COUNT,
   DEFAULT_QUERY_CHANNELS_SECONDS_BETWEEN_RETRIES,
 } from './constants';
+import { WithSubscriptions } from './utils/WithSubscriptions';
 
 export type ChannelManagerPagination = {
   filters: ChannelFilters;
@@ -154,10 +155,9 @@ export const DEFAULT_CHANNEL_MANAGER_PAGINATION_OPTIONS = {
  *
  * @internal
  */
-export class ChannelManager {
+export class ChannelManager extends WithSubscriptions {
   public readonly state: StateStore<ChannelManagerState>;
   private client: StreamChat;
-  private unsubscribeFunctions: Set<() => void> = new Set();
   private eventHandlers: Map<string, EventHandlerType> = new Map();
   private eventHandlerOverrides: Map<string, EventHandlerOverrideType> = new Map();
   private options: ChannelManagerOptions = {};
@@ -173,6 +173,8 @@ export class ChannelManager {
     eventHandlerOverrides?: ChannelManagerEventHandlerOverrides;
     options?: ChannelManagerOptions;
   }) {
+    super();
+
     this.id = `channel-manager-${generateUUIDv4()}`;
     this.client = client;
     this.state = new StateStore<ChannelManagerState>({
@@ -706,20 +708,15 @@ export class ChannelManager {
   };
 
   public registerSubscriptions = () => {
-    if (this.unsubscribeFunctions.size) {
+    if (this.hasSubscriptions) {
       // Already listening for events and changes
       return;
     }
 
     for (const eventType of Object.keys(channelManagerEventToHandlerMapping)) {
-      this.unsubscribeFunctions.add(
+      this.addUnsubscribeFunction(
         this.client.on(eventType, this.subscriptionOrOverride).unsubscribe,
       );
     }
   };
-
-  public unregisterSubscriptions = () => {
-    this.unsubscribeFunctions.forEach((cleanupFunction) => cleanupFunction());
-    this.unsubscribeFunctions.clear();
-  };
 }

src/messageComposer/attachmentManager.ts

@@ -71,10 +71,35 @@ const initState = ({
 export class AttachmentManager {
   readonly state: StateStore<AttachmentManagerState>;
   readonly composer: MessageComposer;
+  private attachmentsByIdGetterCache: {
+    attachmentsById: Record<string, LocalAttachment>;
+    attachments: LocalAttachment[];
+  };
 
   constructor({ composer, message }: AttachmentManagerOptions) {
     this.composer = composer;
     this.state = new StateStore<AttachmentManagerState>(initState({ message }));
+    this.attachmentsByIdGetterCache = { attachmentsById: {}, attachments: [] };
+  }
+
+  get attachmentsById() {
+    const { attachments } = this.state.getLatestValue();
+
+    if (attachments !== this.attachmentsByIdGetterCache.attachments) {
+      this.attachmentsByIdGetterCache.attachments = attachments;
+      this.attachmentsByIdGetterCache.attachmentsById = attachments.reduce<
+        Record<string, LocalAttachment>
+      >((newAttachmentsById, attachment) => {
+        // should never happen but does not hurt to check
+        if (!attachment.localMetadata.id) return newAttachmentsById;
+
+        newAttachmentsById[attachment.localMetadata.id] ??= attachment;
+
+        return newAttachmentsById;
+      }, {});
+    }
+
+    return this.attachmentsByIdGetterCache.attachmentsById;
   }
 
   get client() {
@@ -176,44 +201,47 @@ export class AttachmentManager {
     this.state.next(initState({ message }));
   };
 
-  getAttachmentIndex = (localId: string) =>
-    this.attachments.findIndex(
-      (attachment) =>
-        attachment.localMetadata.id && localId === attachment.localMetadata?.id,
-    );
+  getAttachmentIndex = (localId: string) => {
+    const attachmentsById = this.attachmentsById;
+
+    return this.attachments.indexOf(attachmentsById[localId]);
+  };
 
   upsertAttachments = (attachmentsToUpsert: LocalAttachment[]) => {
     if (!attachmentsToUpsert.length) return;
-    const stateAttachments = this.attachments;
-    const attachments = [...this.attachments];
-    attachmentsToUpsert.forEach((upsertedAttachment) => {
-      const attachmentIndex = this.getAttachmentIndex(
-        upsertedAttachment.localMetadata.id,
-      );
 
-      if (attachmentIndex === -1) {
-        const localAttachment = ensureIsLocalAttachment(upsertedAttachment);
-        if (localAttachment) attachments.push(localAttachment);
+    const currentAttachments = this.attachments;
+    const newAttachments = [...currentAttachments];
+
+    attachmentsToUpsert.forEach((attachment) => {
+      const targetAttachmentIndex = this.getAttachmentIndex(attachment.localMetadata?.id);
+
+      if (targetAttachmentIndex < 0) {
+        const localAttachment = ensureIsLocalAttachment(attachment);
+        if (localAttachment) newAttachments.push(localAttachment);
       } else {
+        // do not re-organize newAttachments array otherwise indexing would no longer work
+        // replace in place only with the attachments with the same id's
         const merged = mergeWithDiff<LocalAttachment>(
-          stateAttachments[attachmentIndex] ?? {},
-          upsertedAttachment,
+          currentAttachments[targetAttachmentIndex],
+          attachment,
         );
         const updatesOnMerge = merged.diff && Object.keys(merged.diff.children).length;
         if (updatesOnMerge) {
           const localAttachment = ensureIsLocalAttachment(merged.result);
-          if (localAttachment) attachments.splice(attachmentIndex, 1, localAttachment);
+          if (localAttachment)
+            newAttachments.splice(targetAttachmentIndex, 1, localAttachment);
         }
       }
     });
 
-    this.state.partialNext({ attachments });
+    this.state.partialNext({ attachments: newAttachments });
   };
 
   removeAttachments = (localAttachmentIds: string[]) => {
     this.state.partialNext({
       attachments: this.attachments.filter(
-        (att) => !localAttachmentIds.includes(att.localMetadata?.id),
+        (attachment) => !localAttachmentIds.includes(attachment.localMetadata?.id),
       ),
     });
   };

src/messageComposer/configuration/types.ts

@@ -41,17 +41,16 @@ export type AttachmentManagerConfig = {
   /** Function that allows to customize the upload request. */
   doUploadRequest?: UploadRequestFn;
 };
-export type LinkPreviewConfig = {
-  /** Custom function to react to link preview dismissal */
-  onLinkPreviewDismissed?: (linkPreview: LinkPreview) => void;
-};
-export type LinkPreviewsManagerConfig = LinkPreviewConfig & {
+
+export type LinkPreviewsManagerConfig = {
   /** Number of milliseconds to debounce firing the URL enrichment queries when typing. The default value is 1500(ms). */
   debounceURLEnrichmentMs: number;
   /** Allows for toggling the URL enrichment and link previews in `MessageInput`. By default, the feature is disabled. */
   enabled: boolean;
   /** Custom function to identify URLs in a string and request OG data */
   findURLFn: (text: string) => string[];
+  /** Custom function to react to link preview dismissal */
+  onLinkPreviewDismissed?: (linkPreview: LinkPreview) => void;
 };
 
 export type MessageComposerConfig = {