Hack around a react warning
when login completes, we replace the whole state, which means we unset collapse_lhs, which then leads to complaints from the RoomList. I think the 'default view' for MatrixChat ought to be factored out to another component, which could manage collapse_lhs properly; but for now, hack around it.pull/21833/head
parent
0351ab0a3d
commit
a1d3db76e5
|
@ -1093,7 +1093,7 @@ module.exports = React.createClass({
|
|||
<div className="mx_MatrixChat_wrapper">
|
||||
{topBar}
|
||||
<div className={bodyClasses}>
|
||||
<LeftPanel selectedRoom={this.state.currentRoomId} collapsed={this.state.collapse_lhs} opacity={this.state.sideOpacity}/>
|
||||
<LeftPanel selectedRoom={this.state.currentRoomId} collapsed={this.state.collapse_lhs || false} opacity={this.state.sideOpacity}/>
|
||||
<main className="mx_MatrixChat_middlePanel">
|
||||
{page_element}
|
||||
</main>
|
||||
|
|
|
@ -33,7 +33,7 @@ module.exports = React.createClass({
|
|||
|
||||
propTypes: {
|
||||
ConferenceHandler: React.PropTypes.any,
|
||||
collapsed: React.PropTypes.bool,
|
||||
collapsed: React.PropTypes.bool.isRequired,
|
||||
currentRoom: React.PropTypes.string,
|
||||
searchFilter: React.PropTypes.string,
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue