Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions packages/module/src/DataViewFilters/DataViewFilters.test.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { render, fireEvent } from '@testing-library/react';
import '@testing-library/jest-dom';
import DataViewFilters from './DataViewFilters';
import DataViewToolbar from '../DataViewToolbar';
import DataViewTextFilter from '../DataViewTextFilter';
Expand Down Expand Up @@ -37,4 +38,19 @@ describe('DataViewFilters component', () => {
fireEvent.input(input, { target: { value: 'abc' } });
expect(mockOnChange).toHaveBeenCalledWith('one', { one: 'abc' });
});

it('renders an accessible name on the filter category toggle (#680)', () => {
const { container } = render(
<DataViewToolbar
filters={
<DataViewFilters onChange={mockOnChange} values={{}}>
<DataViewTextFilter filterId="name" title="Name" />
<DataViewTextFilter filterId="label" title="Label" />
</DataViewFilters>
}
/>
);
const categoryToggle = container.querySelector('.pf-v6-c-menu-toggle');
expect(categoryToggle).toHaveAccessibleName('Filter by');
});
});
6 changes: 5 additions & 1 deletion packages/module/src/DataViewFilters/DataViewFilters.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ export const DataViewFilters = <T extends object>({
values,
...props
}: DataViewFiltersProps<T>) => {
const [ activeAttributeMenu, setActiveAttributeMenu ] = useState<string>('');
const [ activeAttributeMenu, setActiveAttributeMenu ] = useState<string>(() => {
const firstFilter = Children.toArray(children).find(isValidElement);
return firstFilter ? String((firstFilter.props as { title?: string }).title ?? '') : '';
});
const [ isAttributeMenuOpen, setIsAttributeMenuOpen ] = useState(false);
const attributeToggleRef = useRef<HTMLButtonElement>(null);
const attributeMenuRef = useRef<HTMLDivElement>(null);
Expand Down Expand Up @@ -80,6 +83,7 @@ export const DataViewFilters = <T extends object>({
const attributeToggle = (
<MenuToggle
ref={attributeToggleRef}
aria-label="Filter by"
onClick={() => setIsAttributeMenuOpen(!isAttributeMenuOpen)}
isExpanded={isAttributeMenuOpen}
icon={toggleIcon}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ exports[`DataViewFilters component should render correctly 1`] = `
<div>
<button
aria-expanded="false"
aria-label="Filter by"
class="pf-v6-c-menu-toggle"
data-ouia-component-id="OUIA-Generated-MenuToggle-1"
data-ouia-component-type="PF6/MenuToggle"
Expand Down