forked from cybrespace/mastodon
		
	Fix media modal regression on public pages (#15221)
This commit is contained in:
		
							parent
							
								
									ec0edf74d6
								
							
						
					
					
						commit
						e1a6526c8d
					
				
					 1 changed files with 13 additions and 2 deletions
				
			
		| 
						 | 
					@ -30,6 +30,7 @@ export default class MediaContainer extends PureComponent {
 | 
				
			||||||
    media: null,
 | 
					    media: null,
 | 
				
			||||||
    index: null,
 | 
					    index: null,
 | 
				
			||||||
    time: null,
 | 
					    time: null,
 | 
				
			||||||
 | 
					    backgroundColor: null,
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  handleOpenMedia = (media, index) => {
 | 
					  handleOpenMedia = (media, index) => {
 | 
				
			||||||
| 
						 | 
					@ -52,7 +53,16 @@ export default class MediaContainer extends PureComponent {
 | 
				
			||||||
    document.body.classList.remove('with-modals--active');
 | 
					    document.body.classList.remove('with-modals--active');
 | 
				
			||||||
    document.documentElement.style.marginRight = 0;
 | 
					    document.documentElement.style.marginRight = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    this.setState({ media: null, index: null, time: null });
 | 
					    this.setState({
 | 
				
			||||||
 | 
					      media: null,
 | 
				
			||||||
 | 
					      index: null,
 | 
				
			||||||
 | 
					      time: null,
 | 
				
			||||||
 | 
					      backgroundColor: null,
 | 
				
			||||||
 | 
					    });
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  setBackgroundColor = color => {
 | 
				
			||||||
 | 
					    this.setState({ backgroundColor: color });
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  render () {
 | 
					  render () {
 | 
				
			||||||
| 
						 | 
					@ -85,13 +95,14 @@ export default class MediaContainer extends PureComponent {
 | 
				
			||||||
            );
 | 
					            );
 | 
				
			||||||
          })}
 | 
					          })}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
          <ModalRoot onClose={this.handleCloseMedia}>
 | 
					          <ModalRoot backgroundColor={this.state.backgroundColor} onClose={this.handleCloseMedia}>
 | 
				
			||||||
            {this.state.media && (
 | 
					            {this.state.media && (
 | 
				
			||||||
              <MediaModal
 | 
					              <MediaModal
 | 
				
			||||||
                media={this.state.media}
 | 
					                media={this.state.media}
 | 
				
			||||||
                index={this.state.index || 0}
 | 
					                index={this.state.index || 0}
 | 
				
			||||||
                time={this.state.time}
 | 
					                time={this.state.time}
 | 
				
			||||||
                onClose={this.handleCloseMedia}
 | 
					                onClose={this.handleCloseMedia}
 | 
				
			||||||
 | 
					                onChangeBackgroundColor={this.setBackgroundColor}
 | 
				
			||||||
              />
 | 
					              />
 | 
				
			||||||
            )}
 | 
					            )}
 | 
				
			||||||
          </ModalRoot>
 | 
					          </ModalRoot>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue