Skip to content
Closed
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
49 changes: 49 additions & 0 deletions browser_tests/assets/inputs/checkpoint_loader.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"last_node_id": 4,
"last_link_id": 0,
"nodes": [
{
"id": 4,
"type": "CheckpointLoaderSimple",
"pos": [400, 300],
"size": [350, 240],
"flags": {},
"order": 0,
"mode": 0,
"outputs": [
{
"name": "MODEL",
"type": "MODEL",
"links": [],
"slot_index": 0
},
{
"name": "CLIP",
"type": "CLIP",
"links": [],
"slot_index": 1
},
{
"name": "VAE",
"type": "VAE",
"links": [],
"slot_index": 2
}
],
"properties": {
"Node name for S&R": "CheckpointLoaderSimple"
},
"widgets_values": ["sd_xl_base_1.0.safetensors"]
}
],
"links": [],
"groups": [],
"config": {},
"extra": {
"ds": {
"scale": 0.8,
"offset": [0, 0]
}
},
"version": 0.4
}
64 changes: 64 additions & 0 deletions browser_tests/tests/sidebar/modelLibrary.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -301,3 +301,67 @@ test.describe('Model library sidebar - empty state', () => {
})
})
})

test.describe('Model library drops on Vue nodes', { tag: '@vue-nodes' }, () => {
test.use({ initialSettings: { 'Comfy.ModelLibrary.UseAssetBrowser': false } })

test.beforeEach(async ({ comfyPage }) => {
await comfyPage.modelLibrary.mockFoldersWithFiles(MOCK_FOLDERS)
await comfyPage.workflow.loadWorkflow('inputs/checkpoint_loader')
const tab = comfyPage.menu.modelLibraryTab
await tab.open()
await tab.refreshButton.click()
await tab.getFolderByLabel('checkpoints').click()
await expect(tab.getLeafByLabel('dreamshaper_8')).toBeVisible()
await comfyPage.command.executeCommand('Comfy.Canvas.FitView')
await comfyPage.canvasOps.waitForViewToSettle()
})

test.afterEach(async ({ comfyPage }) => {
await comfyPage.modelLibrary.clearMocks()
await comfyPage.canvasOps.resetView()
})

test('updates an existing loader without creating another node', async ({
comfyPage
}) => {
const [loader] = await comfyPage.nodeOps.getNodeRefsByType(
'CheckpointLoaderSimple'
)
const filename = await loader.getWidgetByName('ckpt_name')
const node = comfyPage.vueNodes.getNodeByTitle('Load Checkpoint')
const nodeCount = await comfyPage.nodeOps.getGraphNodesCount()
await comfyPage.menu.modelLibraryTab
.getLeafByLabel('dreamshaper_8')
.dragTo(node)
await comfyPage.nextFrame()
await expect(node).toContainText('dreamshaper_8.safetensors')
await expect
.poll(() => filename.getValue())
.toBe('dreamshaper_8.safetensors')
await expect
.poll(() => comfyPage.nodeOps.getGraphNodesCount())
.toBe(nodeCount)
})

test('still creates a loader when dropped onto empty canvas', async ({
comfyPage
}) => {
await comfyPage.menu.topbar.newWorkflowButton.click()
await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(0)
const box = (await comfyPage.canvas.boundingBox())!
await comfyPage.menu.modelLibraryTab
.getLeafByLabel('dreamshaper_8')
.dragTo(comfyPage.canvas, {
targetPosition: { x: box.width / 2, y: box.height / 2 }
})
await comfyPage.nextFrame()
await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(1)
const [loader] = await comfyPage.nodeOps.getNodeRefsByType(
'CheckpointLoaderSimple'
)
await expect
.poll(async () => (await loader.getWidgetByName('ckpt_name')).getValue())
.toBe('dreamshaper_8.safetensors')
})
})
35 changes: 35 additions & 0 deletions browser_tests/tests/vueNodes/layout/ecsBridgeHistory.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {
comfyExpect as expect,
comfyPageFixture as test
} from '@e2e/fixtures/ComfyPage'
import { TestIds } from '@e2e/fixtures/selectors'
import { toNodeId } from '@/types/nodeId'

test.describe(
Expand Down Expand Up @@ -80,6 +81,40 @@ test.describe(
})
})

