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

allow LoggedInView to override collapseLhs 

by updating prop through the dispatcher instead of
having it's own state that is OR'ed in.

before the state couldn't override the prop and you couldn't
expand the left panel anymore when MatrixChat
decided your viewport was too narrow
pull/21833/head
Bruno Windels 2019-01-31 10:15:27 +01:00
parent 3a23423a43
commit 3251a055c2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/structures/LoggedInView.js
View File

@ -164,9 +164,11 @@ const LoggedInView = React.createClass({
const collapseConfig = { const collapseConfig = {
toggleSize: 260 - 50, toggleSize: 260 - 50,
onCollapsed: (collapsed) => { onCollapsed: (collapsed) => {
this.setState({collapseLhs: collapsed});
if (collapsed) { if (collapsed) {
dis.dispatch({action: "hide_left_panel"}, true);
window.localStorage.setItem("mx_lhs_size", '0'); window.localStorage.setItem("mx_lhs_size", '0');
} else {
dis.dispatch({action: "show_left_panel"}, true);
} }
}, },
onResized: (size) => { onResized: (size) => {
@ -540,7 +542,7 @@ const LoggedInView = React.createClass({
<div ref={this._setResizeContainerRef} className={bodyClasses}> <div ref={this._setResizeContainerRef} className={bodyClasses}>
<LeftPanel <LeftPanel
toolbarShown={!!topBar} toolbarShown={!!topBar}
collapsed={this.props.collapseLhs || this.state.collapseLhs || false} collapsed={this.props.collapseLhs || false}
disabled={this.props.leftDisabled} disabled={this.props.leftDisabled}
/> />
<ResizeHandle /> <ResizeHandle />