-
Notifications
You must be signed in to change notification settings - Fork 406
Contextmenu Monkeypatch Standardization #5977
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.
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
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
3bc9bcc
feat(contextMenu): add extension API for context menu items
Myestery f78cf05
Merge branch 'main' into contextmenu-for-extensions
Myestery 3defee1
refactor(contextMenu): use invokeExtensions pattern for menu collection
Myestery f858803
test: overhaul context menu extension tests
Myestery 9e8c004
fix(tests): update type assertion for separator in context menu tests
Myestery File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,7 @@ import { shallowRef } from 'vue' | |
| import { useCanvasPositionConversion } from '@/composables/element/useCanvasPositionConversion' | ||
| import { registerProxyWidgets } from '@/core/graph/subgraph/proxyWidget' | ||
| import { st, t } from '@/i18n' | ||
| import type { IContextMenuValue } from '@/lib/litegraph/src/interfaces' | ||
| import { | ||
| LGraph, | ||
| LGraphCanvas, | ||
|
|
@@ -1667,6 +1668,56 @@ export class ComfyApp { | |
| useExtensionService().registerExtension(extension) | ||
| } | ||
|
|
||
| /** | ||
| * Collects context menu items from all extensions for canvas menus | ||
| * @param canvas The canvas instance | ||
| * @returns Array of context menu items from all extensions | ||
| */ | ||
| collectCanvasMenuItems(canvas: LGraphCanvas): IContextMenuValue[] { | ||
| const items: IContextMenuValue[] = [] | ||
|
|
||
| for (const ext of this.extensions) { | ||
| if (ext.getCanvasMenuItems) { | ||
| try { | ||
| const extItems = ext.getCanvasMenuItems(canvas) | ||
| items.push(...extItems) | ||
| } catch (error) { | ||
| console.error( | ||
| `[Context Menu] Extension "${ext.name}" failed to provide canvas menu items:`, | ||
Myestery marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| error | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return items | ||
| } | ||
|
|
||
| /** | ||
| * Collects context menu items from all extensions for node menus | ||
| * @param node The node being right-clicked | ||
| * @returns Array of context menu items from all extensions | ||
| */ | ||
| collectNodeMenuItems(node: LGraphNode): IContextMenuValue[] { | ||
| const items: IContextMenuValue[] = [] | ||
|
|
||
| for (const ext of this.extensions) { | ||
|
||
| if (ext.getNodeMenuItems) { | ||
| try { | ||
| const extItems = ext.getNodeMenuItems(node) | ||
| items.push(...extItems) | ||
| } catch (error) { | ||
| console.error( | ||
| `[Context Menu] Extension "${ext.name}" failed to provide node menu items:`, | ||
| error | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return items | ||
| } | ||
|
|
||
| /** | ||
| * Refresh combo list on whole nodes | ||
| */ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.