From 4c6221929f608764c616c2b909eccdc8a17e8909 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Sun, 21 Apr 2019 15:57:06 +0200 Subject: [PATCH] Move ComposerTextareaIcons to TextareaIcons --- .../compose/components/compose_form.js | 7 +-- .../compose/components/textarea_icons.js | 59 ++++++++++++++++++ .../features/composer/textarea/icons/index.js | 60 ------------------- 3 files changed, 61 insertions(+), 65 deletions(-) create mode 100644 app/javascript/flavours/glitch/features/compose/components/textarea_icons.js delete mode 100644 app/javascript/flavours/glitch/features/composer/textarea/icons/index.js diff --git a/app/javascript/flavours/glitch/features/compose/components/compose_form.js b/app/javascript/flavours/glitch/features/compose/components/compose_form.js index 2ea1379654c..ae22f4d6db1 100644 --- a/app/javascript/flavours/glitch/features/compose/components/compose_form.js +++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.js @@ -7,7 +7,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component'; // Components. import ComposerOptions from '../../composer/options'; import ComposerPublisher from '../../composer/publisher'; -import ComposerTextareaIcons from '../../composer/textarea/icons'; +import TextareaIcons from './textarea_icons'; import UploadFormContainer from '../containers/upload_form_container'; import PollFormContainer from '../containers/poll_form_container'; import WarningContainer from '../containers/warning_container'; @@ -347,10 +347,7 @@ class ComposeForm extends ImmutablePureComponent {
- + + {advancedOptions ? iconMap.map( + ([key, icon, message]) => advancedOptions.get(key) ? ( + + + + ) : null + ) : null} +
+ ); + } +} diff --git a/app/javascript/flavours/glitch/features/composer/textarea/icons/index.js b/app/javascript/flavours/glitch/features/composer/textarea/icons/index.js deleted file mode 100644 index 049cdd5cdfc..00000000000 --- a/app/javascript/flavours/glitch/features/composer/textarea/icons/index.js +++ /dev/null @@ -1,60 +0,0 @@ -// Package imports. -import PropTypes from 'prop-types'; -import React from 'react'; -import ImmutablePropTypes from 'react-immutable-proptypes'; -import { defineMessages } from 'react-intl'; - -// Components. -import Icon from 'flavours/glitch/components/icon'; - -// Messages. -const messages = defineMessages({ - localOnly: { - defaultMessage: 'This post is local-only', - id: 'advanced_options.local-only.tooltip', - }, - threadedMode: { - defaultMessage: 'Threaded mode enabled', - id: 'advanced_options.threaded_mode.tooltip', - }, -}); - -// We use an array of tuples here instead of an object because it -// preserves order. -const iconMap = [ - ['do_not_federate', 'home', messages.localOnly], - ['threaded_mode', 'comments', messages.threadedMode], -]; - -// The component. -export default function ComposerTextareaIcons ({ - advancedOptions, - intl, -}) { - - // The result. We just map every active option to its icon. - return ( -
- {advancedOptions ? iconMap.map( - ([key, icon, message]) => advancedOptions.get(key) ? ( - - - - ) : null - ) : null} -
- ); -} - -// Props. -ComposerTextareaIcons.propTypes = { - advancedOptions: ImmutablePropTypes.map, - intl: PropTypes.object.isRequired, -};