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

Merge pull request #3773 from matrix-org/t3chguy/fix_incoming_call_dup 

Fix duplicate Incoming Call prompt on Community Invite sublist
pull/21833/head
Michael Telatynski 2019-12-23 18:10:51 +00:00 committed by GitHub
parent 6e9791c950 e552195701
commit 659644e612
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/views/rooms/RoomList.js
View File

@ -636,7 +636,6 @@ module.exports = createReactClass({
const defaultProps = {
collapsed: this.props.collapsed,
isFiltered: !!this.props.searchFilter,
incomingCall: this.state.incomingCall,
};
subListsProps.forEach((p) => {
@ -649,7 +648,7 @@ module.exports = createReactClass({
}));
return subListsProps.reduce((components, props, i) => {
props = Object.assign({}, defaultProps, props);
props = {...defaultProps, ...props};
const isLast = i === subListsProps.length - 1;
const len = props.list.length + (props.extraTiles ? props.extraTiles.length : 0);
const {key, label, onHeaderClick, ...otherProps} = props;
@ -660,12 +659,12 @@ module.exports = createReactClass({
onHeaderClick(collapsed);
}
};
let startAsHidden = props.startAsHidden || this.collapsedState[chosenKey];
const startAsHidden = props.startAsHidden || this.collapsedState[chosenKey];
this._layoutSections.push({
id: chosenKey,
count: len,
});
let subList = (<RoomSubList
const subList = (<RoomSubList
ref={this._subListRef.bind(this, chosenKey)}
startAsHidden={startAsHidden}
forceExpand={!!this.props.searchFilter}