Browse Source

Update mediaGallery component's width when opening CWs

closed-social-glitch-2
Thibaut Girka 6 years ago
committed by ThibG
parent
commit
dfa5b0576f
2 changed files with 11 additions and 0 deletions
  1. +10
    -0
      app/javascript/flavours/glitch/components/media_gallery.js
  2. +1
    -0
      app/javascript/flavours/glitch/components/status.js

+ 10
- 0
app/javascript/flavours/glitch/components/media_gallery.js View File

@ -215,6 +215,7 @@ export default class MediaGallery extends React.PureComponent {
standalone: PropTypes.bool,
letterbox: PropTypes.bool,
fullwidth: PropTypes.bool,
hidden: PropTypes.bool,
media: ImmutablePropTypes.list.isRequired,
size: PropTypes.object,
onOpenMedia: PropTypes.func.isRequired,
@ -235,6 +236,14 @@ export default class MediaGallery extends React.PureComponent {
}
}
componentDidUpdate (prevProps) {
if (this.node && this.node.offsetWidth) {
this.setState({
width: this.node.offsetWidth,
});
}
}
handleOpen = () => {
this.setState({ visible: !this.state.visible });
}
@ -244,6 +253,7 @@ export default class MediaGallery extends React.PureComponent {
}
handleRef = (node) => {
this.node = node;
if (node /*&& this.isStandaloneEligible()*/) {
// offsetWidth triggers a layout, so only calculate when we need to
this.setState({

+ 1
- 0
app/javascript/flavours/glitch/components/status.js View File

@ -465,6 +465,7 @@ export default class Status extends ImmutablePureComponent {
sensitive={status.get('sensitive')}
letterbox={settings.getIn(['media', 'letterbox'])}
fullwidth={settings.getIn(['media', 'fullwidth'])}
hidden={isCollapsed || !isExpanded}
onOpenMedia={this.props.onOpenMedia}
/>
)}

Loading…
Cancel
Save