test('preserves Redo after Undo normalizes a subgraph node size', async ({
comfyPage
}) => {
await comfyPage.workflow.loadWorkflow(
'subgraphs/subgraph-with-promoted-text-widget'
)
await comfyPage.vueNodes.enterSubgraph('11')
await comfyPage.command.executeCommand('Comfy.Canvas.FitView')

const node = await comfyPage.vueNodes.getFixtureByTitle('KSampler')
const title = 'Sampling with a long descriptive title for this workflow'
const rootBreadcrumb = comfyPage.page.getByTestId(
TestIds.breadcrumb.item('root')
)
await node.setTitle(title)
await rootBreadcrumb.click()
await comfyPage.vueNodes.enterSubgraph('11')

const stepsRow = comfyPage.vueNodes.getWidgetRowByLabel(title, 'steps')
const steps = stepsRow.getByRole('spinbutton')
await comfyPage.vueNodes.setInputNumberValue(stepsRow, '21')
await expect(steps).toHaveValue('21')
await rootBreadcrumb.click()
await comfyPage.vueNodes.enterSubgraph('11')

await comfyPage.command.executeCommand('Comfy.Undo')
await expect(steps).toHaveValue('20')
await rootBreadcrumb.click()

await comfyPage.command.executeCommand('Comfy.Redo')
await comfyPage.vueNodes.enterSubgraph('11')
await expect(steps).toHaveValue('21')
})

test('preserves geometry through navigation, renderer toggle, and history', async ({
comfyPage
}) => {
Expand Down
42 changes: 40 additions & 2 deletions src/components/graph/GraphCanvas.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
import { fromPartial } from '@total-typescript/shoehorn'
import { getActivePinia } from 'pinia'
import { render, screen } from '@testing-library/vue'
import { fireEvent, render, screen } from '@testing-library/vue'
import type { RenderOptions } from '@testing-library/vue'
import { beforeEach, describe, expect, it, vi } from 'vitest'
import {
assert,
beforeEach,
describe,
expect,
it,
onTestFinished,
vi
} from 'vitest'
import { nextTick } from 'vue'
import { createI18n } from 'vue-i18n'

Expand All @@ -10,6 +19,7 @@ import { useSettingStore } from '@/platform/settings/settingStore'
import { useReleaseStore } from '@/platform/updates/common/releaseStore'
import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
import { api } from '@/scripts/api'
import { app } from '@/scripts/app'
import { useBootstrapStore } from '@/stores/bootstrapStore'
import { useExecutionStore } from '@/stores/executionStore'
Expand Down Expand Up @@ -217,6 +227,34 @@ describe('GraphCanvas first-run tour wiring', () => {
})
})

describe('GraphCanvas canvas parent', () => {
it('keeps title-editor touches within the canvas parent used by extensions', async () => {
vi.spyOn(api, 'getSystemStats').mockResolvedValue(
fromPartial({ devices: [] })
)
await mountGraphCanvas({
TitleEditor: { template: '<input aria-label="Node title" />' }
})
// eslint-disable-next-line testing-library/no-node-access -- Extensions use this canvas ID.
const canvas = document.getElementById('graph-canvas')
assert.exists(canvas)
// eslint-disable-next-line testing-library/no-node-access -- Canvas-parent listeners are the compatibility contract under test.
const parent = canvas.parentElement
assert.exists(parent)
const receivedTouch = vi.fn()
parent.addEventListener('touchstart', receivedTouch, true)
onTestFinished(() =>
parent.removeEventListener('touchstart', receivedTouch, true)
)

await fireEvent.touchStart(
screen.getByRole('textbox', { name: 'Node title' })
)

expect(receivedTouch).toHaveBeenCalledOnce()
})
})

