Add images to chat

This commit is contained in:
Torjus
2018-07-18 12:00:55 +02:00
parent 977ffd9d24
commit c416d0c402
9 changed files with 94 additions and 112 deletions
+7 -5
View File
@@ -14,7 +14,8 @@ class Chat extends Component
onSendMessage,
disabledInput,
autofocus,
displayName
displayName,
picture
} = this.props;
return (
@@ -22,7 +23,7 @@ class Chat extends Component
<MessageList />
<form
data-component='Sender'
onSubmit={(e) => { onSendMessage(e, displayName); }}
onSubmit={(e) => { onSendMessage(e, displayName, picture); }}
>
<input
type='text'
@@ -59,14 +60,15 @@ const mapStateToProps = (state) =>
{
return {
disabledInput : state.chatbehavior.disabledInput,
displayName : state.me.displayName
displayName : state.me.displayName,
picture : state.me.picture
};
};
const mapDispatchToProps = (dispatch) =>
{
return {
onSendMessage : (event, displayName) =>
onSendMessage : (event, displayName, picture) =>
{
event.preventDefault();
const userInput = event.target.message.value;
@@ -74,7 +76,7 @@ const mapDispatchToProps = (dispatch) =>
if (userInput)
{
dispatch(stateActions.addUserMessage(userInput));
dispatch(requestActions.sendChatMessage(userInput, displayName));
dispatch(requestActions.sendChatMessage(userInput, displayName, picture));
}
event.target.message.value = '';
}
+7 -1
View File
@@ -50,9 +50,14 @@ class MessageList extends Component
{
const messageTime = new Date(message.time);
const picture = message.sender === 'response' ?
message.picture : this.props.myPicture;
return (
<div className='message' key={i}>
<div className={message.sender}>
{picture && <img src={picture} />}
<div
className='message-text'
// eslint-disable-next-line react/no-danger
@@ -82,7 +87,8 @@ MessageList.propTypes =
const mapStateToProps = (state) =>
{
return {
chatmessages : state.chatmessages
chatmessages : state.chatmessages,
myPicture : state.me.picture
};
};