From be6812e9a9e5361362c17446c59a616b11ffa5cf Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Mon, 4 Sep 2017 20:59:08 -0300 Subject: [PATCH] Merge pull request #8019 from RocketChat/messagebox-autogrow [FIX] message-box autogrow --- .../client/imports/components/message-box.css | 5 ++++- packages/rocketchat-ui/client/lib/textarea-autogrow.js | 10 ++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/packages/rocketchat-theme/client/imports/components/message-box.css b/packages/rocketchat-theme/client/imports/components/message-box.css index 149883503d78..200b32f093fc 100644 --- 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 index b375bdcc28fd..e158f1a6e109 100644 --- 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) {