describe('GraphCanvas execution progress updates', () => {
async function mountProgressHarness({
totalNodes = 1_000,
Expand Down
8 changes: 8 additions & 0 deletions src/components/graph/GraphCanvas.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
<!-- TransformPane for Vue node rendering -->
<TransformPane
v-if="shouldRenderVueNodes && comfyApp.canvas && comfyAppReady"
ref="transformPaneRef"
:canvas="comfyApp.canvas"
:inert="agentNodeSelectionStore.isActive"
@wheel.capture="canvasInteractions.forwardEventToCanvas"
Expand Down Expand Up @@ -224,6 +225,12 @@ const emit = defineEmits<{
ready: []
}>()
const canvasRef = ref<HTMLCanvasElement | null>(null)
const transformPaneRef =
useTemplateRef<InstanceType<typeof TransformPane>>('transformPaneRef')
const vueNodeDropTarget = computed(() => {
const element: unknown = transformPaneRef.value?.$el
return element instanceof HTMLElement ? element : null
})
const canvasPanelBoundsRef = useTemplateRef('canvasPanelBoundsRef')
const nodeSearchboxPopoverRef = shallowRef<InstanceType<
typeof NodeSearchboxPopover
Expand Down Expand Up @@ -488,6 +495,7 @@ const comfyAppReady = ref(false)
const workflowPersistence = useWorkflowPersistence()
const { runUrlActionLoaders } = useUrlActionLoaders()
useCanvasDrop(canvasRef)
useCanvasDrop(vueNodeDropTarget)
useLitegraphSettings()
useNodeBadge()

Expand Down
2 changes: 1 addition & 1 deletion src/components/sidebar/tabs/ModelLibrarySidebarTab.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ describe('ModelLibrarySidebarTab', () => {
'checkpoints'
)
expect(useNodeDragToCanvas().startDrag).toHaveBeenCalledWith(mockNodeDef, {
widgetValues: { ckpt_name: 'model.safetensors' },
widgetValues: [{ selector: 'ckpt_name', value: 'model.safetensors' }],
source: 'sidebar_drag'
})
})
Expand Down
8 changes: 6 additions & 2 deletions src/composables/node/startModelNodeDragFromAsset.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ describe('startModelNodeDragFromAsset', () => {

expect(error).toBeUndefined()
expect(useNodeDragToCanvas().startDrag).toHaveBeenCalledWith(nodeDef, {
widgetValues: { ckpt_name: 'sd_xl_base_1.0.safetensors' },
widgetValues: [
{ selector: 'ckpt_name', value: 'sd_xl_base_1.0.safetensors' }
],
source: 'sidebar_drag'
})
})
Expand All @@ -57,7 +59,9 @@ describe('startModelNodeDragFromAsset', () => {
startModelNodeDragFromAsset(createAsset(), 'asset_browser')

expect(useNodeDragToCanvas().startDrag).toHaveBeenCalledWith(nodeDef, {
widgetValues: { ckpt_name: 'sd_xl_base_1.0.safetensors' },
widgetValues: [
{ selector: 'ckpt_name', value: 'sd_xl_base_1.0.safetensors' }
],
source: 'asset_browser'
})
})
Expand Down
4 changes: 3 additions & 1 deletion src/composables/node/startModelNodeDragFromAsset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ export function startModelLoaderDrag(
filename: string,
source: NodeAddSource = 'sidebar_drag'
) {
const widgetValues = provider.key ? { [provider.key]: filename } : undefined
const widgetValues = provider.key
? [{ selector: provider.key, value: filename }]
: undefined
useNodeDragToCanvas().startDrag(provider.nodeDef, { widgetValues, source })
}

Expand Down
60 changes: 58 additions & 2 deletions src/composables/node/useNodeDragToCanvas.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ describe('useNodeDragToCanvas', () => {

const { startDrag } = useNodeDragToCanvas()
startDrag(mockNodeDef, {
widgetValues: { ckpt_name: 'model.safetensors' }
widgetValues: [{ selector: 'ckpt_name', value: 'model.safetensors' }]
})

document.dispatchEvent(
Expand All @@ -275,6 +275,62 @@ describe('useNodeDragToCanvas', () => {
expect(widget.value).toBe('model.safetensors')
})

it('should apply a pattern selection to the first matching widget', () => {
mockCanvas.canvas.getBoundingClientRect.mockReturnValue({
left: 0,
right: 500,
top: 0,
bottom: 500
})
mockConvertEventToCanvasOffset.mockReturnValue([150, 150])
const placedNode = new LGraphNode('Placed node')
const strength = placedNode.addWidget(
'number',
'loras.0.strength',
0.5,
() => {}
)
const first = placedNode.addWidget(
'text',
'loras.0.lora_name',
'A.safetensors',
() => {}
)
const second = placedNode.addWidget(
'text',
'loras.1.lora_name',
'B.safetensors',
() => {}
)
vi.mocked(useLitegraphService().addNodeOnGraph).mockReturnValue(
placedNode
)

const { startDrag } = useNodeDragToCanvas()
startDrag(mockNodeDef, {
widgetValues: [
{
selector: /^loras\.(?:0|[1-9]\d*)\.lora_name$/,
value: 'C.safetensors'
}
]
})

document.dispatchEvent(
new PointerEvent('pointerup', {
clientX: 250,
clientY: 250,
bubbles: true
})
)

expect([strength.value, first.value, second.value]).toEqual([
0.5,
'C.safetensors',
'B.safetensors'
])
})

it('should warn but still place the node when a requested widget is missing', () => {
mockCanvas.canvas.getBoundingClientRect.mockReturnValue({
left: 0,
Expand All @@ -293,7 +349,7 @@ describe('useNodeDragToCanvas', () => {

const { startDrag } = useNodeDragToCanvas()
startDrag(mockNodeDef, {
widgetValues: { ckpt_name: 'model.safetensors' }
widgetValues: [{ selector: 'ckpt_name', value: 'model.safetensors' }]
})

document.dispatchEvent(
Expand Down
Loading
Loading