Skip to content

✨ context-menu has separators for different groups #179

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

Merged
merged 1 commit into from
Nov 4, 2022
Merged

✨ context-menu has separators for different groups #179

Show file tree
Hide file tree
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
15 changes: 12 additions & 3 deletions src/tab-manager/__tests__/context-menu.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ describe('Tab Manager context-menu test suite', () => {
let event;
let listeners;
let mockMenu;
let mockMenuItem;
let params;
let tabManager;
beforeEach(() => {
jest.resetModules();
mockMenu = {
append: jest.fn(),
entries: [],
append: jest.fn(e => mockMenu.entries.push(e)),
popup: jest.fn()
};
jest.mock('electron', () => require('../../__tests__').mockElectronInstance({
Menu: jest.fn(() => mockMenu),
MenuItem: jest.fn(() => mockMenuItem)
MenuItem: jest.fn(def => def)
}));
jest.mock('../../settings', () => ({
loadSettings: jest.fn(() => ({
Expand Down Expand Up @@ -106,6 +106,15 @@ describe('Tab Manager context-menu test suite', () => {
'adds MenuItem with label %s', async label => {
expect(electron.MenuItem).toHaveBeenCalledWith(expect.objectContaining({label}));
});
describe('separator', () => {
test('groups are separated by a separator', async () => {
// separator after Back and Reload
expect(mockMenu.entries[2].type).toBe('separator');
});
test('last item is not a separator', () => {
expect(mockMenu.entries[mockMenu.entries.length - 1].type).not.toBe('separator');
});
});
describe('Back', () => {
test('disabled when canGoBack returns false', async () => {
expect(electron.MenuItem).toHaveBeenCalledWith(expect.objectContaining({
Expand Down
6 changes: 5 additions & 1 deletion src/tab-manager/context-menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,14 @@ const spellCheckContextMenu = async (event, params) => {

const regularContextMenu = (event, params) => {
const menu = new Menu();
entries(event, params).forEach(group => {
const isVisible = me => !Object.keys(me).includes('visible') || me.visible === true;
entries(event, params).forEach((group, idx, arr) => {
for (const entry of group) {
menu.append(new MenuItem({...entry}));
}
if (group.filter(isVisible).length > 0 && idx < arr.length - 1) {
menu.append(new MenuItem({type: 'separator'}));
}
});
return menu;
};
Expand Down