mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-05-23 22:25:05 +00:00
*PR Created by the Glary-Bot Agent* --- ## Summary - Eliminates the confusing dual-helpers structure where `browser_tests/helpers/` and `browser_tests/fixtures/helpers/` coexisted one tier apart with overlapping purposes - Routes each file to its natural home based on what it actually *is*: page objects → `components/`, standalone utils → `utils/`, domain helper classes stay in `helpers/` - Adds an ESLint guard (`no-restricted-imports`) to prevent re-creating `browser_tests/helpers/` ## File Moves | File | From | To | Reason | |---|---|---|---| | `actionbar.ts` | `helpers/` | `fixtures/components/Actionbar.ts` | Page object class imported by ComfyPage | | `templates.ts` | `helpers/` | `fixtures/components/Templates.ts` | Page object class imported by ComfyPage | | `boundsUtils.ts` | `fixtures/helpers/` | `fixtures/utils/` | Pure function, not a helper class | | `mimeTypeUtil.ts` | `fixtures/helpers/` | `fixtures/utils/` | Pure function, not a helper class | | `builderTestUtils.ts` | `helpers/` | `fixtures/utils/` | Shared test setup functions | | `clipboardSpy.ts` | `helpers/` | `fixtures/utils/` | Page injection utility | | `fitToView.ts` | `helpers/` | `fixtures/utils/` | Canvas utility function | | `manageGroupNode.ts` | `helpers/` | `fixtures/utils/` | Litegraph interaction helper | | `painter.ts` | `helpers/` | `fixtures/utils/` | Test helper functions | | `perfReporter.ts` | `helpers/` | `fixtures/utils/` | Test infrastructure | | `promotedWidgets.ts` | `helpers/` | `fixtures/utils/` | Query helpers for specs | ## What Changed Beyond File Moves - **28 import statements** updated across test specs, fixtures, and infra files - **AGENTS.md** — directory tree diagram and architectural separation descriptions updated - **README.md** — "Leverage Existing Fixtures and Helpers" section updated - **`.claude/skills/perf-fix-with-proof/SKILL.md`** — perfReporter path reference updated - **`eslint.config.ts`** — added `@e2e/helpers/*` restricted import pattern to both spec and non-spec browser_tests rules ## Verification - `pnpm typecheck` — clean - `pnpm typecheck:browser` — clean - `pnpm lint` — 0 errors, 0 warnings - `pnpm format:check` — all files formatted - `pnpm knip` — clean - Pre-commit hooks passed full pipeline (oxfmt, oxlint, eslint, typecheck, typecheck:browser) ## Config Audit No changes needed to: `tsconfig.json` (`@e2e/*` alias covers all subdirs), `playwright.config.ts`, `vite.config.mts`, `knip.config.ts`, `.oxlintrc.json`, `nx.json` ## Manual Verification Note This is a pure structural refactoring (file moves + import updates) with zero behavioral or visual changes. The typecheck and lint passes confirm all imports resolve correctly. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-11411-refactor-consolidate-browser_tests-helpers-into-fixtures-3476d73d3650816cb671ef7fa8433f66) by [Unito](https://www.unito.io) --------- Co-authored-by: glary-bot <glary-bot@comfy.org> Co-authored-by: Glary-Bot <glary-bot@users.noreply.github.com> Co-authored-by: DrJKL <DrJKL0424@gmail.com> 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()
|
|
}
|