Skip to content

Commit 765d99a

Browse files
feat(ui): remove entity list context menu (again)
stupid events
1 parent ac9a66a commit 765d99a

File tree

2 files changed

+5
-20
lines changed

2 files changed

+5
-20
lines changed

invokeai/frontend/web/src/features/controlLayers/components/CanvasPanelContent.tsx

+4-19
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,22 @@
1-
import { Box, ContextMenu, Divider, Flex, MenuList } from '@invoke-ai/ui-library';
1+
import { Divider, Flex } from '@invoke-ai/ui-library';
22
import { useAppSelector } from 'app/store/storeHooks';
33
import { CanvasAddEntityButtons } from 'features/controlLayers/components/CanvasAddEntityButtons';
44
import { CanvasEntityList } from 'features/controlLayers/components/CanvasEntityList/CanvasEntityList';
55
import { EntityListActionBar } from 'features/controlLayers/components/CanvasEntityList/EntityListActionBar';
6-
import { CanvasEntityListMenuItems } from 'features/controlLayers/components/CanvasEntityList/EntityListActionBarAddLayerMenuItems';
76
import { CanvasManagerProviderGate } from 'features/controlLayers/contexts/CanvasManagerProviderGate';
87
import { selectHasEntities } from 'features/controlLayers/store/selectors';
9-
import { memo, useCallback } from 'react';
8+
import { memo } from 'react';
109

1110
export const CanvasPanelContent = memo(() => {
1211
const hasEntities = useAppSelector(selectHasEntities);
13-
const renderMenu = useCallback(
14-
() => (
15-
<MenuList>
16-
<CanvasEntityListMenuItems />
17-
</MenuList>
18-
),
19-
[]
20-
);
2112

2213
return (
2314
<CanvasManagerProviderGate>
2415
<Flex flexDir="column" gap={2} w="full" h="full">
2516
<EntityListActionBar />
2617
<Divider py={0} />
27-
<ContextMenu<HTMLDivElement> renderMenu={renderMenu}>
28-
{(ref) => (
29-
<Box ref={ref} w="full" h="full">
30-
{!hasEntities && <CanvasAddEntityButtons />}
31-
{hasEntities && <CanvasEntityList />}
32-
</Box>
33-
)}
34-
</ContextMenu>
18+
{!hasEntities && <CanvasAddEntityButtons />}
19+
{hasEntities && <CanvasEntityList />}
3520
</Flex>
3621
</CanvasManagerProviderGate>
3722
);

invokeai/frontend/web/src/features/controlLayers/components/common/CanvasEntityHeader.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export const CanvasEntityHeader = memo(({ children, ...rest }: FlexProps) => {
5656
}, [entityIdentifier]);
5757

5858
return (
59-
<ContextMenu renderMenu={renderMenu} stopImmediatePropagation>
59+
<ContextMenu renderMenu={renderMenu}>
6060
{(ref) => (
6161
<Flex ref={ref} gap={2} alignItems="center" p={2} {...rest}>
6262
{children}

0 commit comments

Comments
 (0)