[FIX] Load messages after disconnect and message box scroll missing (#…

…14668)
RocketChat · May 29, 2019 · 3170e2a · 3170e2a
1 parent 52ce365
commit 3170e2a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/ui-message/client/messageBox/messageBoxAutogrow.js b/app/ui-message/client/messageBox/messageBoxAutogrow.js
@@ -34,7 +34,7 @@ export const setupAutogrow = (textarea: HTMLTextAreaElement, shadow: HTMLDivElem
 			return true;
 		}
 
-		const shadowText =			text.replace(/</g, '&lt;')
+		const shadowText = text.replace(/</g, '&lt;')
 			.replace(/>/g, '&gt;')
 			.replace(/&/g, '&amp;')
 			.replace(/\n$/, '<br/>&nbsp;')
@@ -56,7 +56,7 @@ export const setupAutogrow = (textarea: HTMLTextAreaElement, shadow: HTMLDivElem
 
 		lastHeight = height;
 
-		const overflow = height === maxHeight ? 'hidden' : '';
+		const overflow = height < maxHeight ? 'hidden' : '';
 
 		if (height < maxHeight) {
 			textLenght = text.length;

diff --git a/app/ui-utils/client/lib/RoomManager.js b/app/ui-utils/client/lib/RoomManager.js
@@ -10,13 +10,14 @@ import { fireGlobalEvent } from './fireGlobalEvent';
 import { upsertMessage, RoomHistoryManager } from './RoomHistoryManager';
 import { mainReady } from './mainReady';
 import { roomTypes } from '../../../utils';
-import { call } from '../..';
 import { callbacks } from '../../../callbacks';
 import { Notifications } from '../../../notifications';
 import { CachedChatRoom, ChatMessage, ChatSubscription, CachedChatSubscription } from '../../../models';
 import { CachedCollectionManager } from '../../../ui-cached-collection';
 import { getConfig } from '../config';
 
+import { call } from '..';
+
 
 const maxRoomsOpen = parseInt(getConfig('maxRoomsOpen')) || 5;