PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

put repeated props in process function

Browse source
This commit is contained in:
Bruno Windels 2018-10-18 15:15:56 +02:00
parent c12368ea48
commit 99982b1164
1 changed files with 7 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/components/views/rooms/RoomList.js
View file

@ -511,6 +511,13 @@ module.exports = React.createClass({
const self = this; const self = this;
function mapProps(subListsProps) { function mapProps(subListsProps) {
const defaultProps = {
collapsed: self.props.collapsed,
searchFilter: self.props.searchFilter,
onShowMoreRooms: self.onShowMoreRooms,
showEmpty: showEmpty,
incomingCall: self.state.incomingCall,
};
return subListsProps.map((props) => { return subListsProps.map((props) => {
const {key, label, ... otherProps} = props; const {key, label, ... otherProps} = props;
const chosenKey = key || label; const chosenKey = key || label;
@ -525,21 +532,12 @@ module.exports = React.createClass({
label: _t('Community Invites'), label: _t('Community Invites'),
order: "recent", order: "recent",
isInvite: true, isInvite: true,
collapsed: self.props.collapsed,
searchFilter: self.props.searchFilter,
onShowMoreRooms: self.onShowMoreRooms,
showEmpty: showEmpty,
}, },
{ {
list: self.state.lists['im.vector.fake.invite'], list: self.state.lists['im.vector.fake.invite'],
label: _t('Invites'), label: _t('Invites'),
order: "recent", order: "recent",
isInvite: true, isInvite: true,
incomingCall: self.state.incomingCall,
collapsed: self.props.collapsed,
searchFilter: self.props.searchFilter,
onShowMoreRooms: self.onShowMoreRooms,
showEmpty: showEmpty,
}, },
{ {
list: self.state.lists['m.favourite'], list: self.state.lists['m.favourite'],
@ -547,11 +545,6 @@ module.exports = React.createClass({
tagName: "m.favourite", tagName: "m.favourite",
emptyContent: this._getEmptyContent('m.favourite'), emptyContent: this._getEmptyContent('m.favourite'),
order: "manual", order: "manual",
incomingCall: self.state.incomingCall,
collapsed: self.props.collapsed,
searchFilter: self.props.searchFilter,
onShowMoreRooms: self.onShowMoreRooms,
showEmpty: showEmpty,
}, },
{ {
list: self.state.lists['im.vector.fake.direct'], list: self.state.lists['im.vector.fake.direct'],
@ -560,12 +553,7 @@ module.exports = React.createClass({
emptyContent: this._getEmptyContent('im.vector.fake.direct'), emptyContent: this._getEmptyContent('im.vector.fake.direct'),
headerItems: this._getHeaderItems('im.vector.fake.direct'), headerItems: this._getHeaderItems('im.vector.fake.direct'),
order: "recent", order: "recent",
incomingCall: self.state.incomingCall,
collapsed: self.props.collapsed,
alwaysShowHeader: true, alwaysShowHeader: true,
searchFilter: self.props.searchFilter,
onShowMoreRooms: self.onShowMoreRooms,
showEmpty: showEmpty,
}, },
{ {
list: self.state.lists['im.vector.fake.recent'], list: self.state.lists['im.vector.fake.recent'],
@ -573,11 +561,6 @@ module.exports = React.createClass({
emptyContent: this._getEmptyContent('im.vector.fake.recent'), emptyContent: this._getEmptyContent('im.vector.fake.recent'),
headerItems: this._getHeaderItems('im.vector.fake.recent'), headerItems: this._getHeaderItems('im.vector.fake.recent'),
order: "recent", order: "recent",
incomingCall: self.state.incomingCall,
collapsed: self.props.collapsed,
searchFilter: self.props.searchFilter,
onShowMoreRooms: self.onShowMoreRooms,
showEmpty: showEmpty,
}, },
]; ];
const tagSubLists = Object.keys(self.state.lists) const tagSubLists = Object.keys(self.state.lists)
@ -591,11 +574,6 @@ module.exports = React.createClass({
tagName: tagName, tagName: tagName,
emptyContent: this._getEmptyContent(tagName), emptyContent: this._getEmptyContent(tagName),
order: "manual", order: "manual",
incomingCall: self.state.incomingCall,
collapsed: self.props.collapsed,
searchFilter: self.props.searchFilter,
onShowMoreRooms: self.onShowMoreRooms,
showEmpty: showEmpty,
}; };
}); });
subLists = subLists.concat(tagSubLists); subLists = subLists.concat(tagSubLists);
@ -606,11 +584,6 @@ module.exports = React.createClass({
tagName: "m.lowpriority", tagName: "m.lowpriority",
emptyContent: this._getEmptyContent('m.lowpriority'), emptyContent: this._getEmptyContent('m.lowpriority'),
order: "recent", order: "recent",
incomingCall: self.state.incomingCall,
collapsed: self.props.collapsed,
searchFilter: self.props.searchFilter,
onShowMoreRooms: self.onShowMoreRooms,
showEmpty: showEmpty,
}, },
{ {
list: self.state.lists['im.vector.fake.archived'], list: self.state.lists['im.vector.fake.archived'],
@ -623,26 +596,16 @@ module.exports = React.createClass({
</div>, </div>,
label: _t('Historical'), label: _t('Historical'),
order: "recent", order: "recent",
collapsed: self.props.collapsed,
alwaysShowHeader: true, alwaysShowHeader: true,
startAsHidden: true, startAsHidden: true,
showSpinner: self.state.isLoadingLeftRooms, showSpinner: self.state.isLoadingLeftRooms,
onHeaderClick: self.onArchivedHeaderClick, onHeaderClick: self.onArchivedHeaderClick,
incomingCall: self.state.incomingCall,
searchFilter: self.props.searchFilter,
onShowMoreRooms: self.onShowMoreRooms,
showEmpty: showEmpty,
}, },
{ {
list: self.state.lists['m.server_notice'], list: self.state.lists['m.server_notice'],
label: _t('System Alerts'), label: _t('System Alerts'),
tagName: "m.lowpriority", tagName: "m.lowpriority",
order: "recent", order: "recent",
incomingCall: self.state.incomingCall,
collapsed: self.props.collapsed,
searchFilter: self.props.searchFilter,
onShowMoreRooms: self.onShowMoreRooms,
showEmpty: false,
}, },
]); ]);