mirror
/
soapbox
kopia lustrzana https://gitlab.com/soapbox-pub/soapbox
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge branch 'more-chat-fixes' into 'develop' 

More chat fixes

See merge request soapbox-pub/soapbox-fe!1545
environments/review-develop-3zknud/deployments/311
Alex Gleason 2022-06-18 21:34:18 +00:00
rodzic 3bd9467cc7 9365aa2cee
commit a8a35222be
1 zmienionych plików z 7 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
app/soapbox/features/chats/components/chat-window.tsx
Wyświetl plik

@ -8,7 +8,7 @@ import {
import Avatar from 'soapbox/components/avatar'; import Avatar from 'soapbox/components/avatar';
import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper'; import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper';
import IconButton from 'soapbox/components/icon_button'; import IconButton from 'soapbox/components/icon_button';
import { Counter } from 'soapbox/components/ui'; import { HStack, Counter } from 'soapbox/components/ui';
import { useAppSelector, useAppDispatch } from 'soapbox/hooks'; import { useAppSelector, useAppDispatch } from 'soapbox/hooks';
import { makeGetChat } from 'soapbox/selectors'; import { makeGetChat } from 'soapbox/selectors';
import { getAcct } from 'soapbox/utils/accounts'; import { getAcct } from 'soapbox/utils/accounts';
@ -58,7 +58,6 @@ const ChatWindow: React.FC<IChatWindow> = ({ idx, chatId, windowState }) => {
const handleInputRef = (el: HTMLTextAreaElement) => { const handleInputRef = (el: HTMLTextAreaElement) => {
inputElem.current = el; inputElem.current = el;
focusInput();
}; };
const focusInput = () => { const focusInput = () => {
@ -66,8 +65,10 @@ const ChatWindow: React.FC<IChatWindow> = ({ idx, chatId, windowState }) => {
}; };
useEffect(() => { useEffect(() => {
if (windowState === 'open') {
focusInput(); focusInput();
}, [windowState === 'open']); }
}, [windowState]);
if (!chat) return null; if (!chat) return null;
const account = chat.account as unknown as AccountEntity; const account = chat.account as unknown as AccountEntity;
@ -91,7 +92,7 @@ const ChatWindow: React.FC<IChatWindow> = ({ idx, chatId, windowState }) => {
return ( return (
<div className={`pane pane--${windowState}`} style={{ right: `${right}px` }}> <div className={`pane pane--${windowState}`} style={{ right: `${right}px` }}>
<div className='pane__header'> <HStack space={2} className='pane__header'>
{unreadCount > 0 ? unreadIcon : avatar } {unreadCount > 0 ? unreadIcon : avatar }
<button className='pane__title' onClick={handleChatToggle(chat.id)}> <button className='pane__title' onClick={handleChatToggle(chat.id)}>
@{getAcct(account, displayFqn)} @{getAcct(account, displayFqn)}
@ -99,7 +100,7 @@ const ChatWindow: React.FC<IChatWindow> = ({ idx, chatId, windowState }) => {
<div className='pane__close'> <div className='pane__close'>
<IconButton src={require('@tabler/icons/icons/x.svg')} title='Close chat' onClick={handleChatClose(chat.id)} /> <IconButton src={require('@tabler/icons/icons/x.svg')} title='Close chat' onClick={handleChatClose(chat.id)} />
</div> </div>
</div> </HStack>
<div className='pane__content'> <div className='pane__content'>
<ChatBox <ChatBox
chatId={chat.id} chatId={chat.id}