Progress on new composer

Updated composer to work with comments, groups, timelines, comments in groups, etc.
This commit is contained in:
mgabdev
2020-12-20 20:37:53 -05:00
parent 1a8ecc672c
commit a2ffbadedb
11 changed files with 84 additions and 96 deletions

View File

@@ -5,7 +5,6 @@ import { List as ImmutableList } from 'immutable'
import ComposeForm from '../components/compose_form'
import {
changeCompose,
submitCompose,
clearComposeSuggestions,
fetchComposeSuggestions,
selectComposeSuggestion,
@@ -21,11 +20,12 @@ import { me } from '../../../initial_state'
const mapStateToProps = (state, props) => {
const {
replyToId,
isStandalone,
formLocation,
shouldCondense,
isModal,
} = props
const isStandalone = formLocation === 'standalone'
const reduxReplyToId = state.getIn(['compose', 'in_reply_to'])
const isModalOpen = state.getIn(['modal', 'modalType']) === 'COMPOSE' || isStandalone
let isMatch;
@@ -44,6 +44,7 @@ const mapStateToProps = (state, props) => {
if (!isMatch) {
return {
isStandalone,
isMatch,
isModalOpen,
reduxReplyToId,
@@ -73,6 +74,7 @@ const mapStateToProps = (state, props) => {
isMatch,
isModalOpen,
reduxReplyToId,
isStandalone,
edit: state.getIn(['compose', 'id']) !== null,
text: state.getIn(['compose', 'text']),
markdown: state.getIn(['compose', 'markdown']),
@@ -96,16 +98,13 @@ const mapStateToProps = (state, props) => {
}
}
const mapDispatchToProps = (dispatch, { isStandalone }) => ({
const mapDispatchToProps = (dispatch, { formLocation }) => ({
onChange(text, markdown, newReplyToId, position) {
const isStandalone = formLocation === 'standalone'
dispatch(changeCompose(text, markdown, newReplyToId, isStandalone, position))
},
onSubmit(groupId, replyToId, router, autoJoinGroup) {
dispatch(submitCompose(groupId, replyToId, router, isStandalone, autoJoinGroup))
},
onClearSuggestions() {
dispatch(clearComposeSuggestions())
},