vbatts/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Enable to handle app immediately after closing modal (#3082)

Browse source
This commit is contained in:
geta6 2017-05-16 19:12:38 +09:00 committed by Eugen Rochko
parent 0dfffb6dcb
commit bbaac89eb0
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/javascript/mastodon/features/ui/components/modal_root.js
View file

@ -48,9 +48,10 @@ class ModalRoot extends React.PureComponent {
render () { render () {
const { type, props, onClose } = this.props; const { type, props, onClose } = this.props;
const visible = !!type;
const items = []; const items = [];
if (!!type) { if (visible) {
items.push({ items.push({
key: type, key: type,
data: { type, props }, data: { type, props },
@ -69,7 +70,7 @@ class ModalRoot extends React.PureComponent {
const SpecificComponent = MODAL_COMPONENTS[type]; const SpecificComponent = MODAL_COMPONENTS[type];
return ( return (
<div key={key}> <div key={key} style={{ pointerEvents: visible ? 'auto' : 'none' }}>
<div role='presentation' className='modal-root__overlay' style={{ opacity: style.opacity }} onClick={onClose} /> <div role='presentation' className='modal-root__overlay' style={{ opacity: style.opacity }} onClick={onClose} />
<div className='modal-root__container' style={{ opacity: style.opacity, transform: `translateZ(0px) scale(${style.scale})` }}> <div className='modal-root__container' style={{ opacity: style.opacity, transform: `translateZ(0px) scale(${style.scale})` }}>
<SpecificComponent {...props} onClose={onClose} /> <SpecificComponent {...props} onClose={onClose} />