- { _t('Forward Message') }
+ if (isContentActionable(mxEvent)) {
+ forwardButton = (
+
+ { _t('Forward Message') }
+
+ );
+
+ if (this.state.canPin) {
+ pinButton = (
+
+ { this._isPinned() ? _t('Unpin Message') : _t('Pin Message') }
);
-
- if (this.state.canPin) {
- pinButton = (
-
- { this._isPinned() ? _t('Unpin Message') : _t('Pin Message') }
-
- );
- }
}
}
diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.js
index 276a142ccb..76bae137f5 100644
--- a/src/components/views/messages/MessageActionBar.js
+++ b/src/components/views/messages/MessageActionBar.js
@@ -16,7 +16,7 @@ limitations under the License.
import React from 'react';
import PropTypes from 'prop-types';
-import {EventStatus} from 'matrix-js-sdk';
+import classNames from 'classnames';
import { _t } from '../../../languageHandler';
import sdk from '../../../index';
@@ -24,7 +24,7 @@ import dis from '../../../dispatcher';
import Modal from '../../../Modal';
import { createMenu } from '../../structures/ContextualMenu';
import SettingsStore from '../../../settings/SettingsStore';
-import classNames from 'classnames';
+import { isContentActionable } from '../../../utils/EventUtils';
export default class MessageActionBar extends React.PureComponent {
static propTypes = {
@@ -123,27 +123,6 @@ export default class MessageActionBar extends React.PureComponent {
this.onFocusChange(true);
}
- isContentActionable() {
- const { mxEvent } = this.props;
- 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;
- }
-
isReactionsEnabled() {
return SettingsStore.isFeatureEnabled("feature_reactions");
}
@@ -220,7 +199,7 @@ export default class MessageActionBar extends React.PureComponent {
let likeDimensionReactionButtons;
let replyButton;
- if (this.isContentActionable()) {
+ if (isContentActionable(this.props.mxEvent)) {
agreeDimensionReactionButtons = this.renderAgreeDimension();
likeDimensionReactionButtons = this.renderLikeDimension();
replyButton =
{
+ return ;
+ });
+
+ return
+ {items}
+
;
+ }
+}
diff --git a/src/components/views/messages/ReactionsRowButton.js b/src/components/views/messages/ReactionsRowButton.js
new file mode 100644
index 0000000000..985479a237
--- /dev/null
+++ b/src/components/views/messages/ReactionsRowButton.js
@@ -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
+ {content} {adjustedCount}
+ ;
+ }
+}
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index dd0a7aa47b..6bec3f4fff 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -622,6 +622,14 @@ module.exports = withMatrixClient(React.createClass({