Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

fix: improve accessibility across the apps list (#41393)

Joel4c414988eec3
diff --git a/e2e/features/step-definitions/apps/duplicate-app.steps.ts b/e2e/features/step-definitions/apps/duplicate-app.steps.ts
index 707fdf13d8c..71bdf8bf0af 100644
--- a/e2e/features/step-definitions/apps/duplicate-app.steps.ts
+++ b/e2e/features/step-definitions/apps/duplicate-app.steps.ts
@@ -20,10 +20,13 @@ When('I open the options menu for the last created E2E app', async function (thi
const page = this.getPage()
await waitForAppsConsole(page, 30_000)
const studio = page.getByRole('region', { name: 'Studio' })
- const appLink = studio.getByRole('link', { name: appName, exact: true })
+ const appCard = studio.getByRole('listitem').filter({
+ has: page.getByRole('link', { name: appName, exact: true }),
+ })
+ const appLink = appCard.getByRole('link', { name: appName, exact: true })
await expect(appLink).toBeVisible()
await appLink.hover()
- await studio.getByRole('button', { name: `More actions for ${appName}`, exact: true }).click()
+ await appCard.getByRole('button', { name: `More actions for ${appName}`, exact: true }).click()
})
When('I click {string} in the app options menu', async function (this: DifyWorld, label: string) {
diff --git a/oxlint-suppressions.json b/oxlint-suppressions.json
index dfbc8b6c8e8..9cb1ae7a569 100644
--- a/oxlint-suppressions.json
+++ b/oxlint-suppressions.json
@@ -533,14 +533,6 @@
"count": 2
}
},
- "web/app/components/apps/import-from-marketplace-template-modal.tsx": {
- "jsx-a11y/click-events-have-key-events": {
- "count": 1
- },
- "jsx-a11y/no-static-element-interactions": {
- "count": 1
- }
- },
"web/app/components/base/agent-log-modal/detail.tsx": {
"typescript/no-explicit-any": {
"count": 1
diff --git a/web/app/components/apps/__tests__/app-card.spec.tsx b/web/app/components/apps/__tests__/app-card.spec.tsx
index af53580c464..84a880c6804 100644
--- a/web/app/components/apps/__tests__/app-card.spec.tsx
+++ b/web/app/components/apps/__tests__/app-card.spec.tsx
@@ -386,15 +386,18 @@ vi.mock('@/features/tag-management/components/app-card-tags', () => ({
AppCardTags: ({
tags,
canBindOrUnbindTags,
+ appName,
}: {
tags?: { id: string; name: string }[]
canBindOrUnbindTags?: boolean
+ appName: string
}) => {
return React.createElement(
'div',
{
'aria-label': 'tag-selector',
'data-can-bind-or-unbind-tags': String(Boolean(canBindOrUnbindTags)),
+ 'data-app-name': appName,
},
tags?.map((tag: { id: string; name: string }) =>
React.createElement('span', { key: tag.id }, tag.name),
@@ -472,6 +475,8 @@ describe('AppCard', () => {
const card = screen.getByRole('button', { name: 'Preview Only App' })
expect(card).toHaveClass('opacity-60')
+ expect(screen.getByRole('listitem')).toContainElement(card)
+ expect(card).toHaveAccessibleDescription('Only visible metadata')
expect(card).not.toHaveAttribute('aria-disabled')
expect(screen.getByText('Only visible metadata')).toBeInTheDocument()
expect(screen.getByText('Readonly Author')).toBeInTheDocument()
@@ -552,6 +557,17 @@ describe('AppCard', () => {
const emojiIcon = container.querySelector(`em-emoji[id="${mockApp.icon}"]`)
const imageIcon = container.querySelector('img')
expect(emojiIcon || imageIcon).toBeTruthy()
+ expect(emojiIcon?.parentElement).toHaveAttribute('aria-hidden', 'true')
+ })
+
+ it('should treat a redundant image icon as decorative', () => {
+ const imageApp = createMockApp({
+ icon_type: 'image',
+ icon_url: 'https://example.com/app-icon.png',
+ })
+ const { container } = render(<AppCard app={imageApp} />)
+
+ expect(container.querySelector('img')).toHaveAttribute('alt', '')
})
it('should render app type icon', () => {
@@ -579,7 +595,7 @@ describe('AppCard', () => {
}
render(<AppCard app={appWithTags} />)
// Verify the tag selector component renders
- expect(screen.getByLabelText('tag-selector')).toBeInTheDocument()
+ expect(screen.getByLabelText('tag-selector')).toHaveAttribute('data-app-name', 'Test App')
})
it('should display refreshed tag names from app props when tag ids stay the same', () => {
@@ -670,6 +686,10 @@ describe('AppCard', () => {
const cardLink = screen.getByRole('link', { name: 'Test App' })
expect(cardLink).toHaveAttribute('href', '/app/test-app-id/configuration')
+ expect(cardLink).toHaveAccessibleName('Test App')
+ expect(cardLink).toHaveAccessibleDescription('Test app description')
+ expect(cardLink).toHaveAttribute('aria-describedby')
+ expect(screen.getByRole('listitem')).toContainElement(cardLink)
})
it('should expose a visible focus ring on the card link', () => {
@@ -684,7 +704,7 @@ describe('AppCard', () => {
const user = userEvent.setup()
render(<AppCard app={mockApp} />)
- const starToggle = screen.getByRole('button', { name: 'app.studio.starApp' })
+ const starToggle = screen.getByRole('button', { name: 'app.studio.starApp: Test App' })
expect(starToggle).toHaveAttribute('aria-pressed', 'false')
await user.click(starToggle)
@@ -702,9 +722,13 @@ describe('AppCard', () => {
const starredApp = createMockApp({ is_starred: true })
render(<AppCard app={starredApp} />)
- const starToggle = screen.getByRole('button', { name: 'app.studio.starApp' })
+ const starToggle = screen.getByRole('button', { name: 'app.studio.starApp: Test App' })
expect(starToggle).toHaveAttribute('aria-pressed', 'true')
+ await user.hover(starToggle)
+
+ expect(await screen.findByText('app.studio.starApp')).toBeInTheDocument()
+
await user.click(starToggle)
await waitFor(() => {
diff --git a/web/app/components/apps/__tests__/creators-filter.spec.tsx b/web/app/components/apps/__tests__/creators-filter.spec.tsx
index 9d905f39e38..98849d51f5f 100644
--- a/web/app/components/apps/__tests__/creators-filter.spec.tsx
+++ b/web/app/components/apps/__tests__/creators-filter.spec.tsx
@@ -1,4 +1,6 @@
-import { fireEvent, screen, within } from '@testing-library/react'
+import { screen, waitFor, within } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { useState } from 'react'
import { createConsoleQueryWrapper } from '@/test/console/query-data'
import { render as renderWithConsoleState } from '@/test/console/render'
import CreatorsFilter from '../creators-filter'
@@ -10,6 +12,11 @@ const render = (ui: Parameters<typeof renderWithConsoleState>[0]) =>
wrapper: createConsoleQueryWrapper({ accountProfile: { id: 'member-2' } }).wrapper,
})
+const StatefulCreatorsFilter = ({ initialValue }: { initialValue: string[] }) => {
+ const [value, setValue] = useState(initialValue)
+ return <CreatorsFilter value={value} onChange={setValue} />
+}
+
vi.mock('@/service/use-common', () => ({
useMembers: () => ({
data: {
@@ -28,16 +35,13 @@ describe('CreatorsFilter', () => {
vi.clearAllMocks()
})
- it('should sort the current user first and filter out pending members', () => {
+ it('should sort the current user first and filter out pending members', async () => {
+ const user = userEvent.setup()
render(<CreatorsFilter value={[]} onChange={mockOnChange} />)
- fireEvent.click(screen.getByRole('button', { name: /app\.studio\.filters\.creators/i }))
+ await user.click(screen.getByRole('combobox', { name: 'app.studio.filters.creators' }))
- const options = screen
- .getAllByRole('button')
- .filter((button) =>
- ['Alice', 'Bob', 'Zoe'].some((name) => button.textContent?.includes(name)),
- )
+ const options = screen.getAllByRole('option')
expect(options.map((option) => option.textContent)).toEqual([
expect.stringContaining('Alice'),
@@ -48,52 +52,111 @@ describe('CreatorsFilter', () => {
expect(screen.queryByText('Pending User')).not.toBeInTheDocument()
})
- it('should search creators, clear keywords, and select a creator', () => {
+ it('should search creators, clear keywords, and select a creator', async () => {
+ const user = userEvent.setup()
render(<CreatorsFilter value={[]} onChange={mockOnChange} />)
- fireEvent.click(screen.getByRole('button', { name: /app\.studio\.filters\.creators/i }))
- fireEvent.change(screen.getByPlaceholderText('app.studio.filters.searchCreators'), {
- target: { value: 'zo' },
+ await user.click(screen.getByRole('combobox', { name: 'app.studio.filters.creators' }))
+ const searchInput = screen.getByRole('combobox', {
+ name: 'app.studio.filters.searchCreators',
})
+ await user.type(searchInput, 'zo')
- expect(screen.getByRole('button', { name: /Zoe/ })).toBeInTheDocument()
- expect(screen.queryByRole('button', { name: /Bob/ })).not.toBeInTheDocument()
+ const zoeOption = screen.getByRole('option', { name: /Zoe/ })
+ expect(zoeOption).toBeInTheDocument()
+ expect(screen.queryByRole('option', { name: /Bob/ })).not.toBeInTheDocument()
+ await waitFor(() => {
+ expect(searchInput).toHaveAttribute('aria-activedescendant', zoeOption.id)
+ })
- fireEvent.click(screen.getByRole('button', { name: 'common.operation.clear' }))
+ await user.click(screen.getByRole('button', { name: 'common.operation.clear' }))
- const searchInput = screen.getByPlaceholderText('app.studio.filters.searchCreators')
expect(searchInput).toHaveValue('')
expect(searchInput).toHaveFocus()
- fireEvent.click(screen.getByRole('button', { name: /Bob/ }))
+ await user.click(screen.getByRole('option', { name: /Bob/ }))
expect(mockOnChange).toHaveBeenCalledWith(['member-3'])
})
- it('should remove selected creators from the trigger reset and menu reset controls', () => {
- const { rerender } = render(
- <CreatorsFilter value={['member-2', 'member-3']} onChange={mockOnChange} />,
- )
+ it('should clear only the search query from the input action', async () => {
+ const user = userEvent.setup()
+ render(<CreatorsFilter value={['member-2']} onChange={mockOnChange} />)
+
+ await user.click(screen.getByRole('combobox', { name: 'app.studio.filters.creators' }))
+ const searchInput = screen.getByRole('combobox', {
+ name: 'app.studio.filters.searchCreators',
+ })
+ await user.type(searchInput, 'zo')
+ await user.click(screen.getByRole('button', { name: 'common.operation.clear' }))
+
+ expect(searchInput).toHaveValue('')
+ expect(searchInput).toHaveFocus()
+ expect(screen.getByRole('option', { name: /Alice/ })).toHaveAttribute('aria-selected', 'true')
+ expect(mockOnChange).not.toHaveBeenCalled()
+ })
+
+ it('should return focus to the trigger after clearing creators from the filter chip', async () => {
+ const user = userEvent.setup()
+ render(<StatefulCreatorsFilter initialValue={['member-2', 'member-3']} />)
+
+ const trigger = screen.getByRole('combobox', { name: 'app.studio.filters.creators' })
+ const triggerReset = screen.getByRole('button', { name: 'app.studio.filters.reset' })
+
+ expect(trigger).not.toContainElement(triggerReset)
- const trigger = screen.getByRole('button', { name: /app\.studio\.filters\.creators/i })
- fireEvent.click(within(trigger).getByRole('button', { name: 'app.studio.filters.reset' }))
+ await user.click(triggerReset)
- expect(mockOnChange).toHaveBeenCalledWith([])
+ expect(trigger).toHaveFocus()
+ expect(
+ screen.queryByRole('button', { name: 'app.studio.filters.reset' }),
+ ).not.toBeInTheDocument()
+ })
+
+ it('should preserve unavailable creator ids when removing an available creator', async () => {
+ const user = userEvent.setup()
+ render(
+ <CreatorsFilter value={['missing-member', 'member-2', 'member-3']} onChange={mockOnChange} />,
+ )
- rerender(<CreatorsFilter value={['member-2', 'member-3']} onChange={mockOnChange} />)
+ await user.click(screen.getByRole('combobox', { name: 'app.studio.filters.creators' }))
+ const aliceOption = screen.getByRole('option', { name: /Alice/ })
+ expect(aliceOption).toHaveAttribute('aria-selected', 'true')
- fireEvent.click(screen.getByRole('button', { name: /app\.studio\.filters\.creators/i }))
- fireEvent.click(screen.getAllByRole('button', { name: 'app.studio.filters.reset' }).at(-1)!)
+ await user.click(aliceOption)
- expect(mockOnChange).toHaveBeenCalledWith([])
+ expect(mockOnChange).toHaveBeenCalledWith(['missing-member', 'member-3'])
})
- it('should remove a selected creator when toggled from the menu', () => {
+ it('should expose the selected creator count from the closed trigger', () => {
render(<CreatorsFilter value={['member-2', 'member-3']} onChange={mockOnChange} />)
- fireEvent.click(screen.getByRole('button', { name: /app\.studio\.filters\.creators/i }))
- fireEvent.click(screen.getByRole('button', { name: /Alice/ }))
+ const trigger = screen.getByRole('combobox', { name: 'app.studio.filters.creators' })
+ const selectedCount = within(trigger).getByText('common.dynamicSelect.selected:{"count":2}')
+ expect(selectedCount).toHaveClass('sr-only')
+ expect(within(trigger).getByText('+2').parentElement).toHaveAttribute('aria-hidden', 'true')
+ })
- expect(mockOnChange).toHaveBeenCalledWith(['member-3'])
+ it('should expose the creator picker as a named combobox with keyboard-owned options', async () => {
+ const user = userEvent.setup()
+ render(<CreatorsFilter value={[]} onChange={mockOnChange} />)
+
+ await user.click(screen.getByRole('combobox', { name: 'app.studio.filters.creators' }))
+
+ const popup = screen.getByRole('dialog', { name: 'app.studio.filters.creators' })
+ const searchInput = within(popup).getByRole('combobox', {
+ name: 'app.studio.filters.searchCreators',
+ })
+ expect(popup).toBeInTheDocument()
+ expect(screen.queryByRole('menu')).not.toBeInTheDocument()
+ expect(within(popup).getByRole('option', { name: /Alice/ })).toHaveAttribute(
+ 'aria-selected',
+ 'false',
+ )
+
+ await waitFor(() => expect(searchInput).toHaveFocus())
+ await user.keyboard('{ArrowDown}{Enter}')
+
+ expect(mockOnChange).toHaveBeenCalledWith(['member-2'])
})
})
diff --git a/web/app/components/apps/__tests__/import-from-marketplace-template-modal.spec.tsx b/web/app/components/apps/__tests__/import-from-marketplace-template-modal.spec.tsx
index 3d02be678f3..865e6bbf4d3 100644
--- a/web/app/components/apps/__tests__/import-from-marketplace-template-modal.spec.tsx
+++ b/web/app/components/apps/__tests__/import-from-marketplace-template-modal.spec.tsx
@@ -1,4 +1,4 @@
-import { render, screen } from '@testing-library/react'
+import { fireEvent, render, screen } from '@testing-library/react'
import ImportFromMarketplaceTemplateModal from '../import-from-marketplace-template-modal'
const mockUseMarketplaceTemplateDetail = vi.fn()
@@ -43,5 +43,60 @@ describe('ImportFromMarketplaceTemplateModal', () => {
expect(screen.getByText('Human Input: Writing Assistant')).toBeInTheDocument()
expect(screen.queryByText('technologist')).not.toBeInTheDocument()
+ expect(document.querySelector('em-emoji')?.parentElement).toHaveAttribute('aria-hidden', 'true')
+ expect(
+ screen.getByRole('dialog', { name: /marketplace\.template\.modalTitle/ }),
+ ).toBeInTheDocument()
+ })
+
+ it('exposes a named close control', () => {
+ const onClose = vi.fn()
+ render(
+ <ImportFromMarketplaceTemplateModal
+ templateId="human-input-writing"
+ onClose={onClose}
+ onConfirm={vi.fn()}
+ />,
+ )
+
+ fireEvent.click(screen.getByRole('button', { name: /operation\.close/ }))
+
+ expect(onClose).toHaveBeenCalledOnce()
+ })
+
+ it('exposes loading progress and announces the error state', () => {
+ mockUseMarketplaceTemplateDetail.mockReturnValue({
+ data: undefined,
+ isLoading: true,
+ isError: false,
+ })
+ const { rerender } = render(
+ <ImportFromMarketplaceTemplateModal
+ templateId="human-input-writing"
+ onClose={vi.fn()}
+ onConfirm={vi.fn()}
+ />,
+ )
+
+ expect(screen.getByText('common.loading').parentElement?.parentElement).toHaveAttribute(
+ 'aria-busy',
+ 'true',
+ )
+ expect(screen.queryByRole('status')).not.toBeInTheDocument()
+
+ mockUseMarketplaceTemplateDetail.mockReturnValue({
+ data: undefined,
+ isLoading: false,
+ isError: true,
+ })
+ rerender(
+ <ImportFromMarketplaceTemplateModal
+ templateId="human-input-writing"
+ onClose={vi.fn()}
+ onConfirm={vi.fn()}
+ />,
+ )
+
+ expect(screen.getByRole('alert')).toHaveTextContent('app.marketplace.template.fetchFailed')
})
})
diff --git a/web/app/components/apps/__tests__/list.spec.tsx b/web/app/components/apps/__tests__/list.spec.tsx
index 79816ab08a8..9ef5a5cdd8b 100644
--- a/web/app/components/apps/__tests__/list.spec.tsx
+++ b/web/app/components/apps/__tests__/list.spec.tsx
@@ -439,7 +439,6 @@ vi.mock('../empty', () => ({
{
'data-testid': 'empty-state',
'data-step-by-step-tour-target': stepByStepTourTarget,
- role: 'status',
},
'No apps found',
)
@@ -626,7 +625,7 @@ describe('List', () => {
it('should render filters and search before the right aligned actions', () => {
renderList()
- const creatorsButton = screen.getByRole('button', { name: 'Creators' })
+ const creatorsButton = screen.getByRole('combobox', { name: 'Creators' })
const searchInput = screen.getByRole('searchbox', {
name: 'app.gotoAnything.actions.searchApplications',
})
@@ -635,6 +634,7 @@ describe('List', () => {
const createButton = screen.getByRole('button', { name: 'common.operation.create' })
expect(snippetsLink).toHaveAttribute('href', '/snippets')
+ expect(sortButton).toHaveTextContent('Sort by Last modified')
expect(
creatorsButton.compareDocumentPosition(sortButton) & Node.DOCUMENT_POSITION_FOLLOWING,
).toBeTruthy()
@@ -689,14 +689,15 @@ describe('List', () => {
renderList()
- const starredLabel = screen.getByText('Starred')
- const starredCard = screen.getByRole('link', { name: /Starred App/ })
- const allAppsLabel = screen.getByText('All Apps')
+ const starredLabel = screen.getByRole('heading', { level: 2, name: 'Starred' })
+ const starredCard = screen.getByRole('link', { name: 'Starred App' })
+ const allAppsLabel = screen.getByRole('heading', { level: 2, name: 'All Apps' })
const firstAppCard = screen.getByTestId('app-card-app-1')
const actionBar = screen.getByRole('button', { name: 'Actions for Starred App' })
expect(starredCard).toBeInTheDocument()
expect(actionBar).toBeInTheDocument()
+ expect(screen.getAllByRole('list')).toHaveLength(2)
expect(
starredLabel.compareDocumentPosition(starredCard) & Node.DOCUMENT_POSITION_FOLLOWING,
).toBeTruthy()
@@ -739,7 +740,7 @@ describe('List', () => {
const firstWorkspaceCard = screen.getByTestId('app-card-app-1')
const firstWorkspaceActionBar = screen.getByTestId('app-card-action-bar-app-1')
- const starredCard = screen.getByRole('link', { name: /Starred App/ })
+ const starredCard = screen.getByRole('link', { name: 'Starred App' })
const starredActionBar = screen.getByRole('button', {
name: 'Actions for Starred App',
})
@@ -791,7 +792,7 @@ describe('List', () => {
renderList()
- const starredCard = screen.getByRole('link', { name: /Starred App/ })
+ const starredCard = screen.getByRole('link', { name: 'Starred App' })
const firstWorkspaceCard = screen.getByTestId('app-card-app-1')
const firstWorkspaceActionBar = screen.getByTestId('app-card-action-bar-app-1')
@@ -862,6 +863,9 @@ describe('List', () => {
it('should render drop DSL hint when app creation permission is available', () => {
renderList()
expect(screen.getByText('app.newApp.dropDSLToCreateApp'))!.toBeInTheDocument()
+ expect(
+ screen.queryByRole('region', { name: 'app.newApp.dropDSLToCreateApp' }),
+ ).not.toBeInTheDocument()
})
it('should render first empty state when there are no apps and no active filters', () => {
@@ -933,11 +937,35 @@ describe('List', () => {
renderList('?keywords=missing+app')
expect(screen.getByTestId('empty-state'))!.toBeInTheDocument()
+ expect(screen.getByRole('status')).toHaveTextContent('app.filterEmpty.noApps')
+ expect(screen.getByRole('status')).toHaveClass('sr-only')
+ expect(screen.getByTestId('empty-state').parentElement).toHaveAttribute('aria-busy', 'false')
expect(screen.getByRole('button', { name: 'Types' }))!.toBeInTheDocument()
expect(screen.queryByTestId('new-app-card')).not.toBeInTheDocument()
expect(screen.queryByText('app.firstEmpty.title')).not.toBeInTheDocument()
})
+ it('should keep the result status quiet while placeholder results are fetching', () => {
+ mockAppData = { pages: [{ data: [], total: 0 }] }
+ mockServiceState.isFetching = true
+ mockServiceState.isPlaceholderData = true
+
+ renderList('?keywords=missing+app')
+
+ expect(screen.getByRole('status')).toBeEmptyDOMElement()
+ expect(screen.getByTestId('empty-state').parentElement).toHaveAttribute('aria-busy', 'true')
+ })
+
+ it('should keep the settled empty status during a background refetch', () => {
+ mockAppData = { pages: [{ data: [], total: 0 }] }
+ mockServiceState.isFetching = true
+
+ renderList('?keywords=missing+app')
+
+ expect(screen.getByRole('status')).toHaveTextContent('app.filterEmpty.noApps')
+ expect(screen.getByTestId('empty-state').parentElement).toHaveAttribute('aria-busy', 'true')
+ })
+
it('should leave the first empty state as soon as a filter changes', () => {
mockAppData = { pages: [{ data: [], total: 0 }] }
renderList()
@@ -1073,11 +1101,12 @@ describe('List', () => {
expect(scrollTo).toHaveBeenCalledWith({ top: 0 })
})
- it('should build paged query input from active filters', () => {
+ it('should build paged query input from active filters', async () => {
+ const user = userEvent.setup()
renderList('?keywords=sales&category=workflow')
- fireEvent.click(screen.getByRole('button', { name: 'Creators' }))
- fireEvent.click(screen.getByText('Alice'))
- fireEvent.click(screen.getByText('common.tag.placeholder'))
+ await user.click(screen.getByRole('combobox', { name: 'Creators' }))
+ await user.click(screen.getByRole('option', { name: /Alice/ }))
+ await user.click(screen.getByText('common.tag.placeholder'))
const options = mockAppListInfiniteOptions.mock.calls.at(-1)?.[0] as AppListInfiniteOptions
@@ -1096,11 +1125,12 @@ describe('List', () => {
expect(options.getNextPageParam({ has_more: false, page: 2 })).toBeUndefined()
})
- it('should build starred query input from active filters with the starred limit', () => {
+ it('should build starred query input from active filters with the starred limit', async () => {
+ const user = userEvent.setup()
renderList('?keywords=sales&category=workflow')
- fireEvent.click(screen.getByRole('button', { name: 'Creators' }))
- fireEvent.click(screen.getByText('Alice'))
- fireEvent.click(screen.getByText('common.tag.placeholder'))
+ await user.click(screen.getByRole('combobox', { name: 'Creators' }))
+ await user.click(screen.getByRole('option', { name: /Alice/ }))
+ await user.click(screen.getByText('common.tag.placeholder'))
const options = mockAppStarredListQueryOptions.mock.calls.at(
-1,
@@ -1140,13 +1170,15 @@ describe('List', () => {
})
describe('Creators Filter', () => {
- it('should handle creator selection', () => {
+ it('should handle creator selection', async () => {
+ const user = userEvent.setup()
renderList()
- fireEvent.click(screen.getByRole('button', { name: 'Creators' }))
- fireEvent.click(screen.getByRole('button', { name: /Bob/ }))
+ const trigger = screen.getByRole('combobox', { name: 'Creators' })
+ await user.click(trigger)
+ await user.click(screen.getByRole('option', { name: /Bob/ }))
- expect(screen.getByRole('button', { name: /Creators.*\+1/ })).toBeInTheDocument()
+ expect(trigger).toHaveTextContent('+1')
})
})
diff --git a/web/app/components/apps/app-card/action-bar/index.tsx b/web/app/components/apps/app-card/action-bar/index.tsx
index 0f50501b552..5d46c6b36b1 100644
--- a/web/app/components/apps/app-card/action-bar/index.tsx
+++ b/web/app/components/apps/app-card/action-bar/index.tsx
@@ -357,10 +357,8 @@ export const AppCardActionBar = memo(
shouldShowSwitchOption ||
shouldShowAccessConfigOption ||
shouldShowDeleteOption
- const starActionLabel = app.is_starred
- ? t(($) => $['studio.unstarApp'], { ns: 'app' })
- : t(($) => $['studio.starApp'], { ns: 'app' })
const starToggleLabel = t(($) => $['studio.starApp'], { ns: 'app' })
+ const starToggleAccessibleLabel = `${starToggleLabel}: ${app.name}`
return (
<>
@@ -383,7 +381,7 @@ export const AppCardActionBar = memo(
render={
<IconButton
size="lg"
- aria-label={starToggleLabel}
+ aria-label={starToggleAccessibleLabel}
className="group disabled:opacity-70"
>
<StarIcon
@@ -395,7 +393,7 @@ export const AppCardActionBar = memo(
/>
}
/>
- <TooltipContent>{starActionLabel}</TooltipContent>
+ <TooltipContent>{starToggleLabel}</TooltipContent>
</Tooltip>
{shouldShowOperationsMenu && (
<DropdownMenu
diff --git a/web/app/components/apps/app-card/index.tsx b/web/app/components/apps/app-card/index.tsx
index 8a1760a68f6..d31bf1df410 100644
--- a/web/app/components/apps/app-card/index.tsx
+++ b/web/app/components/apps/app-card/index.tsx
@@ -138,6 +138,7 @@ export const AppCard = memo(
icon={app.icon ?? undefined}
background={app.icon_background}
imageUrl={app.icon_url}
+ decorative
/>
<AppTypeIcon
type={app.mode}
@@ -187,7 +188,7 @@ export const AppCard = memo(
)
return (
- <div className="group relative col-span-1 h-41.5">
+ <div role="listitem" className="group relative col-span-1 h-41.5">
{isPreviewOnly ? (
<button
type="button"
@@ -222,6 +223,7 @@ export const AppCard = memo(
<div className="absolute top-26 right-3 left-3 flex h-6.5 min-w-0 items-start">
<AppCardTags
appId={app.id}
+ appName={app.name}
tags={app.tags ?? []}
canBindOrUnbindTags={canBindOrUnbindTags}
onOpenTagManagement={onOpenTagManagement}
diff --git a/web/app/components/apps/app-list-catalog.tsx b/web/app/components/apps/app-list-catalog.tsx
index 97d7fa36fbc..307d317819b 100644
--- a/web/app/components/apps/app-list-catalog.tsx
+++ b/web/app/components/apps/app-list-catalog.tsx
@@ -26,7 +26,7 @@ import Empty from './empty'
import FirstEmptyState from './first-empty-state'
import { useAppListTour } from './hooks/use-app-list-tour'
import { useWorkflowOnlineUsers } from './hooks/use-workflow-online-users'
-import { StarredAppList } from './starred-app-list'
+import { ALL_APPS_HEADING_ID, AppListSectionHeading, StarredAppList } from './starred-app-list'
const STARRED_APP_LIMIT = 100
const STEP_BY_STEP_TOUR_APP_ROW_CARD_COUNT = 4
@@ -56,6 +56,7 @@ type AppListCatalogContentProps = Omit<AppListCatalogProps, 'appListQuery'> &
appListPages: AppPagination[]
hasNextPage: boolean
isFetchNextPageError: boolean
+ isError: boolean
isFetching: boolean
isFetchingNextPage: boolean
isPlaceholderData: boolean
@@ -85,6 +86,7 @@ function AppListCatalogContent({
hasActiveFilters,
hasNextPage,
isFetchNextPageError,
+ isError,
isFetching,
isFetchingNextPage,
isPlaceholderData,
@@ -118,6 +120,9 @@ function AppListCatalogContent({
const hasResolvedFirstPage = appListPages.length > 0
const hasAnyApp = (appListPages[0]?.total ?? 0) > 0
+ const emptyMessage = t(($) => $['filterEmpty.noApps'], { ns: 'app' })
+ const resultStatusMessage =
+ !isError && !isPlaceholderData && hasResolvedFirstPage && !hasAnyApp ? emptyMessage : ''
const showFirstEmptyState =
!isPlaceholderData && !hasAnyApp && canCreateApp && hasResolvedFirstPage && !hasActiveFilters
const showNoCreateEmptyState =
@@ -134,6 +139,9 @@ function AppListCatalogContent({
return (
<>
+ <span className="sr-only" role="status">
+ {resultStatusMessage}
+ </span>
{showFirstEmptyState ? (
<FirstEmptyState
onCreateBlank={onCreateBlank}
@@ -163,7 +171,16 @@ function AppListCatalogContent({
}
/>
)}
+ {starredApps.length > 0 && (
+ <AppListSectionHeading
+ id={ALL_APPS_HEADING_ID}
+ label={t(($) => $['studio.allApps'], { ns: 'app' })}
+ />
+ )}
<div
+ role={hasAnyApp ? 'list' : undefined}
+ aria-busy={isFetching}
+ aria-labelledby={hasAnyApp && starredApps.length > 0 ? ALL_APPS_HEADING_ID : undefined}
className={cn(
`relative grow content-start ${APP_LIST_GRID_CLASS_NAME}`,
!hasAnyApp && 'overflow-hidden',
@@ -202,6 +219,7 @@ function AppListCatalogContent({
))
) : (
<Empty
+ message={emptyMessage}
stepByStepTourTarget={
showNoCreateEmptyState ? STEP_BY_STEP_TOUR_TARGETS.studioNoCreateEmpty : undefined
}
@@ -244,8 +262,6 @@ function AppListCatalogContent({
{canCreateApp && !showFirstEmptyState && (
<div
className={`flex items-center justify-center gap-2 py-4 ${dragging ? 'text-text-accent' : 'text-text-quaternary'}`}
- role="region"
- aria-label={t(($) => $['newApp.dropDSLToCreateApp'], { ns: 'app' })}
>
<span className="i-ri-drag-drop-line size-4" />
<span className="system-xs-regular">
@@ -318,6 +334,7 @@ export function AppListCatalog(props: AppListCatalogProps) {
hasActiveFilters={hasActiveFilters}
hasNextPage={appList.hasNextPage}
isFetchNextPageError={appList.isFetchNextPageError}
+ isError={appList.isError}
isFetching={appList.isFetching}
isFetchingNextPage={appList.isFetchingNextPage}
isPlaceholderData={appList.isPlaceholderData}
diff --git a/web/app/components/apps/app-sort-filter.tsx b/web/app/components/apps/app-sort-filter.tsx
index 8593a3c36c5..fbb6ac1a614 100644
--- a/web/app/components/apps/app-sort-filter.tsx
+++ b/web/app/components/apps/app-sort-filter.tsx
@@ -49,7 +49,7 @@ export function AppSortFilter({ value, onChange }: AppSortFilterProps) {
className="flex h-8 cursor-pointer items-center rounded-lg border-none bg-components-input-bg-normal py-1 pr-2.5 pl-2 text-left whitespace-nowrap outline-hidden hover:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid data-popup-open:bg-state-base-hover"
>
<span className="flex items-center gap-1 p-1 text-[13px] leading-4 whitespace-nowrap">
- <span className="font-normal text-text-tertiary">{sortByLabel}</span>
+ <span className="font-normal text-text-tertiary">{sortByLabel}</span>{' '}
<span className="font-medium text-text-secondary">{activeOption.text}</span>
</span>
<span aria-hidden className="i-ri-arrow-down-s-line size-4 shrink-0 text-text-tertiary" />
diff --git a/web/app/components/apps/creators-filter.tsx b/web/app/components/apps/creators-filter.tsx
index 63c6be49b6c..b5de0249425 100644
--- a/web/app/components/apps/creators-filter.tsx
+++ b/web/app/components/apps/creators-filter.tsx
@@ -1,14 +1,22 @@
'use client'
import { Avatar } from '@langgenius/dify-ui/avatar'
-import { Checkbox } from '@langgenius/dify-ui/checkbox'
import { cn } from '@langgenius/dify-ui/cn'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
-import { Input } from '@langgenius/dify-ui/input'
+ Combobox,
+ ComboboxInput,
+ ComboboxInputGroup,
+ ComboboxItem,
+ ComboboxItemIndicator,
+ ComboboxItemText,
+ ComboboxList,
+ ComboboxPopup,
+ ComboboxPortal,
+ ComboboxPositioner,
+ ComboboxTrigger,
+ ComboboxValue,
+} from '@langgenius/dify-ui/combobox'
+import { IconButton } from '@langgenius/dify-ui/icon-button'
import { useSuspenseQuery } from '@tanstack/react-query'
import { useCallback, useMemo, useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
@@ -38,6 +46,7 @@ const CreatorsFilter = ({ value, onChange }: CreatorsFilterProps) => {
})
const { data: membersData } = useMembers()
const [keywords, setKeywords] = useState('')
+ const triggerRef = useRef<HTMLButtonElement>(null)
const searchInputRef = useRef<HTMLInputElement>(null)
const creatorOptions = useMemo<CreatorOption[]>(() => {
@@ -58,189 +67,187 @@ const CreatorsFilter = ({ value, onChange }: CreatorsFilterProps) => {
}))
}, [currentUserId, membersData?.accounts])
- const filteredCreators = useMemo(() => {
- const normalizedKeywords = keywords.trim().toLowerCase()
- if (!normalizedKeywords) return creatorOptions
-
- return creatorOptions.filter((creator) => {
- const keyword = normalizedKeywords
- return creator.name.toLowerCase().includes(keyword)
- })
- }, [creatorOptions, keywords])
-
+ const creatorMap = useMemo(
+ () => new Map(creatorOptions.map((creator) => [creator.id, creator])),
+ [creatorOptions],
+ )
+ const selectedCreatorValues = useMemo(() => {
+ return value.map(
+ (id) =>
+ creatorMap.get(id) ?? {
+ id,
+ name: id,
+ avatarUrl: null,
+ isYou: false,
+ },
+ )
+ }, [creatorMap, value])
const selectedCreators = useMemo(() => {
- const creatorMap = new Map(creatorOptions.map((creator) => [creator.id, creator]))
return value
.map((id) => creatorMap.get(id))
.filter((creator): creator is CreatorOption => Boolean(creator))
- }, [creatorOptions, value])
+ }, [creatorMap, value])
- const toggleCreator = useCallback(
- (creatorId: string) => {
- if (value.includes(creatorId)) {
- onChange(value.filter((id) => id !== creatorId))
- return
- }
-
- onChange([...value, creatorId])
- },
- [onChange, value],
+ const handleValueChange = useCallback(
+ (creators: CreatorOption[]) => onChange(creators.map((creator) => creator.id)),
+ [onChange],
)
- const resetCreators = useCallback(() => {
+ const clearCreatorQuery = useCallback(() => {
+ setKeywords('')
+ searchInputRef.current?.focus()
+ }, [])
+
+ const handleSelectionClear = useCallback(() => {
onChange([])
setKeywords('')
+ triggerRef.current?.focus()
}, [onChange])
const selectedCount = value.length
const selectedAvatarCreators = selectedCreators.slice(0, 3)
- const isSelected = selectedCount > 0
+ const creatorFilterLabel = t(($) => $['studio.filters.creators'], { ns: 'app' })
+ const resetLabel = t(($) => $['studio.filters.reset'], { ns: 'app' })
+ const selectedCountLabel =
+ selectedCount > 0
+ ? t(($) => $['dynamicSelect.selected'], {
+ ns: 'common',
+ count: selectedCount,
+ })
+ : ''
return (
- <DropdownMenu>
- <DropdownMenuTrigger
- render={
- <button
- type="button"
- className={cn(
- baseChipClassName,
- isSelected
- ? 'border-components-button-secondary-border bg-components-button-secondary-bg shadow-xs hover:bg-state-base-hover'
- : 'border-transparent bg-components-input-bg-normal text-text-tertiary hover:bg-components-input-bg-hover',
- )}
- />
- }
- >
- {!isSelected && (
- <>
- <span className="px-1 text-text-tertiary">
- {t(($) => $['studio.filters.creators'], { ns: 'app' })}
+ <Combobox<CreatorOption, true>
+ multiple
+ autoHighlight
+ items={creatorOptions}
+ value={selectedCreatorValues}
+ inputValue={keywords}
+ isItemEqualToValue={(creator, selectedCreator) => creator.id === selectedCreator.id}
+ itemToStringLabel={(creator) => creator.name}
+ itemToStringValue={(creator) => creator.id}
+ onInputValueChange={setKeywords}
+ onValueChange={handleValueChange}
+ >
+ <div className="relative inline-flex h-8 items-stretch">
+ <ComboboxTrigger
+ ref={triggerRef}
+ icon={false}
+ aria-label={creatorFilterLabel}
+ className={cn(
+ baseChipClassName,
+ 'peer/creators-trigger w-auto min-w-0 border-components-button-secondary-border bg-components-button-secondary-bg pr-8 shadow-xs hover:bg-state-base-hover-alt focus-visible:bg-state-base-hover-alt data-placeholder:border-transparent data-placeholder:bg-components-input-bg-normal data-placeholder:pr-2 data-placeholder:text-text-tertiary data-placeholder:shadow-none data-placeholder:hover:bg-components-input-bg-hover data-popup-open:bg-state-base-hover-alt',
+ )}
+ >
+ <ComboboxValue<CreatorOption, true>>
+ <span aria-hidden className="flex min-w-0 items-center">
+ <span className="px-1 text-text-tertiary group-data-popup-open/combobox-trigger:text-text-secondary">
+ {creatorFilterLabel}
+ </span>
+ {selectedCount > 0 ? (
+ <>
+ <span className="flex items-center pr-1">
+ {selectedAvatarCreators.map((creator, index) => (
+ <Avatar
+ key={creator.id}
+ avatar={creator.avatarUrl}
+ name={creator.name}
+ size="xs"
+ className={cn('border border-components-panel-bg', index > 0 && '-ml-1')}
+ />
+ ))}
+ </span>
+ <span className="text-xs leading-4 font-medium text-text-tertiary group-data-popup-open/combobox-trigger:text-text-secondary">{`+${selectedCount}`}</span>
+ </>
+ ) : (
+ <span className="i-ri-arrow-down-s-line h-4 w-4 shrink-0 text-text-tertiary group-data-popup-open/combobox-trigger:text-text-secondary" />
+ )}
</span>
- <span
- aria-hidden
- className="i-ri-arrow-down-s-line h-4 w-4 shrink-0 text-text-tertiary"
- />
- </>
+ <span className="sr-only">{selectedCountLabel}</span>
+ </ComboboxValue>
+ </ComboboxTrigger>
+ {selectedCount > 0 && (
+ <IconButton
+ size="sm"
+ aria-label={resetLabel}
+ className="absolute top-1/2 right-1 size-5 -translate-y-1/2 text-text-tertiary peer-data-popup-open/creators-trigger:text-text-secondary"
+ onClick={handleSelectionClear}
+ >
+ <span aria-hidden className="i-ri-close-circle-fill h-3.5 w-3.5" />
+ </IconButton>
)}
- {isSelected && (
- <>
- <span className="px-1 text-text-tertiary">
- {t(($) => $['studio.filters.creators'], { ns: 'app' })}
- </span>
- <span className="flex items-center pr-1">
- {selectedAvatarCreators.map((creator, index) => (
- <Avatar
- key={creator.id}
- avatar={creator.avatarUrl}
- name={creator.name}
- size="xs"
- className={cn('border border-components-panel-bg', index > 0 && '-ml-1')}
+ </div>
+ <ComboboxPortal>
+ <ComboboxPositioner placement="bottom-start" sideOffset={4}>
+ <ComboboxPopup
+ aria-label={t(($) => $['studio.filters.creators'], { ns: 'app' })}
+ className="w-[min(280px,var(--available-width))] min-w-[min(var(--anchor-width),var(--available-width))] bg-components-panel-bg-blur text-sm text-text-secondary backdrop-blur-[5px]"
+ >
+ <div className="p-2 pb-1">
+ <ComboboxInputGroup className="h-8 min-h-8 px-2">
+ <ComboboxInput
+ ref={searchInputRef}
+ type="search"
+ name="creator-query"
+ enterKeyHint="search"
+ aria-label={t(($) => $['studio.filters.searchCreators'], { ns: 'app' })}
+ className="block h-4.5 grow px-1 py-0 [&::-webkit-search-cancel-button]:appearance-none [&::-webkit-search-decoration]:appearance-none"
+ placeholder={t(($) => $['studio.filters.searchCreators'], { ns: 'app' })}
/>
- ))}
- </span>
- <span className="text-xs leading-4 font-medium text-text-tertiary">{`+${selectedCount}`}</span>
- <span
- role="button"
- tabIndex={0}
- aria-label={t(($) => $['studio.filters.reset'], { ns: 'app' })}
- className="ml-1 flex h-4 w-4 shrink-0 items-center justify-center rounded-xs text-text-quaternary outline-hidden hover:text-text-tertiary focus-visible:ring-2 focus-visible:ring-state-accent-solid"
- onClick={(event) => {
- event.stopPropagation()
- resetCreators()
- }}
- onKeyDown={(event) => {
- if (event.key !== 'Enter' && event.key !== ' ') return
-
- event.preventDefault()
- event.stopPropagation()
- resetCreators()
- }}
- >
- <span aria-hidden className="i-ri-close-circle-fill h-3.5 w-3.5" />
- </span>
- </>
- )}
- </DropdownMenuTrigger>
- <DropdownMenuContent placement="bottom-start" className="w-[280px] p-0">
- <div className="flex items-center gap-1 p-2 pb-1">
- <div className="relative min-w-0 grow">
- <span
- aria-hidden
- className="pointer-events-none absolute top-1/2 left-2 i-ri-search-line size-4 -translate-y-1/2 text-components-input-text-placeholder"
- />
- <Input
- ref={searchInputRef}
- type="search"
- name="creator-query"
- autoComplete="off"
- enterKeyHint="search"
- aria-label={t(($) => $['studio.filters.searchCreators'], { ns: 'app' })}
- className={cn(
- 'pl-6.5 [&::-webkit-search-cancel-button]:appearance-none [&::-webkit-search-decoration]:appearance-none',
- keywords && 'pr-6.5',
+ <span
+ aria-hidden
+ className="order-first me-0.5 i-ri-search-line size-4 shrink-0 text-components-input-text-placeholder"
+ />
+ {!!keywords && (
+ <IconButton
+ size="sm"
+ aria-label={t(($) => $['operation.clear'], { ns: 'common' })}
+ className="me-0 shrink-0 text-text-quaternary hover:bg-transparent hover:text-text-tertiary focus-visible:bg-components-input-bg-hover focus-visible:ring-inset"
+ onClick={clearCreatorQuery}
+ >
+ <span aria-hidden className="i-ri-close-circle-fill size-4" />
+ </IconButton>
+ )}
+ </ComboboxInputGroup>
+ </div>
+ <ComboboxList<CreatorOption> className="max-h-60 px-1 pt-0 pb-1">
+ {(creator) => (
+ <ComboboxItem
+ key={creator.id}
+ value={creator}
+ className="group/creator-option grid-cols-[auto_1fr] gap-1 rounded-md"
+ >
+ <span
+ aria-hidden
+ className="inline-flex size-4 shrink-0 items-center justify-center rounded-sm border border-components-checkbox-border bg-components-checkbox-bg-unchecked text-components-checkbox-icon shadow-xs shadow-shadow-shadow-3 group-data-selected/creator-option:border-transparent group-data-selected/creator-option:bg-components-checkbox-bg"
+ >
+ <ComboboxItemIndicator className="ms-0 size-3 text-components-checkbox-icon" />
+ </span>
+ <ComboboxItemText className="flex items-center gap-2 px-1 font-normal">
+ <span aria-hidden>
+ <Avatar
+ avatar={creator.avatarUrl}
+ name={creator.name}
+ size="xs"
+ className="border-[0.5px] border-divider-regular"
+ />
+ </span>
+ <span className="flex min-w-0 grow items-center justify-between gap-2">
+ <span className="truncate text-sm text-text-secondary">{creator.name}</span>
+ {creator.isYou && (
+ <span className="shrink-0 text-sm text-text-quaternary">
+ {t(($) => $['studio.filters.you'], { ns: 'app' })}
+ </span>
+ )}
+ </span>
+ </ComboboxItemText>
+ </ComboboxItem>
)}
- value={keywords}
- onChange={(e) => setKeywords(e.target.value)}
- placeholder={t(($) => $['studio.filters.searchCreators'], { ns: 'app' })}
- />
- {!!keywords && (
- <button
- type="button"
- aria-label={t(($) => $['operation.clear'], { ns: 'common' })}
- className="absolute top-1/2 right-2 flex size-4 -translate-y-1/2 items-center justify-center rounded-sm text-components-input-text-placeholder outline-hidden hover:text-components-input-text-filled focus-visible:ring-2 focus-visible:ring-state-accent-solid"
- onClick={() => {
- setKeywords('')
- searchInputRef.current?.focus()
- }}
- >
- <span aria-hidden className="i-ri-close-circle-fill size-4" />
- </button>
- )}
- </div>
- {isSelected && (
- <button
- type="button"
- className="shrink-0 rounded-sm px-2 py-1 text-xs font-medium text-text-tertiary outline-hidden hover:bg-state-base-hover hover:text-text-secondary focus-visible:ring-2 focus-visible:ring-state-accent-solid"
- onClick={resetCreators}
- >
- {t(($) => $['studio.filters.reset'], { ns: 'app' })}
- </button>
- )}
- </div>
- <div className="max-h-60 overflow-y-auto px-1 pb-1">
- {filteredCreators.map((creator) => {
- const checked = value.includes(creator.id)
-
- return (
- <button
- key={creator.id}
- type="button"
- className="flex w-full items-center gap-1 rounded-md px-2 py-1.5 outline-hidden hover:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid"
- onClick={() => toggleCreator(creator.id)}
- >
- <Checkbox id={creator.id} checked={checked} className="shrink-0" />
- <div className="flex min-w-0 grow items-center gap-2 px-1">
- <Avatar
- avatar={creator.avatarUrl}
- name={creator.name}
- size="xs"
- className="border-[0.5px] border-divider-regular"
- />
- <div className="flex min-w-0 grow items-center justify-between gap-2">
- <span className="truncate text-sm text-text-secondary">{creator.name}</span>
- {creator.isYou && (
- <span className="shrink-0 text-sm text-text-quaternary">
- {t(($) => $['studio.filters.you'], { ns: 'app' })}
- </span>
- )}
- </div>
- </div>
- </button>
- )
- })}
- </div>
- </DropdownMenuContent>
- </DropdownMenu>
+ </ComboboxList>
+ </ComboboxPopup>
+ </ComboboxPositioner>
+ </ComboboxPortal>
+ </Combobox>
)
}
diff --git a/web/app/components/apps/import-from-marketplace-template-modal.tsx b/web/app/components/apps/import-from-marketplace-template-modal.tsx
index 2891d12e620..c28a24b8230 100644
--- a/web/app/components/apps/import-from-marketplace-template-modal.tsx
+++ b/web/app/components/apps/import-from-marketplace-template-modal.tsx
@@ -1,7 +1,7 @@
'use client'
import { Button } from '@langgenius/dify-ui/button'
-import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
+import { Dialog, DialogClose, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
import { toast } from '@langgenius/dify-ui/toast'
import { RiCloseLine } from '@remixicon/react'
import { useCallback, useMemo, useRef, useState } from 'react'
@@ -73,22 +73,34 @@ const ImportFromMarketplaceTemplateModal = ({
}}
>
<DialogContent className="w-130 rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-0 shadow-xl">
- <div className="flex items-center justify-between pt-6 pr-5 pb-3 pl-6 title-2xl-semi-bold text-text-primary">
- {t(($) => $['marketplace.template.modalTitle'], { ns: 'app' })}
- <div className="flex size-8 cursor-pointer items-center" onClick={onClose}>
- <RiCloseLine className="size-5 text-text-tertiary" />
- </div>
+ <div className="flex items-center justify-between pt-6 pr-5 pb-3 pl-6">
+ <DialogTitle className="title-2xl-semi-bold text-text-primary">
+ {t(($) => $['marketplace.template.modalTitle'], { ns: 'app' })}
+ </DialogTitle>
+ <DialogClose
+ render={
+ <button
+ type="button"
+ aria-label={t(($) => $['operation.close'], { ns: 'common' })}
+ className="flex size-8 cursor-pointer items-center border-none bg-transparent p-0 outline-hidden focus-visible:ring-2 focus-visible:ring-state-accent-solid"
+ >
+ <RiCloseLine aria-hidden className="size-5 text-text-tertiary" />
+ </button>
+ }
+ />
</div>
- <div className="px-6 py-4">
+ <div className="px-6 py-4" aria-busy={isLoading}>
{isLoading && (
<div className="flex items-center justify-center py-8">
- <div className="system-md-regular text-text-tertiary">Loading...</div>
+ <div className="system-md-regular text-text-tertiary">
+ {t(($) => $.loading, { ns: 'common' })}
+ </div>
</div>
)}
{isError && (
- <div className="flex items-center justify-center py-8">
+ <div className="flex items-center justify-center py-8" role="alert">
<div className="system-md-regular text-text-destructive">
{t(($) => $['marketplace.template.fetchFailed'], { ns: 'app' })}
</div>
@@ -103,6 +115,7 @@ const ImportFromMarketplaceTemplateModal = ({
iconType={template.icon_file_key ? 'image' : 'emoji'}
icon={template.icon || 'page_facing_up'}
background={template.icon_file_key ? undefined : template.icon_background}
+ decorative
imageUrl={
template.icon_file_key
? `${MARKETPLACE_API_PREFIX}/templates/${template.id}/icon`
diff --git a/web/app/components/apps/starred-app-card.tsx b/web/app/components/apps/starred-app-card.tsx
index 5d3e7da6ae6..d6c806d20c8 100644
--- a/web/app/components/apps/starred-app-card.tsx
+++ b/web/app/components/apps/starred-app-card.tsx
@@ -73,6 +73,7 @@ export const StarredAppCard = memo(
icon={app.icon ?? undefined}
background={app.icon_background}
imageUrl={app.icon_url}
+ decorative
/>
<AppTypeIcon
type={app.mode}
@@ -94,7 +95,7 @@ export const StarredAppCard = memo(
)
return (
- <div className="group relative">
+ <div role="listitem" className="group relative">
{isPreviewOnly ? (
<button
type="button"
@@ -109,6 +110,7 @@ export const StarredAppCard = memo(
) : (
<Link
href={href}
+ aria-labelledby={appNameId}
data-step-by-step-tour-target={stepByStepTourCardTarget}
data-step-by-step-tour-highlight-part={stepByStepTourCardHighlightPart}
className={cardClassName}
diff --git a/web/app/components/apps/starred-app-list.tsx b/web/app/components/apps/starred-app-list.tsx
index ec3b9f5f74b..1486fd12eab 100644
--- a/web/app/components/apps/starred-app-list.tsx
+++ b/web/app/components/apps/starred-app-list.tsx
@@ -12,11 +12,16 @@ type StarredAppListProps = {
stepByStepTourHighlightedCardCount?: number
}
-function SectionDivider({ label }: { label: string }) {
+const STARRED_APPS_HEADING_ID = 'starred-apps-heading'
+export const ALL_APPS_HEADING_ID = 'all-apps-heading'
+
+export function AppListSectionHeading({ id, label }: { id: string; label: string }) {
return (
<div className="flex h-7 flex-col items-start px-8 pt-3">
<div className="flex h-4 w-full items-center">
- <div className="system-xs-medium-uppercase text-text-tertiary uppercase">{label}</div>
+ <h2 id={id} className="system-xs-medium-uppercase text-text-tertiary uppercase">
+ {label}
+ </h2>
</div>
</div>
)
@@ -34,8 +39,15 @@ export function StarredAppList({
return (
<>
- <SectionDivider label={t(($) => $['studio.starred'], { ns: 'app' })} />
- <div className={APP_LIST_GRID_CLASS_NAME}>
+ <AppListSectionHeading
+ id={STARRED_APPS_HEADING_ID}
+ label={t(($) => $['studio.starred'], { ns: 'app' })}
+ />
+ <div
+ role="list"
+ aria-labelledby={STARRED_APPS_HEADING_ID}
+ className={APP_LIST_GRID_CLASS_NAME}
+ >
{apps.map((app, index) => (
<StarredAppCard
key={app.id}
@@ -49,7 +61,6 @@ export function StarredAppList({
/>
))}
</div>
- <SectionDivider label={t(($) => $['studio.allApps'], { ns: 'app' })} />
</>
)
}
diff --git a/web/app/components/base/app-icon/index.tsx b/web/app/components/base/app-icon/index.tsx
index 8fe2cb12896..8cae0adfa16 100644
--- a/web/app/components/base/app-icon/index.tsx
+++ b/web/app/components/base/app-icon/index.tsx
@@ -28,6 +28,7 @@ type AppIconProps = {
icon?: string
background?: string | null
imageUrl?: string | null
+ decorative?: boolean
className?: string
innerIcon?: React.ReactNode
coverElement?: React.ReactNode
@@ -103,6 +104,7 @@ const AppIcon: FC<AppIconProps> = ({
icon,
background,
imageUrl,
+ decorative = false,
className,
innerIcon,
coverElement,
@@ -110,6 +112,7 @@ const AppIcon: FC<AppIconProps> = ({
showEditIcon = false,
}) => {
const isValidImageIcon = iconType === 'image' && imageUrl
+ const isDecorative = decorative && !onClick
const emojiIcon = icon && icon !== '' ? icon : '🤖'
const isHydrated = useIsHydrated()
const Icon = isHydrated ? <em-emoji key={emojiIcon} id={emojiIcon} /> : emojiIcon
@@ -133,9 +136,10 @@ const AppIcon: FC<AppIconProps> = ({
onKeyDown={onClick ? handleKeyDown : undefined}
role={onClick ? 'button' : undefined}
tabIndex={onClick ? 0 : undefined}
+ aria-hidden={isDecorative || undefined}
>
{isValidImageIcon ? (
- <img src={imageUrl} className="size-full" alt="app icon" />
+ <img src={imageUrl} className="size-full" alt={isDecorative ? '' : 'app icon'} />
) : (
innerIcon || Icon
)}
diff --git a/web/app/components/main-nav/__tests__/index.spec.tsx b/web/app/components/main-nav/__tests__/index.spec.tsx
index 390df3b4a28..9408839897d 100644
--- a/web/app/components/main-nav/__tests__/index.spec.tsx
+++ b/web/app/components/main-nav/__tests__/index.spec.tsx
@@ -1441,6 +1441,57 @@ describe('MainNav', () => {
)
})
+ it('announces no installed web app results only after the search settles', async () => {
+ const user = userEvent.setup()
+ let resolveSearch: (() => void) | undefined
+ const searchPending = new Promise<void>((resolve) => {
+ resolveSearch = resolve
+ })
+ mockInstalledApps = [createInstalledApp()]
+ mockInstalledAppsRequest.mockImplementation(async ({ query }: { query: { name?: string } }) => {
+ if (!query.name) {
+ return {
+ installed_apps: mockInstalledApps,
+ has_more: false,
+ next_cursor: null,
+ }
+ }
+
+ await searchPending
+ return {
+ installed_apps: [],
+ has_more: false,
+ next_cursor: null,
+ }
+ })
+
+ renderMainNav()
+
+ const webAppsRegion = await screen.findByRole('region', {
+ name: 'explore.sidebar.webApps',
+ })
+ await user.click(screen.getByRole('button', { name: 'common.operation.search' }))
+ const resultStatus = within(webAppsRegion).getByRole('status')
+ expect(resultStatus).toBeEmptyDOMElement()
+
+ await user.type(screen.getByPlaceholderText('common.mainNav.webApps.searchPlaceholder'), 'z')
+
+ await waitFor(() => {
+ expect(webAppsRegion).toHaveAttribute('aria-busy', 'true')
+ })
+ expect(resultStatus).toBeEmptyDOMElement()
+
+ act(() => {
+ resolveSearch?.()
+ })
+
+ await waitFor(() => {
+ expect(webAppsRegion).toHaveAttribute('aria-busy', 'false')
+ expect(resultStatus).toHaveTextContent('common.mainNav.webApps.noResults')
+ })
+ expect(within(webAppsRegion).getByRole('status')).toBe(resultStatus)
+ })
+
it('hides the installed web apps section while installed apps are loading', () => {
mockInstalledAppsPending = true
diff --git a/web/app/components/main-nav/components/web-apps-section.tsx b/web/app/components/main-nav/components/web-apps-section.tsx
index e86f63bee3f..e12e9e7cce4 100644
--- a/web/app/components/main-nav/components/web-apps-section.tsx
+++ b/web/app/components/main-nav/components/web-apps-section.tsx
@@ -128,6 +128,12 @@ const WebAppsSectionContent = () => {
})
const canLoadMore = !installedAppsQuery.isFetching && !installedAppsQuery.error
+ const noResultsMessage = t(($) => $['mainNav.webApps.noResults'], { ns: 'common' })
+ const showNoResults =
+ !installedAppsQuery.isError &&
+ !installedAppsQuery.isFetching &&
+ !installedAppsQuery.isPlaceholderData &&
+ installedApps.length === 0
const handleSearchTextChange = (value: string) => {
scrollRef.current?.scrollTo({ top: 0 })
@@ -249,13 +255,16 @@ const WebAppsSectionContent = () => {
<ScrollArea className="min-h-0 flex-1 overflow-hidden">
<ScrollAreaViewport
ref={scrollRef}
- aria-busy={installedAppsQuery.isFetchingNextPage}
+ aria-busy={installedAppsQuery.isFetching}
aria-label={t(($) => $['sidebar.webApps'], { ns: 'explore' })}
style={{ overflowX: 'hidden' }}
className="overscroll-contain"
role="region"
>
<ScrollAreaContent style={{ minWidth: 0 }} className="w-full max-w-full px-2">
+ <div className="sr-only" role="status">
+ {showNoResults ? noResultsMessage : ''}
+ </div>
{installedAppsQuery.isError && !installedAppsQuery.isFetchNextPageError && (
<div
className="flex flex-col items-start gap-1 px-2 py-2 system-xs-regular text-text-tertiary"
@@ -273,10 +282,8 @@ const WebAppsSectionContent = () => {
</Button>
</div>
)}
- {!installedAppsQuery.isError && installedApps.length === 0 && (
- <div className="px-2 py-1 system-xs-regular">
- {t(($) => $['mainNav.webApps.noResults'], { ns: 'common' })}
- </div>
+ {showNoResults && (
+ <div className="px-2 py-1 system-xs-regular">{noResultsMessage}</div>
)}
{webAppRows.length > 0 && (
<div
diff --git a/web/app/components/snippet-list/__tests__/index.spec.tsx b/web/app/components/snippet-list/__tests__/index.spec.tsx
index 2715097d514..e63bb7cb42b 100644
--- a/web/app/components/snippet-list/__tests__/index.spec.tsx
+++ b/web/app/components/snippet-list/__tests__/index.spec.tsx
@@ -388,11 +388,12 @@ describe('SnippetList', () => {
expect(searchInput).toHaveFocus()
})
- it('updates the creator query state as a multi creator filter', () => {
+ it('updates the creator query state as a multi creator filter', async () => {
+ const user = userEvent.setup()
renderList()
- fireEvent.click(screen.getByRole('button', { name: 'app.studio.filters.creators' }))
- fireEvent.click(screen.getByRole('button', { name: /Bob/ }))
+ await user.click(screen.getByRole('combobox', { name: 'app.studio.filters.creators' }))
+ await user.click(screen.getByRole('option', { name: /Bob/ }))
expect(mockSetCreatorIDs).toHaveBeenCalledWith(['creator-2'])
})
diff --git a/web/features/tag-management/__tests__/tag-selector.spec.tsx b/web/features/tag-management/__tests__/tag-selector.spec.tsx
index 5ef445420f8..2cb24e804f9 100644
--- a/web/features/tag-management/__tests__/tag-selector.spec.tsx
+++ b/web/features/tag-management/__tests__/tag-selector.spec.tsx
@@ -150,6 +150,12 @@ describe('TagSelector', () => {
expect(screen.getByText('Frontend')).toBeInTheDocument()
})
+ it('adds the owning app name to the combobox accessible name', () => {
+ render(<TagSelector {...defaultProps} contextLabel="Test App" />)
+
+ expect(screen.getByRole('combobox', { name: 'Frontend: Test App' })).toBeInTheDocument()
+ })
+
it('keeps dataset tag interactions inside the tag trigger', async () => {
const user = userEvent.setup()
const onOuterClick = vi.fn()
diff --git a/web/features/tag-management/components/app-card-tags.tsx b/web/features/tag-management/components/app-card-tags.tsx
index eeaeb0e4e89..d5400e2c8f0 100644
--- a/web/features/tag-management/components/app-card-tags.tsx
+++ b/web/features/tag-management/components/app-card-tags.tsx
@@ -3,6 +3,7 @@ import { TagSelector } from '@/features/tag-management/components/tag-selector'
type AppCardTagsProps = {
appId: string
+ appName: string
tags: Tag[]
canBindOrUnbindTags?: boolean
onOpenTagManagement?: () => void
@@ -11,6 +12,7 @@ type AppCardTagsProps = {
export const AppCardTags = ({
appId,
+ appName,
tags,
canBindOrUnbindTags,
onOpenTagManagement = () => {},
@@ -20,6 +22,7 @@ export const AppCardTags = ({
<TagSelector
type="app"
targetId={appId}
+ contextLabel={appName}
value={tags}
canBindOrUnbindTags={canBindOrUnbindTags}
onOpenTagManagement={onOpenTagManagement}
diff --git a/web/features/tag-management/components/tag-selector.tsx b/web/features/tag-management/components/tag-selector.tsx
index df7a9e761b0..36b718a11cf 100644
--- a/web/features/tag-management/components/tag-selector.tsx
+++ b/web/features/tag-management/components/tag-selector.tsx
@@ -53,6 +53,7 @@ type TagSelectorRootProps = Omit<
export type TagSelectorProps = TagSelectorRootProps &
Pick<ComboboxTriggerProps, 'className' | 'onClick'> & {
targetId: string
+ contextLabel?: string
type: TagType
value: Tag[]
canBindOrUnbindTags?: boolean
@@ -62,6 +63,7 @@ export type TagSelectorProps = TagSelectorRootProps &
export const TagSelector = ({
targetId,
+ contextLabel,
type,
value,
canBindOrUnbindTags,
@@ -106,6 +108,7 @@ export const TagSelector = ({
? t(($) => $['tag.addTag'], { ns: 'common' })
: t(($) => $['tag.noTag'], { ns: 'common' })
const triggerLabel = tagNames.length ? tagNames.join(', ') : emptyTriggerLabel
+ const accessibleTriggerLabel = contextLabel ? `${triggerLabel}: ${contextLabel}` : triggerLabel
const items = useMemo<TagComboboxItem[]>(() => {
const tagIds = new Set<string>()
@@ -251,7 +254,7 @@ export const TagSelector = ({
>
<ComboboxTrigger
disabled={!canManageTags && !canBindOrUnbindTags}
- aria-label={triggerLabel}
+ aria-label={accessibleTriggerLabel}
className={cn(
'group/tag-area relative h-auto w-full cursor-pointer rounded-lg border-0 bg-transparent p-1 hover:bg-state-base-hover focus-visible:bg-transparent data-disabled:bg-transparent data-disabled:opacity-50 data-disabled:hover:bg-transparent data-popup-open:bg-state-base-hover data-popup-open:hover:bg-state-base-hover',
className,
@@ -268,7 +271,7 @@ export const TagSelector = ({
<ComboboxPortal>
<ComboboxPositioner placement="bottom-start" sideOffset={4}>
<ComboboxPopup
- aria-label={triggerLabel}
+ aria-label={accessibleTriggerLabel}
className="w-(--anchor-width) min-w-60 rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-0 shadow-lg backdrop-blur-[5px]"
>
<TagSearchContent