Skip to content

Simplify ContextMenuItemGroup (removing originalListener) #7067

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
Jul 1, 2025
Merged

Simplify ContextMenuItemGroup (removing originalListener) #7067

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
69 changes: 32 additions & 37 deletions packages/compass-components/src/components/context-menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ export function ContextMenuProvider({
export function ContextMenu({ menu }: ContextMenuWrapperProps) {
const menuRef = useRef(null);

const position = menu.position;
const itemGroups = menu.itemGroups;
const { position, itemGroups } = menu;

useEffect(() => {
if (!menu.isOpen) {
Expand All @@ -50,42 +49,38 @@ export function ContextMenu({ menu }: ContextMenuWrapperProps) {
setOpen={menu.close}
justify="start"
>
{itemGroups.map(
(itemGroup: ContextMenuItemGroup, groupIndex: number) => {
return (
<div
key={`menu-group-${groupIndex}`}
data-testid={`menu-group-${groupIndex}`}
>
{itemGroup.items.map(
(item: ContextMenuItem, itemIndex: number) => {
return (
<MenuItem
key={`menu-group-${groupIndex}-item-${itemIndex}`}
data-text={item.label}
data-testid={`menu-group-${groupIndex}-item-${itemIndex}`}
onClick={(evt: React.MouseEvent) => {
item.onAction?.(evt);
menu.close();
}}
>
{item.label}
</MenuItem>
);
}
)}
{groupIndex < itemGroups.length - 1 && (
<div
key={`menu-group-${groupIndex}-separator`}
data-testid={`menu-group-${groupIndex}-separator`}
{itemGroups.map((items: ContextMenuItemGroup, groupIndex: number) => {
return (
<div
key={`menu-group-${groupIndex}`}
data-testid={`menu-group-${groupIndex}`}
>
{items.map((item: ContextMenuItem, itemIndex: number) => {
return (
<MenuItem
key={`menu-group-${groupIndex}-item-${itemIndex}`}
data-text={item.label}
data-testid={`menu-group-${groupIndex}-item-${itemIndex}`}
onClick={(evt: React.MouseEvent) => {
item.onAction?.(evt);
menu.close();
}}
>
<MenuSeparator />
</div>
)}
</div>
);
}
)}
{item.label}
</MenuItem>
);
})}
{groupIndex < itemGroups.length - 1 && (
<div
key={`menu-group-${groupIndex}-separator`}
data-testid={`menu-group-${groupIndex}-separator`}
>
<MenuSeparator />
</div>
)}
</div>
);
})}
</Menu>
</div>
);
Expand Down
5 changes: 1 addition & 4 deletions packages/compass-context-menu/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
export interface ContextMenuItemGroup {
items: ContextMenuItem[];
originListener: (event: MouseEvent) => void;
}
export type ContextMenuItemGroup = ContextMenuItem[];

export type ContextMenuState = {
isOpen: boolean;
Expand Down
5 changes: 1 addition & 4 deletions packages/compass-context-menu/src/use-context-menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,7 @@ export function useContextMenu<
*/
registerItems(items: ContextMenuItem[]) {
function listener(event: MouseEvent): void {
appendContextMenuContent(event, {
items,
originListener: listener,
});
appendContextMenuContent(event, items);
}

return (trigger: HTMLElement | null) => {
Expand Down
Loading