mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 11:47:23 +03:00
Code Issues Projects Releases Packages Wiki Activity

Re-renable Share option for location messages (#7596)

Browse source
This commit is contained in:
Andy Balaam 2022-01-24 12:28:17 +00:00 committed by GitHub
parent 83b0d123c1
commit b02c6c7953
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/components/views/context_menus/MessageContextMenu.tsx
View file

@ -378,27 +378,25 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
let permalink: string | null = null;
let permalinkButton: ReactElement | null = null;
if (canShare(mxEvent)) {
if (this.props.permalinkCreator) {
permalink = this.props.permalinkCreator.forEvent(this.props.mxEvent.getId());
}
permalinkButton = (
<IconizedContextMenuOption
iconClassName="mx_MessageContextMenu_iconPermalink"
onClick={this.onPermalinkClick}
label={_t('Share')}
element="a"
{
// XXX: Typescript signature for AccessibleButton doesn't work properly for non-inputs like `a`
...{
href: permalink,
target: "_blank",
rel: "noreferrer noopener",
}
}
/>
);
if (this.props.permalinkCreator) {
permalink = this.props.permalinkCreator.forEvent(this.props.mxEvent.getId());
}
permalinkButton = (
<IconizedContextMenuOption
iconClassName="mx_MessageContextMenu_iconPermalink"
onClick={this.onPermalinkClick}
label={_t('Share')}
element="a"
{
// XXX: Typescript signature for AccessibleButton doesn't work properly for non-inputs like `a`
...{
href: permalink,
target: "_blank",
rel: "noreferrer noopener",
}
}
/>
);
if (this.canEndPoll(mxEvent)) {
endPollButton = (
@ -519,10 +517,6 @@ function canForward(event: MatrixEvent): boolean {
return !isLocationEvent(event);
}
function canShare(event: MatrixEvent): boolean {
return !isLocationEvent(event);
}
function isLocationEvent(event: MatrixEvent): boolean {
const eventType = event.getType();
return (