This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 830
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2940 from matrix-org/jryans/reactions-below-message
Add existing reactions below message
- Loading branch information
Showing
11 changed files
with
268 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| /* | ||
| Copyright 2019 New Vector Ltd | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| .mx_ReactionsRow { | ||
| margin: 6px 0; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /* | ||
| Copyright 2019 New Vector Ltd | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| .mx_ReactionsRowButton { | ||
| display: inline-block; | ||
| height: 20px; | ||
| line-height: 21px; | ||
| margin-right: 6px; | ||
| padding: 0 6px; | ||
| border: 1px solid $reaction-row-button-border-color; | ||
| border-radius: 10px; | ||
| background-color: $reaction-row-button-bg-color; | ||
| cursor: pointer; | ||
|
|
||
| &:hover { | ||
| border-color: $reaction-row-button-hover-border-color; | ||
| } | ||
|
|
||
| &.mx_ReactionsRowButton_selected { | ||
| background-color: $reaction-row-button-selected-bg-color; | ||
| border-color: $reaction-row-button-selected-border-color; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /* | ||
| Copyright 2019 New Vector Ltd | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
|
|
||
| import sdk from '../../../index'; | ||
| import { isContentActionable } from '../../../utils/EventUtils'; | ||
|
|
||
| // TODO: Actually load reactions from the timeline | ||
| // Since we don't yet load reactions, let's inject some dummy data for testing the UI | ||
| // only. The UI assumes these are already sorted into the order we want to present, | ||
| // presumably highest vote first. | ||
| const SAMPLE_REACTIONS = { | ||
| "👍": 4, | ||
| "👎": 2, | ||
| "🙂": 1, | ||
| }; | ||
|
|
||
| export default class ReactionsRow extends React.PureComponent { | ||
| static propTypes = { | ||
| // The event we're displaying reactions for | ||
| mxEvent: PropTypes.object.isRequired, | ||
| } | ||
|
|
||
| render() { | ||
| const { mxEvent } = this.props; | ||
|
|
||
| if (!isContentActionable(mxEvent)) { | ||
| return null; | ||
| } | ||
|
|
||
| const content = mxEvent.getContent(); | ||
| // TODO: Remove this once we load real reactions | ||
| if (!content.body || content.body !== "reactions test") { | ||
| return null; | ||
| } | ||
|
|
||
| const ReactionsRowButton = sdk.getComponent('messages.ReactionsRowButton'); | ||
| const items = Object.entries(SAMPLE_REACTIONS).map(([content, count]) => { | ||
| return <ReactionsRowButton | ||
| key={content} | ||
| content={content} | ||
| count={count} | ||
| />; | ||
| }); | ||
|
|
||
| return <div className="mx_ReactionsRow"> | ||
| {items} | ||
| </div>; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /* | ||
| Copyright 2019 New Vector Ltd | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import classNames from 'classnames'; | ||
|
|
||
| export default class ReactionsRowButton extends React.PureComponent { | ||
| static propTypes = { | ||
| content: PropTypes.string.isRequired, | ||
| count: PropTypes.number.isRequired, | ||
| } | ||
|
|
||
| constructor(props) { | ||
| super(props); | ||
|
|
||
| // TODO: This should be derived from actual reactions you may have sent | ||
| // once we have some API to read them. | ||
| this.state = { | ||
| selected: false, | ||
| }; | ||
| } | ||
|
|
||
| onClick = (ev) => { | ||
| const state = this.state.selected; | ||
| this.setState({ | ||
| selected: !state, | ||
| }); | ||
| // TODO: Send the reaction event | ||
| }; | ||
|
|
||
| render() { | ||
| const { content, count } = this.props; | ||
| const { selected } = this.state; | ||
|
|
||
| const classes = classNames({ | ||
| mx_ReactionsRowButton: true, | ||
| mx_ReactionsRowButton_selected: selected, | ||
| }); | ||
|
|
||
| let adjustedCount = count; | ||
| if (selected) { | ||
| adjustedCount++; | ||
| } | ||
|
|
||
| return <span className={classes} | ||
| onClick={this.onClick} | ||
| > | ||
| {content} {adjustedCount} | ||
| </span>; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /* | ||
| Copyright 2019 New Vector Ltd | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| import { EventStatus } from 'matrix-js-sdk'; | ||
|
|
||
| /** | ||
| * Returns whether an event should allow actions like reply, reactions, edit, etc. | ||
| * which effectively checks whether it's a regular message that has been sent and that we | ||
| * can display. | ||
| * | ||
| * @param {MatrixEvent} mxEvent The event to check | ||
| * @returns {boolean} true if actionable | ||
| */ | ||
| export function isContentActionable(mxEvent) { | ||
| const { status: eventStatus } = mxEvent; | ||
|
|
||
| // status is SENT before remote-echo, null after | ||
| const isSent = !eventStatus || eventStatus === EventStatus.SENT; | ||
|
|
||
| if (isSent && mxEvent.getType() === 'm.room.message') { | ||
| const content = mxEvent.getContent(); | ||
| if ( | ||
| content.msgtype && | ||
| content.msgtype !== 'm.bad.encrypted' && | ||
| content.hasOwnProperty('body') | ||
| ) { | ||
| return true; | ||
| } | ||
| } | ||
|
|
||
| return false; | ||
| } |