Progress
This commit is contained in:
@@ -8,11 +8,19 @@ import TimelineComposeBlock from '../timeline_compose_block'
|
||||
const messages = defineMessages({
|
||||
confirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
|
||||
title: { id: 'navigation_bar.compose', defaultMessage: 'Compose new gab' },
|
||||
comment: { id: 'navigation_bar.compose_comment', defaultMessage: 'Compose new comment' },
|
||||
edit: { id: 'navigation_bar.edit_gab', defaultMessage: 'Edit' },
|
||||
})
|
||||
|
||||
const mapStateToProps = (state) => ({
|
||||
composeText: state.getIn(['compose', 'text']),
|
||||
})
|
||||
const mapStateToProps = (state) => {
|
||||
const status = state.getIn(['statuses', state.getIn(['compose', 'id'])])
|
||||
|
||||
return {
|
||||
composeText: state.getIn(['compose', 'text']),
|
||||
isEditing: !!status,
|
||||
isComment: !!state.getIn(['compose', 'in_reply_to']),
|
||||
}
|
||||
}
|
||||
|
||||
export default
|
||||
@connect(mapStateToProps)
|
||||
@@ -24,10 +32,17 @@ class ComposeModal extends ImmutablePureComponent {
|
||||
onClose: PropTypes.func.isRequired,
|
||||
composeText: PropTypes.string,
|
||||
dispatch: PropTypes.func.isRequired,
|
||||
};
|
||||
isEditing: PropTypes.bool,
|
||||
isComment: PropTypes.bool,
|
||||
}
|
||||
|
||||
onClickClose = () => {
|
||||
const { composeText, dispatch, onClose, intl } = this.props;
|
||||
const {
|
||||
composeText,
|
||||
dispatch,
|
||||
onClose,
|
||||
intl,
|
||||
} = this.props
|
||||
|
||||
if (composeText) {
|
||||
dispatch(openModal('CONFIRM', {
|
||||
@@ -36,24 +51,30 @@ class ComposeModal extends ImmutablePureComponent {
|
||||
confirm: intl.formatMessage(messages.confirm),
|
||||
onConfirm: () => dispatch(cancelReplyCompose()),
|
||||
onCancel: () => dispatch(openModal('COMPOSE')),
|
||||
}));
|
||||
}))
|
||||
}
|
||||
else {
|
||||
onClose('COMPOSE');
|
||||
onClose('COMPOSE')
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
render() {
|
||||
const { intl } = this.props
|
||||
const {
|
||||
intl,
|
||||
isEditing,
|
||||
isComment,
|
||||
} = this.props
|
||||
|
||||
const title = isEditing ? messages.edit : isComment ? messages.comment : messages.title
|
||||
|
||||
return (
|
||||
<ModalLayout
|
||||
noPadding
|
||||
title={intl.formatMessage(messages.title)}
|
||||
title={intl.formatMessage(title)}
|
||||
onClose={this.onClickClose}
|
||||
>
|
||||
<TimelineComposeBlock modal />
|
||||
</ModalLayout>
|
||||
);
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user