mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-20 06:20:11 +00:00
## Summary Fix subgraph internal node positions being permanently corrupted when entering a subgraph after a draft workflow reload. The corruption accumulated across page refreshes, causing nodes to progressively drift apart or compress together. ## Changes - **What**: In the `ResizeObserver` callback (`useVueNodeResizeTracking.ts`), node positions are now read from the Layout Store (source of truth, initialized from LiteGraph) instead of reverse-converting DOM screen coordinates via `getBoundingClientRect()` + `clientPosToCanvasPos()`. The fallback to DOM-based conversion is retained only for nodes not yet present in the Layout Store. ## Root Cause `ResizeObserver` was using `getBoundingClientRect()` to get DOM element positions, then converting them to canvas coordinates via `clientPosToCanvasPos()`. This conversion depends on the current `canvas.ds.scale` and `canvas.ds.offset`. During graph transitions (e.g., entering a subgraph from a draft-loaded workflow), the canvas viewport was stale — it still had the **parent graph's zoom level** because `fitView()` hadn't run yet (it's scheduled via `requestAnimationFrame`). The `ResizeObserver` callback fired before `fitView`, converting DOM positions using the wrong scale/offset, and writing the corrupted positions to the Layout Store. The `useLayoutSync` writeback then permanently overwrote the LiteGraph node positions. The corruption accumulated across sessions: 1. Load workflow → enter subgraph → `ResizeObserver` writes corrupted positions 2. Draft auto-saves the corrupted positions to localStorage 3. Page refresh → draft loads with corrupted positions → enter subgraph → positions corrupted further 4. Each cycle amplifies the drift based on the parent graph's zoom level This is the same class of bug that PR #9121 fixed for **slot** positions — the DOM→canvas coordinate conversion is inherently fragile during viewport transitions. This PR applies the same principle to **node** positions. ## Why This Only Affects `main` (No Backport Needed) This bug requires two features that only exist on `main`, not on `core/1.41` or `core/1.42`: 1. **PR #10247** changed `subgraphNavigationStore`'s watcher to `flush: 'sync'` and added `requestAnimationFrame(fitView)` on viewport cache miss. This creates the timing window where `ResizeObserver` fires before `fitView` corrects the canvas scale. 2. **PR #6811** added hash-based subgraph auto-entry on page load, which triggers graph transitions during the draft reload flow. On 1.41/1.42, `restoreViewport` does nothing on cache miss (no `fitView` scheduling), and the watcher uses default async flush — so the `ResizeObserver` never runs with a stale viewport. ## Review Focus - The core change is small: use `nodeLayout.position` (already in the Layout Store from `initializeFromLiteGraph`) instead of computing position from `getBoundingClientRect()`. This eliminates the dependency on canvas scale/offset being up-to-date during `ResizeObserver` callbacks. - The fallback path (`getBoundingClientRect` → `clientPosToCanvasPos`) is retained for nodes not yet in the Layout Store (e.g., first render of a newly created node). At that point the canvas transform is stable, so the conversion is safe. - Unit tests updated to reflect that position is no longer overwritten from DOM when Layout Store already has the position. - E2E test added: load subgraph workflow → enter subgraph → reload (draft) → verify positions preserved. ## E2E Test Fixes - `subgraphDraftPositions.spec.ts`: replaced `comfyPage.setup({ clearStorage: false })` with `page.reload()` + explicit draft persistence polling. The `setup()` method performs a full navigation via `goto()` which bypassed the draft auto-load flow. - `SubgraphHelper.packAllInteriorNodes`: replaced `canvas.click()` with `dispatchEvent('pointerdown'/'pointerup')`. The position fix places subgraph nodes at their correct locations, which now overlap with DOM widget textareas that intercept pointer events. ## Test Plan - [x] Unit tests pass (`useVueNodeResizeTracking.test.ts`) - [x] E2E test: `subgraphDraftPositions.spec.ts` — draft reload preserves subgraph node positions - [x] Manual: load workflow with subgraph, zoom in/out on root graph, enter subgraph, verify no position drift - [x] Manual: repeat with page refresh (draft reload) — positions should be stable across reloads - [x] Manual: drag nodes inside subgraph — positions should update correctly - [x] Manual: create new node inside subgraph — position should be set correctly (fallback path) ## Screenshots Before <img width="1331" height="879" alt="스크린샷 2026-04-03 오전 3 56 48" src="https://github.com/user-attachments/assets/377d1b2e-6d47-4884-8181-920e22fa6541" /> After <img width="1282" height="715" alt="스크린샷 2026-04-03 오전 3 58 24" src="https://github.com/user-attachments/assets/34528f6c-0225-4538-9383-227c849bccad" /> ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-10828-fix-prevent-subgraph-node-position-corruption-during-graph-transitions-3366d73d365081418502dbb78da54013) by [Unito](https://www.unito.io) --------- Co-authored-by: Alexander Brown <drjkl@comfy.org>
183 lines
5.5 KiB
TypeScript
183 lines
5.5 KiB
TypeScript
import { readFileSync } from 'fs'
|
|
|
|
import type { AppMode } from '../../../src/composables/useAppMode'
|
|
import type {
|
|
ComfyApiWorkflow,
|
|
ComfyWorkflowJSON
|
|
} from '../../../src/platform/workflow/validation/schemas/workflowSchema'
|
|
import type { WorkspaceStore } from '../../types/globals'
|
|
import type { ComfyPage } from '../ComfyPage'
|
|
import { assetPath } from '../utils/paths'
|
|
|
|
type FolderStructure = {
|
|
[key: string]: FolderStructure | string
|
|
}
|
|
|
|
export class WorkflowHelper {
|
|
constructor(private readonly comfyPage: ComfyPage) {}
|
|
|
|
convertLeafToContent(structure: FolderStructure): FolderStructure {
|
|
const result: FolderStructure = {}
|
|
|
|
for (const [key, value] of Object.entries(structure)) {
|
|
if (typeof value === 'string') {
|
|
const filePath = assetPath(value)
|
|
result[key] = readFileSync(filePath, 'utf-8')
|
|
} else {
|
|
result[key] = this.convertLeafToContent(value)
|
|
}
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
async setupWorkflowsDirectory(structure: FolderStructure) {
|
|
const resp = await this.comfyPage.request.post(
|
|
`${this.comfyPage.url}/api/devtools/setup_folder_structure`,
|
|
{
|
|
data: {
|
|
tree_structure: this.convertLeafToContent(structure),
|
|
base_path: `user/${this.comfyPage.id}/workflows`
|
|
}
|
|
}
|
|
)
|
|
|
|
if (resp.status() !== 200) {
|
|
throw new Error(
|
|
`Failed to setup workflows directory: ${await resp.text()}`
|
|
)
|
|
}
|
|
|
|
await this.comfyPage.page.evaluate(async () => {
|
|
await (
|
|
window.app!.extensionManager as WorkspaceStore
|
|
).workflow.syncWorkflows()
|
|
})
|
|
|
|
// Wait for Vue to re-render the workflow list
|
|
await this.comfyPage.nextFrame()
|
|
}
|
|
|
|
async waitForDraftPersisted({ timeout = 5000 } = {}) {
|
|
await this.comfyPage.page.waitForFunction(
|
|
() =>
|
|
Object.keys(localStorage).some((k) =>
|
|
k.startsWith('Comfy.Workflow.Draft.v2:')
|
|
),
|
|
{ timeout }
|
|
)
|
|
}
|
|
|
|
async loadWorkflow(workflowName: string) {
|
|
await this.comfyPage.workflowUploadInput.setInputFiles(
|
|
assetPath(`${workflowName}.json`)
|
|
)
|
|
await this.comfyPage.nextFrame()
|
|
}
|
|
|
|
async deleteWorkflow(
|
|
workflowName: string,
|
|
whenMissing: 'ignoreMissing' | 'throwIfMissing' = 'ignoreMissing'
|
|
) {
|
|
// Open workflows tab
|
|
const { workflowsTab } = this.comfyPage.menu
|
|
await workflowsTab.open()
|
|
|
|
// Action to take if workflow missing
|
|
if (whenMissing === 'ignoreMissing') {
|
|
const workflows = await workflowsTab.getTopLevelSavedWorkflowNames()
|
|
if (!workflows.includes(workflowName)) return
|
|
}
|
|
|
|
// Delete workflow
|
|
await workflowsTab.getPersistedItem(workflowName).click({ button: 'right' })
|
|
await this.comfyPage.contextMenu.clickMenuItem('Delete')
|
|
await this.comfyPage.nextFrame()
|
|
await this.comfyPage.confirmDialog.delete.click()
|
|
|
|
// Clear toast & close tab
|
|
await this.comfyPage.toast.closeToasts(1)
|
|
await workflowsTab.close()
|
|
}
|
|
|
|
async getUndoQueueSize(): Promise<number | undefined> {
|
|
return this.comfyPage.page.evaluate(() => {
|
|
const workflow = (window.app!.extensionManager as WorkspaceStore).workflow
|
|
.activeWorkflow
|
|
return workflow?.changeTracker.undoQueue.length
|
|
})
|
|
}
|
|
|
|
async getRedoQueueSize(): Promise<number | undefined> {
|
|
return this.comfyPage.page.evaluate(() => {
|
|
const workflow = (window.app!.extensionManager as WorkspaceStore).workflow
|
|
.activeWorkflow
|
|
return workflow?.changeTracker.redoQueue.length
|
|
})
|
|
}
|
|
|
|
async getActiveWorkflowPath(): Promise<string | undefined> {
|
|
return this.comfyPage.page.evaluate(() => {
|
|
return (window.app!.extensionManager as WorkspaceStore).workflow
|
|
.activeWorkflow?.path
|
|
})
|
|
}
|
|
|
|
async getActiveWorkflowActiveAppMode(): Promise<AppMode | null | undefined> {
|
|
return this.comfyPage.page.evaluate(() => {
|
|
return (window.app!.extensionManager as WorkspaceStore).workflow
|
|
.activeWorkflow?.activeMode
|
|
})
|
|
}
|
|
|
|
async getActiveWorkflowInitialMode(): Promise<AppMode | null | undefined> {
|
|
return this.comfyPage.page.evaluate(() => {
|
|
return (window.app!.extensionManager as WorkspaceStore).workflow
|
|
.activeWorkflow?.initialMode
|
|
})
|
|
}
|
|
|
|
async getLinearModeFromGraph(): Promise<boolean | undefined> {
|
|
return this.comfyPage.page.evaluate(() => {
|
|
return window.app!.rootGraph.extra?.linearMode as boolean | undefined
|
|
})
|
|
}
|
|
|
|
async getOpenWorkflowCount(): Promise<number> {
|
|
return this.comfyPage.page.evaluate(() => {
|
|
return (window.app!.extensionManager as WorkspaceStore).workflow.workflows
|
|
.length
|
|
})
|
|
}
|
|
|
|
async isCurrentWorkflowModified(): Promise<boolean | undefined> {
|
|
return this.comfyPage.page.evaluate(() => {
|
|
return (window.app!.extensionManager as WorkspaceStore).workflow
|
|
.activeWorkflow?.isModified
|
|
})
|
|
}
|
|
|
|
async waitForWorkflowIdle(timeout = 5000): Promise<void> {
|
|
await this.comfyPage.page.waitForFunction(
|
|
() =>
|
|
!(window.app?.extensionManager as WorkspaceStore | undefined)?.workflow
|
|
?.isBusy,
|
|
undefined,
|
|
{ timeout }
|
|
)
|
|
}
|
|
|
|
async getExportedWorkflow(options: { api: true }): Promise<ComfyApiWorkflow>
|
|
async getExportedWorkflow(options?: {
|
|
api?: false
|
|
}): Promise<ComfyWorkflowJSON>
|
|
async getExportedWorkflow(options?: {
|
|
api?: boolean
|
|
}): Promise<ComfyWorkflowJSON | ComfyApiWorkflow> {
|
|
const api = options?.api ?? false
|
|
return this.comfyPage.page.evaluate(async (api) => {
|
|
return (await window.app!.graphToPrompt())[api ? 'output' : 'workflow']
|
|
}, api)
|
|
}
|
|
}
|