mirror of
https://github.com/vector-im/element-web.git
synced 2025-10-03 19:41:20 +02:00
Merge pull request #3138 from matrix-org/jryans/quick-reactions-v2
Add quick reaction buttons in tooltip
This commit is contained in:
commit
b673742e40
@ -117,7 +117,8 @@
|
|||||||
@import "./views/messages/_MTextBody.scss";
|
@import "./views/messages/_MTextBody.scss";
|
||||||
@import "./views/messages/_MessageActionBar.scss";
|
@import "./views/messages/_MessageActionBar.scss";
|
||||||
@import "./views/messages/_MessageTimestamp.scss";
|
@import "./views/messages/_MessageTimestamp.scss";
|
||||||
@import "./views/messages/_ReactionDimension.scss";
|
@import "./views/messages/_ReactionQuickTooltip.scss";
|
||||||
|
@import "./views/messages/_ReactionTooltipButton.scss";
|
||||||
@import "./views/messages/_ReactionsRow.scss";
|
@import "./views/messages/_ReactionsRow.scss";
|
||||||
@import "./views/messages/_ReactionsRowButton.scss";
|
@import "./views/messages/_ReactionsRowButton.scss";
|
||||||
@import "./views/messages/_ReactionsRowButtonTooltip.scss";
|
@import "./views/messages/_ReactionsRowButtonTooltip.scss";
|
||||||
|
@ -67,6 +67,10 @@ limitations under the License.
|
|||||||
background-color: $message-action-bar-fg-color;
|
background-color: $message-action-bar-fg-color;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.mx_MessageActionBar_reactButton::after {
|
||||||
|
mask-image: url('$(res)/img/react.svg');
|
||||||
|
}
|
||||||
|
|
||||||
.mx_MessageActionBar_replyButton::after {
|
.mx_MessageActionBar_replyButton::after {
|
||||||
mask-image: url('$(res)/img/reply.svg');
|
mask-image: url('$(res)/img/reply.svg');
|
||||||
}
|
}
|
||||||
|
29
res/css/views/messages/_ReactionQuickTooltip.scss
Normal file
29
res/css/views/messages/_ReactionQuickTooltip.scss
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2019 The Matrix.org Foundation C.I.C.
|
||||||
|
|
||||||
|
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_ReactionsQuickTooltip_buttons {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(4, auto);
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_ReactionsQuickTooltip_label {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_ReactionsQuickTooltip_shortcode {
|
||||||
|
padding-left: 6px;
|
||||||
|
opacity: 0.7;
|
||||||
|
}
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright 2019 New Vector Ltd
|
Copyright 2019 The Matrix.org Foundation C.I.C.
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
@ -14,12 +14,17 @@ See the License for the specific language governing permissions and
|
|||||||
limitations under the License.
|
limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.mx_ReactionDimension {
|
.mx_ReactionTooltipButton {
|
||||||
width: 42px;
|
font-size: 16px;
|
||||||
display: flex;
|
padding: 6px;
|
||||||
justify-content: space-evenly;
|
user-select: none;
|
||||||
|
transition: transform 0.25s;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
transform: scale(1.2);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_ReactionDimension_disabled {
|
.mx_ReactionTooltipButton_selected {
|
||||||
opacity: 0.4;
|
opacity: 0.4;
|
||||||
}
|
}
|
10
res/img/react.svg
Normal file
10
res/img/react.svg
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="18" height="17" viewBox="0 0 18 17">
|
||||||
|
<g fill="none" fill-rule="evenodd">
|
||||||
|
<path fill="#2E2F32" fill-rule="nonzero" d="M13.6 14.5a7.875 7.875 0 1 1 2.183-3h-.818a7.125 7.125 0 1 0-2.62 3H13.6z"/>
|
||||||
|
<g stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round" stroke-width=".75">
|
||||||
|
<path d="M11.5 13h6M14.5 10v6"/>
|
||||||
|
</g>
|
||||||
|
<path stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round" stroke-width=".75" d="M5.5 10s1.125 1.5 3 1.5 3-1.5 3-1.5"/>
|
||||||
|
<path stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M6.25 6.25h.008M10.75 6.25h.008"/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 696 B |
@ -57,7 +57,7 @@ export default class MessageActionBar extends React.PureComponent {
|
|||||||
this.props.onFocusChange(focused);
|
this.props.onFocusChange(focused);
|
||||||
}
|
}
|
||||||
|
|
||||||
onCryptoClicked = () => {
|
onCryptoClick = () => {
|
||||||
const event = this.props.mxEvent;
|
const event = this.props.mxEvent;
|
||||||
Modal.createTrackedDialogAsync('Encrypted Event Dialog', '',
|
Modal.createTrackedDialogAsync('Encrypted Event Dialog', '',
|
||||||
import('../../../async-components/views/dialogs/EncryptedEventDialog'),
|
import('../../../async-components/views/dialogs/EncryptedEventDialog'),
|
||||||
@ -89,7 +89,7 @@ export default class MessageActionBar extends React.PureComponent {
|
|||||||
|
|
||||||
let e2eInfoCallback = null;
|
let e2eInfoCallback = null;
|
||||||
if (this.props.mxEvent.isEncrypted()) {
|
if (this.props.mxEvent.isEncrypted()) {
|
||||||
e2eInfoCallback = () => this.onCryptoClicked();
|
e2eInfoCallback = () => this.onCryptoClick();
|
||||||
}
|
}
|
||||||
|
|
||||||
const menuOptions = {
|
const menuOptions = {
|
||||||
@ -131,43 +131,28 @@ export default class MessageActionBar extends React.PureComponent {
|
|||||||
return SettingsStore.isFeatureEnabled("feature_message_editing");
|
return SettingsStore.isFeatureEnabled("feature_message_editing");
|
||||||
}
|
}
|
||||||
|
|
||||||
renderAgreeDimension() {
|
renderReactButton() {
|
||||||
if (!this.isReactionsEnabled()) {
|
if (!this.isReactionsEnabled()) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
const ReactionDimension = sdk.getComponent('messages.ReactionDimension');
|
const ReactMessageAction = sdk.getComponent('messages.ReactMessageAction');
|
||||||
return <ReactionDimension
|
const { mxEvent, reactions } = this.props;
|
||||||
title={_t("Agree or Disagree")}
|
|
||||||
options={["👍", "👎"]}
|
|
||||||
reactions={this.props.reactions}
|
|
||||||
mxEvent={this.props.mxEvent}
|
|
||||||
/>;
|
|
||||||
}
|
|
||||||
|
|
||||||
renderLikeDimension() {
|
return <ReactMessageAction
|
||||||
if (!this.isReactionsEnabled()) {
|
mxEvent={mxEvent}
|
||||||
return null;
|
reactions={reactions}
|
||||||
}
|
onFocusChange={this.onFocusChange}
|
||||||
|
|
||||||
const ReactionDimension = sdk.getComponent('messages.ReactionDimension');
|
|
||||||
return <ReactionDimension
|
|
||||||
title={_t("Like or Dislike")}
|
|
||||||
options={["🙂", "😔"]}
|
|
||||||
reactions={this.props.reactions}
|
|
||||||
mxEvent={this.props.mxEvent}
|
|
||||||
/>;
|
/>;
|
||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
let agreeDimensionReactionButtons;
|
let reactButton;
|
||||||
let likeDimensionReactionButtons;
|
|
||||||
let replyButton;
|
let replyButton;
|
||||||
let editButton;
|
let editButton;
|
||||||
|
|
||||||
if (isContentActionable(this.props.mxEvent)) {
|
if (isContentActionable(this.props.mxEvent)) {
|
||||||
agreeDimensionReactionButtons = this.renderAgreeDimension();
|
reactButton = this.renderReactButton();
|
||||||
likeDimensionReactionButtons = this.renderLikeDimension();
|
|
||||||
replyButton = <span className="mx_MessageActionBar_maskButton mx_MessageActionBar_replyButton"
|
replyButton = <span className="mx_MessageActionBar_maskButton mx_MessageActionBar_replyButton"
|
||||||
title={_t("Reply")}
|
title={_t("Reply")}
|
||||||
onClick={this.onReplyClick}
|
onClick={this.onReplyClick}
|
||||||
@ -181,8 +166,7 @@ export default class MessageActionBar extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return <div className="mx_MessageActionBar">
|
return <div className="mx_MessageActionBar">
|
||||||
{agreeDimensionReactionButtons}
|
{reactButton}
|
||||||
{likeDimensionReactionButtons}
|
|
||||||
{replyButton}
|
{replyButton}
|
||||||
{editButton}
|
{editButton}
|
||||||
<span className="mx_MessageActionBar_maskButton mx_MessageActionBar_optionsButton"
|
<span className="mx_MessageActionBar_maskButton mx_MessageActionBar_optionsButton"
|
||||||
|
97
src/components/views/messages/ReactMessageAction.js
Normal file
97
src/components/views/messages/ReactMessageAction.js
Normal file
@ -0,0 +1,97 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2019 The Matrix.org Foundation C.I.C.
|
||||||
|
|
||||||
|
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';
|
||||||
|
|
||||||
|
export default class ReactMessageAction extends React.PureComponent {
|
||||||
|
static propTypes = {
|
||||||
|
mxEvent: PropTypes.object.isRequired,
|
||||||
|
// The Relations model from the JS SDK for reactions to `mxEvent`
|
||||||
|
reactions: PropTypes.object,
|
||||||
|
onFocusChange: PropTypes.func,
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(props) {
|
||||||
|
super(props);
|
||||||
|
|
||||||
|
if (props.reactions) {
|
||||||
|
props.reactions.on("Relations.add", this.onReactionsChange);
|
||||||
|
props.reactions.on("Relations.remove", this.onReactionsChange);
|
||||||
|
props.reactions.on("Relations.redaction", this.onReactionsChange);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
onFocusChange = (focused) => {
|
||||||
|
if (!this.props.onFocusChange) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.props.onFocusChange(focused);
|
||||||
|
}
|
||||||
|
|
||||||
|
componentDidUpdate(prevProps) {
|
||||||
|
if (prevProps.reactions !== this.props.reactions) {
|
||||||
|
this.props.reactions.on("Relations.add", this.onReactionsChange);
|
||||||
|
this.props.reactions.on("Relations.remove", this.onReactionsChange);
|
||||||
|
this.props.reactions.on("Relations.redaction", this.onReactionsChange);
|
||||||
|
this.onReactionsChange();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
componentWillUnmount() {
|
||||||
|
if (this.props.reactions) {
|
||||||
|
this.props.reactions.removeListener(
|
||||||
|
"Relations.add",
|
||||||
|
this.onReactionsChange,
|
||||||
|
);
|
||||||
|
this.props.reactions.removeListener(
|
||||||
|
"Relations.remove",
|
||||||
|
this.onReactionsChange,
|
||||||
|
);
|
||||||
|
this.props.reactions.removeListener(
|
||||||
|
"Relations.redaction",
|
||||||
|
this.onReactionsChange,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
onReactionsChange = () => {
|
||||||
|
// Force a re-render of the tooltip because a change in the reactions
|
||||||
|
// set means the event tile's layout may have changed and possibly
|
||||||
|
// altered the location where the tooltip should be shown.
|
||||||
|
this.forceUpdate();
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
const ReactionsQuickTooltip = sdk.getComponent('messages.ReactionsQuickTooltip');
|
||||||
|
const InteractiveTooltip = sdk.getComponent('elements.InteractiveTooltip');
|
||||||
|
const { mxEvent, reactions } = this.props;
|
||||||
|
|
||||||
|
const content = <ReactionsQuickTooltip
|
||||||
|
mxEvent={mxEvent}
|
||||||
|
reactions={reactions}
|
||||||
|
/>;
|
||||||
|
|
||||||
|
return <InteractiveTooltip
|
||||||
|
content={content}
|
||||||
|
onVisibilityChange={this.onFocusChange}
|
||||||
|
>
|
||||||
|
<span className="mx_MessageActionBar_maskButton mx_MessageActionBar_reactButton" />
|
||||||
|
</InteractiveTooltip>;
|
||||||
|
}
|
||||||
|
}
|
@ -1,176 +0,0 @@
|
|||||||
/*
|
|
||||||
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';
|
|
||||||
|
|
||||||
import MatrixClientPeg from '../../../MatrixClientPeg';
|
|
||||||
|
|
||||||
export default class ReactionDimension extends React.PureComponent {
|
|
||||||
static propTypes = {
|
|
||||||
mxEvent: PropTypes.object.isRequired,
|
|
||||||
// Array of strings containing the emoji for each option
|
|
||||||
options: PropTypes.array.isRequired,
|
|
||||||
title: PropTypes.string,
|
|
||||||
// The Relations model from the JS SDK for reactions
|
|
||||||
reactions: PropTypes.object,
|
|
||||||
};
|
|
||||||
|
|
||||||
constructor(props) {
|
|
||||||
super(props);
|
|
||||||
|
|
||||||
this.state = this.getSelection();
|
|
||||||
|
|
||||||
if (props.reactions) {
|
|
||||||
props.reactions.on("Relations.add", this.onReactionsChange);
|
|
||||||
props.reactions.on("Relations.remove", this.onReactionsChange);
|
|
||||||
props.reactions.on("Relations.redaction", this.onReactionsChange);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
componentDidUpdate(prevProps) {
|
|
||||||
if (prevProps.reactions !== this.props.reactions) {
|
|
||||||
this.props.reactions.on("Relations.add", this.onReactionsChange);
|
|
||||||
this.props.reactions.on("Relations.remove", this.onReactionsChange);
|
|
||||||
this.props.reactions.on("Relations.redaction", this.onReactionsChange);
|
|
||||||
this.onReactionsChange();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
componentWillUnmount() {
|
|
||||||
if (this.props.reactions) {
|
|
||||||
this.props.reactions.removeListener(
|
|
||||||
"Relations.add",
|
|
||||||
this.onReactionsChange,
|
|
||||||
);
|
|
||||||
this.props.reactions.removeListener(
|
|
||||||
"Relations.remove",
|
|
||||||
this.onReactionsChange,
|
|
||||||
);
|
|
||||||
this.props.reactions.removeListener(
|
|
||||||
"Relations.redaction",
|
|
||||||
this.onReactionsChange,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
onReactionsChange = () => {
|
|
||||||
this.setState(this.getSelection());
|
|
||||||
}
|
|
||||||
|
|
||||||
getSelection() {
|
|
||||||
const myReactions = this.getMyReactions();
|
|
||||||
if (!myReactions) {
|
|
||||||
return {
|
|
||||||
selectedOption: null,
|
|
||||||
selectedReactionEvent: null,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
const { options } = this.props;
|
|
||||||
let selectedOption = null;
|
|
||||||
let selectedReactionEvent = null;
|
|
||||||
for (const option of options) {
|
|
||||||
const reactionForOption = myReactions.find(mxEvent => {
|
|
||||||
if (mxEvent.isRedacted()) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return mxEvent.getRelation().key === option;
|
|
||||||
});
|
|
||||||
if (!reactionForOption) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (selectedOption) {
|
|
||||||
// If there are multiple selected values (only expected to occur via
|
|
||||||
// non-Riot clients), then act as if none are selected.
|
|
||||||
return {
|
|
||||||
selectedOption: null,
|
|
||||||
selectedReactionEvent: null,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
selectedOption = option;
|
|
||||||
selectedReactionEvent = reactionForOption;
|
|
||||||
}
|
|
||||||
return { selectedOption, selectedReactionEvent };
|
|
||||||
}
|
|
||||||
|
|
||||||
getMyReactions() {
|
|
||||||
const reactions = this.props.reactions;
|
|
||||||
if (!reactions) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
const userId = MatrixClientPeg.get().getUserId();
|
|
||||||
const myReactions = reactions.getAnnotationsBySender()[userId];
|
|
||||||
if (!myReactions) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return [...myReactions.values()];
|
|
||||||
}
|
|
||||||
|
|
||||||
onOptionClick = (ev) => {
|
|
||||||
const { key } = ev.target.dataset;
|
|
||||||
this.toggleDimension(key);
|
|
||||||
}
|
|
||||||
|
|
||||||
toggleDimension(key) {
|
|
||||||
const { selectedOption, selectedReactionEvent } = this.state;
|
|
||||||
const newSelectedOption = selectedOption !== key ? key : null;
|
|
||||||
this.setState({
|
|
||||||
selectedOption: newSelectedOption,
|
|
||||||
});
|
|
||||||
if (selectedReactionEvent) {
|
|
||||||
MatrixClientPeg.get().redactEvent(
|
|
||||||
this.props.mxEvent.getRoomId(),
|
|
||||||
selectedReactionEvent.getId(),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
if (newSelectedOption) {
|
|
||||||
MatrixClientPeg.get().sendEvent(this.props.mxEvent.getRoomId(), "m.reaction", {
|
|
||||||
"m.relates_to": {
|
|
||||||
"rel_type": "m.annotation",
|
|
||||||
"event_id": this.props.mxEvent.getId(),
|
|
||||||
"key": newSelectedOption,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
render() {
|
|
||||||
const { selectedOption } = this.state;
|
|
||||||
const { options } = this.props;
|
|
||||||
|
|
||||||
const items = options.map(option => {
|
|
||||||
const disabled = selectedOption && selectedOption !== option;
|
|
||||||
const classes = classNames({
|
|
||||||
mx_ReactionDimension_disabled: disabled,
|
|
||||||
});
|
|
||||||
return <span key={option}
|
|
||||||
data-key={option}
|
|
||||||
className={classes}
|
|
||||||
onClick={this.onOptionClick}
|
|
||||||
>
|
|
||||||
{option}
|
|
||||||
</span>;
|
|
||||||
});
|
|
||||||
|
|
||||||
return <span className="mx_ReactionDimension"
|
|
||||||
title={this.props.title}
|
|
||||||
aria-hidden={true}
|
|
||||||
>
|
|
||||||
{items}
|
|
||||||
</span>;
|
|
||||||
}
|
|
||||||
}
|
|
68
src/components/views/messages/ReactionTooltipButton.js
Normal file
68
src/components/views/messages/ReactionTooltipButton.js
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2019 The Matrix.org Foundation C.I.C.
|
||||||
|
|
||||||
|
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';
|
||||||
|
|
||||||
|
import MatrixClientPeg from '../../../MatrixClientPeg';
|
||||||
|
|
||||||
|
export default class ReactionTooltipButton extends React.PureComponent {
|
||||||
|
static propTypes = {
|
||||||
|
mxEvent: PropTypes.object.isRequired,
|
||||||
|
// The reaction content / key / emoji
|
||||||
|
content: PropTypes.string.isRequired,
|
||||||
|
title: PropTypes.string,
|
||||||
|
// A possible Matrix event if the current user has voted for this type
|
||||||
|
myReactionEvent: PropTypes.object,
|
||||||
|
};
|
||||||
|
|
||||||
|
onClick = (ev) => {
|
||||||
|
const { mxEvent, myReactionEvent, content } = this.props;
|
||||||
|
if (myReactionEvent) {
|
||||||
|
MatrixClientPeg.get().redactEvent(
|
||||||
|
mxEvent.getRoomId(),
|
||||||
|
myReactionEvent.getId(),
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
MatrixClientPeg.get().sendEvent(mxEvent.getRoomId(), "m.reaction", {
|
||||||
|
"m.relates_to": {
|
||||||
|
"rel_type": "m.annotation",
|
||||||
|
"event_id": mxEvent.getId(),
|
||||||
|
"key": content,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
const { content, myReactionEvent } = this.props;
|
||||||
|
|
||||||
|
const classes = classNames({
|
||||||
|
mx_ReactionTooltipButton: true,
|
||||||
|
mx_ReactionTooltipButton_selected: !!myReactionEvent,
|
||||||
|
});
|
||||||
|
|
||||||
|
return <span className={classes}
|
||||||
|
data-key={content}
|
||||||
|
title={this.props.title}
|
||||||
|
aria-hidden={true}
|
||||||
|
onClick={this.onClick}
|
||||||
|
>
|
||||||
|
{content}
|
||||||
|
</span>;
|
||||||
|
}
|
||||||
|
}
|
195
src/components/views/messages/ReactionsQuickTooltip.js
Normal file
195
src/components/views/messages/ReactionsQuickTooltip.js
Normal file
@ -0,0 +1,195 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2019 The Matrix.org Foundation C.I.C.
|
||||||
|
|
||||||
|
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 { _t } from '../../../languageHandler';
|
||||||
|
import sdk from '../../../index';
|
||||||
|
import MatrixClientPeg from '../../../MatrixClientPeg';
|
||||||
|
import { unicodeToShortcode } from '../../../HtmlUtils';
|
||||||
|
|
||||||
|
export default class ReactionsQuickTooltip extends React.PureComponent {
|
||||||
|
static propTypes = {
|
||||||
|
mxEvent: PropTypes.object.isRequired,
|
||||||
|
// The Relations model from the JS SDK for reactions to `mxEvent`
|
||||||
|
reactions: PropTypes.object,
|
||||||
|
};
|
||||||
|
|
||||||
|
constructor(props) {
|
||||||
|
super(props);
|
||||||
|
|
||||||
|
if (props.reactions) {
|
||||||
|
props.reactions.on("Relations.add", this.onReactionsChange);
|
||||||
|
props.reactions.on("Relations.remove", this.onReactionsChange);
|
||||||
|
props.reactions.on("Relations.redaction", this.onReactionsChange);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.state = {
|
||||||
|
hoveredItem: null,
|
||||||
|
myReactions: this.getMyReactions(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
componentDidUpdate(prevProps) {
|
||||||
|
if (prevProps.reactions !== this.props.reactions) {
|
||||||
|
this.props.reactions.on("Relations.add", this.onReactionsChange);
|
||||||
|
this.props.reactions.on("Relations.remove", this.onReactionsChange);
|
||||||
|
this.props.reactions.on("Relations.redaction", this.onReactionsChange);
|
||||||
|
this.onReactionsChange();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
componentWillUnmount() {
|
||||||
|
if (this.props.reactions) {
|
||||||
|
this.props.reactions.removeListener(
|
||||||
|
"Relations.add",
|
||||||
|
this.onReactionsChange,
|
||||||
|
);
|
||||||
|
this.props.reactions.removeListener(
|
||||||
|
"Relations.remove",
|
||||||
|
this.onReactionsChange,
|
||||||
|
);
|
||||||
|
this.props.reactions.removeListener(
|
||||||
|
"Relations.redaction",
|
||||||
|
this.onReactionsChange,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
onReactionsChange = () => {
|
||||||
|
this.setState({
|
||||||
|
myReactions: this.getMyReactions(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
getMyReactions() {
|
||||||
|
const reactions = this.props.reactions;
|
||||||
|
if (!reactions) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
const userId = MatrixClientPeg.get().getUserId();
|
||||||
|
const myReactions = reactions.getAnnotationsBySender()[userId];
|
||||||
|
if (!myReactions) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return [...myReactions.values()];
|
||||||
|
}
|
||||||
|
|
||||||
|
onMouseOver = (ev) => {
|
||||||
|
const { key } = ev.target.dataset;
|
||||||
|
const item = this.items.find(({ content }) => content === key);
|
||||||
|
this.setState({
|
||||||
|
hoveredItem: item,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
onMouseOut = (ev) => {
|
||||||
|
this.setState({
|
||||||
|
hoveredItem: null,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
get items() {
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
content: "👍",
|
||||||
|
title: _t("Agree"),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
content: "👎",
|
||||||
|
title: _t("Disagree"),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
content: "😄",
|
||||||
|
title: _t("Happy"),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
content: "🎉",
|
||||||
|
title: _t("Party Popper"),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
content: "😕",
|
||||||
|
title: _t("Confused"),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
content: "❤️",
|
||||||
|
title: _t("Heart"),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
content: "🚀",
|
||||||
|
title: _t("Rocket"),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
content: "👀",
|
||||||
|
title: _t("Eyes"),
|
||||||
|
},
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
const { mxEvent } = this.props;
|
||||||
|
const { myReactions, hoveredItem } = this.state;
|
||||||
|
const ReactionTooltipButton = sdk.getComponent('messages.ReactionTooltipButton');
|
||||||
|
|
||||||
|
const buttons = this.items.map(({ content, title }) => {
|
||||||
|
const myReactionEvent = myReactions && myReactions.find(mxEvent => {
|
||||||
|
if (mxEvent.isRedacted()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return mxEvent.getRelation().key === content;
|
||||||
|
});
|
||||||
|
|
||||||
|
return <ReactionTooltipButton
|
||||||
|
key={content}
|
||||||
|
content={content}
|
||||||
|
title={title}
|
||||||
|
mxEvent={mxEvent}
|
||||||
|
myReactionEvent={myReactionEvent}
|
||||||
|
/>;
|
||||||
|
});
|
||||||
|
|
||||||
|
let label = " "; // non-breaking space to keep layout the same when empty
|
||||||
|
if (hoveredItem) {
|
||||||
|
const { content, title } = hoveredItem;
|
||||||
|
|
||||||
|
let shortcodeLabel;
|
||||||
|
const shortcode = unicodeToShortcode(content);
|
||||||
|
if (shortcode) {
|
||||||
|
shortcodeLabel = <span className="mx_ReactionsQuickTooltip_shortcode">
|
||||||
|
{shortcode}
|
||||||
|
</span>;
|
||||||
|
}
|
||||||
|
|
||||||
|
label = <div className="mx_ReactionsQuickTooltip_label">
|
||||||
|
<span className="mx_ReactionsQuickTooltip_title">
|
||||||
|
{title}
|
||||||
|
</span>
|
||||||
|
{shortcodeLabel}
|
||||||
|
</div>;
|
||||||
|
}
|
||||||
|
|
||||||
|
return <div className="mx_ReactionsQuickTooltip"
|
||||||
|
onMouseOver={this.onMouseOver}
|
||||||
|
onMouseOut={this.onMouseOut}
|
||||||
|
>
|
||||||
|
<div className="mx_ReactionsQuickTooltip_buttons">
|
||||||
|
{buttons}
|
||||||
|
</div>
|
||||||
|
{label}
|
||||||
|
</div>;
|
||||||
|
}
|
||||||
|
}
|
@ -404,7 +404,7 @@ module.exports = withMatrixClient(React.createClass({
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
onCryptoClicked: function(e) {
|
onCryptoClick: function(e) {
|
||||||
const event = this.props.mxEvent;
|
const event = this.props.mxEvent;
|
||||||
|
|
||||||
Modal.createTrackedDialogAsync('Encrypted Event Dialog', '',
|
Modal.createTrackedDialogAsync('Encrypted Event Dialog', '',
|
||||||
@ -440,7 +440,7 @@ module.exports = withMatrixClient(React.createClass({
|
|||||||
|
|
||||||
_renderE2EPadlock: function() {
|
_renderE2EPadlock: function() {
|
||||||
const ev = this.props.mxEvent;
|
const ev = this.props.mxEvent;
|
||||||
const props = {onClick: this.onCryptoClicked};
|
const props = {onClick: this.onCryptoClick};
|
||||||
|
|
||||||
// event could not be decrypted
|
// event could not be decrypted
|
||||||
if (ev.getContent().msgtype === 'm.bad.encrypted') {
|
if (ev.getContent().msgtype === 'm.bad.encrypted') {
|
||||||
|
@ -928,8 +928,6 @@
|
|||||||
"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",
|
||||||
"Edit": "Edit",
|
"Edit": "Edit",
|
||||||
"Options": "Options",
|
"Options": "Options",
|
||||||
@ -940,6 +938,12 @@
|
|||||||
"Invalid file%(extra)s": "Invalid file%(extra)s",
|
"Invalid file%(extra)s": "Invalid file%(extra)s",
|
||||||
"Error decrypting image": "Error decrypting image",
|
"Error decrypting image": "Error decrypting image",
|
||||||
"Error decrypting video": "Error decrypting video",
|
"Error decrypting video": "Error decrypting video",
|
||||||
|
"Agree": "Agree",
|
||||||
|
"Disagree": "Disagree",
|
||||||
|
"Happy": "Happy",
|
||||||
|
"Party Popper": "Party Popper",
|
||||||
|
"Confused": "Confused",
|
||||||
|
"Eyes": "Eyes",
|
||||||
"<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>",
|
"<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>",
|
||||||
"%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s",
|
"%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s",
|
||||||
"%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removed the room avatar.",
|
"%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removed the room avatar.",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user