diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-11-04 11:21:14 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-11-04 11:21:14 -0400 |
| commit | e6f7a47c99075a39d862308659b904bfaf64a11a (patch) | |
| tree | 863f6eb80a2367fb080437d9e037fca283e3c270 /webapp/components/navbar.jsx | |
| parent | dbdd719c51d061dfc327644d4b2ca89a0595b4f1 (diff) | |
| download | chat-e6f7a47c99075a39d862308659b904bfaf64a11a.tar.gz chat-e6f7a47c99075a39d862308659b904bfaf64a11a.tar.bz2 chat-e6f7a47c99075a39d862308659b904bfaf64a11a.zip | |
PLT-4507 Don't mount modals until opened to make resetting state automatic (#4358)
* Don't mount modals until opened to make resetting state automatic
* Move dimiss handler to be fired after modal exit animation complete
Diffstat (limited to 'webapp/components/navbar.jsx')
| -rw-r--r-- | webapp/components/navbar.jsx | 48 |
1 files changed, 26 insertions, 22 deletions
diff --git a/webapp/components/navbar.jsx b/webapp/components/navbar.jsx index 9852e0c59..9721ddee1 100644 --- a/webapp/components/navbar.jsx +++ b/webapp/components/navbar.jsx @@ -730,21 +730,23 @@ export default class Navbar extends React.Component { ); } - editChannelHeaderModal = ( - <EditChannelHeaderModal - show={this.state.showEditChannelHeaderModal} - onHide={() => this.setState({showEditChannelHeaderModal: false})} - channel={channel} - /> - ); + if (this.state.showEditChannelHeaderModal) { + editChannelHeaderModal = ( + <EditChannelHeaderModal + onHide={() => this.setState({showEditChannelHeaderModal: false})} + channel={channel} + /> + ); + } - editChannelPurposeModal = ( - <EditChannelPurposeModal - show={this.state.showEditChannelPurposeModal} - onModalDismissed={() => this.setState({showEditChannelPurposeModal: false})} - channel={channel} - /> - ); + if (this.state.showEditChannelPurposeModal) { + editChannelPurposeModal = ( + <EditChannelPurposeModal + onModalDismissed={() => this.setState({showEditChannelPurposeModal: false})} + channel={channel} + /> + ); + } renameChannelModal = ( <RenameChannelModal @@ -754,14 +756,16 @@ export default class Navbar extends React.Component { /> ); - channelMembersModal = ( - <ChannelMembersModal - show={this.state.showMembersModal} - onModalDismissed={this.hideMembersModal} - channel={channel} - isAdmin={isAdmin} - /> - ); + if (this.state.showMembersModal) { + channelMembersModal = ( + <ChannelMembersModal + show={true} + onModalDismissed={this.hideMembersModal} + channel={channel} + isAdmin={isAdmin} + /> + ); + } channelSwitchModal = ( <ChannelSwitchModal |