mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-24 18:25:49 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2321 from matrix-org/bwindels/persistcollapsedandrhssize

Browse source 
Redesign: resizer persistence
This commit is contained in:
Bruno Windels 2018-12-04 09:27:30 +00:00 committed by GitHub
commit 7936e1a0b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/components/structures/MainSplit.js
View file

@ -23,6 +23,11 @@ export default class MainSplit extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
this._setResizeContainerRef = this._setResizeContainerRef.bind(this); this._setResizeContainerRef = this._setResizeContainerRef.bind(this);
this._onResized = this._onResized.bind(this);
}
_onResized(size) {
window.localStorage.setItem("mx_rhs_size", size);
} }
_createResizer() { _createResizer() {
@ -33,7 +38,9 @@ export default class MainSplit extends React.Component {
}; };
const resizer = new Resizer( const resizer = new Resizer(
this.resizeContainer, this.resizeContainer,
FixedDistributor); FixedDistributor,
{onResized: this._onResized},
);
resizer.setClassNames(classNames); resizer.setClassNames(classNames);
const rhsSize = window.localStorage.getItem("mx_rhs_size"); const rhsSize = window.localStorage.getItem("mx_rhs_size");
if (rhsSize !== null) { if (rhsSize !== null) {

25
src/components/views/rooms/RoomList.js
View file

@ -72,8 +72,9 @@ module.exports = React.createClass({
getInitialState: function() { getInitialState: function() {
const sizesJson = window.localStorage.getItem("mx_roomlist_sizes"); const sizesJson = window.localStorage.getItem("mx_roomlist_sizes");
const collapsedJson = window.localStorage.getItem("mx_roomlist_collapsed");
this.subListSizes = sizesJson ? JSON.parse(sizesJson) : {}; this.subListSizes = sizesJson ? JSON.parse(sizesJson) : {};
this.collapsedState = collapsedJson ? JSON.parse(collapsedJson) : {};
return { return {
isLoadingLeftRooms: false, isLoadingLeftRooms: false,
totalRoomCount: null, totalRoomCount: null,
@ -474,6 +475,11 @@ module.exports = React.createClass({
(filter[0] === '#' && room.getAliases().some((alias) => alias.toLowerCase().startsWith(lcFilter)))); (filter[0] === '#' && room.getAliases().some((alias) => alias.toLowerCase().startsWith(lcFilter))));
}, },
_persistCollapsedState: function(key, collapsed) {
this.collapsedState[key] = collapsed;
window.localStorage.setItem("mx_roomlist_collapsed", JSON.stringify(this.collapsedState));
},
_mapSubListProps: function(subListsProps) { _mapSubListProps: function(subListsProps) {
const defaultProps = { const defaultProps = {
collapsed: this.props.collapsed, collapsed: this.props.collapsed,
@ -493,10 +499,23 @@ module.exports = React.createClass({
return subListsProps.reduce((components, props, i) => { return subListsProps.reduce((components, props, i) => {
props = Object.assign({}, defaultProps, props); props = Object.assign({}, defaultProps, props);
const isLast = i === subListsProps.length - 1; const isLast = i === subListsProps.length - 1;
const {key, label, ... otherProps} = props; const {key, label, onHeaderClick, ... otherProps} = props;
const chosenKey = key || label; const chosenKey = key || label;
const onSubListHeaderClick = (collapsed) => {
this._persistCollapsedState(chosenKey, collapsed);
if (onHeaderClick) {
onHeaderClick(collapsed);
}
};
const startAsHidden = props.startAsHidden || this.collapsedState[chosenKey];
let subList = (<RoomSubList
startAsHidden={startAsHidden}
onHeaderClick={onSubListHeaderClick}
key={chosenKey}
label={label}
{...otherProps} />);
let subList = <RoomSubList key={chosenKey} label={label} {...otherProps} />;
if (!isLast) { if (!isLast) {
return components.concat( return components.concat(
subList, subList,