Skip to content

#6154 Fix: 3 dot menu action button not appear issue #6161

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ioanatflowcrypt wants to merge 1 commit into from
Closed

#6154 Fix: 3 dot menu action button not appear issue #6161

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 31 additions & 7 deletions extension/js/content_scripts/webmail/gmail/gmail-element-replacer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,12 +298,18 @@
};

private addMenuButton = (replyOption: ReplyOption, gmailContextMenuBtn: Element | null) => {
if (gmailContextMenuBtn && $(gmailContextMenuBtn).is(':visible') && !document.querySelector(`.action_${replyOption.replace('a_', '')}_message_button`)) {
const button = $(this.factory.btnSecureMenuBtn(replyOption)).insertAfter(gmailContextMenuBtn); // xss-safe-factory
button.on(
'click',
Ui.event.handle((el, ev: JQuery.Event) => this.actionActivateSecureReplyHandler(el, ev))
);
if (gmailContextMenuBtn && $(gmailContextMenuBtn).is(':visible')) {
const btnClass = `action_${replyOption.replace('a_', '')}_message_button`;
// Check if button already exists in this specific menu (sibling of the target button)
const alreadyExists = $(gmailContextMenuBtn).parent().find(`.${btnClass}`).length > 0;

if (!alreadyExists) {
const button = $(this.factory.btnSecureMenuBtn(replyOption)).insertAfter(gmailContextMenuBtn); // xss-safe-factory
button.on(
'click',
Ui.event.handle((el, ev: JQuery.Event) => this.actionActivateSecureReplyHandler(el, ev))
);
}
}
};

Expand Down Expand Up @@ -970,7 +976,25 @@
}

// Find the message container from the menu's position or context
const messageContainer = $('div.h7:visible').last(); // Get the last visible message container
let messageContainer: JQuery<HTMLElement>;

Check failure

Code scanning / ESLint

Disallow type arguments that are equal to the default Error

This is the default value for this type parameter, so it can be omitted.

// Try to find the trigger button that opened this menu (it should have aria-expanded="true")
// This provides a more reliable way to identify the correct message than selecting the last visible one
const menuTrigger = document.querySelector('div[aria-expanded="true"][role="button"], div[aria-expanded="true"][role="menuitem"], .T-I[aria-expanded="true"]');

if (menuTrigger) {
if (this.debug) {
console.debug('addSecureActionsToMessageMenu found menu trigger:', menuTrigger);
}
messageContainer = $(menuTrigger).closest(this.sel.msgOuter);
if (!messageContainer.length) {
// Fallback
messageContainer = $('div.h7:visible').last();
}
} else {
messageContainer = $('div.h7:visible').last(); // Get the last visible message container
}

const msgIdElement = messageContainer.find('[data-legacy-message-id], [data-message-id]');
const msgId = msgIdElement.attr('data-legacy-message-id') || msgIdElement.attr('data-message-id');

Expand Down
Loading