forked from matrix/element-web
Getting click to not collapse expand when header stuck
This commit is contained in:
parent
d2937c2aed
commit
5467fd89d8
|
@ -17,6 +17,7 @@ limitations under the License.
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var React = require('react');
|
var React = require('react');
|
||||||
|
var ReactDOM = require('react-dom');
|
||||||
var classNames = require('classnames');
|
var classNames = require('classnames');
|
||||||
var DropTarget = require('react-dnd').DropTarget;
|
var DropTarget = require('react-dnd').DropTarget;
|
||||||
var sdk = require('matrix-react-sdk')
|
var sdk = require('matrix-react-sdk')
|
||||||
|
@ -114,7 +115,13 @@ var RoomSubList = React.createClass({
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
isHeaderStuck: function() {
|
||||||
|
var stuck = this.refs.header.dataset.stuck;
|
||||||
|
return stuck !== undefined && (stuck === "top" || stuck === "bottom");
|
||||||
|
},
|
||||||
|
|
||||||
onClick: function(ev) {
|
onClick: function(ev) {
|
||||||
|
if (!this.isHeaderStuck()) {
|
||||||
// Collapse and truncation logic
|
// Collapse and truncation logic
|
||||||
var isHidden = false;
|
var isHidden = false;
|
||||||
var isTruncatable = this.props.list.length > TRUNCATE_AT;
|
var isTruncatable = this.props.list.length > TRUNCATE_AT;
|
||||||
|
@ -153,7 +160,9 @@ var RoomSubList = React.createClass({
|
||||||
}
|
}
|
||||||
|
|
||||||
this.props.onShowMoreRooms();
|
this.props.onShowMoreRooms();
|
||||||
this.props.onHeaderClick(isHidden);
|
}
|
||||||
|
ev.persist();
|
||||||
|
this.props.onHeaderClick(ev, isHidden);
|
||||||
},
|
},
|
||||||
|
|
||||||
tsOfNewestEvent: function(room) {
|
tsOfNewestEvent: function(room) {
|
||||||
|
@ -406,7 +415,7 @@ var RoomSubList = React.createClass({
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="mx_RoomSubList_labelContainer">
|
<div className="mx_RoomSubList_labelContainer" ref="header">
|
||||||
<div onClick={ this.onClick } className="mx_RoomSubList_label">
|
<div onClick={ this.onClick } className="mx_RoomSubList_label">
|
||||||
{ this.props.collapsed ? '' : this.props.label }
|
{ this.props.collapsed ? '' : this.props.label }
|
||||||
<div className="mx_RoomSubList_roomCount">{roomCount}</div>
|
<div className="mx_RoomSubList_roomCount">{roomCount}</div>
|
||||||
|
|
|
@ -49,6 +49,7 @@ limitations under the License.
|
||||||
flex: 1 1 0;
|
flex: 1 1 0;
|
||||||
|
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
|
z-index: 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_LeftPanel.collapsed .mx_BottomLeftMenu {
|
.mx_LeftPanel.collapsed .mx_BottomLeftMenu {
|
||||||
|
|
|
@ -40,14 +40,13 @@ limitations under the License.
|
||||||
padding-bottom: 6px;
|
padding-bottom: 6px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
background-color: rgba(118, 207, 166, 0.2);
|
background-color: rgba(118, 207, 166, 0.2);
|
||||||
z-index: 3;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_RoomSubList_label.mx_RoomSubList_fixed {
|
.mx_RoomSubList_label.mx_RoomSubList_fixed {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top: 0;
|
top: 0;
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
pointer-events: none;
|
/* pointer-events: none; */
|
||||||
}
|
}
|
||||||
|
|
||||||
.collapsed .mx_RoomSubList_label {
|
.collapsed .mx_RoomSubList_label {
|
||||||
|
|
Loading…
Reference in New Issue