Disroot/Mangane
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases 2 Wiki Activity

Merge branch 'fix-modal-navigation' into 'develop'

Browse source 
Fix: User is returned to a previously viewed page after replying to a post

Closes #843

See merge request soapbox-pub/soapbox-fe!1078
This commit is contained in:
marcin mikołajczak 2022-03-06 22:35:39 +00:00
parent 7e5ca22264 5b46f0c0f7
commit fd27688b11
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/soapbox/components/modal_root.js
View file

@ -54,6 +54,10 @@ class ModalRoot extends React.PureComponent {
onCancel: PropTypes.func,
};
static contextTypes = {
router: PropTypes.object,
};
state = {
revealed: !!this.props.children,
};

2
app/soapbox/features/scheduled_statuses/components/scheduled_status.js
View file

@ -39,7 +39,7 @@ class ScheduledStatus extends ImmutablePureComponent {
<div className='scheduled-status'>
<div className={classNames('status__wrapper', `status__wrapper-${status.get('visibility')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id') })} tabIndex={this.props.muted ? null : 0}>
<div className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), muted: this.props.muted })} data-id={status.get('id')}>
<div className='status__expand' onClick={this.handleExpandClick} role='presentation' />
<div className='status__expand' role='presentation' />
<div className='status__info'>
<NavLink to={statusUrl} className='status__relative-time'>
<RelativeTimestamp timestamp={status.get('created_at')} futureDate />

2
app/soapbox/features/ui/components/pending_status.js
View file

@ -63,7 +63,7 @@ class PendingStatus extends ImmutablePureComponent {
<div className={classNames('pending-status', className)}>
<div className={classNames('status__wrapper', `status__wrapper-${status.get('visibility')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id') })} tabIndex={this.props.muted ? null : 0}>
<div className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), muted: this.props.muted })} data-id={status.get('id')}>
<div className='status__expand' onClick={this.handleExpandClick} role='presentation' />
<div className='status__expand' role='presentation' />
<div className='status__info'>
<span className='status__relative-time'>
<RelativeTimestamp timestamp={status.get('created_at')} />