Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix searchbox dismissed when closing filter panel #2196

Merged
merged 5 commits into from
Jan 8, 2025
Merged

Fix searchbox dismissed when closing filter panel #2196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
69f9bec
Set dismissable mask on search filter panel
christian-byrne Jan 7, 2025
4bb0703
Add Playwright test
christian-byrne Jan 7, 2025
aa2e4f2
Add header property in filter panel fixture
christian-byrne Jan 7, 2025
9c828ba
Use hide cb instead of after-hide
christian-byrne Jan 8, 2025
5dfe6c5
Remove redundant focus input call
christian-byrne Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions browser_tests/fixtures/components/ComfyNodeSearchBox.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ import { Locator, Page } from '@playwright/test'
export class ComfyNodeSearchFilterSelectionPanel {
constructor(public readonly page: Page) {}

get header() {
return this.page
.getByRole('dialog')
.locator('div')
.filter({ hasText: 'Add node filter condition' })
}

async selectFilterType(filterType: string) {
await this.page
.locator(
Expand Down
16 changes: 16 additions & 0 deletions browser_tests/nodeSearchBox.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,22 @@ test.describe('Node search box', () => {
await expectFilterChips(comfyPage, ['MODEL'])
})

test('Outer click dismisses filter panel but keeps search box visible', async ({
comfyPage
}) => {
await comfyPage.searchBox.filterButton.click()
const panel = comfyPage.searchBox.filterSelectionPanel
await panel.header.waitFor({ state: 'visible' })
const panelBounds = await panel.header.boundingBox()
await comfyPage.page.mouse.click(panelBounds!.x - 10, panelBounds!.y - 10)

// Verify the filter selection panel is hidden
expect(panel.header).not.toBeVisible()

// Verify the node search dialog is still visible
expect(comfyPage.searchBox.input).toBeVisible()
})

test('Can add multiple filters', async ({ comfyPage }) => {
await comfyPage.searchBox.addFilter('MODEL', 'Input Type')
await comfyPage.searchBox.addFilter('CLIP', 'Output Type')
Expand Down
9 changes: 7 additions & 2 deletions src/components/searchbox/NodeSearchBox.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,13 @@
class="filter-button z-10"
@click="nodeSearchFilterVisible = true"
/>
<Dialog v-model:visible="nodeSearchFilterVisible" class="min-w-96">
<Dialog
v-model:visible="nodeSearchFilterVisible"
class="min-w-96"
dismissable-mask
modal
@hide="reFocusInput"
>
<template #header>
<h3>Add node filter condition</h3>
</template>
Expand Down Expand Up @@ -140,7 +146,6 @@ onMounted(reFocusInput)
const onAddFilter = (filterAndValue: FilterAndValue) => {
nodeSearchFilterVisible.value = false
emit('addFilter', filterAndValue)
reFocusInput()
}
const onRemoveFilter = (event: Event, filterAndValue: FilterAndValue) => {
event.stopPropagation()
Expand Down
Loading