matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-11 20:22:36 +03:00
Code Activity

Merge branch 'develop' into travis/3pid-invites

Browse Source
This commit is contained in:
Travis Ralston
2020-09-14 11:50:08 -06:00
parent ac300a293e ab91ce4b2d
commit 61e8d3e3d7
8 changed files with 130 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -198,7 +198,8 @@ export default class ScrollPanel extends React.Component {
}
onScroll = ev => {
if (this.props.resizeNotifier.isResizing) return; // skip scroll events caused by resizing
// skip scroll events caused by resizing
if (this.props.resizeNotifier && this.props.resizeNotifier.isResizing) return;
debuglog("onScroll", this._getScrollNode().scrollTop);
this._scrollTimeout.restart();
this._saveScrollState();

7
src/components/views/settings/tabs/room/BridgeSettingsTab.tsx
View File

@@ -46,9 +46,10 @@ export default class BridgeSettingsTab extends React.Component<IProps> {
const client = MatrixClientPeg.get();
const roomState = client.getRoom(roomId).currentState;
return [].concat(...BRIDGE_EVENT_TYPES.map((typeName) =>
Array.from(roomState.events.get(typeName).values()),
));
return BRIDGE_EVENT_TYPES.map(typeName => {
const events = roomState.events.get(typeName);
return events ? Array.from(events.values()) : [];
}).flat(1);
}
render() {