Use basic read path from JS SDK for reactions

This displays existing reactions correctly in the action bar and reaction row,
but it doesn't yet update after a new reaction is sent.
This commit is contained in:
J. Ryan Stinnett 2019-05-08 18:16:27 +01:00
parent 8903f65fcb
commit 8fdb59a909
6 changed files with 76 additions and 23 deletions

View file

@ -92,6 +92,9 @@ module.exports = React.createClass({
// show timestamps always // show timestamps always
alwaysShowTimestamps: PropTypes.bool, alwaysShowTimestamps: PropTypes.bool,
// helper function to access relations for an event
getRelationsForEvent: PropTypes.func,
}, },
componentWillMount: function() { componentWillMount: function() {
@ -529,6 +532,7 @@ module.exports = React.createClass({
permalinkCreator={this.props.permalinkCreator} permalinkCreator={this.props.permalinkCreator}
last={last} last={last}
isSelectedEvent={highlight} isSelectedEvent={highlight}
getRelationsForEvent={this.props.getRelationsForEvent}
/> />
</li>, </li>,
); );

View file

@ -1168,6 +1168,10 @@ const TimelinePanel = React.createClass({
}); });
}, },
getRelationsForEvent(...args) {
return this.props.timelineSet.getRelationsForEvent(...args);
},
render: function() { render: function() {
const MessagePanel = sdk.getComponent("structures.MessagePanel"); const MessagePanel = sdk.getComponent("structures.MessagePanel");
const Loader = sdk.getComponent("elements.Spinner"); const Loader = sdk.getComponent("elements.Spinner");
@ -1239,6 +1243,7 @@ const TimelinePanel = React.createClass({
className={this.props.className} className={this.props.className}
tileShape={this.props.tileShape} tileShape={this.props.tileShape}
resizeNotifier={this.props.resizeNotifier} resizeNotifier={this.props.resizeNotifier}
getRelationsForEvent={this.getRelationsForEvent}
/> />
); );
}, },

View file

