mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-19 22:09:37 +00:00
3b78dfbe1c
## Summary Complete the @e2e/ path alias migration started in #10735 by converting all 354 remaining relative imports and adding a lint rule to prevent backsliding. ## Changes - **What**: Migrate all relative imports in browser_tests/ to use `@e2e/` (intra-directory) and `@/` (src/ imports) path aliases. Add `no-restricted-imports` ESLint rule banning `./` and `../` imports in `browser_tests/**/*.ts`. Suppress pre-existing oxlint `no-eval` and `no-console` warnings exposed by touching those files. ## Review Focus - ESLint flat-config merging: the `@playwright/test` ban and relative-import ban are in two separate blocks to avoid last-match-wins collision with the `useI18n`/`useVirtualList` blocks higher in the config. - The `['./**', '../**']` glob patterns (not `['./*', '../*']`) are needed to catch multi-level relative paths like `../../../src/foo`. Follows up on #10735 ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-10958-test-migrate-browser_tests-to-e2e-path-alias-and-add-lint-rule-33c6d73d365081649d1be771eac986fd) by [Unito](https://www.unito.io) Co-authored-by: Amp <amp@ampcode.com>
105 lines
2.5 KiB
TypeScript
105 lines
2.5 KiB
TypeScript
import type { ReadOnlyRect } from '@/lib/litegraph/src/interfaces'
|
|
import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
|
|
|
|
interface FitToViewOptions {
|
|
selectionOnly?: boolean
|
|
zoom?: number
|
|
padding?: number
|
|
}
|
|
|
|
/**
|
|
* Instantly fits the canvas view to graph content without waiting for UI animation.
|
|
*
|
|
* Lives outside the shared fixture to keep the default ComfyPage interactions user-oriented.
|
|
*/
|
|
export async function fitToViewInstant(
|
|
comfyPage: ComfyPage,
|
|
options: FitToViewOptions = {}
|
|
) {
|
|
const { selectionOnly = false, zoom = 0.75, padding = 10 } = options
|
|
|
|
const rectangles = await comfyPage.page.evaluate<
|
|
ReadOnlyRect[] | null,
|
|
{ selectionOnly: boolean }
|
|
>(
|
|
({ selectionOnly }) => {
|
|
const app = window.app
|
|
if (!app?.canvas) return null
|
|
|
|
const canvas = app.canvas
|
|
const items = (() => {
|
|
if (selectionOnly && canvas.selectedItems?.size) {
|
|
return Array.from(canvas.selectedItems)
|
|
}
|
|
try {
|
|
return Array.from(canvas.positionableItems ?? [])
|
|
} catch {
|
|
return []
|
|
}
|
|
})()
|
|
|
|
if (!items.length) return null
|
|
|
|
const rects: ReadOnlyRect[] = []
|
|
|
|
for (const item of items) {
|
|
const rect = item?.boundingRect
|
|
if (!rect) continue
|
|
|
|
const x = Number(rect[0])
|
|
const y = Number(rect[1])
|
|
const width = Number(rect[2])
|
|
const height = Number(rect[3])
|
|
|
|
rects.push([x, y, width, height] as const)
|
|
}
|
|
|
|
return rects.length ? rects : null
|
|
},
|
|
{ selectionOnly }
|
|
)
|
|
|
|
if (!rectangles || rectangles.length === 0) return
|
|
|
|
let minX = Infinity
|
|
let minY = Infinity
|
|
let maxX = -Infinity
|
|
let maxY = -Infinity
|
|
|
|
for (const [x, y, width, height] of rectangles) {
|
|
minX = Math.min(minX, Number(x))
|
|
minY = Math.min(minY, Number(y))
|
|
maxX = Math.max(maxX, Number(x) + Number(width))
|
|
maxY = Math.max(maxY, Number(y) + Number(height))
|
|
}
|
|
|
|
const hasFiniteBounds =
|
|
Number.isFinite(minX) &&
|
|
Number.isFinite(minY) &&
|
|
Number.isFinite(maxX) &&
|
|
Number.isFinite(maxY)
|
|
|
|
if (!hasFiniteBounds) return
|
|
|
|
const bounds: ReadOnlyRect = [
|
|
minX - padding,
|
|
minY - padding,
|
|
maxX - minX + 2 * padding,
|
|
maxY - minY + 2 * padding
|
|
]
|
|
|
|
await comfyPage.page.evaluate(
|
|
({ bounds, zoom }) => {
|
|
const app = window.app
|
|
if (!app?.canvas) return
|
|
|
|
const canvas = app.canvas
|
|
canvas.ds.fitToBounds(bounds, { zoom })
|
|
canvas.setDirty(true, true)
|
|
},
|
|
{ bounds, zoom }
|
|
)
|
|
|
|
await comfyPage.nextFrame()
|
|
}
|