Merge pull request #435 from ThibG/glitch-soc/features/public-modals
[Glitch] Show media modal on public pagesmaster
beatrix
7 years ago
committed by
GitHub
commit
e88ce27855
@ -0,0 +1,84 @@ |
||||
import React from 'react'; |
||||
import PropTypes from 'prop-types'; |
||||
|
||||
export default class ModalRoot extends React.PureComponent { |
||||
|
||||
static propTypes = { |
||||
children: PropTypes.node, |
||||
onClose: PropTypes.func.isRequired, |
||||
}; |
||||
|
||||
state = { |
||||
revealed: !!this.props.children, |
||||
}; |
||||
|
||||
activeElement = this.state.revealed ? document.activeElement : null; |
||||
|
||||
handleKeyUp = (e) => { |
||||
if ((e.key === 'Escape' || e.key === 'Esc' || e.keyCode === 27) |
||||
&& !!this.props.children && !this.props.props.noEsc) { |
||||
this.props.onClose(); |
||||
} |
||||
} |
||||
|
||||
componentDidMount () { |
||||
window.addEventListener('keyup', this.handleKeyUp, false); |
||||
} |
||||
|
||||
componentWillReceiveProps (nextProps) { |
||||
if (!!nextProps.children && !this.props.children) { |
||||
this.activeElement = document.activeElement; |
||||
|
||||
this.getSiblings().forEach(sibling => sibling.setAttribute('inert', true)); |
||||
} else if (!nextProps.children) { |
||||
this.setState({ revealed: false }); |
||||
} |
||||
} |
||||
|
||||
componentDidUpdate (prevProps) { |
||||
if (!this.props.children && !!prevProps.children) { |
||||
this.getSiblings().forEach(sibling => sibling.removeAttribute('inert')); |
||||
this.activeElement.focus(); |
||||
this.activeElement = null; |
||||
} |
||||
if (this.props.children) { |
||||
requestAnimationFrame(() => { |
||||
this.setState({ revealed: true }); |
||||
}); |
||||
} |
||||
} |
||||
|
||||
componentWillUnmount () { |
||||
window.removeEventListener('keyup', this.handleKeyUp); |
||||
} |
||||
|
||||
getSiblings = () => { |
||||
return Array(...this.node.parentElement.childNodes).filter(node => node !== this.node); |
||||
} |
||||
|
||||
setRef = ref => { |
||||
this.node = ref; |
||||
} |
||||
|
||||
render () { |
||||
const { children, onClose } = this.props; |
||||
const { revealed } = this.state; |
||||
const visible = !!children; |
||||
|
||||
if (!visible) { |
||||
return ( |
||||
<div className='modal-root' ref={this.setRef} style={{ opacity: 0 }} /> |
||||
); |
||||
} |
||||
|
||||
return ( |
||||
<div className='modal-root' ref={this.setRef} style={{ opacity: revealed ? 1 : 0 }}> |
||||
<div style={{ pointerEvents: visible ? 'auto' : 'none' }}> |
||||
<div role='presentation' className='modal-root__overlay' onClick={onClose} /> |
||||
<div role='dialog' className='modal-root__container'>{children}</div> |
||||
</div> |
||||
</div> |
||||
); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,68 @@ |
||||
import React from 'react'; |
||||
import ReactDOM from 'react-dom'; |
||||
import PropTypes from 'prop-types'; |
||||
import { IntlProvider, addLocaleData } from 'react-intl'; |
||||
import { getLocale } from 'mastodon/locales'; |
||||
import MediaGallery from 'flavours/glitch/components/media_gallery'; |
||||
import ModalRoot from 'flavours/glitch/components/modal_root'; |
||||
import MediaModal from 'flavours/glitch/features/ui/components/media_modal'; |
||||
import { fromJS } from 'immutable'; |
||||
|
||||
const { localeData, messages } = getLocale(); |
||||
addLocaleData(localeData); |
||||
|
||||
export default class MediaGalleriesContainer extends React.PureComponent { |
||||
|
||||
static propTypes = { |
||||
locale: PropTypes.string.isRequired, |
||||
galleries: PropTypes.object.isRequired, |
||||
}; |
||||
|
||||
state = { |
||||
media: null, |
||||
index: null, |
||||
}; |
||||
|
||||
handleOpenMedia = (media, index) => { |
||||
document.body.classList.add('media-gallery-standalone__body'); |
||||
this.setState({ media, index }); |
||||
} |
||||
|
||||
handleCloseMedia = () => { |
||||
document.body.classList.remove('media-gallery-standalone__body'); |
||||
this.setState({ media: null, index: null }); |
||||
} |
||||
|
||||
render () { |
||||
const { locale, galleries } = this.props; |
||||
|
||||
return ( |
||||
<IntlProvider locale={locale} messages={messages}> |
||||
<React.Fragment> |
||||
{[].map.call(galleries, gallery => { |
||||
const { media, ...props } = JSON.parse(gallery.getAttribute('data-props')); |
||||
|
||||
return ReactDOM.createPortal( |
||||
<MediaGallery |
||||
{...props} |
||||
media={fromJS(media)} |
||||
onOpenMedia={this.handleOpenMedia} |
||||
/>, |
||||
gallery |
||||
); |
||||
})} |
||||
<ModalRoot onClose={this.handleCloseMedia}> |
||||
{this.state.media === null || this.state.index === null ? null : ( |
||||
<MediaModal |
||||
media={this.state.media} |
||||
index={this.state.index} |
||||
onClose={this.handleCloseMedia} |
||||
/> |
||||
)} |
||||
</ModalRoot> |
||||
</React.Fragment> |
||||
</IntlProvider> |
||||
); |
||||
} |
||||
|
||||
} |
||||
@ -1,34 +0,0 @@ |
||||
import React from 'react'; |
||||
import PropTypes from 'prop-types'; |
||||
import { IntlProvider, addLocaleData } from 'react-intl'; |
||||
import { getLocale } from 'mastodon/locales'; |
||||
import MediaGallery from 'flavours/glitch/components/media_gallery'; |
||||
import { fromJS } from 'immutable'; |
||||
|
||||
const { localeData, messages } = getLocale(); |
||||
addLocaleData(localeData); |
||||
|
||||
export default class MediaGalleryContainer extends React.PureComponent { |
||||
|
||||
static propTypes = { |
||||
locale: PropTypes.string.isRequired, |
||||
media: PropTypes.array.isRequired, |
||||
}; |
||||
|
||||
handleOpenMedia = () => {} |
||||
|
||||
render () { |
||||
const { locale, media, ...props } = this.props; |
||||
|
||||
return ( |
||||
<IntlProvider locale={locale} messages={messages}> |
||||
<MediaGallery |
||||
{...props} |
||||
media={fromJS(media)} |
||||
onOpenMedia={this.handleOpenMedia} |
||||
/> |
||||
</IntlProvider> |
||||
); |
||||
} |
||||
|
||||
} |
||||
Loading…
Reference in new issue