mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-02-09 09:30:06 +00:00
* WIP
* WIP: UI design for right click menu
* feat: add composable for node customization and information handling
* fix: correct v-show directive in MaskEditorButton and enhance MoreOptions functionality
* feat: add selection and subgraph operations composables for enhanced graph management
* fix: update computed properties to use 'void' for non-reactive calls and add MenuOptionItem component
* feat: add composables for More Options menu and submenu positioning logic
* feat: refactor MoreOptions component to use MenuOptionItem for menu rendering and streamline submenu handling
* feat: implement SubmenuPopover component for enhanced submenu functionality and selection handling
* feat: add 'More Options' label and enhance shape options in localization file
* refactor: simplify shape name handling by removing Pascal case conversion and using localized names
* refactor: enhance submenu handling by dynamically setting refs and improving key assignment
* feat: implement useNodeArrangement composable for node alignment and distribution functionality
* feat: enhance useMoreOptionsMenu with image node operations and alignment options
* feat: localize context menu options and enhance submenu handling
* refactor: improve type safety for title assignment in selection operations and enhance color option retrieval in node customization
* fix: adjust component order in SelectionToolbox for improved layout
* feat: update FrameNodes button visibility and tooltip, and add localization for frameNodes
* feat: enhance button visibility logic in SelectionToolbox based on selection types
* refactor: reorganize properties panel option in More Options menu for single nodes
* remove excessive logging and alerts
* fix component tests
* ad browser tests
* feat: enhance popover behavior in MoreOptions component to manage visibility state during selection overlay changes
* refactor: update visibility logic for buttons in SelectionToolbox and ExecuteButton components
* refactor: remove duplicate shape option and clean up shapeOptions array
* refactor: update help toggle logic in InfoButton and useMoreOptionsMenu to manage sidebar and help state
* refactor: streamline node info handling and integrate output node filtering in useNodeInfo and useMoreOptionsMenu
* Added useSelectionState composable consolidating all selection-derived state and the node help toggle
* Updated toolbox buttons (InfoButton, BookmarkButton, BypassButton, MaskEditorButton, ConvertToSubgraphButton, PinButton, DeleteButton, ColorPickerButton, ExecuteButton, FrameNodes, Load3DViewerButton) to remove duplicated selection logic and use useSelectionState
* Introduced HideReason ('manual' | 'drag') to differentiate drag-induced hides from manual/outside hides in MoreOptions
* refactor: enhance popover visibility handling during drag events using canvas state
* fix: update shape option name from 'default' to 'box' and add localization for 'box'
* refactor: streamline BypassButton logic and enhance MoreOptions menu with state bumping
* refactor: remove toast notifications from subgraph operations for cleaner logic
* refactor: ensure menu options re-compute when selection flags change
* feat: Enhance MoreOptions behavior with drag-and-drop support
* fix: Update mask icon class for consistent styling in MaskEditorButton
* refactor: Standardize icon sizes and classes across selection toolbox buttons
* refactor: Update layout and styling in SelectionToolbox and MoreOptions components
* refactor: Improve selection toolbox behavior with more options state management
* Refactor: Remove unused imports and conditionally add subgraph option in menu
* Enhance popover behavior: add show/hide event handlers and improve positioning logic
* Cleanup: Remove debug comments from popover functions for clarity
* Refactor: Clean up FrameNodes component and add MenuOptionBadge for better option display
* Cleanup: Remove debug comments from useSelectionToolboxPosition for clarity
* Add useFrameNodes composable for grouping selected nodes
* Refactor: Update shape options in useNodeCustomization and localize frame nodes label
* fix tests
* Cleanup: Remove packageManager entry from package.json
* Refactor: Replace ILucide icons with named imports from lucide-vue-next
* Refactor: Update shape selection and improve color picker behavior in selection toolbox
* Update test expectations [skip ci]
* feat: Enhance More Options Menu for group node management and update localization strings
* refactor: Comment out PublishButton
* refactor: Comment out test for bookmark button visibility in SelectionToolbox
* refactor: Update class names for dark theme compatibility in ExecuteButton and MenuOptionItem components
* refactor: Modularize menu options by creating dedicated composables for group, image, node, and selection operations
* refactor: Update selectors in tests to match design changes
* refactor: Update help button selector in Node Help tests
* refactor: Update getGroupColorOptions to accept groupContext and bump parameters
* Update test expectations [skip ci]
* refactor: Center KSampler node before interaction in More Options submenu tests
* refactor: Adjust KSampler node positioning and simplify button click in More Options submenu tests
* refactor: Rename comfyPageFixture import for clarity
* refactor: use gap-1 instead of the explicit gap-[4px]
* refactor: Replace app.canvas with canvasStore.getCanvas for state management
* refactor: Simplify prop access by removing 'props.' prefix in MenuOptionItem component
* refactor: Remove explicit type annotation for item in buildSelectionSignature function
* refactor: Replace Lucide icons with string-based icon references in menu options
* refactor: Remove export from interface declarations for improved clarity
* refactor: Simplify class binding in BypassButton component for improved readability
* refactor: Update button class for consistent sizing in ExecuteButton component
* refactor: Update help button locator class for consistency in Node Help tests
* fix node help test
* refactor: Remove unused imports and simplify visibility conditions in selection toolbox components
* feat: Add 3D node selection logic and cleanup on unmount for selection toolbox
* refactor: Update help button locator to use consistent data-testid in Node Help tests
* fix: Correct help button locator syntax in Node Help tests
* refactor: Change resetMoreOptionsState to an internal function in useSelectionToolboxPosition
* test: Add Load3D node visibility logic for ColorPickerButton and remove redundant test case
* fix: Increase tooltip show delay for ColorPickerButton
* fix: Update selectedOutputNodes computation to filter by isLGraphNode
* fix: Remove unused nodeDef reference from InfoButton and submenu trigger from MenuOptionItem
* fix: Update showInfoButton logic to depend on nodeDef value
* refactor: Remove deprecated getBasicNodeOptions function for cleaner code
* refactor: Replace useNodeInfo with useSelectedNodeActions
* refactor: Integrate useNodeDefStore for improved node definition handling in SelectionToolbox and InfoButton tests
* refactor: Introduce useCanvasRefresh composable for consistent canvas refresh logic across node operations
* refactor: Remove irrelevant append-to attribute from Popover
* refactor: Use storeToRefs for selectedItems in useSelectionState and add tests for selection logic
* refactor: Update ExecuteButton to use hasOutputNodesSelected for visibility and remove unnecessary computed property
* refactor: move display of execution button tests to selectionToolbox
---------
Co-authored-by: github-actions <github-actions@github.com>
148 lines
3.7 KiB
TypeScript
148 lines
3.7 KiB
TypeScript
import { computed } from 'vue'
|
|
import { useI18n } from 'vue-i18n'
|
|
|
|
import { useCommandStore } from '@/stores/commandStore'
|
|
|
|
import { useFrameNodes } from './useFrameNodes'
|
|
import { BadgeVariant, type MenuOption } from './useMoreOptionsMenu'
|
|
import { useNodeArrangement } from './useNodeArrangement'
|
|
import { useSelectionOperations } from './useSelectionOperations'
|
|
import { useSubgraphOperations } from './useSubgraphOperations'
|
|
|
|
/**
|
|
* Composable for selection-related menu operations
|
|
*/
|
|
export function useSelectionMenuOptions() {
|
|
const { t } = useI18n()
|
|
const {
|
|
copySelection,
|
|
duplicateSelection,
|
|
deleteSelection,
|
|
renameSelection
|
|
} = useSelectionOperations()
|
|
|
|
const { alignOptions, distributeOptions, applyAlign, applyDistribute } =
|
|
useNodeArrangement()
|
|
|
|
const { convertToSubgraph, unpackSubgraph, addSubgraphToLibrary } =
|
|
useSubgraphOperations()
|
|
|
|
const { frameNodes } = useFrameNodes()
|
|
|
|
const alignSubmenu = computed(() =>
|
|
alignOptions.map((align) => ({
|
|
label: align.localizedName,
|
|
icon: align.icon,
|
|
action: () => applyAlign(align)
|
|
}))
|
|
)
|
|
|
|
const distributeSubmenu = computed(() =>
|
|
distributeOptions.map((distribute) => ({
|
|
label: distribute.localizedName,
|
|
icon: distribute.icon,
|
|
action: () => applyDistribute(distribute)
|
|
}))
|
|
)
|
|
|
|
const getBasicSelectionOptions = (): MenuOption[] => [
|
|
{
|
|
label: t('contextMenu.Rename'),
|
|
action: renameSelection
|
|
},
|
|
{
|
|
label: t('contextMenu.Copy'),
|
|
shortcut: 'Ctrl+C',
|
|
action: copySelection
|
|
},
|
|
{
|
|
label: t('contextMenu.Duplicate'),
|
|
shortcut: 'Ctrl+D',
|
|
action: duplicateSelection
|
|
}
|
|
]
|
|
|
|
const getSubgraphOptions = (hasSubgraphs: boolean): MenuOption[] => {
|
|
if (hasSubgraphs) {
|
|
return [
|
|
{
|
|
label: t('contextMenu.Add Subgraph to Library'),
|
|
icon: 'icon-[lucide--folder-plus]',
|
|
action: addSubgraphToLibrary
|
|
},
|
|
{
|
|
label: t('contextMenu.Unpack Subgraph'),
|
|
icon: 'icon-[lucide--expand]',
|
|
action: unpackSubgraph
|
|
}
|
|
]
|
|
} else {
|
|
return [
|
|
{
|
|
label: t('contextMenu.Convert to Subgraph'),
|
|
icon: 'icon-[lucide--shrink]',
|
|
action: convertToSubgraph,
|
|
badge: BadgeVariant.NEW
|
|
}
|
|
]
|
|
}
|
|
}
|
|
|
|
const getMultipleNodesOptions = (): MenuOption[] => {
|
|
const convertToGroupNodes = () => {
|
|
const commandStore = useCommandStore()
|
|
void commandStore.execute(
|
|
'Comfy.GroupNode.ConvertSelectedNodesToGroupNode'
|
|
)
|
|
}
|
|
|
|
return [
|
|
{
|
|
label: t('contextMenu.Convert to Group Node'),
|
|
icon: 'icon-[lucide--group]',
|
|
action: convertToGroupNodes,
|
|
badge: BadgeVariant.DEPRECATED
|
|
},
|
|
{
|
|
label: t('g.frameNodes'),
|
|
icon: 'icon-[lucide--frame]',
|
|
action: frameNodes
|
|
}
|
|
]
|
|
}
|
|
|
|
const getAlignmentOptions = (): MenuOption[] => [
|
|
{
|
|
label: t('contextMenu.Align Selected To'),
|
|
icon: 'icon-[lucide--align-start-horizontal]',
|
|
hasSubmenu: true,
|
|
submenu: alignSubmenu.value,
|
|
action: () => {}
|
|
},
|
|
{
|
|
label: t('contextMenu.Distribute Nodes'),
|
|
icon: 'icon-[lucide--align-center-horizontal]',
|
|
hasSubmenu: true,
|
|
submenu: distributeSubmenu.value,
|
|
action: () => {}
|
|
}
|
|
]
|
|
|
|
const getDeleteOption = (): MenuOption => ({
|
|
label: t('contextMenu.Delete'),
|
|
icon: 'icon-[lucide--trash-2]',
|
|
shortcut: 'Delete',
|
|
action: deleteSelection
|
|
})
|
|
|
|
return {
|
|
getBasicSelectionOptions,
|
|
getSubgraphOptions,
|
|
getMultipleNodesOptions,
|
|
getDeleteOption,
|
|
getAlignmentOptions,
|
|
alignSubmenu,
|
|
distributeSubmenu
|
|
}
|
|
}
|