From 09f881c0f5dc32135c6c8cd9dbd18ed937d7ae2d Mon Sep 17 00:00:00 2001 From: Leonard Kim Date: Tue, 7 May 2019 15:29:22 -0700 Subject: [PATCH] ref(chat): bring in package for text area auto-resizing --- package-lock.json | 52 ++++++++----------- package.json | 1 + .../features/chat/components/web/ChatInput.js | 7 ++- 3 files changed, 27 insertions(+), 33 deletions(-) diff --git a/package-lock.json b/package-lock.json index 247ac47ce..c3357af67 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2840,7 +2840,7 @@ "blueimp-md5": "^2.10.0", "json3": "^3.3.2", "lodash": "^4.17.4", - "ua-parser-js": "github:amplitude/ua-parser-js#ed538f1" + "ua-parser-js": "github:amplitude/ua-parser-js#ed538f16f5c6ecd8357da989b617d4f156dcf35d" }, "dependencies": { "ua-parser-js": { @@ -6750,8 +6750,7 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true, - "optional": true + "bundled": true }, "aproba": { "version": "1.2.0", @@ -6769,13 +6768,11 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, - "optional": true + "bundled": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -6788,18 +6785,15 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "concat-map": { "version": "0.0.1", - "bundled": true, - "optional": true + "bundled": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "core-util-is": { "version": "1.0.2", @@ -6902,8 +6896,7 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, - "optional": true + "bundled": true }, "ini": { "version": "1.3.5", @@ -6913,7 +6906,6 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -6926,20 +6918,17 @@ "minimatch": { "version": "3.0.4", "bundled": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true, - "optional": true + "bundled": true }, "minipass": { "version": "2.2.4", "bundled": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -6956,7 +6945,6 @@ "mkdirp": { "version": "0.5.1", "bundled": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -7029,8 +7017,7 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, - "optional": true + "bundled": true }, "object-assign": { "version": "4.1.1", @@ -7040,7 +7027,6 @@ "once": { "version": "1.4.0", "bundled": true, - "optional": true, "requires": { "wrappy": "1" } @@ -7116,8 +7102,7 @@ }, "safe-buffer": { "version": "5.1.1", - "bundled": true, - "optional": true + "bundled": true }, "safer-buffer": { "version": "2.1.2", @@ -7147,7 +7132,6 @@ "string-width": { "version": "1.0.2", "bundled": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -7165,7 +7149,6 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -7204,13 +7187,11 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, - "optional": true + "bundled": true }, "yallist": { "version": "3.0.2", - "bundled": true, - "optional": true + "bundled": true } } }, @@ -12398,6 +12379,15 @@ "exenv": "^1.2.2" } }, + "react-textarea-autosize": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-7.1.0.tgz", + "integrity": "sha512-c2FlR/fP0qbxmlrW96SdrbgP/v0XZMTupqB90zybvmDVDutytUgPl7beU35klwcTeMepUIQEpQUn3P3bdshGPg==", + "requires": { + "@babel/runtime": "^7.1.2", + "prop-types": "^15.6.0" + } + }, "react-transform-hmr": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/react-transform-hmr/-/react-transform-hmr-1.0.4.tgz", diff --git a/package.json b/package.json index 3139abe43..f9ed13108 100644 --- a/package.json +++ b/package.json @@ -79,6 +79,7 @@ "react-native-webrtc": "github:jitsi/react-native-webrtc#4064c6f2db4f8b961daaaa8dafc6a896d7cfbc43", "react-native-webview": "5.8.1", "react-redux": "5.0.7", + "react-textarea-autosize": "7.1.0", "react-transition-group": "2.4.0", "redux": "4.0.0", "redux-thunk": "2.2.0", diff --git a/react/features/chat/components/web/ChatInput.js b/react/features/chat/components/web/ChatInput.js index e76828e89..897073edf 100644 --- a/react/features/chat/components/web/ChatInput.js +++ b/react/features/chat/components/web/ChatInput.js @@ -2,6 +2,7 @@ import React, { Component } from 'react'; import Emoji from 'react-emoji-render'; +import TextareaAutosize from 'react-textarea-autosize'; import type { Dispatch } from 'redux'; import { translate } from '../../../base/i18n'; @@ -114,12 +115,14 @@ class ChatInput extends Component {
-