Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 16 additions & 0 deletions src/composables/canvas/useSelectedLiteGraphItems.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,22 @@ describe('useSelectedLiteGraphItems', () => {
expect(node2.mode).toBe(LGraphEventMode.NEVER)
})

it('areAllSelectedNodesInMode returns true only when every selected node matches', () => {
const { areAllSelectedNodesInMode } = useSelectedLiteGraphItems()
const bypassed1 = { id: 1, mode: LGraphEventMode.BYPASS } as LGraphNode
const bypassed2 = { id: 2, mode: LGraphEventMode.BYPASS } as LGraphNode
const active = { id: 3, mode: LGraphEventMode.ALWAYS } as LGraphNode

app.canvas.selected_nodes = { '0': bypassed1, '1': bypassed2 }
expect(areAllSelectedNodesInMode(LGraphEventMode.BYPASS)).toBe(true)

app.canvas.selected_nodes = { '0': bypassed1, '1': active }
expect(areAllSelectedNodesInMode(LGraphEventMode.BYPASS)).toBe(false)

app.canvas.selected_nodes = {}
expect(areAllSelectedNodesInMode(LGraphEventMode.BYPASS)).toBe(false)
})

it('toggleSelectedNodesMode should set mode to ALWAYS when already in target mode', () => {
const { toggleSelectedNodesMode } = useSelectedLiteGraphItems()
const node = { id: 1, mode: LGraphEventMode.BYPASS } as LGraphNode
Expand Down
29 changes: 19 additions & 10 deletions src/composables/canvas/useSelectedLiteGraphItems.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,19 @@ export function useSelectedLiteGraphItems() {
return collectFromNodes(nodeArray)
}

/**
* True iff every selected (top-level) node is already in the given mode.
* Mirrors the predicate inside {@link toggleSelectedNodesMode} so callers
* (e.g. context-menu labels) can preview what the toggle will do.
*/
const areAllSelectedNodesInMode = (mode: LGraphEventMode): boolean => {
const selectedNodes = app.canvas.selected_nodes
if (!selectedNodes) return false
const selectedNodeArray = Object.values(selectedNodes)
if (selectedNodeArray.length === 0) return false
return selectedNodeArray.every((node) => node.mode === mode)
}

/**
* Toggle the execution mode of all selected nodes
*
Expand All @@ -105,15 +118,10 @@ export function useSelectedLiteGraphItems() {
const selectedNodes = app.canvas.selected_nodes
if (!selectedNodes) return

// Convert selected_nodes object to array
const selectedNodeArray: LGraphNode[] = []
for (const i in selectedNodes) {
selectedNodeArray.push(selectedNodes[i])
}
const allNodesMatch = !selectedNodeArray.some(
(selectedNode) => selectedNode.mode !== mode
)
const newModeForSelectedNode = allNodesMatch ? LGraphEventMode.ALWAYS : mode
const selectedNodeArray = Object.values(selectedNodes)
const newModeForSelectedNode = areAllSelectedNodesInMode(mode)
? LGraphEventMode.ALWAYS
: mode

for (const selectedNode of selectedNodeArray)
selectedNode.mode = newModeForSelectedNode
Expand All @@ -126,6 +134,7 @@ export function useSelectedLiteGraphItems() {
hasSelectableItems,
hasMultipleSelectableItems,
getSelectedNodes,
toggleSelectedNodesMode
toggleSelectedNodesMode,
areAllSelectedNodesInMode
}
}
27 changes: 27 additions & 0 deletions src/composables/graph/contextMenuConverter.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,33 @@ describe('contextMenuConverter', () => {
expect(getIndex('Node Info')).toBeLessThanOrEqual(getIndex('Color'))
})

it('should collapse legacy and Vue Remove Bypass to the Vue item when a node is bypassed', () => {
const options: MenuOption[] = [
{ label: 'Remove Bypass', action: () => {}, source: 'litegraph' },
{ label: 'Remove Bypass', action: () => {}, source: 'vue' }
]

const result = buildStructuredMenu(options)

const removeBypassItems = result.filter(
(opt) => opt.label === 'Remove Bypass'
)
expect(removeBypassItems).toHaveLength(1)
expect(removeBypassItems[0].source).toBe('vue')
})

it('should not treat Bypass and Remove Bypass as equivalent labels', () => {
const options: MenuOption[] = [
{ label: 'Bypass', action: () => {}, source: 'litegraph' },
{ label: 'Remove Bypass', action: () => {}, source: 'vue' }
]

const result = buildStructuredMenu(options)

expect(result.find((opt) => opt.label === 'Bypass')).toBeDefined()
expect(result.find((opt) => opt.label === 'Remove Bypass')).toBeDefined()
})

it('should recognize Frame Nodes as a core menu item', () => {
const options: MenuOption[] = [
{ label: 'Rename', source: 'vue' },
Expand Down
7 changes: 5 additions & 2 deletions src/services/litegraphService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,8 @@ export const useLitegraphService = () => {
const toastStore = useToastStore()
const widgetStore = useWidgetStore()
const canvasStore = useCanvasStore()
const { toggleSelectedNodesMode } = useSelectedLiteGraphItems()
const { toggleSelectedNodesMode, areAllSelectedNodesInMode } =
useSelectedLiteGraphItems()
const subgraphPseudoWidgetCache = new WeakMap<
SubgraphNode,
SubgraphPseudoWidgetCache<LGraphNode, IBaseWidget>
Expand Down Expand Up @@ -719,7 +720,9 @@ export const useLitegraphService = () => {
}

options.push({
content: 'Bypass',
content: areAllSelectedNodesInMode(LGraphEventMode.BYPASS)
? t('contextMenu.Remove Bypass')
: t('contextMenu.Bypass'),
callback: () => {
toggleSelectedNodesMode(LGraphEventMode.BYPASS)
canvas.setDirty(true, true)
Expand Down
Loading