Merge pull request #8019 from RocketChat/messagebox-autogrow

[FIX] message-box autogrow
RocketChat · Sep 5, 2017 · be6812e · be6812e
1 parent ca4ce25
commit be6812e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/packages/rocketchat-theme/client/imports/components/message-box.css b/packages/rocketchat-theme/client/imports/components/message-box.css
@@ -85,6 +85,8 @@
 
 		cursor: text;
 
+		line-height: 20px;
+
 		transition: background-color 0.3s;
 
 		border-width: var(--message-box-container-border-width);
@@ -99,9 +101,10 @@
 
 	&__textarea {
 		width: 100%;
+		height: 15px;
 		max-height: 155px;
+
 		padding: 0;
-		height: 15px;
 
 		resize: none;
 

diff --git a/packages/rocketchat-ui/client/lib/textarea-autogrow.js b/packages/rocketchat-ui/client/lib/textarea-autogrow.js
@@ -64,23 +64,17 @@
 				}
 
 				if(newHeight === $self[0].offsetHeight){
-					return;
+					return false;
 				}
 
 				if(maxHeight <= newHeight){
-					return;
+					newHeight = maxHeight;
 				}
 
-				$self.css('overflow-y', 'hidden');
-
 				$self.stop().animate( { height: newHeight }, { duration: 100, complete: ()=> {
 					$self.trigger('autogrow', []);
-					$self.css('overflow-y', '');
 				}});
 
-
-
-
 				$self.trigger('autogrow', []);
 
 				if (settings.postGrowCallback !== null) {