Browse Source

Use contentEditable for chat input field

pull/2032/head
Gabe Kangas 3 years ago
parent
commit
c56c45d904
No known key found for this signature in database
GPG Key ID: 9A56337728BC81EA
  1. 3
      web/components/chat/ChatContainer.tsx
  2. 52
      web/components/chat/ChatTextField/ChatTextField.tsx
  3. 14
      web/components/stores/ClientConfigStore.tsx
  4. 2
      web/components/ui/Content/Content.tsx
  5. 22
      web/package-lock.json
  6. 1
      web/package.json
  7. 14
      web/stories/ChatContainer.stories.tsx
  8. 33
      web/stories/ChatTextField.stories.tsx

3
web/components/chat/ChatContainer.tsx

@ -26,15 +26,14 @@ export default function ChatContainer(props: Props) { @@ -26,15 +26,14 @@ export default function ChatContainer(props: Props) {
default:
return null;
}
return null;
};
console.log(messages);
return (
<div>
<h1>Chat</h1>
<Spin spinning={loading} indicator={spinIcon} />
<Virtuoso
style={{ height: '80vh' }}
ref={chatContainerRef}
initialTopMostItemIndex={999}
data={messages}

52
web/components/chat/ChatTextField/ChatTextField.tsx

@ -1,34 +1,42 @@ @@ -1,34 +1,42 @@
import { MoreOutlined } from '@ant-design/icons';
import { Input, Button } from 'antd';
import { useEffect, useState } from 'react';
import { SmileOutlined } from '@ant-design/icons';
import { Button, Input } from 'antd';
import { useRef, useState } from 'react';
import { useRecoilValue } from 'recoil';
import ContentEditable from 'react-contenteditable';
import WebsocketService from '../../../services/websocket-service';
import { websocketServiceAtom } from '../../stores/ClientConfigStore';
import s from './ChatTextField.module.scss';
interface Props {}
interface Props {
value?: string;
}
export default function ChatTextField(props: Props) {
const [value, setValue] = useState('');
const { value: originalValue } = props;
const [value, setValue] = useState(originalValue);
const [showEmojis, setShowEmojis] = useState(false);
const websocketService = useRecoilValue<WebsocketService>(websocketServiceAtom);
const text = useRef(value);
// large is 40px
const size = 'large';
const size = 'small';
useEffect(() => {
console.log({ value });
}, [value]);
const handleChange = evt => {
text.current = evt.target.value;
};
return (
<div>
<Input.Group compact style={{ display: 'flex' }}>
<Input
onChange={e => setValue(e.target.value)}
size={size}
placeholder="Enter text and hit enter!"
/>
<Button
size={size}
icon={<MoreOutlined />}
type="default"
onClick={() => setShowEmojis(!showEmojis)}
<Input.Group compact style={{ display: 'flex', width: '100%', position: 'absolute' }}>
<ContentEditable
style={{ width: '60%', maxHeight: '50px', padding: '5px' }}
html={text.current}
onChange={handleChange}
/>
<Button type="default" ghost title="Emoji" onClick={() => setShowEmojis(!showEmojis)}>
<SmileOutlined style={{ color: 'rgba(0,0,0,.45)' }} />
</Button>
<Button size={size} type="primary">
Submit
</Button>
@ -36,3 +44,7 @@ export default function ChatTextField(props: Props) { @@ -36,3 +44,7 @@ export default function ChatTextField(props: Props) {
</div>
);
}
ChatTextField.defaultProps = {
value: '',
};

14
web/components/stores/ClientConfigStore.tsx

@ -59,6 +59,11 @@ export const chatMessagesAtom = atom<ChatMessage[]>({ @@ -59,6 +59,11 @@ export const chatMessagesAtom = atom<ChatMessage[]>({
default: [] as ChatMessage[],
});
export const websocketServiceAtom = atom<WebsocketService>({
key: 'websocketServiceAtom',
default: null,
});
export function ClientConfigStore() {
const setClientConfig = useSetRecoilState<ClientConfig>(clientConfigStateAtom);
const setChatVisibility = useSetRecoilState<ChatVisibilityState>(chatVisibilityAtom);
@ -67,8 +72,10 @@ export function ClientConfigStore() { @@ -67,8 +72,10 @@ export function ClientConfigStore() {
const setChatDisplayName = useSetRecoilState<string>(chatDisplayNameAtom);
const [appState, setAppState] = useRecoilState<AppState>(appStateAtom);
const [accessToken, setAccessToken] = useRecoilState<string>(accessTokenAtom);
const [websocketService, setWebsocketService] =
useRecoilState<WebsocketService>(websocketServiceAtom);
let websocketService: WebsocketService;
// let websocketService: WebsocketService;
const updateClientConfig = async () => {
try {
@ -126,8 +133,9 @@ export function ClientConfigStore() { @@ -126,8 +133,9 @@ export function ClientConfigStore() {
const startChat = async () => {
setChatState(ChatState.Loading);
try {
websocketService = new WebsocketService(accessToken, '/ws');
websocketService.handleMessage = handleMessage;
const ws = new WebsocketService(accessToken, '/ws');
ws.handleMessage = handleMessage;
setWebsocketService(ws);
} catch (error) {
console.error(`ChatService -> startChat() ERROR: \n${error}`);
}

2
web/components/ui/Content/Content.tsx

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import { useRecoilValue } from 'recoil';
import { Layout, Tabs, Layout, Row, Col, Tabs } from 'antd';
import { Layout, Row, Col, Tabs } from 'antd';
import Grid from 'antd/lib/card/Grid';
import {
chatVisibilityAtom,

22
web/package-lock.json generated

@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
"rc-util": "5.17.0",
"react": "17.0.2",
"react-chartkick": "0.5.2",
"react-contenteditable": "^3.3.6",
"react-dom": "17.0.2",
"react-linkify": "1.0.0-alpha",
"react-markdown": "8.0.0",
@ -26414,6 +26415,18 @@ @@ -26414,6 +26415,18 @@
"react-dom": ">=16.8.0"
}
},
"node_modules/react-contenteditable": {
"version": "3.3.6",
"resolved": "https://registry.npmjs.org/react-contenteditable/-/react-contenteditable-3.3.6.tgz",
"integrity": "sha512-61+Anbmzggel1sP7nwvxq3d2woD3duR5R89RoLGqKan1A+nruFIcmLjw2F+qqk70AyABls0BDKzE1vqS1UIF1g==",
"dependencies": {
"fast-deep-equal": "^3.1.3",
"prop-types": "^15.7.1"
},
"peerDependencies": {
"react": ">=16.3"
}
},
"node_modules/react-docgen": {
"version": "5.4.0",
"resolved": "https://registry.npmjs.org/react-docgen/-/react-docgen-5.4.0.tgz",
@ -51724,6 +51737,15 @@ @@ -51724,6 +51737,15 @@
"integrity": "sha512-M1TJH2X3RXEt12sWkpa6hLc/bbYS0H6F4rIqjQZ+RxNBstpY67d9TrFXtqdZwhpmBXcCwEi7stKqFue3ZRkiOg==",
"requires": {}
},
"react-contenteditable": {
"version": "3.3.6",
"resolved": "https://registry.npmjs.org/react-contenteditable/-/react-contenteditable-3.3.6.tgz",
"integrity": "sha512-61+Anbmzggel1sP7nwvxq3d2woD3duR5R89RoLGqKan1A+nruFIcmLjw2F+qqk70AyABls0BDKzE1vqS1UIF1g==",
"requires": {
"fast-deep-equal": "^3.1.3",
"prop-types": "^15.7.1"
}
},
"react-docgen": {
"version": "5.4.0",
"resolved": "https://registry.npmjs.org/react-docgen/-/react-docgen-5.4.0.tgz",

1
web/package.json

@ -29,6 +29,7 @@ @@ -29,6 +29,7 @@
"rc-util": "5.17.0",
"react": "17.0.2",
"react-chartkick": "0.5.2",
"react-contenteditable": "^3.3.6",
"react-dom": "17.0.2",
"react-linkify": "1.0.0-alpha",
"react-markdown": "8.0.0",

14
web/stories/ChatContainer.stories.tsx

File diff suppressed because one or more lines are too long

33
web/stories/ChatTextField.stories.tsx

@ -1,15 +1,44 @@ @@ -1,15 +1,44 @@
import React from 'react';
import { ComponentStory, ComponentMeta } from '@storybook/react';
import { RecoilRoot } from 'recoil';
import ChatTextField from '../components/chat/ChatTextField/ChatTextField';
export default {
title: 'owncast/Chat/Input text field',
component: ChatTextField,
parameters: {},
parameters: {
docs: {
description: {
component: `
- This is a element using \`contentEditable\` in order to support rendering emoji images inline.
- Emoji button shows emoji picker.
- Should show one line by default, but grow to two lines as needed.
- The Send button should be hidden for desktop layouts and be shown for mobile layouts.`,
},
},
},
} as ComponentMeta<typeof ChatTextField>;
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const Template: ComponentStory<typeof ChatTextField> = args => <ChatTextField />;
const Template: ComponentStory<typeof ChatTextField> = args => (
<RecoilRoot>
<ChatTextField {...args} />
</RecoilRoot>
);
// eslint-disable-next-line @typescript-eslint/no-unused-vars
export const Example = Template.bind({});
export const LongerMessage = Template.bind({});
LongerMessage.args = {
value:
'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.',
};
LongerMessage.parameters = {
docs: {
description: {
story: 'Should display two lines of text and scroll to display more.',
},
},
};

Loading…
Cancel
Save