Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't open the regular browser or our context menu on right-clicking the Options button in the message action bar #8648

Merged
merged 2 commits into from
May 19, 2022
Merged

Don't open the regular browser or our context menu on right-clicking the Options button in the message action bar #8648

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be2c9e7
Don't open the regular browser or our context menu on right-click
SimonBrandner May 19, 2022
cb41570
Move `onClick` out of inline JSX
SimonBrandner May 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/components/views/messages/MessageActionBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,10 @@ const OptionsButton: React.FC<IOptionsButtonProps> = ({
<ContextMenuTooltipButton
className="mx_MessageActionBar_maskButton mx_MessageActionBar_optionsButton"
title={_t("Options")}
onClick={() => {
onClick={(e: React.MouseEvent) => {
SimonBrandner marked this conversation as resolved.
Show resolved Hide resolved
// Don't open the regular browser or our context menu on right-click
e.preventDefault();
e.stopPropagation();
openMenu();
// when the context menu is opened directly, e.g. via mouse click, the onFocus handler which tracks
// the element that is currently focused is skipped. So we want to call onFocus manually to keep the
Expand Down