diff options
author | beatrix <beatrix.bitrot@gmail.com> | 2018-01-06 11:28:36 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-06 11:28:36 -0500 |
commit | a251c42192d0f8aa3481aae47429f4b732bfb623 (patch) | |
tree | 8b9d4b093b1e77561c9c063a2de0aa28b22abc04 /app/javascript/flavours/glitch/features/composer/textarea/index.js | |
parent | 2ec9a75a1de70e8b53b58c05e64a4772e5709fa3 (diff) | |
parent | c71d84885511793a1a5ef613e0e4566f85c2ffe5 (diff) |
Merge pull request #296 from glitch-soc/thread-mode
Threaded mode~
Diffstat (limited to 'app/javascript/flavours/glitch/features/composer/textarea/index.js')
-rw-r--r-- | app/javascript/flavours/glitch/features/composer/textarea/index.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/features/composer/textarea/index.js b/app/javascript/flavours/glitch/features/composer/textarea/index.js index 2e0b3e3d7..0f5fd4d4d 100644 --- a/app/javascript/flavours/glitch/features/composer/textarea/index.js +++ b/app/javascript/flavours/glitch/features/composer/textarea/index.js @@ -10,6 +10,7 @@ import Textarea from 'react-textarea-autosize'; // Components. import EmojiPicker from 'flavours/glitch/features/emoji_picker'; +import ComposerTextareaIcons from './icons'; import ComposerTextareaSuggestions from './suggestions'; // Utils. @@ -232,6 +233,7 @@ export default class ComposerTextarea extends React.Component { handleRefTextarea, } = this.handlers; const { + advancedOptions, autoFocus, disabled, intl, @@ -249,6 +251,10 @@ export default class ComposerTextarea extends React.Component { <div className='composer--textarea'> <label> <span {...hiddenComponent}><FormattedMessage {...messages.placeholder} /></span> + <ComposerTextareaIcons + advancedOptions={advancedOptions} + intl={intl} + /> <Textarea aria-autocomplete='list' autoFocus={autoFocus} @@ -280,6 +286,7 @@ export default class ComposerTextarea extends React.Component { // Props. ComposerTextarea.propTypes = { + advancedOptions: ImmutablePropTypes.map, autoFocus: PropTypes.bool, disabled: PropTypes.bool, intl: PropTypes.object.isRequired, |