From f9afd06221baf7f635b346dfbe350652ba6ffbd0 Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Sat, 12 May 2018 22:30:06 +0900 Subject: [PATCH] Combine similar components into one on public UI (#7458) --- .../mastodon/containers/cards_container.js | 59 ------------------- ...leries_container.js => media_container.js} | 39 +++++++----- .../mastodon/containers/video_container.js | 26 -------- app/javascript/packs/public.js | 33 +++-------- .../styles/mastodon/containers.scss | 3 +- 5 files changed, 33 insertions(+), 127 deletions(-) delete mode 100644 app/javascript/mastodon/containers/cards_container.js rename app/javascript/mastodon/containers/{media_galleries_container.js => media_container.js} (53%) delete mode 100644 app/javascript/mastodon/containers/video_container.js diff --git a/app/javascript/mastodon/containers/cards_container.js b/app/javascript/mastodon/containers/cards_container.js deleted file mode 100644 index 894bf4ef99..0000000000 --- a/app/javascript/mastodon/containers/cards_container.js +++ /dev/null @@ -1,59 +0,0 @@ -import React, { Fragment } from 'react'; -import ReactDOM from 'react-dom'; -import PropTypes from 'prop-types'; -import { IntlProvider, addLocaleData } from 'react-intl'; -import { getLocale } from '../locales'; -import Card from '../features/status/components/card'; -import ModalRoot from '../components/modal_root'; -import MediaModal from '../features/ui/components/media_modal'; -import { fromJS } from 'immutable'; - -const { localeData, messages } = getLocale(); -addLocaleData(localeData); - -export default class CardsContainer extends React.PureComponent { - - static propTypes = { - locale: PropTypes.string, - cards: PropTypes.object.isRequired, - }; - - state = { - media: null, - }; - - handleOpenCard = (media) => { - document.body.classList.add('card-standalone__body'); - this.setState({ media }); - } - - handleCloseCard = () => { - document.body.classList.remove('card-standalone__body'); - this.setState({ media: null }); - } - - render () { - const { locale, cards } = this.props; - - return ( - - - {[].map.call(cards, container => { - const { card, ...props } = JSON.parse(container.getAttribute('data-props')); - - return ReactDOM.createPortal( - , - container, - ); - })} - - {this.state.media && ( - - )} - - - - ); - } - -} diff --git a/app/javascript/mastodon/containers/media_galleries_container.js b/app/javascript/mastodon/containers/media_container.js similarity index 53% rename from app/javascript/mastodon/containers/media_galleries_container.js rename to app/javascript/mastodon/containers/media_container.js index d77bd688bf..eb2d540cb3 100644 --- a/app/javascript/mastodon/containers/media_galleries_container.js +++ b/app/javascript/mastodon/containers/media_container.js @@ -1,9 +1,11 @@ -import React from 'react'; +import React, { PureComponent, Fragment } from 'react'; import ReactDOM from 'react-dom'; import PropTypes from 'prop-types'; import { IntlProvider, addLocaleData } from 'react-intl'; import { getLocale } from '../locales'; import MediaGallery from '../components/media_gallery'; +import Video from '../features/video'; +import Card from '../features/status/components/card'; import ModalRoot from '../components/modal_root'; import MediaModal from '../features/ui/components/media_modal'; import { fromJS } from 'immutable'; @@ -11,11 +13,13 @@ import { fromJS } from 'immutable'; const { localeData, messages } = getLocale(); addLocaleData(localeData); -export default class MediaGalleriesContainer extends React.PureComponent { +const MEDIA_COMPONENTS = { MediaGallery, Video, Card }; + +export default class MediaContainer extends PureComponent { static propTypes = { locale: PropTypes.string.isRequired, - galleries: PropTypes.object.isRequired, + components: PropTypes.object.isRequired, }; state = { @@ -24,31 +28,34 @@ export default class MediaGalleriesContainer extends React.PureComponent { }; handleOpenMedia = (media, index) => { - document.body.classList.add('media-gallery-standalone__body'); + document.body.classList.add('media-standalone__body'); this.setState({ media, index }); } handleCloseMedia = () => { - document.body.classList.remove('media-gallery-standalone__body'); + document.body.classList.remove('media-standalone__body'); this.setState({ media: null, index: null }); } render () { - const { locale, galleries } = this.props; + const { locale, components } = this.props; return ( - - {[].map.call(galleries, gallery => { - const { media, ...props } = JSON.parse(gallery.getAttribute('data-props')); + + {[].map.call(components, (component, i) => { + const componentName = component.getAttribute('data-component'); + const Component = MEDIA_COMPONENTS[componentName]; + const { media, card, ...props } = JSON.parse(component.getAttribute('data-props')); + + Object.assign(props, { + ...(media ? { media: fromJS(media) } : {}), + ...(card ? { card: fromJS(card) } : {}), + }); return ReactDOM.createPortal( - , - gallery + , + component, ); })} @@ -60,7 +67,7 @@ export default class MediaGalleriesContainer extends React.PureComponent { /> )} - + ); } diff --git a/app/javascript/mastodon/containers/video_container.js b/app/javascript/mastodon/containers/video_container.js deleted file mode 100644 index 2fd353096d..0000000000 --- a/app/javascript/mastodon/containers/video_container.js +++ /dev/null @@ -1,26 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import { IntlProvider, addLocaleData } from 'react-intl'; -import { getLocale } from '../locales'; -import Video from '../features/video'; - -const { localeData, messages } = getLocale(); -addLocaleData(localeData); - -export default class VideoContainer extends React.PureComponent { - - static propTypes = { - locale: PropTypes.string.isRequired, - }; - - render () { - const { locale, ...props } = this.props; - - return ( - - - ); - } - -} diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js index 3a1f1a16b4..d5e5b7fe00 100644 --- a/app/javascript/packs/public.js +++ b/app/javascript/packs/public.js @@ -24,7 +24,6 @@ function main() { const emojify = require('../mastodon/features/emoji/emoji').default; const { getLocale } = require('../mastodon/locales'); const { localeData } = getLocale(); - const VideoContainer = require('../mastodon/containers/video_container').default; const React = require('react'); const ReactDOM = require('react-dom'); @@ -69,30 +68,16 @@ function main() { }); }); - [].forEach.call(document.querySelectorAll('[data-component="Video"]'), (content) => { - const props = JSON.parse(content.getAttribute('data-props')); - ReactDOM.render(, content); - }); - - const cards = document.querySelectorAll('[data-component="Card"]'); - - if (cards.length > 0) { - import(/* webpackChunkName: "containers/cards_container" */ '../mastodon/containers/cards_container').then(({ default: CardsContainer }) => { - const content = document.createElement('div'); - - ReactDOM.render(, content); - document.body.appendChild(content); - }).catch(error => console.error(error)); - } - - const mediaGalleries = document.querySelectorAll('[data-component="MediaGallery"]'); - - if (mediaGalleries.length > 0) { - const MediaGalleriesContainer = require('../mastodon/containers/media_galleries_container').default; - const content = document.createElement('div'); + const reactComponents = document.querySelectorAll('[data-component]'); + if (reactComponents.length > 0) { + import(/* webpackChunkName: "containers/media_container" */ '../mastodon/containers/media_container') + .then(({ default: MediaContainer }) => { + const content = document.createElement('div'); - ReactDOM.render(, content); - document.body.appendChild(content); + ReactDOM.render(, content); + document.body.appendChild(content); + }) + .catch(error => console.error(error)); } }); diff --git a/app/javascript/styles/mastodon/containers.scss b/app/javascript/styles/mastodon/containers.scss index c40b38a5a5..ac648c8680 100644 --- a/app/javascript/styles/mastodon/containers.scss +++ b/app/javascript/styles/mastodon/containers.scss @@ -60,8 +60,7 @@ } } -.card-standalone__body, -.media-gallery-standalone__body { +.media-standalone__body { overflow: hidden; }