Skip to content
Snippets Groups Projects
Commit 3b3fc39d authored by Janis Daniel Dähne's avatar Janis Daniel Dähne
Browse files

- some 404 chat styling

parent de45a7f2
No related branches found
No related tags found
No related merge requests found
...@@ -108,10 +108,13 @@ class Chat404 extends React.Component<Props, State> { ...@@ -108,10 +108,13 @@ class Chat404 extends React.Component<Props, State> {
getTypingTimeInMsFromMsg(message: string): number { getTypingTimeInMsFromMsg(message: string): number {
// tslint:disable-next-line // tslint:disable-next-line
const randomWait = this.rnd(100, 500) // const randomWait = this.rnd(100, 500)
// tslint:disable-next-line // tslint:disable-next-line
return message.split(' ').length * 0.4 * 1000 + randomWait // return message.split(' ').length * 0.4 * 1000 + randomWait //this is realistic but we don't want to wait that long
// tslint:disable-next-line
return this.rnd(1000, 1500)
} }
/** /**
...@@ -125,6 +128,7 @@ class Chat404 extends React.Component<Props, State> { ...@@ -125,6 +128,7 @@ class Chat404 extends React.Component<Props, State> {
const randomWait = this.rnd(500, 800) const randomWait = this.rnd(500, 800)
// tslint:disable-next-line // tslint:disable-next-line
return message.split(' ').length / 4 * 1000 + randomWait return message.split(' ').length / 4 * 1000 + randomWait
// return 1
} }
async displayAllMessages(): Promise<void> { async displayAllMessages(): Promise<void> {
...@@ -143,6 +147,12 @@ class Chat404 extends React.Component<Props, State> { ...@@ -143,6 +147,12 @@ class Chat404 extends React.Component<Props, State> {
return { return {
currentConversation: [...prevState.currentConversation, message], currentConversation: [...prevState.currentConversation, message],
} as State } as State
}, () => {
//scroll after the new state is set (and rendered?)
if (this.state.isAutoScrollBotEnabled) {
this.scrollToBottom()
}
}) })
message = { message = {
...@@ -150,11 +160,6 @@ class Chat404 extends React.Component<Props, State> { ...@@ -150,11 +160,6 @@ class Chat404 extends React.Component<Props, State> {
withLoading: false withLoading: false
} as ChatMessage } as ChatMessage
if (this.state.isAutoScrollBotEnabled) {
this.scrollToBottom()
}
await wait(this.getTypingTimeInMsFromMsg(message.message)) await wait(this.getTypingTimeInMsFromMsg(message.message))
//remove old message and insert new with changed props //remove old message and insert new with changed props
...@@ -163,6 +168,12 @@ class Chat404 extends React.Component<Props, State> { ...@@ -163,6 +168,12 @@ class Chat404 extends React.Component<Props, State> {
currentConversation: [...prevState.currentConversation.filter( currentConversation: [...prevState.currentConversation.filter(
(value, index1) => index1 !== prevState.currentConversation.length - 1), message], (value, index1) => index1 !== prevState.currentConversation.length - 1), message],
} as State } as State
}, () => {
//scroll after the new state is set (and rendered?)
if (this.state.isAutoScrollBotEnabled) {
this.scrollToBottom()
}
}) })
await wait(this.getReadTimeInMsFromMsg(message.message)) await wait(this.getReadTimeInMsFromMsg(message.message))
...@@ -174,11 +185,14 @@ class Chat404 extends React.Component<Props, State> { ...@@ -174,11 +185,14 @@ class Chat404 extends React.Component<Props, State> {
return { return {
currentConversation: [...prevState.currentConversation, message], currentConversation: [...prevState.currentConversation, message],
} as State } as State
}, () => {
//scroll after the new state is set (and rendered?)
if (this.state.isAutoScrollBotEnabled) {
this.scrollToBottom()
}
}) })
if (this.state.isAutoScrollBotEnabled) {
this.scrollToBottom()
}
await wait(this.getReadTimeInMsFromMsg(message.message)) await wait(this.getReadTimeInMsFromMsg(message.message))
...@@ -201,7 +215,9 @@ class Chat404 extends React.Component<Props, State> { ...@@ -201,7 +215,9 @@ class Chat404 extends React.Component<Props, State> {
404 404
</div> </div>
<div className={`down-button clickable${this.state.isAutoScrollBotEnabled ? ' is-enabled' : ''}`} onClick={() => { <div className={`down-button clickable${this.state.isAutoScrollBotEnabled
? ' is-enabled'
: ''}`} onClick={() => {
this.setState((prevState, props) => ({ this.setState((prevState, props) => ({
...prevState, ...prevState,
isAutoScrollBotEnabled: !prevState.isAutoScrollBotEnabled isAutoScrollBotEnabled: !prevState.isAutoScrollBotEnabled
...@@ -473,6 +489,14 @@ const conversion: ReadonlyArray<ChatMessage> = [ ...@@ -473,6 +489,14 @@ const conversion: ReadonlyArray<ChatMessage> = [
name: 'Janis', name: 'Janis',
withLoading: true, withLoading: true,
message: 'Super, find ich gut.' message: 'Super, find ich gut.'
} },
{
kind: 'user-entered',
message: 'Janis hat den Chat verlassen'
},
{
kind: 'user-entered',
message: 'Steffen hat den Chat verlassen'
},
] ]
...@@ -87,6 +87,7 @@ ...@@ -87,6 +87,7 @@
&.foreign-message { &.foreign-message {
background-color white background-color white
align-self: flex-start align-self: flex-start
max-width 49%
.user-name { .user-name {
color: #ff603e color: #ff603e
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment