Fixed issue with ReportModal typing and mobile styles
• Fixed: - issue with ReportModal typing and mobile styles
This commit is contained in:
parent
26770fae11
commit
44519fef35
@ -2,13 +2,13 @@ import { defineMessages, injectIntl } from 'react-intl'
|
|||||||
import { OrderedSet } from 'immutable'
|
import { OrderedSet } from 'immutable'
|
||||||
import ImmutablePropTypes from 'react-immutable-proptypes'
|
import ImmutablePropTypes from 'react-immutable-proptypes'
|
||||||
import ImmutablePureComponent from 'react-immutable-pure-component'
|
import ImmutablePureComponent from 'react-immutable-pure-component'
|
||||||
import { changeReportComment, changeReportForward, submitReport } from '../../actions/reports'
|
import { changeReportComment, submitReport } from '../../actions/reports'
|
||||||
import { expandAccountTimeline } from '../../actions/timelines'
|
import { expandAccountTimeline } from '../../actions/timelines'
|
||||||
import { makeGetAccount } from '../../selectors'
|
import { makeGetAccount } from '../../selectors'
|
||||||
import ModalLayout from './modal_layout'
|
import ModalLayout from './modal_layout'
|
||||||
|
import ResponsiveClassesComponent from '../../features/ui/util/responsive_classes_component'
|
||||||
import Button from '../button'
|
import Button from '../button'
|
||||||
import StatusCheckBox from '../status_check_box'
|
import StatusCheckBox from '../status_check_box'
|
||||||
import Switch from '../switch'
|
|
||||||
import Text from '../text'
|
import Text from '../text'
|
||||||
import Textarea from '../textarea'
|
import Textarea from '../textarea'
|
||||||
|
|
||||||
@ -17,8 +17,6 @@ const messages = defineMessages({
|
|||||||
placeholder: { id: 'report.placeholder', defaultMessage: 'Additional comments' },
|
placeholder: { id: 'report.placeholder', defaultMessage: 'Additional comments' },
|
||||||
submit: { id: 'report.submit', defaultMessage: 'Submit' },
|
submit: { id: 'report.submit', defaultMessage: 'Submit' },
|
||||||
hint: { id: 'report.hint', defaultMessage: 'The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:' },
|
hint: { id: 'report.hint', defaultMessage: 'The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:' },
|
||||||
forwardHint: { id: 'report.forward_hint', defaultMessage: 'The account is from another server. Send an anonymized copy of the report there as well?' },
|
|
||||||
forward: { id: 'report.forward', defaultMessage: 'Forward to {target}' },
|
|
||||||
target: { id: 'report.target', defaultMessage: 'Report {target}' },
|
target: { id: 'report.target', defaultMessage: 'Report {target}' },
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -32,7 +30,6 @@ const makeMapStateToProps = () => {
|
|||||||
isSubmitting: state.getIn(['reports', 'new', 'isSubmitting']),
|
isSubmitting: state.getIn(['reports', 'new', 'isSubmitting']),
|
||||||
account: getAccount(state, accountId),
|
account: getAccount(state, accountId),
|
||||||
comment: state.getIn(['reports', 'new', 'comment']),
|
comment: state.getIn(['reports', 'new', 'comment']),
|
||||||
forward: state.getIn(['reports', 'new', 'forward']),
|
|
||||||
statusIds: OrderedSet(state.getIn(['timelines', `account:${accountId}:with_replies`, 'items'])).union(state.getIn(['reports', 'new', 'status_ids'])),
|
statusIds: OrderedSet(state.getIn(['timelines', `account:${accountId}:with_replies`, 'items'])).union(state.getIn(['reports', 'new', 'status_ids'])),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -50,20 +47,15 @@ class ReportModal extends ImmutablePureComponent {
|
|||||||
account: ImmutablePropTypes.map,
|
account: ImmutablePropTypes.map,
|
||||||
statusIds: ImmutablePropTypes.orderedSet.isRequired,
|
statusIds: ImmutablePropTypes.orderedSet.isRequired,
|
||||||
comment: PropTypes.string.isRequired,
|
comment: PropTypes.string.isRequired,
|
||||||
forward: PropTypes.bool,
|
|
||||||
dispatch: PropTypes.func.isRequired,
|
dispatch: PropTypes.func.isRequired,
|
||||||
intl: PropTypes.object.isRequired,
|
intl: PropTypes.object.isRequired,
|
||||||
onClose: PropTypes.func.isRequired,
|
onClose: PropTypes.func.isRequired,
|
||||||
}
|
}
|
||||||
|
|
||||||
handleCommentChange = (e) => {
|
handleCommentChange = (value) => {
|
||||||
this.props.dispatch(changeReportComment(value))
|
this.props.dispatch(changeReportComment(value))
|
||||||
}
|
}
|
||||||
|
|
||||||
handleForwardChange = e => {
|
|
||||||
this.props.dispatch(changeReportForward(e.target.checked))
|
|
||||||
}
|
|
||||||
|
|
||||||
handleSubmit = () => {
|
handleSubmit = () => {
|
||||||
this.props.dispatch(submitReport())
|
this.props.dispatch(submitReport())
|
||||||
}
|
}
|
||||||
@ -91,14 +83,11 @@ class ReportModal extends ImmutablePureComponent {
|
|||||||
intl,
|
intl,
|
||||||
statusIds,
|
statusIds,
|
||||||
isSubmitting,
|
isSubmitting,
|
||||||
forward,
|
|
||||||
onClose
|
onClose
|
||||||
} = this.props
|
} = this.props
|
||||||
|
|
||||||
if (!account) return null
|
if (!account) return null
|
||||||
|
|
||||||
const domain = account.get('acct').split('@')[1]
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ModalLayout
|
<ModalLayout
|
||||||
noPadding
|
noPadding
|
||||||
@ -108,8 +97,14 @@ class ReportModal extends ImmutablePureComponent {
|
|||||||
onClose={onClose}
|
onClose={onClose}
|
||||||
>
|
>
|
||||||
|
|
||||||
<div className={[_s.default, _s.flexRow].join(' ')}>
|
<ResponsiveClassesComponent
|
||||||
<div className={[_s.default, _s.width50PC, _s.py10, _s.px15, _s.borderRight1PX, _s.borderColorSecondary].join(' ')}>
|
classNames={[_s.default, _s.flexRow].join(' ')}
|
||||||
|
classNamesSmall={[_s.default, _s.flexColumnReverse].join(' ')}
|
||||||
|
>
|
||||||
|
<ResponsiveClassesComponent
|
||||||
|
classNames={[_s.default, _s.width50PC, _s.py10, _s.px15, _s.borderRight1PX, _s.borderColorSecondary].join(' ')}
|
||||||
|
classNamesSmall={[_s.default, _s.width100PC, _s.py10, _s.px15, _s.borderTop1PX, _s.borderColorSecondary].join(' ')}
|
||||||
|
>
|
||||||
<Text color='secondary' size='small'>
|
<Text color='secondary' size='small'>
|
||||||
{intl.formatMessage(messages.hint)}
|
{intl.formatMessage(messages.hint)}
|
||||||
</Text>
|
</Text>
|
||||||
@ -124,31 +119,6 @@ class ReportModal extends ImmutablePureComponent {
|
|||||||
autoFocus
|
autoFocus
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{ /** : todo : */
|
|
||||||
domain &&
|
|
||||||
<div>
|
|
||||||
<Text color='secondary' size='small'>
|
|
||||||
{intl.formatMessage(messages.forwardHint)}
|
|
||||||
</Text>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<Switch
|
|
||||||
id='report-forward'
|
|
||||||
checked={forward}
|
|
||||||
disabled={isSubmitting}
|
|
||||||
onChange={this.handleForwardChange}
|
|
||||||
label={intl.formatMessage(messages.forward, {
|
|
||||||
target: domain,
|
|
||||||
})}
|
|
||||||
labelProps={{
|
|
||||||
size: 'small',
|
|
||||||
color: 'secondary',
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
isDisabled={isSubmitting}
|
isDisabled={isSubmitting}
|
||||||
@ -157,18 +127,22 @@ class ReportModal extends ImmutablePureComponent {
|
|||||||
>
|
>
|
||||||
{intl.formatMessage(messages.submit)}
|
{intl.formatMessage(messages.submit)}
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</ResponsiveClassesComponent>
|
||||||
|
|
||||||
<div className={[_s.default, _s.width50PC].join(' ')}>
|
<ResponsiveClassesComponent
|
||||||
<div className={[_s.default, _s.heightMax80VH, _s.overflowYScroll, _s.pr15, _s.py10].join(' ')}>
|
classNames={[_s.default, _s.width50PC, _s.heightMax80VH].join(' ')}
|
||||||
|
classNamesSmall={[_s.default, _s.width100PC, _s.height260PX].join(' ')}
|
||||||
|
>
|
||||||
|
<div className={[_s.default, _s.height100PC, _s.overflowYScroll, _s.pr15, _s.py10].join(' ')}>
|
||||||
{
|
{
|
||||||
statusIds.map(statusId => (
|
statusIds.map(statusId => (
|
||||||
<StatusCheckBox id={statusId} key={statusId} disabled={isSubmitting} />
|
<StatusCheckBox id={statusId} key={statusId} disabled={isSubmitting} />
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</ResponsiveClassesComponent>
|
||||||
</div>
|
</ResponsiveClassesComponent>
|
||||||
|
|
||||||
</ModalLayout>
|
</ModalLayout>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user