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

Fix duplicate Incoming Call prompt on Community Invite sublist

pull/21833/head
Michael Telatynski 2019-12-23 17:57:53 +00:00
parent 0b62f8a62f
commit e552195701
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 = { const defaultProps = {
collapsed: this.props.collapsed, collapsed: this.props.collapsed,
isFiltered: !!this.props.searchFilter, isFiltered: !!this.props.searchFilter,
incomingCall: this.state.incomingCall,
}; };
subListsProps.forEach((p) => { subListsProps.forEach((p) => {
@ -649,7 +648,7 @@ module.exports = createReactClass({
})); }));
return subListsProps.reduce((components, props, i) => { return subListsProps.reduce((components, props, i) => {
props = Object.assign({}, defaultProps, props); props = {...defaultProps, ...props};
const isLast = i === subListsProps.length - 1; const isLast = i === subListsProps.length - 1;
const len = props.list.length + (props.extraTiles ? props.extraTiles.length : 0); const len = props.list.length + (props.extraTiles ? props.extraTiles.length : 0);
const {key, label, onHeaderClick, ...otherProps} = props; const {key, label, onHeaderClick, ...otherProps} = props;
@ -660,12 +659,12 @@ module.exports = createReactClass({
onHeaderClick(collapsed); onHeaderClick(collapsed);
} }
}; };
let startAsHidden = props.startAsHidden || this.collapsedState[chosenKey]; const startAsHidden = props.startAsHidden || this.collapsedState[chosenKey];
this._layoutSections.push({ this._layoutSections.push({
id: chosenKey, id: chosenKey,
count: len, count: len,
}); });
let subList = (<RoomSubList const subList = (<RoomSubList
ref={this._subListRef.bind(this, chosenKey)} ref={this._subListRef.bind(this, chosenKey)}
startAsHidden={startAsHidden} startAsHidden={startAsHidden}
forceExpand={!!this.props.searchFilter} forceExpand={!!this.props.searchFilter}