mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-01-27 03:19:56 +00:00
## Summary - Add `NodeContextMenu.vue` using PrimeVue ContextMenu component with native submenu support - Rename `SubmenuPopover.vue` to `ColorPickerMenu.vue` (specialized for color picker) - Delete old components: `NodeOptions.vue`, `MenuOptionItem.vue`, `useSubmenuPositioning.ts` - Wire up context menu converter in `useMoreOptionsMenu.ts` - Update tests to use hover instead of click for submenus ## Dependencies **This PR depends on #7113** - the context menu converter infrastructure PR. It should be merged after that PR. ## Benefits - Native PrimeVue submenu support with proper keyboard navigation - Constrained menu dimensions with overflow scrolling (max-h-[80vh]) - Cleaner component architecture with ~280 fewer lines of code - Better separation: ColorPickerMenu handles only the custom color picker UI ## Test plan - [x] Typecheck passes - [x] Lint passes - [x] Knip passes - [ ] Browser tests for submenu interactions pass - [ ] Manual testing of node context menu ## Screenshots (Menu UI should look the same, with improved submenu behavior) ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7114-feat-Replace-NodeOptions-with-PrimeVue-ContextMenu-2be6d73d365081fda576fd691175eacf) by [Unito](https://www.unito.io) --------- Co-authored-by: GitHub Action <action@github.com>
130 lines
3.2 KiB
TypeScript
130 lines
3.2 KiB
TypeScript
import { computed } from 'vue'
|
|
import { useI18n } from 'vue-i18n'
|
|
|
|
import type { MenuOption } from './useMoreOptionsMenu'
|
|
import { useNodeCustomization } from './useNodeCustomization'
|
|
import { useSelectedNodeActions } from './useSelectedNodeActions'
|
|
import type { NodeSelectionState } from './useSelectionState'
|
|
|
|
/**
|
|
* Composable for node-related menu operations
|
|
*/
|
|
export function useNodeMenuOptions() {
|
|
const { t } = useI18n()
|
|
const { shapeOptions, applyShape, applyColor, colorOptions, isLightTheme } =
|
|
useNodeCustomization()
|
|
const {
|
|
adjustNodeSize,
|
|
toggleNodeCollapse,
|
|
toggleNodePin,
|
|
toggleNodeBypass,
|
|
runBranch
|
|
} = useSelectedNodeActions()
|
|
|
|
const shapeSubmenu = computed(() =>
|
|
shapeOptions.map((shape) => ({
|
|
label: shape.localizedName,
|
|
action: () => applyShape(shape)
|
|
}))
|
|
)
|
|
|
|
const colorSubmenu = computed(() => {
|
|
return colorOptions.map((colorOption) => ({
|
|
label: colorOption.localizedName,
|
|
color: isLightTheme.value
|
|
? colorOption.value.light
|
|
: colorOption.value.dark,
|
|
action: () =>
|
|
applyColor(colorOption.name === 'noColor' ? null : colorOption)
|
|
}))
|
|
})
|
|
|
|
const getAdjustSizeOption = (): MenuOption => ({
|
|
label: t('contextMenu.Adjust Size'),
|
|
icon: 'icon-[lucide--move-diagonal-2]',
|
|
action: adjustNodeSize
|
|
})
|
|
|
|
const getNodeVisualOptions = (
|
|
states: NodeSelectionState,
|
|
bump: () => void
|
|
): MenuOption[] => [
|
|
{
|
|
label: states.collapsed
|
|
? t('contextMenu.Expand Node')
|
|
: t('contextMenu.Minimize Node'),
|
|
icon: states.collapsed
|
|
? 'icon-[lucide--maximize-2]'
|
|
: 'icon-[lucide--minimize-2]',
|
|
action: () => {
|
|
toggleNodeCollapse()
|
|
bump()
|
|
}
|
|
},
|
|
{
|
|
label: t('contextMenu.Shape'),
|
|
icon: 'icon-[lucide--box]',
|
|
hasSubmenu: true,
|
|
submenu: shapeSubmenu.value,
|
|
action: () => {}
|
|
},
|
|
{
|
|
label: t('contextMenu.Color'),
|
|
icon: 'icon-[lucide--palette]',
|
|
hasSubmenu: true,
|
|
submenu: colorSubmenu.value,
|
|
isColorPicker: true,
|
|
action: () => {}
|
|
}
|
|
]
|
|
|
|
const getPinOption = (
|
|
states: NodeSelectionState,
|
|
bump: () => void
|
|
): MenuOption => ({
|
|
label: states.pinned ? t('contextMenu.Unpin') : t('contextMenu.Pin'),
|
|
icon: states.pinned ? 'icon-[lucide--pin-off]' : 'icon-[lucide--pin]',
|
|
action: () => {
|
|
toggleNodePin()
|
|
bump()
|
|
}
|
|
})
|
|
|
|
const getBypassOption = (
|
|
states: NodeSelectionState,
|
|
bump: () => void
|
|
): MenuOption => ({
|
|
label: states.bypassed
|
|
? t('contextMenu.Remove Bypass')
|
|
: t('contextMenu.Bypass'),
|
|
icon: 'icon-[lucide--redo-dot]',
|
|
shortcut: 'Ctrl+B',
|
|
action: () => {
|
|
toggleNodeBypass()
|
|
bump()
|
|
}
|
|
})
|
|
|
|
const getRunBranchOption = (): MenuOption => ({
|
|
label: t('contextMenu.Run Branch'),
|
|
icon: 'icon-[lucide--play]',
|
|
action: runBranch
|
|
})
|
|
|
|
const getNodeInfoOption = (showNodeHelp: () => void): MenuOption => ({
|
|
label: t('contextMenu.Node Info'),
|
|
icon: 'icon-[lucide--info]',
|
|
action: showNodeHelp
|
|
})
|
|
|
|
return {
|
|
getNodeInfoOption,
|
|
getAdjustSizeOption,
|
|
getNodeVisualOptions,
|
|
getPinOption,
|
|
getBypassOption,
|
|
getRunBranchOption,
|
|
colorSubmenu
|
|
}
|
|
}
|