Initial commit

Author: arnautov-anton

src/components/MessageComposer/AttachmentSelector/AttachmentSelector.tsx

@@ -282,7 +282,8 @@ const useAttachmentSelectorActionsFiltered = (original: AttachmentSelectorAction
     ShareLocationDialog = DefaultLocationDialog,
   } = useComponentContext();
   const { channelCapabilities } = useChannelStateContext();
-  const { isUploadEnabled } = useAttachmentManagerState();
+  const { hasAvailableUploadSlots, hasCustomDoUploadRequest, isUploadEnabled } =
+    useAttachmentManagerState();
   const messageComposer = useMessageComposerController();
   const channelConfig = messageComposer.channel.getConfig();
 
@@ -292,9 +293,8 @@ const useAttachmentSelectorActionsFiltered = (original: AttachmentSelectorAction
         .filter((action) => {
           if (action.type === 'uploadFile')
             return (
-              channelCapabilities['upload-file'] &&
-              channelConfig?.uploads &&
-              isUploadEnabled
+              (!hasCustomDoUploadRequest && channelConfig?.uploads && isUploadEnabled) ||
+              (hasCustomDoUploadRequest && hasAvailableUploadSlots)
             );
 
           if (action.type === 'createPoll')
@@ -328,6 +328,8 @@ const useAttachmentSelectorActionsFiltered = (original: AttachmentSelectorAction
       ShareLocationDialog,
       channelCapabilities,
       channelConfig,
+      hasAvailableUploadSlots,
+      hasCustomDoUploadRequest,
       isUploadEnabled,
       messageComposer.threadId,
       original,
@@ -343,7 +345,6 @@ export const AttachmentSelector = ({
   const { t } = useTranslationContext();
   const { ContextMenu: ContextMenuComponent = ContextMenu, Modal = GlobalModal } =
     useComponentContext();
-  const { channelCapabilities } = useChannelStateContext();
   const messageComposer = useMessageComposerController();
   const isCooldownActive = useIsCooldownActive();
   const { command } = useStateStore(
@@ -434,7 +435,7 @@ export const AttachmentSelector = ({
   return (
     <AttachmentSelectorContextProvider value={{ fileInput }}>
       <div className='str-chat__attachment-selector' {...inertProps}>
-        {channelCapabilities['upload-file'] && <UploadFileInput ref={setFileInput} />}
+        <UploadFileInput ref={setFileInput} />
         <AttachmentSelectorButton
           {...buttonProps}
           aria-expanded={menuDialogIsOpen}

src/components/MessageComposer/hooks/useAttachmentManagerState.ts

@@ -14,6 +14,8 @@ export const useAttachmentManagerState = () => {
     availableUploadSlots: attachmentManager.availableUploadSlots,
     blockedUploadsCount: attachmentManager.blockedUploadsCount,
     failedUploadsCount: attachmentManager.failedUploadsCount,
+    hasAvailableUploadSlots: attachmentManager.hasAvailableUploadSlots,
+    hasCustomDoUploadRequest: attachmentManager.hasCustomDoUploadRequest,
     isUploadEnabled: attachmentManager.isUploadEnabled,
     pendingUploadsCount: attachmentManager.pendingUploadsCount,
     successfulUploadsCount: attachmentManager.successfulUploadsCount,

src/components/ReactFileUtilities/UploadButton.tsx

@@ -6,8 +6,6 @@ import React, { forwardRef, useCallback, useMemo } from 'react';
 import { useHandleFileChangeWrapper } from './utils';
 import { useMessageComposerContext, useTranslationContext } from '../../context';
 import { useMessageComposerController } from '../MessageComposer/hooks/useMessageComposerController';
-import { useAttachmentManagerState } from '../MessageComposer/hooks/useAttachmentManagerState';
-import { useIsCooldownActive } from '../MessageComposer/hooks/useIsCooldownActive';
 import { useStateStore } from '../../store';
 import type { MessageComposerConfig } from 'stream-chat';
 import type { PartialSelected } from '../../types/types';
@@ -43,12 +41,10 @@ export const UploadFileInput = forwardRef(function UploadFileInput(
   const { textareaRef } = useMessageComposerContext();
   const messageComposer = useMessageComposerController();
   const { attachmentManager } = messageComposer;
-  const { isUploadEnabled } = useAttachmentManagerState();
   const { acceptedFiles, maxNumberOfFilesPerMessage } = useStateStore(
     messageComposer.configState,
     attachmentManagerConfigStateSelector,
   );
-  const isCooldownActive = useIsCooldownActive();
   const id = useMemo(() => nanoid(), []);
 
   const onFileChange = useCallback(
@@ -65,7 +61,6 @@ export const UploadFileInput = forwardRef(function UploadFileInput(
       accept={acceptedFiles?.join(',')}
       aria-label={t('aria/File upload')}
       data-testid='file-input'
-      disabled={!isUploadEnabled || isCooldownActive}
       id={id}
       multiple={maxNumberOfFilesPerMessage > 1}
       {...props}