mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-05-24 14:45:36 +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>
96 lines
2.9 KiB
TypeScript
96 lines
2.9 KiB
TypeScript
import type { Page } from '@playwright/test'
|
|
|
|
import { SELECTION_BOUNDS_PADDING } from '@/base/common/selectionBounds'
|
|
import type { CanvasRect } from '@/base/common/selectionBounds'
|
|
|
|
export type { CanvasRect }
|
|
|
|
export interface MeasureResult {
|
|
selectionBounds: CanvasRect | null
|
|
nodeVisualBounds: Record<string, CanvasRect>
|
|
}
|
|
|
|
export async function measureSelectionBounds(
|
|
page: Page,
|
|
nodeIds: string[]
|
|
): Promise<MeasureResult> {
|
|
return page.evaluate(
|
|
({ ids, padding }) => {
|
|
const canvas = window.app!.canvas
|
|
const ds = canvas.ds
|
|
|
|
const selectedItems = canvas.selectedItems
|
|
let minX = Infinity
|
|
let minY = Infinity
|
|
let maxX = -Infinity
|
|
let maxY = -Infinity
|
|
for (const item of selectedItems) {
|
|
const rect = item.boundingRect
|
|
minX = Math.min(minX, rect[0])
|
|
minY = Math.min(minY, rect[1])
|
|
maxX = Math.max(maxX, rect[0] + rect[2])
|
|
maxY = Math.max(maxY, rect[1] + rect[3])
|
|
}
|
|
const selectionBounds =
|
|
selectedItems.size > 0
|
|
? {
|
|
x: minX - padding,
|
|
y: minY - padding,
|
|
w: maxX - minX + 2 * padding,
|
|
h: maxY - minY + 2 * padding
|
|
}
|
|
: null
|
|
|
|
const canvasEl = canvas.canvas as HTMLCanvasElement
|
|
const canvasRect = canvasEl.getBoundingClientRect()
|
|
const nodeVisualBounds: Record<
|
|
string,
|
|
{ x: number; y: number; w: number; h: number }
|
|
> = {}
|
|
|
|
for (const id of ids) {
|
|
const nodeEl = document.querySelector(
|
|
`[data-node-id="${id}"]`
|
|
) as HTMLElement | null
|
|
const isLegacyCanvasNodeWithoutVueDom = !nodeEl
|
|
|
|
if (isLegacyCanvasNodeWithoutVueDom) {
|
|
const node = window.app!.graph._nodes.find(
|
|
(n: { id: number | string }) => String(n.id) === id
|
|
)
|
|
if (!node) {
|
|
throw new Error(`Node ${id} not found in graph`)
|
|
}
|
|
const rect = node.boundingRect
|
|
nodeVisualBounds[id] = {
|
|
x: rect[0],
|
|
y: rect[1],
|
|
w: rect[2],
|
|
h: rect[3]
|
|
}
|
|
continue
|
|
}
|
|
|
|
const domRect = nodeEl.getBoundingClientRect()
|
|
const footerEls = nodeEl.querySelectorAll(
|
|
'[data-testid="subgraph-enter-button"], [data-testid="node-footer"]'
|
|
)
|
|
let bottom = domRect.bottom
|
|
for (const footerEl of footerEls) {
|
|
bottom = Math.max(bottom, footerEl.getBoundingClientRect().bottom)
|
|
}
|
|
|
|
nodeVisualBounds[id] = {
|
|
x: (domRect.left - canvasRect.left) / ds.scale - ds.offset[0],
|
|
y: (domRect.top - canvasRect.top) / ds.scale - ds.offset[1],
|
|
w: domRect.width / ds.scale,
|
|
h: (bottom - domRect.top) / ds.scale
|
|
}
|
|
}
|
|
|
|
return { selectionBounds, nodeVisualBounds }
|
|
},
|
|
{ ids: nodeIds, padding: SELECTION_BOUNDS_PADDING }
|
|
) as Promise<MeasureResult>
|
|
}
|