mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-23 02:51:13 +01:00
Show media modal on public timeline (#7413)
This commit is contained in:
parent
01dfd6dbc8
commit
e0b1e17bd0
5 changed files with 26 additions and 3 deletions
|
@ -206,7 +206,7 @@ export default class Status extends ImmutablePureComponent {
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
media = (
|
media = (
|
||||||
<Bundle fetchComponent={MediaGallery} loading={this.renderLoadingMediaGallery} >
|
<Bundle fetchComponent={MediaGallery} loading={this.renderLoadingMediaGallery}>
|
||||||
{Component => <Component media={status.get('media_attachments')} sensitive={status.get('sensitive')} height={110} onOpenMedia={this.props.onOpenMedia} />}
|
{Component => <Component media={status.get('media_attachments')} sensitive={status.get('sensitive')} height={110} onOpenMedia={this.props.onOpenMedia} />}
|
||||||
</Bundle>
|
</Bundle>
|
||||||
);
|
);
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
import React from 'react';
|
import React, { Fragment } from 'react';
|
||||||
|
import ReactDOM from 'react-dom';
|
||||||
import { Provider } from 'react-redux';
|
import { Provider } from 'react-redux';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import configureStore from '../store/configureStore';
|
import configureStore from '../store/configureStore';
|
||||||
|
@ -8,6 +9,7 @@ import { getLocale } from '../locales';
|
||||||
import PublicTimeline from '../features/standalone/public_timeline';
|
import PublicTimeline from '../features/standalone/public_timeline';
|
||||||
import CommunityTimeline from '../features/standalone/community_timeline';
|
import CommunityTimeline from '../features/standalone/community_timeline';
|
||||||
import HashtagTimeline from '../features/standalone/hashtag_timeline';
|
import HashtagTimeline from '../features/standalone/hashtag_timeline';
|
||||||
|
import ModalContainer from '../features/ui/containers/modal_container';
|
||||||
import initialState from '../initial_state';
|
import initialState from '../initial_state';
|
||||||
|
|
||||||
const { localeData, messages } = getLocale();
|
const { localeData, messages } = getLocale();
|
||||||
|
@ -47,7 +49,13 @@ export default class TimelineContainer extends React.PureComponent {
|
||||||
return (
|
return (
|
||||||
<IntlProvider locale={locale} messages={messages}>
|
<IntlProvider locale={locale} messages={messages}>
|
||||||
<Provider store={store}>
|
<Provider store={store}>
|
||||||
|
<Fragment>
|
||||||
{timeline}
|
{timeline}
|
||||||
|
{ReactDOM.createPortal(
|
||||||
|
<ModalContainer />,
|
||||||
|
document.getElementById('modal-container'),
|
||||||
|
)}
|
||||||
|
</Fragment>
|
||||||
</Provider>
|
</Provider>
|
||||||
</IntlProvider>
|
</IntlProvider>
|
||||||
);
|
);
|
||||||
|
|
|
@ -40,6 +40,17 @@ export default class ModalRoot extends React.PureComponent {
|
||||||
onClose: PropTypes.func.isRequired,
|
onClose: PropTypes.func.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
getSnapshotBeforeUpdate () {
|
||||||
|
const visible = !!this.props.type;
|
||||||
|
return {
|
||||||
|
overflowY: visible ? 'hidden' : null,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
componentDidUpdate (prevProps, prevState, { overflowY }) {
|
||||||
|
document.body.style.overflowY = overflowY;
|
||||||
|
}
|
||||||
|
|
||||||
renderLoading = modalId => () => {
|
renderLoading = modalId => () => {
|
||||||
return ['MEDIA', 'VIDEO', 'BOOST', 'CONFIRM', 'ACTIONS'].indexOf(modalId) === -1 ? <ModalLoading /> : null;
|
return ['MEDIA', 'VIDEO', 'BOOST', 'CONFIRM', 'ACTIONS'].indexOf(modalId) === -1 ? <ModalLoading /> : null;
|
||||||
}
|
}
|
||||||
|
|
|
@ -142,3 +142,5 @@
|
||||||
%p
|
%p
|
||||||
= link_to t('about.source_code'), @instance_presenter.source_url
|
= link_to t('about.source_code'), @instance_presenter.source_url
|
||||||
= " (#{@instance_presenter.version_number})"
|
= " (#{@instance_presenter.version_number})"
|
||||||
|
|
||||||
|
#modal-container
|
||||||
|
|
|
@ -34,3 +34,5 @@
|
||||||
%p= t 'about.about_mastodon_html'
|
%p= t 'about.about_mastodon_html'
|
||||||
|
|
||||||
= render 'features'
|
= render 'features'
|
||||||
|
|
||||||
|
#modal-container
|
||||||
|
|
Loading…
Reference in a new issue