Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Allow expanding the left panel manually when in narrow mode #2541

Merged
merged 2 commits into from
Jan 31, 2019
Merged

Allow expanding the left panel manually when in narrow mode #2541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3251a05
allow LoggedInView to override collapseLhs
bwindels Jan 31, 2019
0450f43
clarify how lhs collapsed state is stored
bwindels Jan 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/components/structures/LoggedInView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,11 @@ const LoggedInView = React.createClass({
const collapseConfig = {
toggleSize: 260 - 50,
onCollapsed: (collapsed) => {
this.setState({collapseLhs: collapsed});
if (collapsed) {
dis.dispatch({action: "hide_left_panel"}, true);
window.localStorage.setItem("mx_lhs_size", '0');
} else {
dis.dispatch({action: "show_left_panel"}, true);
}
},
onResized: (size) => {
Expand Down Expand Up @@ -540,7 +542,7 @@ const LoggedInView = React.createClass({
<div ref={this._setResizeContainerRef} className={bodyClasses}>
<LeftPanel
toolbarShown={!!topBar}
collapsed={this.props.collapseLhs || this.state.collapseLhs || false}
collapsed={this.props.collapseLhs || false}
disabled={this.props.leftDisabled}
/>
<ResizeHandle />
Expand Down
2 changes: 1 addition & 1 deletion src/components/structures/MatrixChat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ export default React.createClass({

// If we're trying to just view a user ID (i.e. /user URL), this is it
viewUserId: null,

// this is persisted as mx_lhs_size, loaded in LoggedInView
collapseLhs: false,
collapsedRhs: window.localStorage.getItem("mx_rhs_collapsed") === "true",
leftDisabled: false,
Expand Down