diff --git a/src/components/selectionbar/SubgraphNodeWidget.vue b/src/components/selectionbar/SubgraphNodeWidget.vue index c6bc35582..0639accc9 100644 --- a/src/components/selectionbar/SubgraphNodeWidget.vue +++ b/src/components/selectionbar/SubgraphNodeWidget.vue @@ -46,7 +46,7 @@ function onClick() { padding: 4px 16px 4px 0; word-break: break-all; border-radius: 4px; - background: var(--bg-color, #202020); + background: var(--p-dialog-background, #202020); } .widget-node { color: var(--color-slate-100, #9c9eab); diff --git a/src/core/graph/subgraph/useSubgraphNodeDialog.ts b/src/core/graph/subgraph/useSubgraphNodeDialog.ts index 7977dd626..fcc11a0a1 100644 --- a/src/core/graph/subgraph/useSubgraphNodeDialog.ts +++ b/src/core/graph/subgraph/useSubgraphNodeDialog.ts @@ -1,4 +1,3 @@ -import SubgraphNode from '@/components/selectionbar/SubgraphNode.vue' import { type DialogComponentProps, useDialogStore } from '@/stores/dialogStore' const key = 'global-subgraph-node-config' @@ -11,11 +10,15 @@ export function showSubgraphNodeDialog() { closable: false, position: 'right' } - - dialogStore.showDialog({ - title: 'Parameters', - key, - component: SubgraphNode, - dialogComponentProps - }) + //FIXME: the vuedraggable import has unknown sideffects that break tests. + void import('@/components/selectionbar/SubgraphNode.vue').then( + (SubgraphNode) => { + dialogStore.showDialog({ + title: 'Parameters', + key, + component: SubgraphNode, + dialogComponentProps + }) + } + ) } diff --git a/tests-ui/tests/litegraph/core/__snapshots__/litegraph.test.ts.snap b/tests-ui/tests/litegraph/core/__snapshots__/litegraph.test.ts.snap index 5302edcbc..15a7dfca1 100644 --- a/tests-ui/tests/litegraph/core/__snapshots__/litegraph.test.ts.snap +++ b/tests-ui/tests/litegraph/core/__snapshots__/litegraph.test.ts.snap @@ -134,6 +134,7 @@ LiteGraphGlobal { "WIDGET_BGCOLOR": "#222", "WIDGET_DISABLED_TEXT_COLOR": "#666", "WIDGET_OUTLINE_COLOR": "#666", + "WIDGET_PROMOTED_OUTLINE_COLOR": "#BF00FF", "WIDGET_SECONDARY_TEXT_COLOR": "#999", "WIDGET_TEXT_COLOR": "#DDD", "allow_multi_output_for_events": true, diff --git a/tests-ui/tests/widgets/proxyWidget.test.ts b/tests-ui/tests/widgets/proxyWidget.test.ts index fc0ab5f2f..5996079e0 100644 --- a/tests-ui/tests/widgets/proxyWidget.test.ts +++ b/tests-ui/tests/widgets/proxyWidget.test.ts @@ -1,15 +1,21 @@ import { describe, expect, test, vi } from 'vitest' -import '@/core/graph/subgraph/proxyWidget' -//import { ComponentWidgetImpl, DOMWidgetImpl } from '@/scripts/domWidget' - -import { LGraphNode, type SubgraphNode } from '@/lib/litegraph/src/litegraph' +import { registerProxyWidgets } from '@/core/graph/subgraph/proxyWidget' +import { + type LGraphCanvas, + LGraphNode, + type SubgraphNode +} from '@/lib/litegraph/src/litegraph' import { createTestSubgraph, createTestSubgraphNode } from '../litegraph/subgraph/fixtures/subgraphHelpers' +registerProxyWidgets({ + canvas: { addEventListener() {} } +} as unknown as LGraphCanvas) + vi.mock('@/renderer/core/canvas/canvasStore', () => ({ useCanvasStore: () => ({}) }))