From 8fd599fb40a5a078f26b5f450d88cf12609d9c14 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Sat, 20 Apr 2019 22:21:28 +0200 Subject: [PATCH] =?UTF-8?q?ComposerReply=20=E2=86=92=20ReplyIndicator?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../compose/components/compose_form.js | 14 +----- .../components/reply_indicator.js} | 46 ++++++++----------- .../containers/compose_form_container.js | 7 --- .../containers/reply_indicator_container.js | 22 +++++++++ 4 files changed, 42 insertions(+), 47 deletions(-) rename app/javascript/flavours/glitch/features/{composer/reply/index.js => compose/components/reply_indicator.js} (70%) create mode 100644 app/javascript/flavours/glitch/features/compose/containers/reply_indicator_container.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 1f37a1da59..10b51d920a 100644 --- a/app/javascript/flavours/glitch/features/compose/components/compose_form.js +++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.js @@ -7,12 +7,12 @@ import ImmutablePureComponent from 'react-immutable-pure-component'; // Components. import ComposerOptions from '../../composer/options'; import ComposerPublisher from '../../composer/publisher'; -import ComposerReply from '../../composer/reply'; import ComposerSpoiler from '../../composer/spoiler'; import ComposerTextarea from '../../composer/textarea'; import ComposerUploadForm from '../../composer/upload_form'; import ComposerPollForm from '../../composer/poll_form'; import WarningContainer from '../containers/warning_container'; +import ReplyIndicatorContainer from '../containers/reply_indicator_container'; // Utils. import { countableText } from 'flavours/glitch/util/counter'; @@ -49,7 +49,6 @@ class ComposeForm extends ImmutablePureComponent { preselectDate: PropTypes.instanceOf(Date), privacy: PropTypes.string, progress: PropTypes.number, - inReplyTo: ImmutablePropTypes.map, resetFileKey: PropTypes.number, sideArm: PropTypes.string, sensitive: PropTypes.bool, @@ -65,7 +64,6 @@ class ComposeForm extends ImmutablePureComponent { preselectOnReply: PropTypes.bool, // Dispatch props. - onCancelReply: PropTypes.func, onChangeAdvancedOption: PropTypes.func, onChangeDescription: PropTypes.func, onChangeSensitivity: PropTypes.func, @@ -283,7 +281,6 @@ class ComposeForm extends ImmutablePureComponent { layout, media, poll, - onCancelReply, onChangeAdvancedOption, onChangeDescription, onChangeSensitivity, @@ -301,7 +298,6 @@ class ComposeForm extends ImmutablePureComponent { onUpload, privacy, progress, - inReplyTo, resetFileKey, sensitive, showSearch, @@ -319,13 +315,7 @@ class ComposeForm extends ImmutablePureComponent {
- {inReplyTo && ( - - )} +