imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prevent thread creation on events with existing relation (#8037)

Browse source
This commit is contained in:
Germain 2022-03-11 17:51:38 +00:00 • committed by GitHub
parent 4b0df21b0a
commit 7508fd975f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/views/messages/MessageActionBar.tsx
View file

@ -19,7 +19,7 @@ limitations under the License.
import React, { ReactElement, useEffect } from 'react';
import { EventStatus, MatrixEvent, MatrixEventEvent } from 'matrix-js-sdk/src/models/event';
import classNames from 'classnames';
import { MsgType } from 'matrix-js-sdk/src/@types/event';
import { MsgType, RelationType } from 'matrix-js-sdk/src/@types/event';
import type { Relations } from 'matrix-js-sdk/src/models/relations';
import { _t } from '../../../languageHandler';
@ -166,7 +166,7 @@ interface IMessageActionBarProps {
isQuoteExpanded?: boolean;
getRelationsForEvent?: (
eventId: string,
relationType: string,
relationType: RelationType | string,
eventType: string
) => Relations;
}
@ -303,11 +303,19 @@ export default class MessageActionBar extends React.PureComponent<IMessageAction
key="cancel"
/>;
const hasARelation = !!this.props.mxEvent?.getRelation()?.rel_type;
const threadTooltipButton = <CardContext.Consumer key="thread">
{ context =>
<RovingAccessibleTooltipButton
className="mx_MessageActionBar_maskButton mx_MessageActionBar_threadButton"
title={_t("Reply in thread")}
disabled={hasARelation}
title={!hasARelation
? _t("Reply in thread")
: _t("Can't create a thread from an event with an existing relation")
}
onClick={this.onThreadClick.bind(null, context.isCard)}
/>
}