astrid
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Keep children of the column-collapsable until the transition is completed (#3218)

pull/3230/head
unarist 2017-05-22 22:01:27 +09:00 committed by Eugen Rochko
parent df92f010ad
commit 361a606edb
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/javascript/mastodon/components/column_collapsable.js
View File

@ -13,30 +13,35 @@ class ColumnCollapsable extends React.PureComponent {
state = { state = {
collapsed: true, collapsed: true,
animating: false,
}; };
handleToggleCollapsed = () => { handleToggleCollapsed = () => {
const currentState = this.state.collapsed; const currentState = this.state.collapsed;
this.setState({ collapsed: !currentState }); this.setState({ collapsed: !currentState, animating: true });
if (!currentState && this.props.onCollapse) { if (!currentState && this.props.onCollapse) {
this.props.onCollapse(); this.props.onCollapse();
} }
} }
handleTransitionEnd = () => {
this.setState({ animating: false });
}
render () { render () {
const { icon, title, fullHeight, children } = this.props; const { icon, title, fullHeight, children } = this.props;
const { collapsed } = this.state; const { collapsed, animating } = this.state;
return ( return (
<div className={`column-collapsable ${collapsed ? 'collapsed' : ''}`}> <div className={`column-collapsable ${collapsed ? 'collapsed' : ''}`} onTransitionEnd={this.handleTransitionEnd}>
<div role='button' tabIndex='0' title={`${title}`} className='column-collapsable__button column-icon' onClick={this.handleToggleCollapsed}> <div role='button' tabIndex='0' title={`${title}`} className='column-collapsable__button column-icon' onClick={this.handleToggleCollapsed}>
<i className={`fa fa-${icon}`} /> <i className={`fa fa-${icon}`} />
</div> </div>
<div className='column-collapsable__content' style={{ height: `${fullHeight}px` }}> <div className='column-collapsable__content' style={{ height: `${fullHeight}px` }}>
{!collapsed && children} {(!collapsed || animating) && children}
</div> </div>
</div> </div>
); );