458bdef633
Previously, the user had to click on the "poll" icon at the bottom of the compose form in order to remove a poll. This commit changes how poll options behave so as to enable an empty poll to be removed through the deletion of either one of its options. This closes #317.
52 lines
1.4 KiB
JavaScript
52 lines
1.4 KiB
JavaScript
import { connect } from 'react-redux';
|
|
import PollForm from '../components/poll_form';
|
|
import { addPollOption, removePollOption, changePollOption, changePollSettings, removePoll } from '../../../actions/compose';
|
|
import {
|
|
clearComposeSuggestions,
|
|
fetchComposeSuggestions,
|
|
selectComposeSuggestion,
|
|
} from '../../../actions/compose';
|
|
|
|
const mapStateToProps = state => ({
|
|
suggestions: state.getIn(['compose', 'suggestions']),
|
|
options: state.getIn(['compose', 'poll', 'options']),
|
|
expiresIn: state.getIn(['compose', 'poll', 'expires_in']),
|
|
isMultiple: state.getIn(['compose', 'poll', 'multiple']),
|
|
});
|
|
|
|
const mapDispatchToProps = dispatch => ({
|
|
onAddOption(title) {
|
|
dispatch(addPollOption(title));
|
|
},
|
|
|
|
onRemoveOption(index) {
|
|
dispatch(removePollOption(index));
|
|
},
|
|
|
|
onChangeOption(index, title) {
|
|
dispatch(changePollOption(index, title));
|
|
},
|
|
|
|
onChangeSettings(expiresIn, isMultiple) {
|
|
dispatch(changePollSettings(expiresIn, isMultiple));
|
|
},
|
|
|
|
onClearSuggestions() {
|
|
dispatch(clearComposeSuggestions());
|
|
},
|
|
|
|
onFetchSuggestions(token) {
|
|
dispatch(fetchComposeSuggestions(token));
|
|
},
|
|
|
|
onSuggestionSelected(position, token, accountId, path) {
|
|
dispatch(selectComposeSuggestion(position, token, accountId, path));
|
|
},
|
|
|
|
onRemovePoll() {
|
|
dispatch(removePoll());
|
|
},
|
|
|
|
});
|
|
|
|
export default connect(mapStateToProps, mapDispatchToProps)(PollForm);
|