@ -28,6 +28,8 @@ import { isContentActionable } from '../../../utils/EventUtils';
export default class MessageActionBar extends React.PureComponent { export default class MessageActionBar extends React.PureComponent {
static propTypes = { static propTypes = {
mxEvent: PropTypes.object.isRequired, mxEvent: PropTypes.object.isRequired,
// The Relations model from the JS SDK for reactions to `mxEvent`
reactions: PropTypes.object,
permalinkCreator: PropTypes.object, permalinkCreator: PropTypes.object,
getTile: PropTypes.func, getTile: PropTypes.func,
getReplyThread: PropTypes.func, getReplyThread: PropTypes.func,
@ -113,6 +115,7 @@ export default class MessageActionBar extends React.PureComponent {
return <ReactionDimension return <ReactionDimension
title={_t("Agree or Disagree")} title={_t("Agree or Disagree")}
options={options} options={options}
reactions={this.props.reactions}
/>; />;
} }
@ -135,6 +138,7 @@ export default class MessageActionBar extends React.PureComponent {
return <ReactionDimension return <ReactionDimension
title={_t("Like or Dislike")} title={_t("Like or Dislike")}
options={options} options={options}
reactions={this.props.reactions}
/>; />;
} }

View file

@ -18,20 +18,56 @@ import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import classNames from 'classnames'; import classNames from 'classnames';
import MatrixClientPeg from '../../../MatrixClientPeg';
export default class ReactionDimension extends React.PureComponent { export default class ReactionDimension extends React.PureComponent {
static propTypes = { static propTypes = {
options: PropTypes.array.isRequired, options: PropTypes.array.isRequired,
title: PropTypes.string, title: PropTypes.string,
// The Relations model from the JS SDK for reactions
reactions: PropTypes.object,
}; };
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
selected: null, selected: this.getInitialSelection(),
}; };
} }
getInitialSelection() {
const myReactions = this.getMyReactions();
if (!myReactions) {
return null;
}
const { options } = this.props;
let selected = null;
for (const { key, content } of options) {
const reactionExists = myReactions.some(mxEvent => {
return mxEvent.getContent()["m.relates_to"].key === content;
});
if (reactionExists) {
if (selected) {
// If there are multiple selected values (only expected to occur via
// non-Riot clients), then act as if none are selected.
return null;
}
selected = key;
}
}
return selected;
}
getMyReactions() {
const reactions = this.props.reactions;
if (!reactions) {
return null;
}
const userId = MatrixClientPeg.get().getUserId();
return reactions.getAnnotationsBySender()[userId];
}
onOptionClick = (ev) => { onOptionClick = (ev) => {
const { key } = ev.target.dataset; const { key } = ev.target.dataset;
this.toggleDimensionValue(key); this.toggleDimensionValue(key);

View file

@ -20,37 +20,24 @@ import PropTypes from 'prop-types';
import sdk from '../../../index'; import sdk from '../../../index';
import { isContentActionable } from '../../../utils/EventUtils'; 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 { export default class ReactionsRow extends React.PureComponent {
static propTypes = { static propTypes = {
// The event we're displaying reactions for // The event we're displaying reactions for
mxEvent: PropTypes.object.isRequired, mxEvent: PropTypes.object.isRequired,
// The Relations model from the JS SDK for reactions to `mxEvent`
reactions: PropTypes.object,
} }
render() { render() {
const { mxEvent } = this.props; const { mxEvent, reactions } = this.props;
if (!isContentActionable(mxEvent)) { if (!reactions || !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; return null;
} }
const ReactionsRowButton = sdk.getComponent('messages.ReactionsRowButton'); const ReactionsRowButton = sdk.getComponent('messages.ReactionsRowButton');
const items = Object.entries(SAMPLE_REACTIONS).map(([content, count]) => { const items = reactions.getSortedAnnotationsByKey().map(([content, events]) => {
const count = events.length;
return <ReactionsRowButton return <ReactionsRowButton
key={content} key={content}
content={content} content={content}

View file

@ -159,6 +159,9 @@ module.exports = withMatrixClient(React.createClass({
// show twelve hour timestamps // show twelve hour timestamps
isTwelveHour: PropTypes.bool, isTwelveHour: PropTypes.bool,
// helper function to access relations for an event
getRelationsForEvent: PropTypes.func,
}, },
getDefaultProps: function() { getDefaultProps: function() {
@ -472,6 +475,17 @@ module.exports = withMatrixClient(React.createClass({
return this.refs.replyThread; return this.refs.replyThread;
}, },
getReactions() {
if (
!SettingsStore.isFeatureEnabled("feature_reactions") ||
!this.props.getRelationsForEvent
) {
return null;
}
const eventId = this.props.mxEvent.getId();
return this.props.getRelationsForEvent(eventId, "m.annotation", "m.reaction");
},
render: function() { render: function() {
const MessageTimestamp = sdk.getComponent('messages.MessageTimestamp'); const MessageTimestamp = sdk.getComponent('messages.MessageTimestamp');
const SenderProfile = sdk.getComponent('messages.SenderProfile'); const SenderProfile = sdk.getComponent('messages.SenderProfile');
@ -584,9 +598,11 @@ module.exports = withMatrixClient(React.createClass({
} }
} }
const reactions = this.getReactions();
const MessageActionBar = sdk.getComponent('messages.MessageActionBar'); const MessageActionBar = sdk.getComponent('messages.MessageActionBar');
const actionBar = <MessageActionBar const actionBar = <MessageActionBar
mxEvent={this.props.mxEvent} mxEvent={this.props.mxEvent}
reactions={reactions}
permalinkCreator={this.props.permalinkCreator} permalinkCreator={this.props.permalinkCreator}
getTile={this.getTile} getTile={this.getTile}
getReplyThread={this.getReplyThread} getReplyThread={this.getReplyThread}
@ -630,11 +646,12 @@ module.exports = withMatrixClient(React.createClass({
<ToolTipButton helpText={keyRequestHelpText} /> <ToolTipButton helpText={keyRequestHelpText} />
</div> : null; </div> : null;
let reactions; let reactionsRow;
if (SettingsStore.isFeatureEnabled("feature_reactions")) { if (SettingsStore.isFeatureEnabled("feature_reactions")) {
const ReactionsRow = sdk.getComponent('messages.ReactionsRow'); const ReactionsRow = sdk.getComponent('messages.ReactionsRow');
reactions = <ReactionsRow reactionsRow = <ReactionsRow
mxEvent={this.props.mxEvent} mxEvent={this.props.mxEvent}
reactions={reactions}
/>; />;
} }
@ -750,7 +767,7 @@ module.exports = withMatrixClient(React.createClass({
showUrlPreview={this.props.showUrlPreview} showUrlPreview={this.props.showUrlPreview}
onHeightChanged={this.props.onHeightChanged} /> onHeightChanged={this.props.onHeightChanged} />
{ keyRequestInfo } { keyRequestInfo }
{ reactions } { reactionsRow }
{ actionBar } { actionBar }
</div> </div>
{ {