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

Create rendering context enum for MessageActionBar

Browse source
This commit is contained in:
Germain Souquet 2021-09-28 14:55:00 +01:00
parent 160bf8e21f
commit c1165830ed
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -128,6 +128,11 @@ const ReactButton: React.FC<IReactButtonProps> = ({ mxEvent, reactions, onFocusC
</React.Fragment>;
};
export enum ActionBarRenderingContext {
Room,
Thread
}
interface IMessageActionBarProps {
mxEvent: MatrixEvent;
reactions?: Relations;
@ -137,7 +142,7 @@ interface IMessageActionBarProps {
permalinkCreator?: RoomPermalinkCreator;
onFocusChange?: (menuDisplayed: boolean) => void;
toggleThreadExpanded: () => void;
isInThreadTimeline?: boolean;
renderingContext?: ActionBarRenderingContext;
isQuoteExpanded?: boolean;
}
@ -146,7 +151,7 @@ export default class MessageActionBar extends React.PureComponent<IMessageAction
public static contextType = RoomContext;
public static defaultProps = {
isInThreadTimeline: false,
renderingContext: ActionBarRenderingContext.Room,
};
public componentDidMount(): void {
@ -293,7 +298,7 @@ export default class MessageActionBar extends React.PureComponent<IMessageAction
// Like the resend button, the react and reply buttons need to appear before the edit.
// The only catch is we do the reply button first so that we can make sure the react
// button is the very first button without having to do length checks for `splice()`.
if (this.context.canReply && !this.props.isInThreadTimeline) {
if (this.context.canReply && this.props.renderingContext === ActionBarRenderingContext.Room) {
toolbarOpts.splice(0, 0, <>
<RovingAccessibleTooltipButton
className="mx_MessageActionBar_maskButton mx_MessageActionBar_replyButton"