mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-03-09 23:20:04 +00:00
## Summary Refactors the error and subgraph node footer UI by extracting a dedicated `NodeFooter` component and replacing the CSS `outline` approach with a layered border overlay for selection/executing state indicators. ## Changes - **What**: Extracted `NodeFooter.vue` from `LGraphNode.vue` to encapsulate the footer tab logic (subgraph enter, error, advanced inputs). Replaced CSS `outline` with an absolutely-positioned border overlay div for selection and executing state. Added a separate root border overlay div for the node body border. Removed unused `isTransparent` function from `colorUtil.ts`. - **Dependencies**: None ## Review Focus - The layered overlay approach (`absolute -inset-[3px] border-3`) for selection/executing outlines vs the previous `outline-3` approach — ensures the outline renders outside the node bounds correctly including the footer area - `NodeFooter` handles 4 cases: subgraph+error (dual tabs), error only, subgraph only, advanced inputs — verify edge cases render correctly - Resize handle bottom offset adjustments for nodes with footers (`hasFooter`) ## Screenshots <img width="1142" height="603" alt="image" src="https://github.com/user-attachments/assets/e0d401f0-8516-4f5f-ab77-48a79530f4bd" /> <img width="1175" height="577" alt="image" src="https://github.com/user-attachments/assets/bcf08fff-728a-491c-add9-5b96d2f3bfce" /> ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-9360-style-Update-error-subgraph-node-footer-design-with-layered-overlay-approach-3186d73d365081b2ac31f166f4d1944a) by [Unito](https://www.unito.io) --------- Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: GitHub Action <action@github.com>
191 lines
5.2 KiB
TypeScript
191 lines
5.2 KiB
TypeScript
/**
|
|
* Vue Node Test Helpers
|
|
*/
|
|
import type { Locator, Page } from '@playwright/test'
|
|
|
|
import { TestIds } from './selectors'
|
|
import { VueNodeFixture } from './utils/vueNodeFixtures'
|
|
|
|
export class VueNodeHelpers {
|
|
constructor(private page: Page) {}
|
|
|
|
/**
|
|
* Get locator for all Vue node components in the DOM
|
|
*/
|
|
get nodes(): Locator {
|
|
return this.page.locator('[data-node-id]')
|
|
}
|
|
|
|
/**
|
|
* Get locator for a Vue node by its NodeId
|
|
*/
|
|
getNodeLocator(nodeId: string): Locator {
|
|
return this.page.locator(`[data-node-id="${nodeId}"]`)
|
|
}
|
|
|
|
/**
|
|
* Get locator for selected Vue node components (using visual selection indicators)
|
|
*/
|
|
get selectedNodes(): Locator {
|
|
return this.page.locator('[data-node-id].outline-node-component-outline')
|
|
}
|
|
|
|
/**
|
|
* Get locator for a Vue node by the node's title (displayed name in the header)
|
|
*/
|
|
getNodeByTitle(title: string): Locator {
|
|
return this.page.locator(`[data-node-id]`).filter({ hasText: title })
|
|
}
|
|
|
|
/**
|
|
* Get total count of Vue nodes in the DOM
|
|
*/
|
|
async getNodeCount(): Promise<number> {
|
|
return await this.nodes.count()
|
|
}
|
|
|
|
/**
|
|
* Get count of selected Vue nodes
|
|
*/
|
|
async getSelectedNodeCount(): Promise<number> {
|
|
return await this.selectedNodes.count()
|
|
}
|
|
|
|
/**
|
|
* Get all Vue node IDs currently in the DOM
|
|
*/
|
|
async getNodeIds(): Promise<string[]> {
|
|
return await this.nodes.evaluateAll((nodes) =>
|
|
nodes
|
|
.map((n) => n.getAttribute('data-node-id'))
|
|
.filter((id): id is string => id !== null)
|
|
)
|
|
}
|
|
|
|
/**
|
|
* Select a specific Vue node by ID
|
|
*/
|
|
async selectNode(nodeId: string): Promise<void> {
|
|
await this.page
|
|
.locator(`[data-node-id="${nodeId}"] .lg-node-header`)
|
|
.click()
|
|
}
|
|
|
|
/**
|
|
* Select multiple Vue nodes by IDs using Ctrl+click
|
|
*/
|
|
async selectNodes(nodeIds: string[]): Promise<void> {
|
|
if (nodeIds.length === 0) return
|
|
|
|
// Select first node normally
|
|
await this.selectNode(nodeIds[0])
|
|
|
|
// Add additional nodes with Ctrl+click on header
|
|
for (let i = 1; i < nodeIds.length; i++) {
|
|
await this.page
|
|
.locator(`[data-node-id="${nodeIds[i]}"] .lg-node-header`)
|
|
.click({
|
|
modifiers: ['Control']
|
|
})
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Clear all selections by clicking empty space
|
|
*/
|
|
async clearSelection(): Promise<void> {
|
|
await this.page.mouse.click(50, 50)
|
|
}
|
|
|
|
/**
|
|
* Delete selected Vue nodes using Delete key
|
|
*/
|
|
async deleteSelected(): Promise<void> {
|
|
await this.page.locator('#graph-canvas').focus()
|
|
await this.page.keyboard.press('Delete')
|
|
}
|
|
|
|
/**
|
|
* Delete selected Vue nodes using Backspace key
|
|
*/
|
|
async deleteSelectedWithBackspace(): Promise<void> {
|
|
await this.page.locator('#graph-canvas').focus()
|
|
await this.page.keyboard.press('Backspace')
|
|
}
|
|
|
|
/**
|
|
* Return a DOM-focused VueNodeFixture for the first node matching the title.
|
|
* Resolves the node id up front so subsequent interactions survive title changes.
|
|
*/
|
|
async getFixtureByTitle(title: string): Promise<VueNodeFixture> {
|
|
const node = this.getNodeByTitle(title).first()
|
|
await node.waitFor({ state: 'visible' })
|
|
|
|
const nodeId = await node.evaluate((el) => el.getAttribute('data-node-id'))
|
|
if (!nodeId) {
|
|
throw new Error(
|
|
`Vue node titled "${title}" is missing its data-node-id attribute`
|
|
)
|
|
}
|
|
|
|
return new VueNodeFixture(this.getNodeLocator(nodeId))
|
|
}
|
|
|
|
/**
|
|
* Wait for Vue nodes to be rendered
|
|
*/
|
|
async waitForNodes(expectedCount?: number): Promise<void> {
|
|
if (expectedCount !== undefined) {
|
|
await this.page.waitForFunction(
|
|
(count) => document.querySelectorAll('[data-node-id]').length >= count,
|
|
expectedCount
|
|
)
|
|
} else {
|
|
await this.page.waitForSelector('[data-node-id]')
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Get a specific widget by node title and widget name
|
|
*/
|
|
getWidgetByName(nodeTitle: string, widgetName: string): Locator {
|
|
return this.getNodeByTitle(nodeTitle).getByLabel(widgetName, {
|
|
exact: true
|
|
})
|
|
}
|
|
|
|
/**
|
|
* Get controls for input number widgets (increment/decrement buttons and input)
|
|
*/
|
|
getInputNumberControls(widget: Locator) {
|
|
return {
|
|
input: widget.locator('input'),
|
|
decrementButton: widget.getByTestId(TestIds.widgets.decrement),
|
|
incrementButton: widget.getByTestId(TestIds.widgets.increment)
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Enter the subgraph of a node.
|
|
* @param nodeId - The ID of the node to enter the subgraph of. If not provided, the first matched subgraph will be entered.
|
|
*/
|
|
async enterSubgraph(nodeId?: string): Promise<void> {
|
|
const locator = nodeId ? this.getNodeLocator(nodeId) : this.page
|
|
const editButton = locator.getByTestId(TestIds.widgets.subgraphEnterButton)
|
|
|
|
// The footer tab button extends below the node body (visible area),
|
|
// but its bounding box center overlaps the node body div.
|
|
// Click at the bottom 25% of the button which is the genuinely visible
|
|
// and unobstructed area outside the node body boundary.
|
|
const box = await editButton.boundingBox()
|
|
if (!box) {
|
|
throw new Error(
|
|
'subgraph-enter-button has no bounding box: element may be hidden or not in DOM'
|
|
)
|
|
}
|
|
await editButton.click({
|
|
position: { x: box.width / 2, y: box.height * 0.75 }
|
|
})
|
|
}
|
|
}
|