OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4197 from matrix-org/t3chguy/dont_remount_main_split 

Don't remount main split children on rhs collapse
pull/21833/head
Michael Telatynski 2020-03-11 09:21:01 +00:00 committed by GitHub
parent 1ae4a1cd5b 78ffb3ddf4
commit f9954a668c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/structures/MainSplit.js
View File

@ -93,14 +93,19 @@ export default class MainSplit extends React.Component {
const bodyView = React.Children.only(this.props.children); const bodyView = React.Children.only(this.props.children);
const panelView = this.props.panel; const panelView = this.props.panel;
if (this.props.collapsedRhs || !panelView) { const hasResizer = !this.props.collapsedRhs && panelView;
return bodyView;
} else { let children;
return <div className="mx_MainSplit" ref={this._setResizeContainerRef}> if (hasResizer) {
{ bodyView } children = <React.Fragment>
<ResizeHandle reverse={true} /> <ResizeHandle reverse={true} />
{ panelView } { panelView }
</div>; </React.Fragment>;
} }
return <div className="mx_MainSplit" ref={hasResizer ? this._setResizeContainerRef : undefined}>
{ bodyView }
{ children }
</div>;
} }
} }