Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Add Reply in thread button
Browse files Browse the repository at this point in the history
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
  • Loading branch information
SimonBrandner committed Jul 7, 2022
1 parent 58b81f6 commit b08a1c3
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 0 deletions.
4 changes: 4 additions & 0 deletions res/css/views/context_menus/_MessageContextMenu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@ limitations under the License.
mask-image: url('$(res)/img/element-icons/room/message-bar/reply.svg');
}

.mx_MessageContextMenu_iconReplyInThread::before {
mask-image: url('$(res)/img/element-icons/message/thread.svg');
}

.mx_MessageContextMenu_iconReact::before {
mask-image: url('$(res)/img/element-icons/room/message-bar/emoji.svg');
}
Expand Down
45 changes: 45 additions & 0 deletions src/components/views/context_menus/MessageContextMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { EventType, RelationType } from "matrix-js-sdk/src/@types/event";
import { Relations } from 'matrix-js-sdk/src/models/relations';
import { RoomMemberEvent } from "matrix-js-sdk/src/models/room-member";
import { M_POLL_START } from "matrix-events-sdk";
import { Thread } from "matrix-js-sdk/src/models/thread";

import { MatrixClientPeg } from '../../../MatrixClientPeg';
import dis from '../../../dispatcher/dispatcher';
Expand Down Expand Up @@ -58,6 +59,9 @@ import { OpenReportEventDialogPayload } from "../../../dispatcher/payloads/OpenR
import { createMapSiteLinkFromEvent } from '../../../utils/location';
import { getForwardableEvent } from '../../../events/forward/getForwardableEvent';
import { getShareableLocationEvent } from '../../../events/location/getShareableLocationEvent';
import { showThread } from "../../../dispatcher/dispatch-actions/threads";
import RightPanel from "../../structures/RightPanel";
import RightPanelStore from "../../../stores/right-panel/RightPanelStore";

interface IProps extends IPosition {
chevronFace: ChevronFace;
Expand Down Expand Up @@ -281,6 +285,30 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
this.closeMenu();
};

private onReplyInThreadClick = (): void => {
const { mxEvent } = this.props;

if (!localStorage.getItem("mx_seen_feature_thread")) {
localStorage.setItem("mx_seen_feature_thread", "true");
}

if (mxEvent.getThread() && !mxEvent.isThreadRoot) {
showThread({
rootEvent: mxEvent.getThread().rootEvent,
initialEvent: mxEvent,
scroll_into_view: true,
highlighted: true,
push: RightPanelStore.instance.isOpen,
});
} else {
showThread({
rootEvent: mxEvent,
push: RightPanelStore.instance.isOpen,
});
}
this.closeMenu();
};

private onReactClick = (): void => {
this.setState({ reactionPickerDisplayed: true });
};
Expand Down Expand Up @@ -582,6 +610,22 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
);
}

let replyInThreadButton: JSX.Element;
if (
rightClick &&
contentActionable &&
canSendMessages && SettingsStore.getValue("feature_thread") &&
Thread.hasServerSideSupport
) {
replyInThreadButton = (
<IconizedContextMenuOption
iconClassName="mx_MessageContextMenu_iconReplyInThread"
label={_t("Reply in thread")}
onClick={this.onReplyInThreadClick}
/>
);
}

let reactButton;
if (rightClick && contentActionable && canReact) {
reactButton = (
Expand Down Expand Up @@ -621,6 +665,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
<IconizedContextMenuOptionList>
{ reactButton }
{ replyButton }
{ replyInThreadButton }
{ editButton }
</IconizedContextMenuOptionList>
);
Expand Down

0 comments on commit b08a1c3

Please sign in to comment.