diff --git a/browser_tests/fixtures/components/ComfyNodeSearchBox.ts b/browser_tests/fixtures/components/ComfyNodeSearchBox.ts index 6a9f659de0c..d88d1fc7c00 100644 --- a/browser_tests/fixtures/components/ComfyNodeSearchBox.ts +++ b/browser_tests/fixtures/components/ComfyNodeSearchBox.ts @@ -13,19 +13,17 @@ class ComfyNodeSearchFilterSelectionPanel { } async selectFilterType(filterType: string) { - await this.page - .locator( - `.filter-type-select .p-togglebutton-label:has-text("${filterType}")` - ) + await this.root + .getByRole('button', { name: filterType, exact: true }) .click() } async selectFilterValue(filterValue: string) { - await this.page.locator('.filter-value-select .p-select-dropdown').click() + await this.root + .getByRole('button', { name: 'Single-select dropdown' }) + .click() await this.page - .locator( - `.p-select-overlay .p-select-list .p-select-option-label:text-is("${filterValue}")` - ) + .getByRole('option', { name: filterValue, exact: true }) .click() } diff --git a/browser_tests/tests/agent/agentConversationReplay.spec.ts-snapshots/two-turn-dependent-edit-wired-cloud-linux.png b/browser_tests/tests/agent/agentConversationReplay.spec.ts-snapshots/two-turn-dependent-edit-wired-cloud-linux.png index 34e410985bd..98c358f4ae7 100644 Binary files a/browser_tests/tests/agent/agentConversationReplay.spec.ts-snapshots/two-turn-dependent-edit-wired-cloud-linux.png and b/browser_tests/tests/agent/agentConversationReplay.spec.ts-snapshots/two-turn-dependent-edit-wired-cloud-linux.png differ diff --git a/browser_tests/tests/authAccountSwitch.spec.ts b/browser_tests/tests/authAccountSwitch.spec.ts index 19fe6f92546..6aab84d93b0 100644 --- a/browser_tests/tests/authAccountSwitch.spec.ts +++ b/browser_tests/tests/authAccountSwitch.spec.ts @@ -330,7 +330,9 @@ test.describe('Cloud account switch', { tag: '@cloud' }, () => { await expect(page).toHaveURL(/\/cloud\/login\?switchAccount=true$/) await page.getByRole('button', { name: 'Use email instead' }).click() await page.getByLabel('Email').fill(ACCOUNT_B.email) - await page.getByLabel('Password').fill('password') + await page + .getByRole('textbox', { name: 'Password', exact: true }) + .fill('password') await page.getByRole('button', { name: 'Sign in' }).click() await expect( diff --git a/browser_tests/tests/cloudWorkspaceDeepLink.spec.ts b/browser_tests/tests/cloudWorkspaceDeepLink.spec.ts index f2aaeb96724..cfa4911c0ff 100644 --- a/browser_tests/tests/cloudWorkspaceDeepLink.spec.ts +++ b/browser_tests/tests/cloudWorkspaceDeepLink.spec.ts @@ -33,6 +33,7 @@ async function gotoAndWaitThroughSwitch(comfyPage: ComfyPage, path: string) { test.describe('Cloud workspace deep link', { tag: '@cloud' }, () => { test('switches into the workspace the link names', async ({ comfyPage }) => { + test.slow() const page = comfyPage.page await gotoAndWaitThroughSwitch(comfyPage, '/?workspace=ws-team') @@ -99,6 +100,7 @@ test.describe('Cloud workspace deep link', { tag: '@cloud' }, () => { test('opens Settings on the requested workspace from a combined deep link', async ({ comfyPage }) => { + test.slow() const page = comfyPage.page await gotoAndWaitThroughSwitch( diff --git a/browser_tests/tests/dialogs/billingSessionSdkRail.spec.ts b/browser_tests/tests/dialogs/billingSessionSdkRail.spec.ts index 81f520b2eda..cb7d6743132 100644 --- a/browser_tests/tests/dialogs/billingSessionSdkRail.spec.ts +++ b/browser_tests/tests/dialogs/billingSessionSdkRail.spec.ts @@ -276,7 +276,7 @@ async function signInWithEmail(page: Page) { ) await page.getByRole('button', { name: 'Use email instead' }).click() await page.getByLabel('Email').fill(CLOUD_SELF_EMAIL) - await page.getByLabel('Password').fill('password') + await page.getByLabel('Password', { exact: true }).fill('password') await page.getByRole('button', { name: 'Sign in' }).click() await expect(page.getByTestId(TestIds.user.currentUserButton)).toBeVisible() } diff --git a/browser_tests/tests/dialogs/settingsDialog.spec.ts b/browser_tests/tests/dialogs/settingsDialog.spec.ts index ed95fd5c0c0..f0614ea08c1 100644 --- a/browser_tests/tests/dialogs/settingsDialog.spec.ts +++ b/browser_tests/tests/dialogs/settingsDialog.spec.ts @@ -180,10 +180,6 @@ test.describe('Settings dialog', { tag: '@ui' }, () => { const settingRow = dialog.root.locator(`[data-setting-id="${settingId}"]`) await expect(settingRow).toBeVisible() - // Wait for the search filter to fully settle — PrimeVue re-renders - // the entire settings list after typing, and the combobox element is - // replaced during re-render. Wait until the filtered list stabilises - // before interacting with the combobox. const settingItems = dialog.root.locator('[data-setting-id]') await expect .poll(() => settingItems.count(), { timeout: 5000 }) @@ -193,20 +189,16 @@ test.describe('Settings dialog', { tag: '@ui' }, () => { await expect(select).toBeVisible() await expect(select).toBeEnabled() - // Open the dropdown via its combobox role and verify it expanded. - // Retry because the PrimeVue Select may still re-render after the - // filter settles, causing the first click to land on a stale element. - await expect(async () => { - const expanded = await select.getAttribute('aria-expanded') - if (expanded !== 'true') await select.click() - await expect(select).toHaveAttribute('aria-expanded', 'true') - }).toPass({ timeout: 10_000 }) + await select.click() // Pick the option that is not the current value const targetValue = initialValue === 'Top' ? 'Disabled' : 'Top' - await comfyPage.page - .getByRole('option', { name: targetValue, exact: true }) - .click() + const targetOption = comfyPage.page.getByRole('option', { + name: targetValue, + exact: true + }) + await expect(targetOption).toBeVisible() + await targetOption.click() await expect .poll(() => comfyPage.settings.getSetting(settingId)) diff --git a/browser_tests/tests/dialogs/signInDialog.spec.ts b/browser_tests/tests/dialogs/signInDialog.spec.ts index 0bdc631e50f..4684ea58e8e 100644 --- a/browser_tests/tests/dialogs/signInDialog.spec.ts +++ b/browser_tests/tests/dialogs/signInDialog.spec.ts @@ -80,8 +80,23 @@ test.describe('Sign In dialog', { tag: '@ui' }, () => { await expect(dialog.apiKeyButton).toBeVisible() }) - test('Should show forgot password link on sign-in form', async () => { + test('Should show forgot password as a keyboard-focusable text action', async () => { await expect(dialog.forgotPasswordLink).toBeVisible() + await expect(dialog.forgotPasswordLink).toHaveCSS( + 'background-color', + 'rgba(0, 0, 0, 0)' + ) + await expect(dialog.forgotPasswordLink).toHaveCSS('border-width', '0px') + await expect(dialog.forgotPasswordLink).toHaveCSS('padding', '0px') + const buttonFont = await dialog.signInButton.evaluate( + (button) => getComputedStyle(button).fontFamily + ) + await expect(dialog.forgotPasswordLink).toHaveCSS('font-family', buttonFont) + + await dialog.emailInput.focus() + await dialog.emailInput.press('Tab') + await expect(dialog.forgotPasswordLink).toBeFocused() + await expect(dialog.forgotPasswordLink).not.toHaveCSS('box-shadow', 'none') }) test('Should close dialog via close button', async () => { diff --git a/browser_tests/tests/extensionAPI.spec.ts b/browser_tests/tests/extensionAPI.spec.ts index 30241c9cd6d..7e595e228c1 100644 --- a/browser_tests/tests/extensionAPI.spec.ts +++ b/browser_tests/tests/extensionAPI.spec.ts @@ -177,14 +177,14 @@ test.describe('Topbar commands', () => { type: 'number', defaultValue: 10 }, - selector: '.p-inputnumber input' + selector: 'input[inputmode="decimal"]' }, { config: { type: 'slider', defaultValue: 10 }, - selector: '.p-slider.p-component' + selector: '[data-slot="slider"]' }, { config: { @@ -192,14 +192,14 @@ test.describe('Topbar commands', () => { defaultValue: 'foo', options: ['foo', 'bar', 'baz'] }, - selector: '.p-select.p-component' + selector: '[role="combobox"]' }, { config: { type: 'text', defaultValue: 'Hello' }, - selector: '.p-inputtext' + selector: 'input' }, { config: { @@ -234,16 +234,11 @@ test.describe('Topbar commands', () => { .getByText('TestSetting Test') .locator(selector) - await expect - .poll(() => - component.evaluate((el) => - el instanceof HTMLInputElement || - el instanceof HTMLButtonElement - ? el.disabled - : el.classList.contains('p-disabled') - ) - ) - .toBe(true) + if (config.type === 'slider') { + await expect(component).toHaveAttribute('aria-disabled', 'true') + } else { + await expect(component).toBeDisabled() + } }) } }) diff --git a/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-off-vue-chromium-linux.png b/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-off-vue-chromium-linux.png index 7a6fd573358..6e8031cb317 100644 Binary files a/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-off-vue-chromium-linux.png and b/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-off-vue-chromium-linux.png differ diff --git a/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-on-vue-chromium-linux.png b/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-on-vue-chromium-linux.png index 945e3ed04b6..4ecfa65c972 100644 Binary files a/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-on-vue-chromium-linux.png and b/browser_tests/tests/nodeBadge.spec.ts-snapshots/api-pricing-on-vue-chromium-linux.png differ diff --git a/browser_tests/tests/nodeSearchBox.spec.ts b/browser_tests/tests/nodeSearchBox.spec.ts index 735916c299d..77654de3a4a 100644 --- a/browser_tests/tests/nodeSearchBox.spec.ts +++ b/browser_tests/tests/nodeSearchBox.spec.ts @@ -187,6 +187,34 @@ test.describe('Node search box', { tag: '@node' }, () => { await expectFilterChips(comfyPage, ['MODEL']) }) + for (const { key, target } of [ + { key: 'Tab', target: 'Add' }, + { key: 'Shift+Tab', target: 'Input Type' } + ]) { + test(`${key} leaves the filter dropdown for ${target}`, async ({ + comfyPage + }) => { + await comfyPage.searchBox.filterButton.click() + const panel = comfyPage.searchBox.filterSelectionPanel + await panel.selectFilterType('Input Type') + await panel.root + .getByRole('button', { name: 'Single-select dropdown' }) + .click() + const search = comfyPage.page.getByRole('combobox', { + name: 'Search', + exact: true + }) + await expect(search).toBeFocused() + + await search.press(key) + + await expect(search).toBeHidden() + await expect( + panel.root.getByRole('button', { name: target, exact: true }) + ).toBeFocused() + }) + } + test('Outer click dismisses filter panel but keeps search box visible', async ({ comfyPage }) => { diff --git a/browser_tests/tests/saveImageAndWebp.spec.ts-snapshots/save-image-and-webm-preview-chromium-linux.png b/browser_tests/tests/saveImageAndWebp.spec.ts-snapshots/save-image-and-webm-preview-chromium-linux.png index 998a5928b08..d4054ed060a 100644 Binary files a/browser_tests/tests/saveImageAndWebp.spec.ts-snapshots/save-image-and-webm-preview-chromium-linux.png and b/browser_tests/tests/saveImageAndWebp.spec.ts-snapshots/save-image-and-webm-preview-chromium-linux.png differ diff --git a/browser_tests/tests/sidebar/nodeLibrary.spec.ts b/browser_tests/tests/sidebar/nodeLibrary.spec.ts index ec9a5af48d1..08176865b6e 100644 --- a/browser_tests/tests/sidebar/nodeLibrary.spec.ts +++ b/browser_tests/tests/sidebar/nodeLibrary.spec.ts @@ -175,7 +175,7 @@ test.describe('Node library sidebar', () => { await tab.getFolder('foo').click({ button: 'right' }) await comfyPage.page - .locator('.p-contextmenu-item-label:has-text("Rename")') + .getByRole('menuitem', { name: 'Rename', exact: true }) .click() await renameInlineFolder(comfyPage, 'bar') @@ -293,9 +293,10 @@ test.describe('Node library sidebar', () => { await comfyPage.page.getByLabel('Customize').click() // Click a color option multiple times - const customColorOption = comfyPage.page.locator( - '.p-togglebutton-content > .pi-palette' - ) + const customColorOption = comfyPage.page.getByRole('button', { + name: 'Custom', + exact: true + }) await customColorOption.click() await customColorOption.click() @@ -342,7 +343,7 @@ test.describe('Node library sidebar', () => { await expect(tab.getFolder('foo')).toBeVisible() await tab.getFolder('foo').click({ button: 'right' }) await comfyPage.page - .locator('.p-contextmenu-item-label:has-text("Rename")') + .getByRole('menuitem', { name: 'Rename', exact: true }) .click() await renameInlineFolder(comfyPage, 'bar') await comfyPage.nextFrame() diff --git a/browser_tests/tests/userSelectView.spec.ts b/browser_tests/tests/userSelectView.spec.ts index e72d42a90ba..9eeba0359c9 100644 --- a/browser_tests/tests/userSelectView.spec.ts +++ b/browser_tests/tests/userSelectView.spec.ts @@ -36,7 +36,7 @@ test.describe('User Select View', { tag: '@settings' }, () => { await page.goto(userSelectPage.url) await expect(page).toHaveURL(userSelectPage.selectionUrl) await userSelectPage.existingUserSelect.click() - await page.locator('.p-select-list .p-select-option').first().click() + await page.getByRole('option').first().click() await userSelectPage.nextButton.click() await expect(page).toHaveURL(userSelectPage.url) }) diff --git a/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-colors-dark-all-colors-chromium-linux.png b/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-colors-dark-all-colors-chromium-linux.png index 6bfd495982b..c1b0d2dc983 100644 Binary files a/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-colors-dark-all-colors-chromium-linux.png and b/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-colors-dark-all-colors-chromium-linux.png differ diff --git a/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-colors-light-all-colors-chromium-linux.png b/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-colors-light-all-colors-chromium-linux.png index 3cd4064a5d0..80e4674646c 100644 Binary files a/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-colors-light-all-colors-chromium-linux.png and b/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-colors-light-all-colors-chromium-linux.png differ diff --git a/package.json b/package.json index 7ca9c26877d..7657b8518b8 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,6 @@ "@iconify/json": "catalog:", "@primeuix/utils": "catalog:", "@primevue/core": "catalog:", - "@primevue/forms": "catalog:", "@primevue/themes": "catalog:", "@sentry/vue": "catalog:", "@sparkjsdev/spark": "catalog:", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 15a923d6c8b..786eb387053 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -84,9 +84,6 @@ catalogs: '@primevue/core': specifier: 4.2.5 version: 4.2.5 - '@primevue/forms': - specifier: 4.2.5 - version: 4.2.5 '@primevue/themes': specifier: 4.2.5 version: 4.2.5 @@ -566,9 +563,6 @@ importers: '@primevue/core': specifier: 'catalog:' version: 4.2.5(vue@3.5.42(typescript@6.0.3)) - '@primevue/forms': - specifier: 'catalog:' - version: 4.2.5(vue@3.5.42(typescript@6.0.3)) '@primevue/themes': specifier: 'catalog:' version: 4.2.5 @@ -3829,10 +3823,6 @@ packages: '@prettier/parse-srcset@3.1.0': resolution: {integrity: sha512-FIRv2rZotO9NP/r66taYqD1zICpPiBbrECqjKV/xqNotqDxF7fLzzUeK+1RSRx9Tenk0DajR/GcRmTJ2qtHaKQ==} - '@primeuix/forms@0.0.2': - resolution: {integrity: sha512-DpecPQd/Qf/kav4LKCaIeGuT3AkwhJzuHCkLANTVlN/zBvo8KIj3OZHsCkm0zlIMVVnaJdtx1ULNlRQdudef+A==} - engines: {node: '>=12.11.0'} - '@primeuix/styled@0.3.2': resolution: {integrity: sha512-ColZes0+/WKqH4ob2x8DyNYf1NENpe5ZguOvx5yCLxaP8EIMVhLjWLO/3umJiDnQU4XXMLkn2mMHHw+fhTX/mw==} engines: {node: '>=12.11.0'} @@ -3847,10 +3837,6 @@ packages: peerDependencies: vue: ^3.3.0 - '@primevue/forms@4.2.5': - resolution: {integrity: sha512-5jarJQ9Qv32bOo/0tY5bqR3JZI6+YmmoUQ2mjhVSbVElQsE4FNfhT7a7JwF+xgBPMPc8KWGNA1QB248HhPNVAg==} - engines: {node: '>=12.11.0'} - '@primevue/icons@4.2.5': resolution: {integrity: sha512-WFbUMZhQkXf/KmwcytkjGVeJ9aGEDXjP3uweOjQZMmRdEIxFnqYYpd90wE90JE1teZn3+TVnT4ZT7ejGyEXnFQ==} engines: {node: '>=12.11.0'} @@ -12253,10 +12239,6 @@ snapshots: '@prettier/parse-srcset@3.1.0': {} - '@primeuix/forms@0.0.2': - dependencies: - '@primeuix/utils': 0.3.2 - '@primeuix/styled@0.3.2': dependencies: '@primeuix/utils': 0.3.2 @@ -12269,14 +12251,6 @@ snapshots: '@primeuix/utils': 0.3.2 vue: 3.5.42(typescript@6.0.3) - '@primevue/forms@4.2.5(vue@3.5.42(typescript@6.0.3))': - dependencies: - '@primeuix/forms': 0.0.2 - '@primeuix/utils': 0.3.2 - '@primevue/core': 4.2.5(vue@3.5.42(typescript@6.0.3)) - transitivePeerDependencies: - - vue - '@primevue/icons@4.2.5(vue@3.5.42(typescript@6.0.3))': dependencies: '@primeuix/utils': 0.3.2 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 6e53a3d9400..9e2a4317f1b 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -35,7 +35,6 @@ catalog: '@playwright/test': ^1.63.0 '@primeuix/utils': ^0.3.2 '@primevue/core': 4.2.5 - '@primevue/forms': 4.2.5 '@primevue/themes': 4.2.5 '@sentry/vite-plugin': ^4.6.0 '@sentry/vue': ^10.32.1 diff --git a/scripts/primevue-import-allowlist.json b/scripts/primevue-import-allowlist.json index 0e9efebb26b..ffccfe178c0 100644 --- a/scripts/primevue-import-allowlist.json +++ b/scripts/primevue-import-allowlist.json @@ -13,25 +13,13 @@ "src/components/breadcrumb/SubgraphBreadcrumbItem.vue", "src/components/button/MoreButton.test.ts", "src/components/button/MoreButton.vue", - "src/components/common/BackgroundImageUpload.vue", - "src/components/common/ColorCustomizationSelector.test.ts", - "src/components/common/ColorCustomizationSelector.vue", - "src/components/common/CustomizationDialog.test.ts", - "src/components/common/CustomizationDialog.vue", "src/components/common/DropdownItem.vue", "src/components/common/DropdownMenu.vue", "src/components/common/DropdownMenu.zindex.test.ts", - "src/components/common/FormItem.vue", - "src/components/common/FormRadioGroup.test.ts", - "src/components/common/FormRadioGroup.vue", "src/components/common/InputKnob.vue", - "src/components/common/InputSlider.vue", "src/components/common/LazyImage.vue", "src/components/common/SystemStatsPanel.vue", "src/components/common/TreeExplorer.vue", - "src/components/common/TreeExplorerTreeNode.test.ts", - "src/components/common/UrlInput.test.ts", - "src/components/common/UrlInput.vue", "src/components/common/UserCredit.vue", "src/components/dialog/GlobalDialog.test.ts", "src/components/dialog/GlobalDialog.vue", @@ -39,33 +27,23 @@ "src/components/dialog/content/ErrorDialogContent.vue", "src/components/dialog/content/TopUpCreditsDialogContentLegacy.test.ts", "src/components/dialog/content/TopUpCreditsDialogContentLegacy.vue", - "src/components/dialog/content/UpdatePasswordContent.vue", "src/components/dialog/content/setting/KeybindingPanel.vue", "src/components/dialog/content/setting/SettingItem.test.ts", "src/components/dialog/content/setting/UsageLogsTable.test.ts", "src/components/dialog/content/setting/UsageLogsTable.vue", - "src/components/dialog/content/signin/ApiKeyForm.test.ts", - "src/components/dialog/content/signin/ApiKeyForm.vue", - "src/components/dialog/content/signin/PasswordFields.vue", "src/components/dialog/content/signin/SignInForm.test.ts", "src/components/dialog/content/signin/SignInForm.vue", - "src/components/dialog/content/signin/SignUpForm.test.ts", - "src/components/dialog/content/signin/SignUpForm.vue", "src/components/dialog/content/subscription/CancelSubscriptionDialogContent.test.ts", "src/components/dialog/content/subscription/CancelSubscriptionDialogContent.vue", "src/components/graph/CanvasModeSelector.vue", "src/components/graph/GraphCanvasMenu.vue", "src/components/graph/NodeContextMenu.vue", "src/components/graph/SelectionToolbox.test.ts", - "src/components/graph/modals/ZoomControlsModal.vue", "src/components/graph/selectionToolbox/BypassButton.test.ts", "src/components/graph/selectionToolbox/ColorPickerButton.test.ts", - "src/components/graph/selectionToolbox/ColorPickerButton.vue", "src/components/graph/selectionToolbox/ExecuteButton.test.ts", "src/components/graph/selectionToolbox/InfoButton.test.ts", "src/components/graph/selectionToolbox/SubmenuPopover.vue", - "src/components/graph/widgets/MultiSelectWidget.test.ts", - "src/components/graph/widgets/MultiSelectWidget.vue", "src/components/graph/widgets/TextPreviewWidget.test.ts", "src/components/graph/widgets/TextPreviewWidget.vue", "src/components/helpcenter/HelpCenterMenuContent.test.ts", @@ -77,11 +55,9 @@ "src/components/rightSidePanel/errors/ErrorNodeCard.test.ts", "src/components/rightSidePanel/errors/MissingPackGroupRow.test.ts", "src/components/rightSidePanel/errors/TabErrors.test.ts", - "src/components/rightSidePanel/settings/TabGlobalSettings.vue", "src/components/searchbox/NodeSearchBox.vue", "src/components/searchbox/NodeSearchBoxPopover.test.ts", "src/components/searchbox/NodeSearchBoxPopover.vue", - "src/components/searchbox/NodeSearchFilter.vue", "src/components/sidebar/ComfyMenuButton.vue", "src/components/sidebar/SideToolbar.test.ts", "src/components/sidebar/SidebarIcon.test.ts", @@ -113,13 +89,9 @@ "src/platform/assets/components/MediaAssetContextMenu.test.ts", "src/platform/assets/components/MediaAssetContextMenu.vue", "src/platform/assets/components/ModelImportProgressDialog.vue", - "src/platform/assets/components/UploadModelUrlInput.vue", "src/platform/assets/composables/useMediaAssetActions.test.ts", "src/platform/assets/composables/useMediaAssetActions.ts", - "src/platform/cloud/onboarding/CloudForgotPasswordView.vue", "src/platform/cloud/onboarding/CloudSubscriptionRedirectView.vue", - "src/platform/cloud/onboarding/components/CloudSignInForm.test.ts", - "src/platform/cloud/onboarding/components/CloudSignInForm.vue", "src/platform/cloud/onboarding/skeletons/CloudLoginViewSkeleton.vue", "src/platform/cloud/onboarding/skeletons/CloudSurveyViewSkeleton.vue", "src/platform/cloud/subscription/components/CreditsTile.vue", @@ -127,11 +99,8 @@ "src/platform/missingModel/components/MissingModelCard.test.ts", "src/platform/nodeReplacement/components/SwapNodeGroupRow.test.ts", "src/platform/nodeReplacement/components/SwapNodesCard.test.ts", - "src/platform/secrets/components/SecretFormDialog.test.ts", - "src/platform/secrets/components/SecretFormDialog.vue", "src/platform/secrets/components/SecretFormDialog.zindex.test.ts", "src/platform/secrets/components/SecretsPanel.vue", - "src/platform/settings/components/ColorPaletteMessage.vue", "src/platform/settings/components/ExtensionPanel.vue", "src/platform/updates/common/toastStore.ts", "src/platform/updates/components/WhatsNewPopup.test.ts", @@ -154,7 +123,6 @@ "src/platform/workspace/components/SubscriptionPanelContentWorkspace.test.ts", "src/platform/workspace/components/TopUpCreditsDialogContentWorkspace.test.ts", "src/platform/workspace/components/TopUpCreditsDialogContentWorkspace.vue", - "src/platform/workspace/components/UnifiedPricingTable.vue", "src/platform/workspace/components/dialogs/ChangeMemberRoleDialogContent.test.ts", "src/platform/workspace/components/dialogs/ChangeMemberRoleDialogContent.vue", "src/platform/workspace/components/dialogs/CreateWorkspaceDialogContent.vue", @@ -184,26 +152,16 @@ "src/platform/workspace/stores/billingOperationStore.ts", "src/renderer/extensions/linearMode/DropZone.test.ts", "src/renderer/extensions/linearMode/MobileDisplay.vue", - "src/renderer/extensions/minimap/MiniMapPanel.vue", "src/renderer/extensions/vueNodes/VideoPreview.vue", - "src/renderer/extensions/vueNodes/components/NodeHeader.test.ts", "src/renderer/extensions/vueNodes/components/WidgetGrid.vue", "src/renderer/extensions/vueNodes/composables/processedWidgetRenderModel.ts", "src/renderer/extensions/vueNodes/composables/useNodeTooltips.ts", "src/renderer/extensions/vueNodes/composables/useProcessedWidgets.test.ts", "src/renderer/extensions/vueNodes/types/widgetGrid.ts", - "src/renderer/extensions/vueNodes/widgets/components/ValueControlPopover.test.ts", - "src/renderer/extensions/vueNodes/widgets/components/ValueControlPopover.vue", "src/renderer/extensions/vueNodes/widgets/components/WidgetChart.vue", "src/renderer/extensions/vueNodes/widgets/components/WidgetGalleria.test.ts", "src/renderer/extensions/vueNodes/widgets/components/WidgetGalleria.vue", - "src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberGradientSlider.test.ts", - "src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberGradientSlider.vue", "src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberInput.test.ts", - "src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberSlider.test.ts", - "src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberSlider.vue", - "src/renderer/extensions/vueNodes/widgets/components/WidgetInputText.test.ts", - "src/renderer/extensions/vueNodes/widgets/components/WidgetInputText.vue", "src/renderer/extensions/vueNodes/widgets/components/WidgetRecordAudio.vue", "src/renderer/extensions/vueNodes/widgets/components/WidgetSelect.asset-mode.test.ts", "src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.test.ts", @@ -219,12 +177,10 @@ "src/types/treeExplorerTypes.ts", "src/views/LinearView.vue", "src/views/UserSelectView.test.ts", - "src/views/UserSelectView.vue", "src/workbench/extensions/manager/components/ManagerProgressToast.vue", "src/workbench/extensions/manager/components/manager/PackVersionBadge.test.ts", "src/workbench/extensions/manager/components/manager/PackVersionBadge.vue", "src/workbench/extensions/manager/components/manager/PackVersionSelectorPopover.test.ts", - "src/workbench/extensions/manager/components/manager/PackVersionSelectorPopover.vue", "src/workbench/extensions/manager/components/manager/button/PackEnableToggle.test.ts", "src/workbench/extensions/manager/components/manager/packCard/PackCardFooter.test.ts", "src/workbench/extensions/manager/components/manager/skeleton/PackCardGridSkeleton.test.ts", diff --git a/src/components/breadcrumb/SubgraphBreadcrumbItem.vue b/src/components/breadcrumb/SubgraphBreadcrumbItem.vue index 076229c10df..0b2c3aab0f8 100644 --- a/src/components/breadcrumb/SubgraphBreadcrumbItem.vue +++ b/src/components/breadcrumb/SubgraphBreadcrumbItem.vue @@ -48,12 +48,12 @@ } }" /> - import { cn } from '@comfyorg/tailwind-utils' -import InputText from 'primevue/inputtext' import type { MenuState } from 'primevue/menu' import Menu from 'primevue/menu' import type { MenuItem } from 'primevue/menuitem' @@ -71,6 +70,7 @@ import { computed, nextTick, ref } from 'vue' import { useI18n } from 'vue-i18n' import Badge from '@/components/ui/badge/Badge.vue' +import Input from '@/components/ui/input/Input.vue' import { useWorkflowActionsMenu } from '@/composables/useWorkflowActionsMenu' import { useWorkflowService } from '@/platform/workflow/core/services/workflowService' import { @@ -107,7 +107,7 @@ const workflowStore = useWorkflowStore() const workflowService = useWorkflowService() const isEditing = ref(false) const itemLabel = ref() -const itemInputRef = ref<{ $el?: HTMLInputElement }>() +const itemInputRef = ref>() const wrapperRef = ref() const rename = async ( @@ -161,13 +161,8 @@ const startRename = async () => { isEditing.value = true itemLabel.value = item.label as string void nextTick(() => { - if (itemInputRef.value?.$el) { - itemInputRef.value.$el.focus() - itemInputRef.value.$el.select() - if (wrapperRef.value) { - itemInputRef.value.$el.style.width = `${Math.max(200, wrapperRef.value.offsetWidth)}px` - } - } + itemInputRef.value?.focus() + itemInputRef.value?.select() }) } diff --git a/src/components/common/BackgroundImageUpload.vue b/src/components/common/BackgroundImageUpload.vue index 72f5af1f255..168e4020fa7 100644 --- a/src/components/common/BackgroundImageUpload.vue +++ b/src/components/common/BackgroundImageUpload.vue @@ -1,6 +1,6 @@ - - diff --git a/src/components/graph/widgets/MultiSelectWidget.test.ts b/src/components/graph/widgets/MultiSelectWidget.test.ts index b2cd38c630f..5b03f8de4af 100644 --- a/src/components/graph/widgets/MultiSelectWidget.test.ts +++ b/src/components/graph/widgets/MultiSelectWidget.test.ts @@ -1,29 +1,15 @@ import { render, screen } from '@testing-library/vue' -import PrimeVue from 'primevue/config' +import userEvent from '@testing-library/user-event' import { describe, expect, it } from 'vitest' import { defineComponent, ref } from 'vue' +import { createI18n } from 'vue-i18n' +import enMessages from '@/locales/en/main.json' with { type: 'json' } import type { ComboInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2' import type { ComponentWidget } from '@/scripts/domWidget' import MultiSelectWidget from './MultiSelectWidget.vue' -const MultiSelectStub = defineComponent({ - name: 'MultiSelect', - inheritAttrs: false, - props: { - modelValue: { type: Array, default: () => [] }, - options: { type: Array, default: () => [] }, - placeholder: { type: String, default: '' }, - display: { type: String, default: '' } - }, - template: `
` -}) - function makeWidget( inputSpec: Partial ): ComponentWidget { @@ -41,75 +27,68 @@ function renderWidget( inputSpec: Partial, initialValue: string[] = [] ) { - const value = ref(initialValue) + const value = ref(initialValue) const widget = makeWidget(inputSpec) const Harness = defineComponent({ components: { MultiSelectWidget }, setup: () => ({ value, widget }), template: '' }) - const utils = render(Harness, { - global: { plugins: [PrimeVue], stubs: { MultiSelect: MultiSelectStub } } + const i18n = createI18n({ + legacy: false, + locale: 'en', + messages: { en: enMessages } }) - return { ...utils, value } + + return { ...render(Harness, { global: { plugins: [i18n] } }), value } } describe('MultiSelectWidget', () => { - describe('Option list', () => { - it('passes inputSpec.options through as MultiSelect options', () => { - renderWidget({ options: ['a', 'b', 'c'] }) - const el = screen.getByTestId('multiselect') - expect(JSON.parse(el.dataset.options!)).toEqual(['a', 'b', 'c']) - }) - - it('falls back to an empty list when inputSpec.options is absent', () => { - renderWidget({}) - const el = screen.getByTestId('multiselect') - expect(JSON.parse(el.dataset.options!)).toEqual([]) - }) - }) - - describe('Placeholder', () => { - it('reads placeholder from multi_select.placeholder', () => { - renderWidget({ - options: ['a'], - multi_select: { placeholder: 'Pick one or more' } - }) - expect(screen.getByTestId('multiselect').dataset.placeholder).toBe( - 'Pick one or more' + it.for([ + { chip: true, expectedTexts: ['Alpha', 'Beta'] }, + { chip: false, expectedTexts: ['Alpha, Beta'] } + ])( + 'renders selected values as chips only when the schema sets chip=$chip', + ({ chip, expectedTexts }) => { + renderWidget( + { + options: ['Alpha', 'Beta'], + multi_select: { chip } + }, + ['Alpha', 'Beta'] ) - }) - it('defaults placeholder to "Select items" when not provided', () => { - renderWidget({ options: ['a'] }) - expect(screen.getByTestId('multiselect').dataset.placeholder).toBe( - 'Select items' - ) - }) - }) + expect( + screen + .getAllByText(/^(Alpha|Beta|Alpha, Beta)$/) + .map((element) => element.textContent) + ).toEqual(expectedTexts) + } + ) - describe('Display mode', () => { - it('uses "chip" display when multi_select.chip is true', () => { - renderWidget({ options: ['a'], multi_select: { chip: true } }) - expect(screen.getByTestId('multiselect').dataset.display).toBe('chip') - }) + it('commits selected option values to the widget model', async () => { + const user = userEvent.setup() + const { value } = renderWidget( + { + options: ['a', 'b'], + multi_select: { placeholder: 'Pick items' } + }, + ['a'] + ) - it('uses "comma" display when chip is false or missing', () => { - renderWidget({ options: ['a'], multi_select: { chip: false } }) - expect(screen.getByTestId('multiselect').dataset.display).toBe('comma') - }) + await user.click(screen.getByRole('button', { name: 'Pick items' })) + await user.click(screen.getByRole('option', { name: 'b' })) - it('uses "comma" display when multi_select is absent', () => { - renderWidget({ options: ['a'] }) - expect(screen.getByTestId('multiselect').dataset.display).toBe('comma') - }) + expect(value.value).toEqual(['a', 'b']) }) - describe('Value binding', () => { - it('forwards the initial selected items to MultiSelect', () => { - renderWidget({ options: ['a', 'b'] }, ['a']) - const el = screen.getByTestId('multiselect') - expect(JSON.parse(el.dataset.modelValue!)).toEqual(['a']) - }) + it('supports keyboard selection', async () => { + const user = userEvent.setup() + const { value } = renderWidget({ options: ['a', 'b'] }) + + await user.click(screen.getByRole('button', { name: 'Select items' })) + await user.keyboard('{ArrowDown}{Enter}') + + expect(value.value).toEqual(['b']) }) }) diff --git a/src/components/graph/widgets/MultiSelectWidget.vue b/src/components/graph/widgets/MultiSelectWidget.vue index 14936fca370..a9b5b76f5f1 100644 --- a/src/components/graph/widgets/MultiSelectWidget.vue +++ b/src/components/graph/widgets/MultiSelectWidget.vue @@ -1,23 +1,32 @@ diff --git a/src/components/load3d/controls/viewer/ViewerGizmoControls.vue b/src/components/load3d/controls/viewer/ViewerGizmoControls.vue index 086c8d6b974..26375012cac 100644 --- a/src/components/load3d/controls/viewer/ViewerGizmoControls.vue +++ b/src/components/load3d/controls/viewer/ViewerGizmoControls.vue @@ -7,10 +7,10 @@ :model-value="gizmoEnabled ? 'on' : 'off'" @update:model-value="(v) => (gizmoEnabled = v === 'on')" > - + {{ $t('g.off') }} - + {{ $t('g.on') }} @@ -27,13 +27,13 @@ } " > - + {{ $t('load3d.gizmo.translate') }} - + {{ $t('load3d.gizmo.rotate') }} - + {{ $t('load3d.gizmo.scale') }} diff --git a/src/components/rightSidePanel/settings/TabGlobalSettings.vue b/src/components/rightSidePanel/settings/TabGlobalSettings.vue index 49422821c77..f72db316559 100644 --- a/src/components/rightSidePanel/settings/TabGlobalSettings.vue +++ b/src/components/rightSidePanel/settings/TabGlobalSettings.vue @@ -1,11 +1,12 @@ diff --git a/src/components/ui/field/Field.stories.ts b/src/components/ui/field/Field.stories.ts new file mode 100644 index 00000000000..fb9d640d932 --- /dev/null +++ b/src/components/ui/field/Field.stories.ts @@ -0,0 +1,113 @@ +import type { Meta, StoryObj } from '@storybook/vue3-vite' + +import Input from '@/components/ui/input/Input.vue' +import Switch from '@/components/ui/switch/Switch.vue' + +import Field from './Field.vue' +import FieldDescription from './FieldDescription.vue' +import FieldError from './FieldError.vue' +import FieldGroup from './FieldGroup.vue' +import FieldLabel from './FieldLabel.vue' + +const meta = { + title: 'Components/Field', + component: Field, + tags: ['autodocs'], + argTypes: { + orientation: { + control: 'select', + options: ['vertical', 'horizontal', 'responsive'] + } + } +} satisfies Meta + +export default meta +type Story = StoryObj + +const components = { + Field, + FieldDescription, + FieldError, + FieldGroup, + FieldLabel, + Input, + Switch +} + +export const Default: Story = { + render: (args) => ({ + components, + setup: () => ({ args }), + template: ` + + Email + + + We only use this to send the reset link. + + ` + }) +} + +export const Invalid: Story = { + render: (args) => ({ + components, + setup: () => ({ args }), + template: ` + + Email + + + ` + }) +} + +export const MultipleErrors: Story = { + render: (args) => ({ + components, + setup: () => ({ args }), + template: ` + + Password + + + ` + }) +} + +export const Horizontal: Story = { + args: { orientation: 'horizontal' }, + render: (args) => ({ + components, + setup: () => ({ args }), + template: ` + + Enable notifications + + ` + }) +} + +export const Group: Story = { + render: () => ({ + components, + template: ` + + + Email + + + + Password + + At least 8 characters. + + ` + }) +} diff --git a/src/components/ui/field/Field.vue b/src/components/ui/field/Field.vue new file mode 100644 index 00000000000..fdb76f3ddb4 --- /dev/null +++ b/src/components/ui/field/Field.vue @@ -0,0 +1,24 @@ + + + diff --git a/src/components/ui/field/FieldDescription.vue b/src/components/ui/field/FieldDescription.vue new file mode 100644 index 00000000000..e7e1eac661b --- /dev/null +++ b/src/components/ui/field/FieldDescription.vue @@ -0,0 +1,25 @@ + + + diff --git a/src/components/ui/field/FieldError.vue b/src/components/ui/field/FieldError.vue new file mode 100644 index 00000000000..ef05f61143a --- /dev/null +++ b/src/components/ui/field/FieldError.vue @@ -0,0 +1,35 @@ + + + diff --git a/src/components/ui/field/FieldGroup.vue b/src/components/ui/field/FieldGroup.vue new file mode 100644 index 00000000000..53dca5c1662 --- /dev/null +++ b/src/components/ui/field/FieldGroup.vue @@ -0,0 +1,23 @@ + + + diff --git a/src/components/ui/field/FieldLabel.vue b/src/components/ui/field/FieldLabel.vue new file mode 100644 index 00000000000..2561475bcc4 --- /dev/null +++ b/src/components/ui/field/FieldLabel.vue @@ -0,0 +1,27 @@ + + + diff --git a/src/components/ui/field/field.variants.ts b/src/components/ui/field/field.variants.ts new file mode 100644 index 00000000000..c2a6567fc76 --- /dev/null +++ b/src/components/ui/field/field.variants.ts @@ -0,0 +1,15 @@ +import type { VariantProps } from 'cva' +import { cva } from 'cva' + +export const fieldVariants = cva({ + base: 'group/field flex w-full gap-3 data-[invalid=true]:text-destructive-background', + variants: { + orientation: { + vertical: 'flex-col *:w-full [&>.sr-only]:w-auto', + horizontal: 'flex-row items-center *:data-[slot=field-label]:flex-auto' + } + }, + defaultVariants: { orientation: 'vertical' } +}) + +export type FieldVariants = VariantProps diff --git a/src/components/ui/input-group/InputGroup.stories.ts b/src/components/ui/input-group/InputGroup.stories.ts new file mode 100644 index 00000000000..9d3dc075aa9 --- /dev/null +++ b/src/components/ui/input-group/InputGroup.stories.ts @@ -0,0 +1,92 @@ +import type { Meta, StoryObj } from '@storybook/vue3-vite' + +import InputGroup from './InputGroup.vue' +import InputGroupAddon from './InputGroupAddon.vue' +import InputGroupButton from './InputGroupButton.vue' +import InputGroupInput from './InputGroupInput.vue' + +const meta = { + title: 'Components/InputGroup', + component: InputGroup, + tags: ['autodocs'] +} satisfies Meta + +export default meta +type Story = StoryObj + +const components = { + InputGroup, + InputGroupAddon, + InputGroupButton, + InputGroupInput +} + +export const LeadingIcon: Story = { + render: () => ({ + components, + template: ` + + + + + + ` + }) +} + +export const TrailingButton: Story = { + render: () => ({ + components, + template: ` + + + + + + + + ` + }) +} + +export const TextAddon: Story = { + render: () => ({ + components, + template: ` + + https:// + + + Validate + + ` + }) +} + +export const Invalid: Story = { + render: () => ({ + components, + template: ` + + + + + + ` + }) +} + +export const Disabled: Story = { + render: () => ({ + components, + template: ` + + + + + + + + ` + }) +} diff --git a/src/components/ui/input-group/InputGroup.vue b/src/components/ui/input-group/InputGroup.vue new file mode 100644 index 00000000000..240c3cb348f --- /dev/null +++ b/src/components/ui/input-group/InputGroup.vue @@ -0,0 +1,28 @@ + + + diff --git a/src/components/ui/input-group/InputGroupAddon.vue b/src/components/ui/input-group/InputGroupAddon.vue new file mode 100644 index 00000000000..58157b83882 --- /dev/null +++ b/src/components/ui/input-group/InputGroupAddon.vue @@ -0,0 +1,32 @@ + + + diff --git a/src/components/ui/input-group/InputGroupButton.vue b/src/components/ui/input-group/InputGroupButton.vue new file mode 100644 index 00000000000..3d800ca5e4f --- /dev/null +++ b/src/components/ui/input-group/InputGroupButton.vue @@ -0,0 +1,34 @@ + + + diff --git a/src/components/ui/input-group/InputGroupInput.vue b/src/components/ui/input-group/InputGroupInput.vue new file mode 100644 index 00000000000..e5302d8e9a2 --- /dev/null +++ b/src/components/ui/input-group/InputGroupInput.vue @@ -0,0 +1,26 @@ + + + diff --git a/src/components/ui/input-group/inputGroup.variants.ts b/src/components/ui/input-group/inputGroup.variants.ts new file mode 100644 index 00000000000..8e23570b4a0 --- /dev/null +++ b/src/components/ui/input-group/inputGroup.variants.ts @@ -0,0 +1,34 @@ +import type { VariantProps } from 'cva' +import { cva } from 'cva' + +export const inputGroupAddonVariants = cva({ + base: 'flex h-auto cursor-text items-center justify-center gap-2 py-1.5 text-sm font-medium text-muted-foreground select-none group-has-[[data-slot=input-group-control]:disabled]/input-group:opacity-50', + variants: { + align: { + 'inline-start': 'order-first pl-3 has-[>button]:pl-1', + 'inline-end': 'order-last pr-3 has-[>button]:pr-1' + } + }, + defaultVariants: { align: 'inline-start' } +}) + +export type InputGroupAddonVariants = VariantProps< + typeof inputGroupAddonVariants +> + +export const inputGroupButtonVariants = cva({ + base: 'flex items-center gap-2 text-sm', + variants: { + size: { + xs: 'h-6 gap-1 rounded-sm px-2', + sm: 'h-8 gap-1.5 rounded-md px-2.5', + 'icon-xs': 'size-6 rounded-sm p-0', + 'icon-sm': 'size-8 p-0' + } + }, + defaultVariants: { size: 'xs' } +}) + +export type InputGroupButtonVariants = VariantProps< + typeof inputGroupButtonVariants +> diff --git a/src/components/ui/input/Input.vue b/src/components/ui/input/Input.vue index f2e2daf49f0..9f35f99fcee 100644 --- a/src/components/ui/input/Input.vue +++ b/src/components/ui/input/Input.vue @@ -29,7 +29,7 @@ defineExpose({ v-model="modelValue" :class=" cn( - 'flex h-10 w-full min-w-0 appearance-none rounded-lg border-none bg-secondary-background px-4 py-2 text-sm text-base-foreground placeholder:text-muted-foreground focus-visible:ring-1 focus-visible:ring-border-default focus-visible:outline-none disabled:pointer-events-none disabled:opacity-50', + 'flex h-10 w-full min-w-0 appearance-none rounded-lg border-none bg-secondary-background px-4 py-2 text-sm text-base-foreground placeholder:text-muted-foreground focus-visible:ring-1 focus-visible:ring-border-default focus-visible:outline-none disabled:pointer-events-none disabled:opacity-50 aria-invalid:ring-1 aria-invalid:ring-destructive-background', className ) " diff --git a/src/components/ui/input/PasswordInput.stories.ts b/src/components/ui/input/PasswordInput.stories.ts new file mode 100644 index 00000000000..f792d8885a9 --- /dev/null +++ b/src/components/ui/input/PasswordInput.stories.ts @@ -0,0 +1,36 @@ +import type { Meta, StoryObj } from '@storybook/vue3-vite' + +import PasswordInput from './PasswordInput.vue' + +const meta: Meta = { + title: 'Components/PasswordInput', + component: PasswordInput, + tags: ['autodocs'], + render: (args) => ({ + components: { PasswordInput }, + setup: () => ({ args }), + template: + '' + }) +} + +export default meta +type Story = StoryObj + +export const Default: Story = {} + +export const Disabled: Story = { + render: () => ({ + components: { PasswordInput }, + template: + '' + }) +} + +export const Invalid: Story = { + render: () => ({ + components: { PasswordInput }, + template: + '' + }) +} diff --git a/src/components/ui/input/PasswordInput.test.ts b/src/components/ui/input/PasswordInput.test.ts new file mode 100644 index 00000000000..9acfd2d22e9 --- /dev/null +++ b/src/components/ui/input/PasswordInput.test.ts @@ -0,0 +1,54 @@ +import { render, screen } from '@testing-library/vue' +import userEvent from '@testing-library/user-event' +import { expect, it } from 'vitest' +import { defineComponent, ref } from 'vue' +import { createI18n } from 'vue-i18n' + +import enMessages from '@/locales/en/main.json' with { type: 'json' } + +import PasswordInput from './PasswordInput.vue' + +const i18n = createI18n({ + legacy: false, + locale: 'en', + messages: { en: enMessages } +}) + +it('reveals and hides the password', async () => { + const user = userEvent.setup() + render(PasswordInput, { + props: { modelValue: 'secret' }, + attrs: { 'aria-label': 'Password' }, + global: { plugins: [i18n] } + }) + + const input = screen.getByLabelText('Password') + const toggle = screen.getByRole('button', { name: 'Show password' }) + expect(input).toHaveAttribute('type', 'password') + + await user.click(toggle) + expect(input).toHaveAttribute('type', 'text') + expect(toggle).toHaveAccessibleName('Hide password') + + await user.click(toggle) + expect(input).toHaveAttribute('type', 'password') +}) + +it('updates a controlled parent model when edited', async () => { + const user = userEvent.setup() + const Harness = defineComponent({ + components: { PasswordInput }, + setup: () => ({ password: ref('initial') }), + template: ` + + {{ password }} + ` + }) + render(Harness, { global: { plugins: [i18n] } }) + + const input = screen.getByLabelText('Password') + await user.clear(input) + await user.type(input, 'changed') + + expect(screen.getByRole('status')).toHaveTextContent('changed') +}) diff --git a/src/components/ui/input/PasswordInput.vue b/src/components/ui/input/PasswordInput.vue new file mode 100644 index 00000000000..1aeafee9c3a --- /dev/null +++ b/src/components/ui/input/PasswordInput.vue @@ -0,0 +1,44 @@ + + + diff --git a/src/components/ui/label/Label.stories.ts b/src/components/ui/label/Label.stories.ts new file mode 100644 index 00000000000..a7f2d8d7222 --- /dev/null +++ b/src/components/ui/label/Label.stories.ts @@ -0,0 +1,36 @@ +import type { Meta, StoryObj } from '@storybook/vue3-vite' + +import Input from '@/components/ui/input/Input.vue' + +import Label from './Label.vue' + +const meta = { + title: 'Components/Label', + component: Label, + tags: ['autodocs'] +} satisfies Meta + +export default meta +type Story = StoryObj + +export const Default: Story = { + render: () => ({ + components: { Label, Input }, + template: ` +
+ + +
` + }) +} + +export const Disabled: Story = { + render: () => ({ + components: { Label, Input }, + template: ` +
+ + +
` + }) +} diff --git a/src/components/ui/label/Label.vue b/src/components/ui/label/Label.vue new file mode 100644 index 00000000000..12dbff41592 --- /dev/null +++ b/src/components/ui/label/Label.vue @@ -0,0 +1,26 @@ + + + diff --git a/src/components/ui/multi-select/MultiSelect.stories.ts b/src/components/ui/multi-select/MultiSelect.stories.ts index c32bcd3844a..c6603bea123 100644 --- a/src/components/ui/multi-select/MultiSelect.stories.ts +++ b/src/components/ui/multi-select/MultiSelect.stories.ts @@ -97,6 +97,31 @@ export const Disabled: Story = { parameters: { controls: { disable: true } } } +export const ChipsViaValueSlot: Story = { + render: () => ({ + components: { MultiSelect }, + setup() { + const selected = ref([sampleOptions[0], sampleOptions[3]]) + return { selected, sampleOptions } + }, + template: ` + + + ` + }), + parameters: { controls: { disable: true } } +} + export const WithSearchBox: Story = { args: { showSearchBox: true }, render: (args) => ({ diff --git a/src/components/ui/multi-select/MultiSelect.test.ts b/src/components/ui/multi-select/MultiSelect.test.ts index 3d51d7d83db..203697e4413 100644 --- a/src/components/ui/multi-select/MultiSelect.test.ts +++ b/src/components/ui/multi-select/MultiSelect.test.ts @@ -197,6 +197,44 @@ describe('MultiSelect', () => { }) }) + it('shows selected option labels in the trigger', () => { + const { unmount } = renderInParent({}, [ + { name: 'Option A', value: 'a' }, + { name: 'Option B', value: 'b' } + ]) + + expect(screen.getByText('Option A, Option B')).toBeInTheDocument() + + unmount() + }) + + it('renders the value slot with the selected options instead of the joined labels', () => { + const Parent = { + template: ` + + + `, + components: { MultiSelect }, + setup: () => ({ + sel: ref([options[0], options[2]]), + options + }) + } + + const { unmount } = render(Parent, { global: { plugins: [i18n] } }) + + expect( + screen.getAllByTestId('chip').map((chip) => chip.textContent.trim()) + ).toEqual(['Option A', 'Option C']) + expect(screen.queryByText('Option A, Option C')).not.toBeInTheDocument() + + unmount() + }) + it('lets the user type in the search box when nested in a trapped focus scope', async () => { const user = userEvent.setup() const InTrap = { diff --git a/src/components/ui/multi-select/MultiSelect.vue b/src/components/ui/multi-select/MultiSelect.vue index c9809f83c07..753c5320535 100644 --- a/src/components/ui/multi-select/MultiSelect.vue +++ b/src/components/ui/multi-select/MultiSelect.vue @@ -8,189 +8,50 @@ ignore-filter :reset-search-term-on-select="false" > - - -
- - {{ label }} - - - {{ selectedCount }} - -
-
- -
-
-
- - - - -
-
- - -
-
- - -
- - {{ $t('g.itemsSelected', { count: selectedCount }) }} - - -
- - - -
- - - -
- {{ opt.name }} -
- - {{ $t('g.noResultsFound') }} - -
- -
- - {{ $t('g.itemsSelected', { count: selectedCount }) }} - - -
-
-
-
+ + + + + diff --git a/src/components/ui/multi-select/MultiSelectContent.vue b/src/components/ui/multi-select/MultiSelectContent.vue new file mode 100644 index 00000000000..69a3c40240a --- /dev/null +++ b/src/components/ui/multi-select/MultiSelectContent.vue @@ -0,0 +1,193 @@ + + + diff --git a/src/components/ui/multi-select/MultiSelectTrigger.vue b/src/components/ui/multi-select/MultiSelectTrigger.vue new file mode 100644 index 00000000000..aef36e0c0c1 --- /dev/null +++ b/src/components/ui/multi-select/MultiSelectTrigger.vue @@ -0,0 +1,76 @@ + + + diff --git a/src/components/ui/number-field/NumberField.stories.ts b/src/components/ui/number-field/NumberField.stories.ts new file mode 100644 index 00000000000..989f6a29763 --- /dev/null +++ b/src/components/ui/number-field/NumberField.stories.ts @@ -0,0 +1,94 @@ +import type { + ComponentPropsAndSlots, + Meta, + StoryObj +} from '@storybook/vue3-vite' +import { ref, toRefs } from 'vue' + +import NumberField from './NumberField.vue' +import NumberFieldDecrement from './NumberFieldDecrement.vue' +import NumberFieldIncrement from './NumberFieldIncrement.vue' +import NumberFieldInput from './NumberFieldInput.vue' + +type StoryArgs = ComponentPropsAndSlots + +const meta: Meta = { + title: 'Components/NumberField', + component: NumberField, + tags: ['autodocs'], + parameters: { layout: 'centered' }, + argTypes: { + min: { control: 'number' }, + max: { control: 'number' }, + step: { control: 'number' }, + disabled: { control: 'boolean' } + }, + args: { + min: 0, + max: 100, + step: 1, + disabled: false + } +} + +export default meta +type Story = StoryObj + +function renderNumberField(children: string, initialValue: number) { + return (args: StoryArgs) => ({ + components: { + NumberField, + NumberFieldDecrement, + NumberFieldIncrement, + NumberFieldInput + }, + setup() { + const { min, max, step, disabled, formatOptions } = toRefs(args) + const value = ref(initialValue) + return { value, min, max, step, disabled, formatOptions } + }, + template: ` + + ${children} + + ` + }) +} + +const stepperChildren = ` + + + +` + +export const Default: Story = { + render: renderNumberField(stepperChildren, 36) +} + +export const Disabled: Story = { + args: { disabled: true }, + render: renderNumberField(stepperChildren, 36) +} + +export const Decimal: Story = { + args: { + min: 0, + max: 1, + step: 0.05, + formatOptions: { minimumFractionDigits: 2, maximumFractionDigits: 2 } + }, + render: renderNumberField(stepperChildren, 0.5) +} + +export const WithPrefix: Story = { + args: { max: 10000, step: 5, formatOptions: { maximumFractionDigits: 0 } }, + render: renderNumberField( + ` + + $ + + + `, + 50 + ) +} diff --git a/src/components/ui/number-field/NumberField.test.ts b/src/components/ui/number-field/NumberField.test.ts new file mode 100644 index 00000000000..14a454b56c6 --- /dev/null +++ b/src/components/ui/number-field/NumberField.test.ts @@ -0,0 +1,107 @@ +import userEvent from '@testing-library/user-event' +import { render, screen, waitFor } from '@testing-library/vue' +import { describe, expect, it } from 'vitest' +import { defineComponent, ref } from 'vue' +import { createI18n } from 'vue-i18n' + +import enMessages from '@/locales/en/main.json' with { type: 'json' } + +import NumberField from './NumberField.vue' +import NumberFieldDecrement from './NumberFieldDecrement.vue' +import NumberFieldIncrement from './NumberFieldIncrement.vue' +import NumberFieldInput from './NumberFieldInput.vue' + +const i18n = createI18n({ + legacy: false, + locale: 'en', + messages: { en: enMessages } +}) + +function renderNumberField(rootAttrs: string, initialValue: number | null) { + const value = ref(initialValue) + const updates: unknown[] = [] + const Harness = defineComponent({ + components: { + NumberField, + NumberFieldDecrement, + NumberFieldIncrement, + NumberFieldInput + }, + setup: () => ({ + value, + onUpdate: (next: number) => { + updates.push(next) + value.value = next + } + }), + template: ` + + + + + + ` + }) + render(Harness, { global: { plugins: [i18n] } }) + return { value, updates, input: screen.getByRole('spinbutton') } +} + +describe('NumberField', () => { + it('does not emit when the input is cleared and restores the value', async () => { + const user = userEvent.setup() + const { updates, input } = renderNumberField(':min="1"', 5) + + await user.clear(input) + await user.tab() + + expect(updates).toEqual([]) + await waitFor(() => expect(input).toHaveValue('5')) + }) + + it('does not emit when focus leaves without a change', async () => { + const user = userEvent.setup() + const { updates, input } = renderNumberField('', 50) + + await user.click(input) + await user.tab() + + expect(updates).toEqual([]) + }) + + it('clamps a typed value to max on commit without step snapping', async () => { + const user = userEvent.setup() + const { updates, input } = renderNumberField( + ':min="0" :max="10000" :step="5"', + 50 + ) + + await user.clear(input) + await user.type(input, '123{Enter}') + expect(updates).toEqual([123]) + + await user.clear(input) + await user.type(input, '20000{Enter}') + expect(updates).toEqual([123, 10000]) + expect(input).toHaveValue('10,000') + }) + + it('steps with buttons and arrow keys from a nullable value', async () => { + const user = userEvent.setup() + const { updates, input } = renderNumberField( + ':min="1" :max="3" :step="0.2" :format-options="{ maximumFractionDigits: 1 }"', + null + ) + + expect(input).toHaveValue('') + await user.click(screen.getByRole('button', { name: 'Increment' })) + expect(updates).toEqual([1]) + + await user.keyboard('{ArrowUp}') + expect(updates).toEqual([1, 1.2]) + expect(input).toHaveAttribute('aria-valuenow', '1.2') + + await user.click(screen.getByRole('button', { name: 'Decrement' })) + expect(updates).toEqual([1, 1.2, 1]) + expect(screen.getByRole('button', { name: 'Decrement' })).toBeDisabled() + }) +}) diff --git a/src/components/ui/number-field/NumberField.vue b/src/components/ui/number-field/NumberField.vue new file mode 100644 index 00000000000..a97100712b4 --- /dev/null +++ b/src/components/ui/number-field/NumberField.vue @@ -0,0 +1,44 @@ + + + diff --git a/src/components/ui/number-field/NumberFieldDecrement.vue b/src/components/ui/number-field/NumberFieldDecrement.vue new file mode 100644 index 00000000000..c2a10f1ed4b --- /dev/null +++ b/src/components/ui/number-field/NumberFieldDecrement.vue @@ -0,0 +1,30 @@ + + + diff --git a/src/components/ui/number-field/NumberFieldIncrement.vue b/src/components/ui/number-field/NumberFieldIncrement.vue new file mode 100644 index 00000000000..5cf021167f5 --- /dev/null +++ b/src/components/ui/number-field/NumberFieldIncrement.vue @@ -0,0 +1,30 @@ + + + diff --git a/src/components/ui/number-field/NumberFieldInput.vue b/src/components/ui/number-field/NumberFieldInput.vue new file mode 100644 index 00000000000..7540ca0f96e --- /dev/null +++ b/src/components/ui/number-field/NumberFieldInput.vue @@ -0,0 +1,22 @@ + + + diff --git a/src/components/ui/radio-group/RadioGroup.stories.ts b/src/components/ui/radio-group/RadioGroup.stories.ts new file mode 100644 index 00000000000..d09827356ca --- /dev/null +++ b/src/components/ui/radio-group/RadioGroup.stories.ts @@ -0,0 +1,105 @@ +import type { Meta, StoryObj } from '@storybook/vue3-vite' +import { ref } from 'vue' + +import RadioGroup from './RadioGroup.vue' +import RadioGroupItem from './RadioGroupItem.vue' + +const meta = { + title: 'Components/RadioGroup', + component: RadioGroup, + tags: ['autodocs'], + argTypes: { + disabled: { control: 'boolean' }, + 'onUpdate:modelValue': { action: 'update:modelValue' } + } +} satisfies Meta + +export default meta +type Story = StoryObj + +function renderRadioGroup(initialValue?: string) { + function render(args: { disabled?: boolean }) { + return { + components: { RadioGroup, RadioGroupItem }, + setup() { + const value = ref(initialValue) + return { args, value } + }, + template: ` + + + + + + ` + } + } + + return render +} + +export const Default: Story = { + render: renderRadioGroup() +} + +export const Preselected: Story = { + render: renderRadioGroup('balanced') +} + +export const Disabled: Story = { + render: renderRadioGroup('balanced'), + args: { disabled: true } +} + +export const WithDescriptions: Story = { + render(args) { + return { + components: { RadioGroup, RadioGroupItem }, + setup() { + const value = ref('increment') + const options = [ + { + value: 'fixed', + title: 'Fixed', + description: 'Keep the value between runs' + }, + { + value: 'increment', + title: 'Increment', + description: 'Add the step after every run' + }, + { + value: 'randomize', + title: 'Randomize', + description: 'Pick a new random value after every run' + } + ] + return { args, value, options } + }, + template: ` + +
+ + +
+
+ ` + } + } +} diff --git a/src/components/ui/radio-group/RadioGroup.test.ts b/src/components/ui/radio-group/RadioGroup.test.ts new file mode 100644 index 00000000000..2391dad87c2 --- /dev/null +++ b/src/components/ui/radio-group/RadioGroup.test.ts @@ -0,0 +1,49 @@ +import { render, screen } from '@testing-library/vue' +import userEvent from '@testing-library/user-event' +import { describe, expect, it } from 'vitest' +import { defineComponent, ref } from 'vue' + +import RadioGroup from './RadioGroup.vue' +import RadioGroupItem from './RadioGroupItem.vue' + +const Harness = defineComponent({ + components: { RadioGroup, RadioGroupItem }, + setup() { + const value = ref('first') + return { value } + }, + template: ` + + + + + ` +}) + +describe('RadioGroup', () => { + it('updates selection through keyboard activation', async () => { + const user = userEvent.setup() + render(Harness) + + const first = screen.getByRole('radio', { name: 'First' }) + const second = screen.getByRole('radio', { name: 'Second' }) + expect(first).toBeChecked() + expect(second).not.toBeChecked() + + second.focus() + await user.keyboard('[Space]') + + expect(second).toBeChecked() + expect(second).toHaveFocus() + }) + + it('prevents interaction while disabled', async () => { + const user = userEvent.setup() + render(Harness, { props: {}, attrs: { disabled: true } }) + + const second = screen.getByRole('radio', { name: 'Second' }) + await user.click(second) + + expect(second).not.toBeChecked() + }) +}) diff --git a/src/components/ui/radio-group/RadioGroup.vue b/src/components/ui/radio-group/RadioGroup.vue new file mode 100644 index 00000000000..6c147139e74 --- /dev/null +++ b/src/components/ui/radio-group/RadioGroup.vue @@ -0,0 +1,24 @@ + + + diff --git a/src/components/ui/radio-group/RadioGroupItem.vue b/src/components/ui/radio-group/RadioGroupItem.vue new file mode 100644 index 00000000000..602ec524df1 --- /dev/null +++ b/src/components/ui/radio-group/RadioGroupItem.vue @@ -0,0 +1,35 @@ + + + diff --git a/src/components/ui/search-input/SearchInput.stories.ts b/src/components/ui/search-input/SearchInput.stories.ts index 3adf7af3e04..32e2a064929 100644 --- a/src/components/ui/search-input/SearchInput.stories.ts +++ b/src/components/ui/search-input/SearchInput.stories.ts @@ -22,6 +22,7 @@ const meta: Meta> = { debounceTime: { control: 'number' }, autofocus: { control: 'boolean' }, loading: { control: 'boolean' }, + invalid: { control: 'boolean' }, size: { control: { type: 'select' }, options: sizes @@ -157,3 +158,10 @@ export const Disabled: Story = { ` }) } + +export const Invalid: Story = { + ...Default, + args: { + invalid: true + } +} diff --git a/src/components/ui/search-input/SearchInput.test.ts b/src/components/ui/search-input/SearchInput.test.ts index 9f1dbcd65cc..d99fc0e7dd7 100644 --- a/src/components/ui/search-input/SearchInput.test.ts +++ b/src/components/ui/search-input/SearchInput.test.ts @@ -191,5 +191,23 @@ describe('SearchInput', () => { await user.click(screen.getByRole('button', { name: 'Clear' })) expect(onUpdate).toHaveBeenCalledWith('') }) + + it('does not allow clearing a disabled search input', async () => { + const onUpdate = vi.fn() + const user = userEvent.setup({ advanceTimers: vi.advanceTimersByTime }) + renderComponent({ + modelValue: 'test', + disabled: true, + 'onUpdate:modelValue': onUpdate + }) + const clearButton = screen.getByRole('button', { name: 'Clear' }) + + expect(clearButton).toBeDisabled() + await user.tab() + expect(clearButton).not.toHaveFocus() + await user.keyboard('{Enter}') + + expect(onUpdate).not.toHaveBeenCalled() + }) }) }) diff --git a/src/components/ui/search-input/SearchInput.vue b/src/components/ui/search-input/SearchInput.vue index 30c1a94005d..e010ec1d36e 100644 --- a/src/components/ui/search-input/SearchInput.vue +++ b/src/components/ui/search-input/SearchInput.vue @@ -3,43 +3,50 @@ - - - + + + + @@ -84,6 +93,7 @@ const { debounceTime = 300, autofocus = false, loading = false, + invalid = false, disabled = false, size = 'md', class: className @@ -94,6 +104,7 @@ const { debounceTime?: number autofocus?: boolean loading?: boolean + invalid?: boolean disabled?: boolean size?: SearchInputVariants['size'] class?: HTMLAttributes['class'] @@ -101,6 +112,7 @@ const { const emit = defineEmits<{ search: [value: string] + blur: [] }>() const sizeConfig = computed(() => searchInputSizeConfig[size]) diff --git a/src/components/ui/search-input/searchInput.variants.ts b/src/components/ui/search-input/searchInput.variants.ts index dd4800a2e6a..3c71aac1274 100644 --- a/src/components/ui/search-input/searchInput.variants.ts +++ b/src/components/ui/search-input/searchInput.variants.ts @@ -2,13 +2,16 @@ import type { VariantProps } from 'cva' import { cva } from 'cva' export const searchInputVariants = cva({ - base: 'relative flex w-full cursor-text items-center rounded-lg bg-secondary-background text-base-foreground', + base: 'relative flex w-full cursor-text items-center rounded-lg bg-secondary-background text-base-foreground focus-within:ring-1 focus-within:ring-border-default', variants: { size: { sm: 'h-6 p-1', md: 'h-8 px-2 py-1.5', lg: 'h-10 p-2', xl: 'h-12 p-2' + }, + invalid: { + true: 'ring-1 ring-destructive-background' } }, defaultVariants: { size: 'md' } diff --git a/src/components/ui/select/types.ts b/src/components/ui/select/types.ts index d775d148596..24976eb0e55 100644 --- a/src/components/ui/select/types.ts +++ b/src/components/ui/select/types.ts @@ -1 +1,4 @@ -export type SelectOption = { name: string; value: string } +export type SelectOption = { + name: string + value: Value +} diff --git a/src/components/ui/select/useSelectSearch.test.ts b/src/components/ui/select/useSelectSearch.test.ts new file mode 100644 index 00000000000..691a16a5c4f --- /dev/null +++ b/src/components/ui/select/useSelectSearch.test.ts @@ -0,0 +1,24 @@ +import { describe, expect, it } from 'vitest' +import { ref } from 'vue' + +import { useSelectSearch } from './useSelectSearch' + +const options = [ + { name: 'Euler', value: 'euler' }, + { name: 'DPM++ 2M', value: 'dpmpp_2m' }, + { name: 'Heun', value: 'heun' } +] + +describe('useSelectSearch', () => { + it.for([ + { query: '', expected: ['euler', 'dpmpp_2m', 'heun'] }, + { query: ' ', expected: ['euler', 'dpmpp_2m', 'heun'] }, + { query: 'heun', expected: ['heun'] }, + { query: 'HEUN', expected: ['heun'] }, + { query: 'dpmpp', expected: ['dpmpp_2m'] }, + { query: 'zzzz', expected: [] } + ])('"$query" matches $expected', ({ query, expected }) => { + const filtered = useSelectSearch(ref(query), options) + expect(filtered.value.map(({ value }) => value)).toEqual(expected) + }) +}) diff --git a/src/components/ui/select/useSelectSearch.ts b/src/components/ui/select/useSelectSearch.ts new file mode 100644 index 00000000000..3a1122b6ae2 --- /dev/null +++ b/src/components/ui/select/useSelectSearch.ts @@ -0,0 +1,21 @@ +import { useFuse } from '@vueuse/integrations/useFuse' +import type { MaybeRefOrGetter, Ref } from 'vue' +import { computed, toValue } from 'vue' + +import type { SelectOption } from './types' + +export function useSelectSearch( + query: Ref, + options: MaybeRefOrGetter[]> +) { + const { results } = useFuse(query, options, { + fuseOptions: { keys: ['name', 'value'], threshold: 0.3 }, + matchAllWhenSearchEmpty: true + }) + + return computed(() => + query.value.trim() + ? results.value.map(({ item }) => item) + : toValue(options) + ) +} diff --git a/src/components/ui/single-select/SearchableSingleSelect.vue b/src/components/ui/single-select/SearchableSingleSelect.vue new file mode 100644 index 00000000000..6f5ea201b4a --- /dev/null +++ b/src/components/ui/single-select/SearchableSingleSelect.vue @@ -0,0 +1,197 @@ + + + diff --git a/src/components/ui/single-select/SingleSelect.test.ts b/src/components/ui/single-select/SingleSelect.test.ts index e5cbec05115..f007f3c76f3 100644 --- a/src/components/ui/single-select/SingleSelect.test.ts +++ b/src/components/ui/single-select/SingleSelect.test.ts @@ -1,5 +1,6 @@ import { ZIndex } from '@primeuix/utils/zindex' import { render, screen } from '@testing-library/vue' +import userEvent from '@testing-library/user-event' import type { ComponentProps } from 'vue-component-type-helpers' import { afterEach, describe, expect, it } from 'vitest' import { nextTick, ref } from 'vue' @@ -13,7 +14,9 @@ const i18n = createI18n({ messages: { en: { g: { - singleSelectDropdown: 'Single-select dropdown' + singleSelectDropdown: 'Single-select dropdown', + search: 'Search', + noResultsFound: 'No results found' } } } @@ -47,7 +50,7 @@ function renderInParent( const Parent = { template: - '
', + '
', components: { SingleSelect }, setup() { return { @@ -82,6 +85,10 @@ async function openSelect(triggerEl: HTMLElement) { }) ) await nextTick() + if (triggerEl.dataset.state === 'closed') { + triggerEl.click() + await nextTick() + } } let openModal: HTMLElement | undefined @@ -94,13 +101,101 @@ afterEach(() => { }) describe('SingleSelect', () => { + it('filters searchable options', async () => { + const user = userEvent.setup() + const { unmount } = renderInParent(undefined, { searchable: true }) + + await openSelect(screen.getByLabelText('Pick')) + const searchInput = screen.getByRole('combobox', { name: 'Search' }) + expect(searchInput).toHaveFocus() + await user.type(searchInput, 'C') + + expect(screen.getByRole('option', { name: 'Option C' })).toBeInTheDocument() + expect( + screen.queryByRole('option', { name: 'Option A' }) + ).not.toBeInTheDocument() + + unmount() + }) + + it('selects a filtered option with the keyboard', async () => { + const user = userEvent.setup() + const { unmount } = renderInParent(undefined, { searchable: true }) + + await openSelect(screen.getByLabelText('Pick')) + const searchInput = screen.getByRole('combobox', { name: 'Search' }) + await user.type(searchInput, 'C') + await user.keyboard('{ArrowDown}{Enter}') + + expect(screen.getByLabelText('Pick')).toHaveTextContent('Option C') + + unmount() + }) + + it('shows an empty result and keeps the search input focused', async () => { + const user = userEvent.setup() + const { unmount } = renderInParent(undefined, { searchable: true }) + + await openSelect(screen.getByLabelText('Pick')) + const searchInput = screen.getByRole('combobox', { name: 'Search' }) + await user.type(searchInput, 'missing') + + expect(screen.getByText('No results found')).toBeInTheDocument() + expect(searchInput).toHaveFocus() + + unmount() + }) + + it('closes on Escape and returns focus to the trigger', async () => { + const user = userEvent.setup() + const { unmount } = renderInParent(undefined, { searchable: true }) + + const trigger = screen.getByLabelText('Pick') + await openSelect(trigger) + await user.keyboard('{Escape}') + + expect(trigger).toHaveAttribute('data-state', 'closed') + expect(trigger).toHaveFocus() + + unmount() + }) + + it('keeps the searchable trigger in the keyboard tab order', async () => { + const user = userEvent.setup() + const { unmount } = renderInParent(undefined, { searchable: true }) + + await user.tab() + + expect(screen.getByRole('button', { name: 'Pick' })).toHaveFocus() + + unmount() + }) + + it('clears the search and restores focus when reopened', async () => { + const user = userEvent.setup() + const { unmount } = renderInParent(undefined, { searchable: true }) + + const trigger = screen.getByLabelText('Pick') + await openSelect(trigger) + await user.type(screen.getByRole('combobox', { name: 'Search' }), 'C') + await user.keyboard('{Escape}') + await openSelect(trigger) + + const searchInput = screen.getByRole('combobox', { name: 'Search' }) + expect(searchInput).toHaveValue('') + expect(searchInput).toHaveFocus() + expect(screen.getAllByRole('option')).toHaveLength(3) + + unmount() + }) + it('opens above a dialog registered with the modal z-index counter', async () => { openModal = document.createElement('div') ZIndex.set('modal', openModal, 3702) const dialogZIndex = Number(openModal.style.zIndex) const { unmount } = renderInParent() - await openSelect(screen.getByRole('combobox')) + await openSelect(screen.getByLabelText('Pick')) const content = findContentElement() expect(content).not.toBeNull() @@ -117,7 +212,7 @@ describe('SingleSelect', () => { contentStyle: { zIndex: 3000 } }) - await openSelect(screen.getByRole('combobox')) + await openSelect(screen.getByLabelText('Pick')) const content = findContentElement() expect(content).not.toBeNull() @@ -142,9 +237,11 @@ describe('SingleSelect', () => { describe('Escape key propagation', () => { it('stops Escape from propagating to parent when popover is open', async () => { - const { unmount, parentEscapeCount } = renderInParent() + const { unmount, parentEscapeCount } = renderInParent(undefined, { + searchable: true + }) - const trigger = screen.getByRole('combobox') + const trigger = screen.getByLabelText('Pick') await openSelect(trigger) const content = findContentElement() diff --git a/src/components/ui/single-select/SingleSelect.vue b/src/components/ui/single-select/SingleSelect.vue index 88e6f4a9ef4..6d84ea5ac54 100644 --- a/src/components/ui/single-select/SingleSelect.vue +++ b/src/components/ui/single-select/SingleSelect.vue @@ -1,5 +1,25 @@