From e63e80dee012b22aca94c0095e184c6a6a80d4d7 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Fri, 4 Nov 2016 12:35:38 -0400 Subject: PLT-4404/PLT-4578/PLT-4541/PLT-4542 Replaced third party autosizing textarea with a custom one (#4442) * PLT-4578 Replaced third party autosizing textarea with a custom one * Fix Textbox.handleHeightChange not being called * Removed unused CSS * PLT-4541 Force EditPostModal to resize upon opening * Removed usage of jquery from AutosizeTextarea * Reverted changes made for PLT-4580 as they're no longer needed --- webapp/components/suggestion/suggestion_box.jsx | 56 +++++++++++++++---------- 1 file changed, 34 insertions(+), 22 deletions(-) (limited to 'webapp/components/suggestion') diff --git a/webapp/components/suggestion/suggestion_box.jsx b/webapp/components/suggestion/suggestion_box.jsx index 590fdae04..21bfd3dc3 100644 --- a/webapp/components/suggestion/suggestion_box.jsx +++ b/webapp/components/suggestion/suggestion_box.jsx @@ -9,7 +9,7 @@ import * as GlobalActions from 'actions/global_actions.jsx'; import SuggestionStore from 'stores/suggestion_store.jsx'; import * as Utils from 'utils/utils.jsx'; -import TextareaAutosize from 'react-autosize-textarea'; +import AutosizeTextarea from 'components/autosize_textarea.jsx'; const KeyCodes = Constants.KeyCodes; @@ -46,14 +46,17 @@ export default class SuggestionBox extends React.Component { } getTextbox() { - // this is to support old code that looks at the input/textarea DOM nodes - let textbox = this.refs.textbox; - - if (!(textbox instanceof HTMLElement)) { - textbox = ReactDOM.findDOMNode(textbox); + if (this.props.type === 'textarea') { + return this.refs.textbox.getDOMNode(); } - return textbox; + return this.refs.textbox; + } + + recalculateSize() { + if (this.props.type === 'textarea') { + this.refs.textbox.recalculateSize(); + } } handleDocumentClick(e) { @@ -71,7 +74,7 @@ export default class SuggestionBox extends React.Component { } handleChange(e) { - const textbox = ReactDOM.findDOMNode(this.refs.textbox); + const textbox = this.getTextbox(); const caret = Utils.getCaretPosition(textbox); const pretext = textbox.value.substring(0, caret); @@ -83,7 +86,7 @@ export default class SuggestionBox extends React.Component { } handleCompleteWord(term, matchedPretext) { - const textbox = ReactDOM.findDOMNode(this.refs.textbox); + const textbox = this.getTextbox(); const caret = Utils.getCaretPosition(textbox); const text = this.props.value; const pretext = text.substring(0, caret); @@ -150,48 +153,57 @@ export default class SuggestionBox extends React.Component { } render() { + const { + type, + listComponent, + listStyle, + renderDividers, + ...props + } = this.props; + let textbox = null; - if (this.props.type === 'input') { + if (type === 'input') { textbox = ( ); - } else if (this.props.type === 'search') { + } else if (type === 'search') { textbox = ( ); - } else if (this.props.type === 'textarea') { + } else if (type === 'textarea') { textbox = ( - ); } - const SuggestionListComponent = this.props.listComponent; + // This needs to be upper case so React doesn't think it's an html tag + const SuggestionListComponent = listComponent; return (
{textbox}
); -- cgit v1.2.3-1-g7c22