mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-24 16:29:45 +00:00
- Add 4 legacy mode selection bounding box tests (expanded/collapsed x bottom-left/bottom-right) - Extract assertSelectionEncompassesNodes shared helper - Add boundingRect fallback for legacy nodes without DOM elements - Rename Vue mode test describe for symmetry
113 lines
3.4 KiB
TypeScript
113 lines
3.4 KiB
TypeScript
import type { Page } from '@playwright/test'
|
|
|
|
export interface CanvasRect {
|
|
x: number
|
|
y: number
|
|
w: number
|
|
h: number
|
|
}
|
|
|
|
export interface MeasureResult {
|
|
selectionBounds: CanvasRect | null
|
|
nodeVisualBounds: Record<string, CanvasRect>
|
|
}
|
|
|
|
// Must match createBounds(selectedItems, 10) in src/extensions/core/selectionBorder.ts:19
|
|
const SELECTION_PADDING = 10
|
|
|
|
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
|
|
// For collapsed nodes, use DOM element size (matches selectionBorder.ts
|
|
// which reads layoutStore.collapsedSize in Vue mode)
|
|
const id = 'id' in item ? String(item.id) : null
|
|
const isCollapsed =
|
|
'flags' in item &&
|
|
!!(item as { flags?: { collapsed?: boolean } }).flags?.collapsed
|
|
const el =
|
|
id && isCollapsed
|
|
? document.querySelector(`[data-node-id="${id}"]`)
|
|
: null
|
|
const w = el instanceof HTMLElement ? el.offsetWidth : rect[2]
|
|
const h = el instanceof HTMLElement ? el.offsetHeight : rect[3]
|
|
|
|
minX = Math.min(minX, rect[0])
|
|
minY = Math.min(minY, rect[1])
|
|
maxX = Math.max(maxX, rect[0] + w)
|
|
maxY = Math.max(maxY, rect[1] + h)
|
|
}
|
|
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
|
|
|
|
// Legacy mode: no Vue DOM element, use boundingRect directly
|
|
if (!nodeEl) {
|
|
const node = window.app!.graph._nodes.find(
|
|
(n: { id: number | string }) => String(n.id) === id
|
|
)
|
|
if (node) {
|
|
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_PADDING }
|
|
) as Promise<MeasureResult>
|
|
}
|