From 0916f9a9934a15b2a57f7445141ac851ef696484 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Tue, 1 Aug 2017 17:36:43 -0300
Subject: [PATCH] Fix chatbox growth

---
 .../rocketchat-theme/client/imports/base.css  | 23 +++++--------------
 .../rocketchat-ui/client/lib/chatMessages.js  | 14 +----------
 .../rocketchat-ui/client/views/app/room.js    |  5 ----
 3 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/base.css b/packages/rocketchat-theme/client/imports/base.css
index 255a7f722e0d..730ed35c4891 100644
--- a/packages/rocketchat-theme/client/imports/base.css
+++ b/packages/rocketchat-theme/client/imports/base.css
@@ -1568,11 +1568,8 @@ label.required::after {
 	flex-flow: row nowrap;
 	padding: 0 10px 0 20px;
 	border-width: 0 0 1px;
-	z-index: 100;
-	top: 0;
-	left: 0;
-	width: 100%;
 	height: calc(var(--header-min-height) + 1px);
+	flex-shrink: 0;
 
 	&.visible h2 {
 		overflow: visible;
@@ -2130,15 +2127,14 @@ label.required::after {
 
 .messages-container {
 	position: relative;
-	height: 100%;
-	width: 100%;
-	top: 0;
-	left: 0;
-	z-index: 1;
+	flex: 1;
+	display: flex;
+	flex-direction: column;
 
 	&-wrapper {
 		height: 100%;
 		display: flex;
+		flex-grow: 1;
 	}
 
 	&-main {
@@ -2175,12 +2171,7 @@ label.required::after {
 	& .footer {
 		padding: 8px 20px 0;
 		border-width: 1px 0 0;
-		z-index: 100;
-		bottom: 0;
-		left: 0;
-		width: 100%;
-		min-height: var(--footer-min-height);
-		height: 130px;
+		flex-shrink: 0;
 	}
 
 	& .message-form {
@@ -2534,7 +2525,6 @@ label.required::after {
 .messages-box {
 	position: relative;
 	overflow: hidden;
-	width: 100%;
 	flex-grow: 1;
 
 	& .message-cog-container .message-action.jump-to-search-message {
@@ -3273,7 +3263,6 @@ body:not(.is-cordova) {
 
 	&.opened .flex-tab {
 		display: block;
-		height: calc(100% - 61px); /* --header-height */
 	}
 }
 
diff --git a/packages/rocketchat-ui/client/lib/chatMessages.js b/packages/rocketchat-ui/client/lib/chatMessages.js
index 896944449476..f0046e918df9 100644
--- a/packages/rocketchat-ui/client/lib/chatMessages.js
+++ b/packages/rocketchat-ui/client/lib/chatMessages.js
@@ -13,13 +13,6 @@ this.ChatMessages = class ChatMessages {
 		this.bindEvents();
 	}
 
-	resize() {
-		let dif = (RocketChat.Layout.isEmbedded() ? 0 : 60) + $('.messages-container').find('footer').outerHeight();
-		dif += $('.announcement').length > 0 ? 40 : 0;
-		return $('.messages-box').css({
-			height: `calc(100% - ${ dif }px)`});
-	}
-
 	getEditingIndex(element) {
 		const msgs = this.wrapper.get(0).querySelectorAll('.own:not(.system)');
 		let index = 0;
@@ -361,11 +354,7 @@ this.ChatMessages = class ChatMessages {
 
 	bindEvents() {
 		if (this.wrapper && this.wrapper.length) {
-			return $('.input-message').autogrow({
-				postGrowCallback: () => {
-					return this.resize();
-				}
-			});
+			$('.input-message').autogrow();
 		}
 	}
 
@@ -416,7 +405,6 @@ this.ChatMessages = class ChatMessages {
 		const input = event.currentTarget;
 		// const $input = $(input);
 		const k = event.which;
-		this.resize(input);
 
 		if (k === 13) {
 			if (sendOnEnter == null || sendOnEnter === 'normal' || sendOnEnter === 'desktop' && Meteor.Device.isDesktop()) {
diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
index 38f9151d97d1..cca77b686a86 100644
--- a/packages/rocketchat-ui/client/views/app/room.js
+++ b/packages/rocketchat-ui/client/views/app/room.js
@@ -175,11 +175,6 @@ Template.room.helpers({
 	showAnnouncement() {
 		const roomData = Session.get(`roomData${ this._id }`);
 		if (!roomData) { return false; }
-		Meteor.defer(() => {
-			if (window.chatMessages && window.chatMessages[roomData._id]) {
-				return window.chatMessages[roomData._id].resize();
-			}
-		});
 		return (roomData.announcement !== undefined) && (roomData.announcement !== '');
 	},