Merge pull request #1890 from matrix-org/matthew/slate

Replace Draft with Slate
This commit is contained in:
David Baker 2018-07-16 14:16:25 +01:00 committed by GitHub
commit d16ac4d80c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 1397 additions and 1141 deletions

View file

@ -62,6 +62,8 @@ const Pill = React.createClass({
room: PropTypes.instanceOf(Room),
// Whether to include an avatar in the pill
shouldShowPillAvatar: PropTypes.bool,
// Whether to render this pill as if it were highlit by a selection
isSelected: PropTypes.bool,
},
@ -268,6 +270,7 @@ const Pill = React.createClass({
const classes = classNames(pillClass, {
"mx_UserPill_me": userId === MatrixClientPeg.get().credentials.userId,
"mx_UserPill_selected": this.props.isSelected,
});
if (this.state.pillType) {