mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-20 06:20:11 +00:00
39d81834d4
- Merge latest main to resolve conflicts
- Fix asset browser filtering: pass target input name (e.g.,
'ckpt_name') instead of PrimitiveNode's widget name ('value')
**Changes:**
- Add `inputNameForBrowser` param to `createAssetWidget`
- Pass `targetInputName` from `PrimitiveNode._createAssetWidget`
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-8596-fix-merge-main-and-pass-target-input-name-to-asset-browser-2fd6d73d36508112bb17cf5d3fe54687)
by [Unito](https://www.unito.io)
---------
Co-authored-by: Subagent 5 <subagent@example.com>
Co-authored-by: Amp <amp@ampcode.com>
Co-authored-by: GitHub Action <action@github.com>
Co-authored-by: guill <jacob.e.segal@gmail.com>
Co-authored-by: Jin Yi <jin12cc@gmail.com>
Co-authored-by: Alexander Brown <drjkl@comfy.org>
Co-authored-by: AustinMroz <austin@comfy.org>
Co-authored-by: Comfy Org PR Bot <snomiao+comfy-pr@gmail.com>
Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: Johnpaul Chiwetelu <49923152+Myestery@users.noreply.github.com>
Co-authored-by: Rizumu Ayaka <rizumu@ayaka.moe>
Co-authored-by: Kelly Yang <124ykl@gmail.com>
Co-authored-by: sno <snomiao@gmail.com>
Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>
Co-authored-by: Benjamin Lu <benjaminlu1107@gmail.com>
Co-authored-by: Terry Jia <terryjia88@gmail.com>
Co-authored-by: Luke Mino-Altherr <luke@comfy.org>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
94 lines
3.1 KiB
TypeScript
94 lines
3.1 KiB
TypeScript
import { expect } from '@playwright/test'
|
|
|
|
import { comfyPageFixture as test } from '../../fixtures/ComfyPage'
|
|
import { TestIds } from '../../fixtures/selectors'
|
|
|
|
test.describe('Properties panel position', () => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
// Open a sidebar tab to ensure sidebar is visible
|
|
await comfyPage.menu.nodeLibraryTab.open()
|
|
await comfyPage.actionbar.propertiesButton.click()
|
|
})
|
|
|
|
test('positions on the right when sidebar is on the left', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.settings.setSetting('Comfy.Sidebar.Location', 'left')
|
|
await comfyPage.nextFrame()
|
|
|
|
const propertiesPanel = comfyPage.page.getByTestId(
|
|
TestIds.propertiesPanel.root
|
|
)
|
|
const sidebar = comfyPage.page.locator('.side-bar-panel').first()
|
|
|
|
await expect(propertiesPanel).toBeVisible()
|
|
await expect(sidebar).toBeVisible()
|
|
|
|
const propsBoundingBox = await propertiesPanel.boundingBox()
|
|
const sidebarBoundingBox = await sidebar.boundingBox()
|
|
|
|
expect(propsBoundingBox).not.toBeNull()
|
|
expect(sidebarBoundingBox).not.toBeNull()
|
|
|
|
// Properties panel should be to the right of the sidebar
|
|
expect(propsBoundingBox!.x).toBeGreaterThan(
|
|
sidebarBoundingBox!.x + sidebarBoundingBox!.width
|
|
)
|
|
})
|
|
|
|
test('positions on the left when sidebar is on the right', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.settings.setSetting('Comfy.Sidebar.Location', 'right')
|
|
await comfyPage.nextFrame()
|
|
|
|
const propertiesPanel = comfyPage.page.getByTestId(
|
|
TestIds.propertiesPanel.root
|
|
)
|
|
const sidebar = comfyPage.page.locator('.side-bar-panel').first()
|
|
|
|
await expect(propertiesPanel).toBeVisible()
|
|
await expect(sidebar).toBeVisible()
|
|
|
|
const propsBoundingBox = await propertiesPanel.boundingBox()
|
|
const sidebarBoundingBox = await sidebar.boundingBox()
|
|
|
|
expect(propsBoundingBox).not.toBeNull()
|
|
expect(sidebarBoundingBox).not.toBeNull()
|
|
|
|
// Properties panel should be to the left of the sidebar
|
|
expect(propsBoundingBox!.x + propsBoundingBox!.width).toBeLessThan(
|
|
sidebarBoundingBox!.x
|
|
)
|
|
})
|
|
|
|
test('close button icon updates based on sidebar location', async ({
|
|
comfyPage
|
|
}) => {
|
|
const propertiesPanel = comfyPage.page.getByTestId(
|
|
TestIds.propertiesPanel.root
|
|
)
|
|
|
|
// When sidebar is on the left, panel is on the right
|
|
await comfyPage.settings.setSetting('Comfy.Sidebar.Location', 'left')
|
|
await comfyPage.nextFrame()
|
|
|
|
await expect(propertiesPanel).toBeVisible()
|
|
const closeButtonLeft = propertiesPanel
|
|
.locator('button[aria-pressed]')
|
|
.locator('i')
|
|
await expect(closeButtonLeft).toBeVisible()
|
|
await expect(closeButtonLeft).toHaveClass(/lucide--panel-right/)
|
|
|
|
// When sidebar is on the right, panel is on the left
|
|
await comfyPage.settings.setSetting('Comfy.Sidebar.Location', 'right')
|
|
await comfyPage.nextFrame()
|
|
|
|
const closeButtonRight = propertiesPanel
|
|
.locator('button[aria-pressed]')
|
|
.locator('i')
|
|
await expect(closeButtonRight).toBeVisible()
|
|
await expect(closeButtonRight).toHaveClass(/lucide--panel-left/)
|
|
})
|
|
})
|