fix: resize autogrowing text input back on clear. resize on paste [ch…

…17995]
anri-asaturov · Dec 18, 2018 · 6bfb532 · 6bfb532
1 parent 9e71a01
commit 6bfb532
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/app/components/controls/auto-expanding-textinput.js b/app/components/controls/auto-expanding-textinput.js
@@ -2,8 +2,10 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { observer } from 'mobx-react/native';
 import { observable } from 'mobx';
+import _ from 'lodash';
 import { vars } from '../../styles/styles';
 import TextInputUncontrolled from './text-input-uncontrolled';
+import { transitionAnimation } from '../helpers/animations';
 
 @observer
 export default class AutoExpandingTextInput extends Component {
@@ -18,17 +20,17 @@ export default class AutoExpandingTextInput extends Component {
     }
 
     _onContentSizeChange = event => {
-        const curHeight = event.nativeEvent.contentSize.height;
-        if (curHeight < this.props.minHeight || curHeight > this.props.maxHeight) return;
-        this.height = curHeight;
+        const { maxHeight, minHeight } = this.props;
+        this.height = _.clamp(event.nativeEvent.contentSize.height, minHeight, maxHeight);
     };
 
     setRef = ref => {
         this.textInputRef = ref;
     };
 
-    clear() {
-        this.textInputRef.clear();
+    resetHeight() {
+        transitionAnimation();
+        this.height = this.props.minHeight;
     }
 
     focus() {

diff --git a/app/components/layout/input-main.js b/app/components/layout/input-main.js
@@ -43,6 +43,7 @@ export default class InputMain extends SafeComponent {
         if (!this.canSend) return;
         this.hasText ? this.props.send(this.value) : this.props.sendAck();
         this.value = '';
+        this.textInputRef.resetHeight();
     }
 
     setFocus() {