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

dont break room directory and search

pull/21833/head
Bruno Windels 2019-03-18 14:05:56 +01:00
parent 95e61a57bc
commit d84003ac44
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/structures/RoomDirectory.js
View File

@ -551,7 +551,6 @@ module.exports = React.createClass({
onFillRequest={ this.onFillRequest } onFillRequest={ this.onFillRequest }
stickyBottom={false} stickyBottom={false}
startAtBottom={false} startAtBottom={false}
onResize={function() {}}
> >
{ scrollpanel_content } { scrollpanel_content }
</ScrollPanel>; </ScrollPanel>;

1
src/components/structures/RoomView.js
View File

@ -1799,6 +1799,7 @@ module.exports = React.createClass({
<ScrollPanel ref="searchResultsPanel" <ScrollPanel ref="searchResultsPanel"
className="mx_RoomView_messagePanel mx_RoomView_searchResultsPanel" className="mx_RoomView_messagePanel mx_RoomView_searchResultsPanel"
onFillRequest={this.onSearchResultsFillRequest} onFillRequest={this.onSearchResultsFillRequest}
resizeNotifier={this.props.resizeNotifier}
> >
<li className={scrollheader_classes}></li> <li className={scrollheader_classes}></li>
{ this.getSearchResultTiles() } { this.getSearchResultTiles() }

9
src/components/structures/ScrollPanel.js
View File

@ -135,6 +135,9 @@ module.exports = React.createClass({
/* style: styles to add to the top-level div /* style: styles to add to the top-level div
*/ */
style: PropTypes.object, style: PropTypes.object,
/* resizeNotifier: ResizeNotifier to know when middle column has changed size
*/
resizeNotifier: PropTypes.object,
}, },
getDefaultProps: function() { getDefaultProps: function() {
@ -149,7 +152,10 @@ module.exports = React.createClass({
componentWillMount: function() { componentWillMount: function() {
this._pendingFillRequests = {b: null, f: null}; this._pendingFillRequests = {b: null, f: null};
if (this.props.resizeNotifier) {
this.props.resizeNotifier.on("middlePanelResized", this.onResize); this.props.resizeNotifier.on("middlePanelResized", this.onResize);
}
this.resetScrollState(); this.resetScrollState();
}, },
@ -173,7 +179,10 @@ module.exports = React.createClass({
// //
// (We could use isMounted(), but facebook have deprecated that.) // (We could use isMounted(), but facebook have deprecated that.)
this.unmounted = true; this.unmounted = true;
if (this.props.resizeNotifier) {
this.props.resizeNotifier.removeListener("middlePanelResized", this.onResize); this.props.resizeNotifier.removeListener("middlePanelResized", this.onResize);
}
}, },
onScroll: function(ev) { onScroll: function(ev) {