From 4f358b9632b981b26174c29b508ccccdc077b123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Sun, 10 Apr 2022 12:07:03 +0200 Subject: [PATCH] Remove ReplyMentionsContainer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- .../ui/select/{select.js => select.tsx} | 7 +-- .../compose/components/compose_form.js | 2 +- .../containers/reply_mentions_container.js | 52 ------------------- 3 files changed, 2 insertions(+), 59 deletions(-) rename app/soapbox/components/ui/select/{select.js => select.tsx} (74%) delete mode 100644 app/soapbox/features/compose/containers/reply_mentions_container.js diff --git a/app/soapbox/components/ui/select/select.js b/app/soapbox/components/ui/select/select.tsx similarity index 74% rename from app/soapbox/components/ui/select/select.js rename to app/soapbox/components/ui/select/select.tsx index 805161dd9..0781430ea 100644 --- a/app/soapbox/components/ui/select/select.js +++ b/app/soapbox/components/ui/select/select.tsx @@ -1,7 +1,6 @@ -import PropTypes from 'prop-types'; import * as React from 'react'; -const Select = React.forwardRef((props, ref) => { +const Select = React.forwardRef((props, ref) => { const { children, ...filteredProps } = props; return ( @@ -15,8 +14,4 @@ const Select = React.forwardRef((props, ref) => { ); }); -Select.propTypes = { - children: PropTypes.node, -}; - export default Select; diff --git a/app/soapbox/features/compose/components/compose_form.js b/app/soapbox/features/compose/components/compose_form.js index 3dd40e858..1c17c5ae1 100644 --- a/app/soapbox/features/compose/components/compose_form.js +++ b/app/soapbox/features/compose/components/compose_form.js @@ -14,6 +14,7 @@ import AutosuggestInput from '../../../components/autosuggest_input'; import AutosuggestTextarea from '../../../components/autosuggest_textarea'; import { Button } from '../../../components/ui'; import { isMobile } from '../../../is_mobile'; +import ReplyMentions from '../components/reply_mentions'; import Warning from '../components/warning'; import EmojiPickerDropdown from '../containers/emoji_picker_dropdown_container'; import MarkdownButtonContainer from '../containers/markdown_button_container'; @@ -22,7 +23,6 @@ import PollFormContainer from '../containers/poll_form_container'; import PrivacyDropdownContainer from '../containers/privacy_dropdown_container'; import QuotedStatusContainer from '../containers/quoted_status_container'; import ReplyIndicatorContainer from '../containers/reply_indicator_container'; -import ReplyMentions from '../containers/reply_mentions_container'; import ScheduleButtonContainer from '../containers/schedule_button_container'; import ScheduleFormContainer from '../containers/schedule_form_container'; import SpoilerButtonContainer from '../containers/spoiler_button_container'; diff --git a/app/soapbox/features/compose/containers/reply_mentions_container.js b/app/soapbox/features/compose/containers/reply_mentions_container.js deleted file mode 100644 index c888ae48a..000000000 --- a/app/soapbox/features/compose/containers/reply_mentions_container.js +++ /dev/null @@ -1,52 +0,0 @@ -import { connect } from 'react-redux'; - -import { openModal } from 'soapbox/actions/modals'; -import { statusToMentionsAccountIdsArray } from 'soapbox/reducers/compose'; -import { makeGetStatus } from 'soapbox/selectors'; -import { getFeatures } from 'soapbox/utils/features'; - -import ReplyMentions from '../components/reply_mentions'; - -const makeMapStateToProps = () => { - const getStatus = makeGetStatus(); - - return state => { - const instance = state.get('instance'); - const { explicitAddressing } = getFeatures(instance); - - if (!explicitAddressing) { - return { - explicitAddressing: false, - }; - } - - const status = getStatus(state, { id: state.getIn(['compose', 'in_reply_to']) }); - - if (!status) { - return { - isReply: false, - }; - } - const to = state.getIn(['compose', 'to']); - - const me = state.get('me'); - const account = state.getIn(['accounts', me]); - - const parentTo = statusToMentionsAccountIdsArray(status, account); - - return { - to, - parentTo, - isReply: true, - explicitAddressing: true, - }; - }; -}; - -const mapDispatchToProps = dispatch => ({ - onOpenMentionsModal() { - dispatch(openModal('REPLY_MENTIONS')); - }, -}); - -export default connect(makeMapStateToProps, mapDispatchToProps)(ReplyMentions);