matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-05 23:10:41 +03:00
Code Activity

Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash

Browse Source
This commit is contained in:
Germain Souquet
2021-06-02 13:54:05 +01:00
parent ecff5bd65c 9d126c51e4
commit bc50028f70
96 changed files with 4936 additions and 1483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -902,13 +902,13 @@ export default class ScrollPanel extends React.Component {
onScroll={this.onScroll}
onWheel={this.props.onUserScroll}
className={`mx_ScrollPanel ${this.props.className}`} style={this.props.style}>
{ this.props.fixedChildren }
<div className="mx_RoomView_messageListWrapper">
<ol ref={this._itemlist} className="mx_RoomView_MessageList" aria-live="polite" role="list">
{ this.props.children }
</ol>
</div>
</AutoHideScrollbar>
);
{ this.props.fixedChildren }
<div className="mx_RoomView_messageListWrapper">
<ol ref={this._itemlist} className="mx_RoomView_MessageList" aria-live="polite" role="list">
{ this.props.children }
</ol>
</div>
</AutoHideScrollbar>
);
}
}