LogalDeveloper/owncast
0
Fork 0
Code Activity

fix for #411

Browse Source
This commit is contained in:
Ginger Wong
2020-12-03 22:43:31 -08:00
parent 0bf8cf1dba
commit 5fe36f37bd
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
webroot/js/components/chat/chat.js
View File

@@ -24,6 +24,7 @@ export default class Chat extends Component {
this.scrollableMessagesContainer = createRef(); this.scrollableMessagesContainer = createRef();
this.websocket = null; this.websocket = null;
this.receivedFirstMessages = false;
this.getChatHistory = this.getChatHistory.bind(this); this.getChatHistory = this.getChatHistory.bind(this);
this.receivedWebsocketMessage = this.receivedWebsocketMessage.bind(this); this.receivedWebsocketMessage = this.receivedWebsocketMessage.bind(this);
@@ -181,8 +182,8 @@ export default class Chat extends Component {
checkShouldScroll() { checkShouldScroll() {
const { scrollTop, scrollHeight, clientHeight } = this.scrollableMessagesContainer.current; const { scrollTop, scrollHeight, clientHeight } = this.scrollableMessagesContainer.current;
const fullyScrolled = scrollHeight - clientHeight; const fullyScrolled = scrollHeight - clientHeight;
const shoudlScroll = scrollHeight >= clientHeight && fullyScrolled - scrollTop < MESSAGE_JUMPTOBOTTOM_BUFFER; const shouldScroll = scrollHeight >= clientHeight && fullyScrolled - scrollTop < MESSAGE_JUMPTOBOTTOM_BUFFER;
return shoudlScroll; return shouldScroll;
} }
handleWindowResize() { handleWindowResize() {
@@ -195,8 +196,13 @@ export default class Chat extends Component {
if (numMutations) { if (numMutations) {
const item = mutations[numMutations - 1]; const item = mutations[numMutations - 1];
if (item.type === 'childList' && item.addedNodes.length) { if (item.type === 'childList' && item.addedNodes.length) {
if (this.newMessagesReceived || this.checkShouldScroll()) { if (this.newMessagesReceived) {
this.scrollToBottom(); if (!this.receivedFirstMessages) {
this.scrollToBottom();
this.receivedFirstMessages = true;
} else if (this.checkShouldScroll()) {
this.scrollToBottom();
}
this.newMessagesReceived = false; this.newMessagesReceived = false;
} }
} }