Separate ChatComposer into its own component
This commit is contained in:
parent
8c82d0400a
commit
4bab81bd7c
|
@ -0,0 +1,76 @@
|
||||||
|
import React from 'react';
|
||||||
|
import { defineMessages, useIntl } from 'react-intl';
|
||||||
|
|
||||||
|
import { HStack, IconButton, Stack, Text, Textarea } from 'soapbox/components/ui';
|
||||||
|
|
||||||
|
const messages = defineMessages({
|
||||||
|
placeholder: { id: 'chat.input.placeholder', defaultMessage: 'Type a message' },
|
||||||
|
send: { id: 'chat.actions.send', defaultMessage: 'Send' },
|
||||||
|
failedToSend: { id: 'chat.failed_to_send', defaultMessage: 'Message failed to send.' },
|
||||||
|
retry: { id: 'chat.retry', defaultMessage: 'Retry?' },
|
||||||
|
});
|
||||||
|
|
||||||
|
interface IChatComposer extends Pick<React.TextareaHTMLAttributes<HTMLTextAreaElement>, 'onKeyDown' | 'onChange'> {
|
||||||
|
value: string,
|
||||||
|
onSubmit: () => void,
|
||||||
|
hasErrorSubmittingMessage?: boolean,
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Textarea input for chats. */
|
||||||
|
const ChatComposer = React.forwardRef<HTMLTextAreaElement, IChatComposer>(({
|
||||||
|
onKeyDown,
|
||||||
|
onChange,
|
||||||
|
value,
|
||||||
|
onSubmit,
|
||||||
|
hasErrorSubmittingMessage = false,
|
||||||
|
}, ref) => {
|
||||||
|
const intl = useIntl();
|
||||||
|
|
||||||
|
const isSubmitDisabled = value.length === 0;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className='mt-auto pt-4 px-4 shadow-3xl'>
|
||||||
|
<HStack alignItems='center' justifyContent='between' space={4}>
|
||||||
|
<Stack grow>
|
||||||
|
<Textarea
|
||||||
|
autoFocus
|
||||||
|
ref={ref}
|
||||||
|
placeholder={intl.formatMessage(messages.placeholder)}
|
||||||
|
onKeyDown={onKeyDown}
|
||||||
|
value={value}
|
||||||
|
onChange={onChange}
|
||||||
|
isResizeable={false}
|
||||||
|
autoGrow
|
||||||
|
maxRows={5}
|
||||||
|
/>
|
||||||
|
</Stack>
|
||||||
|
|
||||||
|
<IconButton
|
||||||
|
src={require('icons/airplane.svg')}
|
||||||
|
iconClassName='w-5 h-5'
|
||||||
|
className='text-primary-500'
|
||||||
|
disabled={isSubmitDisabled}
|
||||||
|
onClick={onSubmit}
|
||||||
|
/>
|
||||||
|
</HStack>
|
||||||
|
|
||||||
|
<HStack alignItems='center' className='h-5' space={1}>
|
||||||
|
{hasErrorSubmittingMessage && (
|
||||||
|
<>
|
||||||
|
<Text theme='danger' size='xs'>
|
||||||
|
{intl.formatMessage(messages.failedToSend)}
|
||||||
|
</Text>
|
||||||
|
|
||||||
|
<button onClick={onSubmit} className='flex hover:underline'>
|
||||||
|
<Text theme='primary' size='xs' tag='span'>
|
||||||
|
{intl.formatMessage(messages.retry)}
|
||||||
|
</Text>
|
||||||
|
</button>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</HStack>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
export default ChatComposer;
|
|
@ -1,7 +1,7 @@
|
||||||
import { useMutation } from '@tanstack/react-query';
|
import { useMutation } from '@tanstack/react-query';
|
||||||
import classNames from 'clsx';
|
import classNames from 'clsx';
|
||||||
import React, { MutableRefObject, useState } from 'react';
|
import React, { MutableRefObject, useState } from 'react';
|
||||||
import { useIntl, defineMessages } from 'react-intl';
|
import { useIntl } from 'react-intl';
|
||||||
|
|
||||||
import { uploadMedia } from 'soapbox/actions/media';
|
import { uploadMedia } from 'soapbox/actions/media';
|
||||||
import { HStack, IconButton, Stack, Text, Textarea } from 'soapbox/components/ui';
|
import { HStack, IconButton, Stack, Text, Textarea } from 'soapbox/components/ui';
|
||||||
|
@ -12,15 +12,9 @@ import { chatKeys, IChat, useChatActions } from 'soapbox/queries/chats';
|
||||||
import { queryClient } from 'soapbox/queries/client';
|
import { queryClient } from 'soapbox/queries/client';
|
||||||
import { truncateFilename } from 'soapbox/utils/media';
|
import { truncateFilename } from 'soapbox/utils/media';
|
||||||
|
|
||||||
|
import ChatComposer from './chat-composer';
|
||||||
import ChatMessageList from './chat-message-list';
|
import ChatMessageList from './chat-message-list';
|
||||||
|
|
||||||
const messages = defineMessages({
|
|
||||||
placeholder: { id: 'chat.input.placeholder', defaultMessage: 'Type a message' },
|
|
||||||
send: { id: 'chat.actions.send', defaultMessage: 'Send' },
|
|
||||||
failedToSend: { id: 'chat.failed_to_send', defaultMessage: 'Message failed to send.' },
|
|
||||||
retry: { id: 'chat.retry', defaultMessage: 'Retry?' },
|
|
||||||
});
|
|
||||||
|
|
||||||
const fileKeyGen = (): number => Math.floor((Math.random() * 0x10000));
|
const fileKeyGen = (): number => Math.floor((Math.random() * 0x10000));
|
||||||
|
|
||||||
interface ChatInterface {
|
interface ChatInterface {
|
||||||
|
@ -215,47 +209,13 @@ const Chat: React.FC<ChatInterface> = ({ chat, autosize, inputRef, className })
|
||||||
<ChatMessageList chat={chat} autosize />
|
<ChatMessageList chat={chat} autosize />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className='mt-auto pt-4 px-4 shadow-3xl'>
|
<ChatComposer
|
||||||
<HStack alignItems='center' justifyContent='between' space={4}>
|
ref={inputRef}
|
||||||
<Stack grow>
|
onKeyDown={handleKeyDown}
|
||||||
<Textarea
|
value={content}
|
||||||
autoFocus
|
onChange={handleContentChange}
|
||||||
ref={inputRef}
|
onSubmit={sendMessage}
|
||||||
placeholder={intl.formatMessage(messages.placeholder)}
|
/>
|
||||||
onKeyDown={handleKeyDown}
|
|
||||||
value={content}
|
|
||||||
onChange={handleContentChange}
|
|
||||||
isResizeable={false}
|
|
||||||
autoGrow
|
|
||||||
maxRows={5}
|
|
||||||
/>
|
|
||||||
</Stack>
|
|
||||||
|
|
||||||
<IconButton
|
|
||||||
src={require('icons/airplane.svg')}
|
|
||||||
iconClassName='w-5 h-5'
|
|
||||||
className='text-primary-500'
|
|
||||||
disabled={isSubmitDisabled}
|
|
||||||
onClick={sendMessage}
|
|
||||||
/>
|
|
||||||
</HStack>
|
|
||||||
|
|
||||||
<HStack alignItems='center' className='h-5' space={1}>
|
|
||||||
{hasErrorSubmittingMessage && (
|
|
||||||
<>
|
|
||||||
<Text theme='danger' size='xs'>
|
|
||||||
{intl.formatMessage(messages.failedToSend)}
|
|
||||||
</Text>
|
|
||||||
|
|
||||||
<button onClick={sendMessage} className='flex hover:underline'>
|
|
||||||
<Text theme='primary' size='xs' tag='span'>
|
|
||||||
{intl.formatMessage(messages.retry)}
|
|
||||||
</Text>
|
|
||||||
</button>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</HStack>
|
|
||||||
</div>
|
|
||||||
</Stack>
|
</Stack>
|
||||||
// {renderAttachment()}
|
// {renderAttachment()}
|
||||||
// {isUploading && (
|
// {isUploading && (
|
||||||
|
|
Loading…
Reference in New Issue