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
Этот коммит содержится в:
Joram Wilander
2016-11-04 11:21:14 -04:00
коммит произвёл Harrison Healey
родитель dbdd719c51
Коммит e6f7a47c99
17 изменённых файлов: 231 добавлений и 243 удалений

Просмотреть файл

@@ -715,6 +715,16 @@ export default class Sidebar extends React.Component {
}
}
let moreDirectChannelsModal;
if (this.state.showDirectChannelsModal) {
moreDirectChannelsModal = (
<MoreDirectChannels
show={true}
onModalDismissed={this.hideMoreDirectChannelsModal}
/>
);
}
return (
<div
className='sidebar--left'
@@ -726,10 +736,7 @@ export default class Sidebar extends React.Component {
channelType={this.state.newChannelModalType}
onModalDismissed={this.hideNewChannelModal}
/>
<MoreDirectChannels
show={this.state.showDirectChannelsModal}
onModalDismissed={this.hideMoreDirectChannelsModal}
/>
{moreDirectChannelsModal}
<SidebarHeader
teamDisplayName={this.state.currentTeam.display_name}