Apply post-review adjustments

Co-authored-by: Martin Cupela <martin.cupela@gmail.com>

Author: arnautov-anton

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 = {

src/messageComposer/messageComposer.ts

@@ -546,19 +546,40 @@ export class MessageComposer extends WithSubscriptions {
       }
     });
 
-  private subscribeMessageComposerConfigStateChanged = () =>
-    this.configState.subscribeWithSelector(
-      ({ text }) => [text] as const,
-      ([currentText]) => {
-        if (this.textComposer.text === '' && currentText.defaultValue) {
+  private subscribeMessageComposerConfigStateChanged = () => {
+    let draftUnsubscribeFunctions: Unsubscribe[] | null;
+
+    const unsubscribe = this.configState.subscribeWithSelector(
+      (currentValue) => ({
+        textDefaultValue: currentValue.text.defaultValue,
+        draftsEnabled: currentValue.drafts.enabled,
+      }),
+      ({ textDefaultValue, draftsEnabled }) => {
+        if (this.textComposer.text === '' && textDefaultValue) {
           this.textComposer.insertText({
-            text: currentText.defaultValue,
+            text: textDefaultValue,
             selection: { start: 0, end: 0 },
           });
         }
+
+        if (draftsEnabled && !draftUnsubscribeFunctions) {
+          draftUnsubscribeFunctions = [
+            this.subscribeDraftUpdated(),
+            this.subscribeDraftDeleted(),
+          ];
+        } else if (!draftsEnabled && draftUnsubscribeFunctions) {
+          draftUnsubscribeFunctions.forEach((fn) => fn());
+          draftUnsubscribeFunctions = null;
+        }
       },
     );
 
+    return () => {
+      draftUnsubscribeFunctions?.forEach((unsubscribe) => unsubscribe());
+      unsubscribe();
+    };
+  };
+
   setQuotedMessage = (quotedMessage: LocalMessage | null) => {
     this.state.partialNext({ quotedMessage });
   };

test/unit/MessageComposer/messageComposer.test.ts

@@ -1055,5 +1055,43 @@ describe('MessageComposer', () => {
         spy.mockRestore();
       });
     });
+
+    it('should toggle the registration of draft WS event subscriptions when drafts are disabled / enabled', () => {
+      const { messageComposer } = setup({
+        config: { drafts: { enabled: false } },
+      });
+
+      const unsubscribeDraftUpdated = vi.fn();
+      const unsubscribeDraftDeleted = vi.fn();
+
+      // @ts-expect-error - we are testing private properties
+      const subscribeDraftUpdatedSpy = vi
+        .spyOn(messageComposer, 'subscribeDraftUpdated')
+        .mockImplementation(() => unsubscribeDraftUpdated);
+      // @ts-expect-error - we are testing private properties
+      const subscribeDraftDeletedSpy = vi
+        .spyOn(messageComposer, 'subscribeDraftDeleted')
+        .mockImplementation(() => unsubscribeDraftDeleted);
+
+      messageComposer.registerSubscriptions();
+
+      expect(subscribeDraftUpdatedSpy).not.toHaveBeenCalled();
+      expect(subscribeDraftDeletedSpy).not.toHaveBeenCalled();
+
+      messageComposer.updateConfig({ drafts: { enabled: true } });
+
+      expect(subscribeDraftUpdatedSpy).toHaveBeenCalledTimes(1);
+      expect(subscribeDraftDeletedSpy).toHaveBeenCalledTimes(1);
+
+      subscribeDraftUpdatedSpy.mockClear();
+      subscribeDraftDeletedSpy.mockClear();
+
+      messageComposer.updateConfig({ drafts: { enabled: false } });
+
+      expect(unsubscribeDraftUpdated).toHaveBeenCalledTimes(1);
+      expect(unsubscribeDraftDeleted).toHaveBeenCalledTimes(1);
+      expect(subscribeDraftUpdatedSpy).not.toHaveBeenCalled();
+      expect(subscribeDraftDeletedSpy).not.toHaveBeenCalled();
+    });
   });
 });