Fix some react warnings firing

pull/21833/head
Luke Barnard 2017-11-01 17:12:22 +00:00
parent 273aae207a
commit 0dcd52d88f
2 changed files with 15 additions and 13 deletions

View File

@ -54,11 +54,11 @@ export default React.createClass({
// extract the props we use from props so we can pass any others through // extract the props we use from props so we can pass any others through
// should consider adding this as a global rule in js-sdk? // should consider adding this as a global rule in js-sdk?
/*eslint no-unused-vars: ["error", { "ignoreRestSiblings": true }]*/ /*eslint no-unused-vars: ["error", { "ignoreRestSiblings": true }]*/
const {groupId, groupAvatarUrl, ...otherProps} = this.props; const {groupId, groupAvatarUrl, groupName, ...otherProps} = this.props;
return ( return (
<BaseAvatar <BaseAvatar
name={this.props.groupName || this.props.groupId[1]} name={groupName || this.props.groupId[1]}
idName={this.props.groupId} idName={this.props.groupId}
url={this.getGroupAvatarUrl()} url={this.getGroupAvatarUrl()}
{...otherProps} {...otherProps}

View File

@ -29,18 +29,20 @@ function getDisplayAliasForRoom(room) {
} }
const RoomDetailRow = React.createClass({ const RoomDetailRow = React.createClass({
propTypes: PropTypes.shape({ propTypes: {
name: PropTypes.string, room: PropTypes.shape({
topic: PropTypes.string, name: PropTypes.string,
roomId: PropTypes.string, topic: PropTypes.string,
avatarUrl: PropTypes.string, roomId: PropTypes.string,
numJoinedMembers: PropTypes.number, avatarUrl: PropTypes.string,
canonicalAlias: PropTypes.string, numJoinedMembers: PropTypes.number,
aliases: PropTypes.arrayOf(PropTypes.string), canonicalAlias: PropTypes.string,
aliases: PropTypes.arrayOf(PropTypes.string),
worldReadable: PropTypes.bool, worldReadable: PropTypes.bool,
guestCanJoin: PropTypes.bool, guestCanJoin: PropTypes.bool,
}), }),
},
onClick: function(ev) { onClick: function(ev) {
ev.preventDefault(); ev.preventDefault();