Browse Source

Show media modal on public timeline (#7413)

custom
Yamagishi Kazutoshi 4 years ago
committed by Eugen Rochko
parent
commit
e0b1e17bd0
  1. 2
      app/javascript/mastodon/components/status.js
  2. 12
      app/javascript/mastodon/containers/timeline_container.js
  3. 11
      app/javascript/mastodon/features/ui/components/modal_root.js
  4. 2
      app/views/about/show.html.haml
  5. 2
      app/views/tags/show.html.haml

2
app/javascript/mastodon/components/status.js

@ -206,7 +206,7 @@ export default class Status extends ImmutablePureComponent {
);
} else {
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} />}
</Bundle>
);

12
app/javascript/mastodon/containers/timeline_container.js

@ -1,4 +1,5 @@
import React from 'react';
import React, { Fragment } from 'react';
import ReactDOM from 'react-dom';
import { Provider } from 'react-redux';
import PropTypes from 'prop-types';
import configureStore from '../store/configureStore';
@ -8,6 +9,7 @@ import { getLocale } from '../locales';
import PublicTimeline from '../features/standalone/public_timeline';
import CommunityTimeline from '../features/standalone/community_timeline';
import HashtagTimeline from '../features/standalone/hashtag_timeline';
import ModalContainer from '../features/ui/containers/modal_container';
import initialState from '../initial_state';
const { localeData, messages } = getLocale();
@ -47,7 +49,13 @@ export default class TimelineContainer extends React.PureComponent {
return (
<IntlProvider locale={locale} messages={messages}>
<Provider store={store}>
{timeline}
<Fragment>
{timeline}
{ReactDOM.createPortal(
<ModalContainer />,
document.getElementById('modal-container'),
)}
</Fragment>
</Provider>
</IntlProvider>
);

11
app/javascript/mastodon/features/ui/components/modal_root.js

@ -40,6 +40,17 @@ export default class ModalRoot extends React.PureComponent {
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 => () => {
return ['MEDIA', 'VIDEO', 'BOOST', 'CONFIRM', 'ACTIONS'].indexOf(modalId) === -1 ? <ModalLoading /> : null;
}

2
app/views/about/show.html.haml

@ -142,3 +142,5 @@
%p
= link_to t('about.source_code'), @instance_presenter.source_url
= " (#{@instance_presenter.version_number})"
#modal-container

2
app/views/tags/show.html.haml

@ -34,3 +34,5 @@
%p= t 'about.about_mastodon_html'
= render 'features'
#modal-container

Loading…
Cancel
Save