PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Restore access to message quote option on first click

Browse source 
This repairs access to the "Quote" option of the message context menu by passing
down a getter so that we always access the most recent tile and reply thread
instances. This ensures the context menu uses the newest information about the
current event when determining menu options to show.

Fixes https://github.com/vector-im/riot-web/issues/9639
This commit is contained in:
J. Ryan Stinnett 2019-05-07 12:06:50 +01:00
parent 19cd02e4e2
commit 94a7afa35b
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/views/messages/MessageActionBar.js
View file

@ -28,8 +28,8 @@ export default class MessageActionBar extends React.PureComponent {
static propTypes = { static propTypes = {
mxEvent: PropTypes.object.isRequired, mxEvent: PropTypes.object.isRequired,
permalinkCreator: PropTypes.object, permalinkCreator: PropTypes.object,
tile: PropTypes.element, getTile: PropTypes.func,
replyThread: PropTypes.element, getReplyThread: PropTypes.func,
onFocusChange: PropTypes.func, onFocusChange: PropTypes.func,
}; };
@ -63,7 +63,9 @@ export default class MessageActionBar extends React.PureComponent {
const x = buttonRect.right + window.pageXOffset; const x = buttonRect.right + window.pageXOffset;
const y = (buttonRect.top + (buttonRect.height / 2) + window.pageYOffset) - 19; const y = (buttonRect.top + (buttonRect.height / 2) + window.pageYOffset) - 19;
const {tile, replyThread} = this.props; const { getTile, getReplyThread } = this.props;
const tile = getTile && getTile();
const replyThread = getReplyThread && getReplyThread();
let e2eInfoCallback = null; let e2eInfoCallback = null;
if (this.props.mxEvent.isEncrypted()) { if (this.props.mxEvent.isEncrypted()) {

12
src/components/views/rooms/EventTile.js
View file

@ -464,6 +464,14 @@ module.exports = withMatrixClient(React.createClass({
}); });
}, },
getTile() {
return this.refs.tile;
},
getReplyThread() {
return this.refs.replyThread;
},
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');
@ -580,8 +588,8 @@ module.exports = withMatrixClient(React.createClass({
const actionBar = <MessageActionBar const actionBar = <MessageActionBar
mxEvent={this.props.mxEvent} mxEvent={this.props.mxEvent}
permalinkCreator={this.props.permalinkCreator} permalinkCreator={this.props.permalinkCreator}
tile={this.refs.tile} getTile={this.getTile}
replyThread={this.refs.replyThread} getReplyThread={this.getReplyThread}
onFocusChange={this.onActionBarFocusChange} onFocusChange={this.onActionBarFocusChange}
/>; />;