mirror of
https://github.com/vector-im/element-web.git
synced 2024-11-16 21:24:59 +08:00
Add primary reactions to action bar
This adds the primary reactions to the action bar. They act as toggles where you can only select one from each group at a time. Note that currently we aren't actually sending the reaction at all. That's left for a separate task. Fixes https://github.com/vector-im/riot-web/issues/9576
This commit is contained in:
parent
00ca930d2e
commit
784599d9e9
@ -20,6 +20,7 @@ limitations under the License.
|
|||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
display: flex;
|
display: flex;
|
||||||
height: 24px;
|
height: 24px;
|
||||||
|
line-height: 24px;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
background: $message-action-bar-bg-color;
|
background: $message-action-bar-bg-color;
|
||||||
top: -13px;
|
top: -13px;
|
||||||
@ -49,8 +50,10 @@ limitations under the License.
|
|||||||
&:only-child {
|
&:only-child {
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
&::after {
|
.mx_MessageActionBar_maskButton::after {
|
||||||
content: '';
|
content: '';
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
@ -60,8 +63,6 @@ limitations under the License.
|
|||||||
mask-repeat: no-repeat;
|
mask-repeat: no-repeat;
|
||||||
mask-position: center;
|
mask-position: center;
|
||||||
background-color: $message-action-bar-fg-color;
|
background-color: $message-action-bar-fg-color;
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_MessageActionBar_replyButton::after {
|
.mx_MessageActionBar_replyButton::after {
|
||||||
@ -71,3 +72,13 @@ limitations under the License.
|
|||||||
.mx_MessageActionBar_optionsButton::after {
|
.mx_MessageActionBar_optionsButton::after {
|
||||||
mask-image: url('$(res)/img/icon_context.svg');
|
mask-image: url('$(res)/img/icon_context.svg');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.mx_MessageActionBar_reactionDimension {
|
||||||
|
width: 42px;
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-evenly;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_MessageActionBar_reactionDisabled {
|
||||||
|
opacity: 0.4;
|
||||||
|
}
|
||||||
|
@ -23,6 +23,8 @@ import sdk from '../../../index';
|
|||||||
import dis from '../../../dispatcher';
|
import dis from '../../../dispatcher';
|
||||||
import Modal from '../../../Modal';
|
import Modal from '../../../Modal';
|
||||||
import { createMenu } from '../../structures/ContextualMenu';
|
import { createMenu } from '../../structures/ContextualMenu';
|
||||||
|
import SettingsStore from '../../../settings/SettingsStore';
|
||||||
|
import classNames from 'classnames';
|
||||||
|
|
||||||
export default class MessageActionBar extends React.PureComponent {
|
export default class MessageActionBar extends React.PureComponent {
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -33,6 +35,15 @@ export default class MessageActionBar extends React.PureComponent {
|
|||||||
onFocusChange: PropTypes.func,
|
onFocusChange: PropTypes.func,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
constructor(props) {
|
||||||
|
super(props);
|
||||||
|
|
||||||
|
this.state = {
|
||||||
|
agreeDimension: null,
|
||||||
|
likeDimension: null,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
onFocusChange = (focused) => {
|
onFocusChange = (focused) => {
|
||||||
if (!this.props.onFocusChange) {
|
if (!this.props.onFocusChange) {
|
||||||
return;
|
return;
|
||||||
@ -48,6 +59,31 @@ export default class MessageActionBar extends React.PureComponent {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
onAgreeClick = (ev) => {
|
||||||
|
this.toggleDimensionValue("agreeDimension", "agree");
|
||||||
|
}
|
||||||
|
|
||||||
|
onDisagreeClick = (ev) => {
|
||||||
|
this.toggleDimensionValue("agreeDimension", "disagree");
|
||||||
|
}
|
||||||
|
|
||||||
|
onLikeClick = (ev) => {
|
||||||
|
this.toggleDimensionValue("likeDimension", "like");
|
||||||
|
}
|
||||||
|
|
||||||
|
onDislikeClick = (ev) => {
|
||||||
|
this.toggleDimensionValue("likeDimension", "dislike");
|
||||||
|
}
|
||||||
|
|
||||||
|
toggleDimensionValue(dimension, value) {
|
||||||
|
const state = this.state[dimension];
|
||||||
|
const newState = state !== value ? value : null;
|
||||||
|
this.setState({
|
||||||
|
[dimension]: newState,
|
||||||
|
});
|
||||||
|
// TODO: Send the reaction event
|
||||||
|
}
|
||||||
|
|
||||||
onReplyClick = (ev) => {
|
onReplyClick = (ev) => {
|
||||||
dis.dispatch({
|
dis.dispatch({
|
||||||
action: 'reply_to_event',
|
action: 'reply_to_event',
|
||||||
@ -108,19 +144,96 @@ export default class MessageActionBar extends React.PureComponent {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
isReactionsEnabled() {
|
||||||
|
return SettingsStore.isFeatureEnabled("feature_reactions");
|
||||||
|
}
|
||||||
|
|
||||||
|
renderAgreeDimension() {
|
||||||
|
if (!this.isReactionsEnabled()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const state = this.state.agreeDimension;
|
||||||
|
const options = [
|
||||||
|
{
|
||||||
|
key: "agree",
|
||||||
|
content: "👍",
|
||||||
|
onClick: this.onAgreeClick,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "disagree",
|
||||||
|
content: "👎",
|
||||||
|
onClick: this.onDisagreeClick,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
return <span className="mx_MessageActionBar_reactionDimension"
|
||||||
|
title={_t("Agree or Disagree")}
|
||||||
|
>
|
||||||
|
{this.renderReactionDimensionItems(state, options)}
|
||||||
|
</span>;
|
||||||
|
}
|
||||||
|
|
||||||
|
renderLikeDimension() {
|
||||||
|
if (!this.isReactionsEnabled()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const state = this.state.likeDimension;
|
||||||
|
const options = [
|
||||||
|
{
|
||||||
|
key: "like",
|
||||||
|
content: "🙂",
|
||||||
|
onClick: this.onLikeClick,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "dislike",
|
||||||
|
content: "😔",
|
||||||
|
onClick: this.onDislikeClick,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
return <span className="mx_MessageActionBar_reactionDimension"
|
||||||
|
title={_t("Like or Dislike")}
|
||||||
|
>
|
||||||
|
{this.renderReactionDimensionItems(state, options)}
|
||||||
|
</span>;
|
||||||
|
}
|
||||||
|
|
||||||
|
renderReactionDimensionItems(state, options) {
|
||||||
|
return options.map(option => {
|
||||||
|
const disabled = state && state !== option.key;
|
||||||
|
const classes = classNames({
|
||||||
|
mx_MessageActionBar_reactionDisabled: disabled,
|
||||||
|
});
|
||||||
|
return <span key={option.key}
|
||||||
|
className={classes}
|
||||||
|
onClick={option.onClick}
|
||||||
|
>
|
||||||
|
{option.content}
|
||||||
|
</span>;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
|
let agreeDimensionReactionButtons;
|
||||||
|
let likeDimensionReactionButtons;
|
||||||
let replyButton;
|
let replyButton;
|
||||||
|
|
||||||
if (this.isContentActionable()) {
|
if (this.isContentActionable()) {
|
||||||
replyButton = <span className="mx_MessageActionBar_replyButton"
|
agreeDimensionReactionButtons = this.renderAgreeDimension();
|
||||||
|
likeDimensionReactionButtons = this.renderLikeDimension();
|
||||||
|
replyButton = <span className="mx_MessageActionBar_maskButton mx_MessageActionBar_replyButton"
|
||||||
title={_t("Reply")}
|
title={_t("Reply")}
|
||||||
onClick={this.onReplyClick}
|
onClick={this.onReplyClick}
|
||||||
/>;
|
/>;
|
||||||
}
|
}
|
||||||
|
|
||||||
return <div className="mx_MessageActionBar">
|
return <div className="mx_MessageActionBar">
|
||||||
|
{agreeDimensionReactionButtons}
|
||||||
|
{likeDimensionReactionButtons}
|
||||||
{replyButton}
|
{replyButton}
|
||||||
<span className="mx_MessageActionBar_optionsButton"
|
<span className="mx_MessageActionBar_maskButton mx_MessageActionBar_optionsButton"
|
||||||
title={_t("Options")}
|
title={_t("Options")}
|
||||||
onClick={this.onOptionsClick}
|
onClick={this.onOptionsClick}
|
||||||
/>
|
/>
|
||||||
|
@ -890,6 +890,8 @@
|
|||||||
"Today": "Today",
|
"Today": "Today",
|
||||||
"Yesterday": "Yesterday",
|
"Yesterday": "Yesterday",
|
||||||
"Error decrypting audio": "Error decrypting audio",
|
"Error decrypting audio": "Error decrypting audio",
|
||||||
|
"Agree or Disagree": "Agree or Disagree",
|
||||||
|
"Like or Dislike": "Like or Dislike",
|
||||||
"Reply": "Reply",
|
"Reply": "Reply",
|
||||||
"Options": "Options",
|
"Options": "Options",
|
||||||
"Attachment": "Attachment",
|
"Attachment": "Attachment",
|
||||||
|
Loading…
Reference in New Issue
Block a user