From bea225e7c47aaa1686346bc75b94c83add54f4fc Mon Sep 17 00:00:00 2001
From: asvarcas <asvarcas@etriek.com.uy>
Date: Thu, 9 Dec 2021 16:14:01 -0300
Subject: [PATCH 1/3] Fix List Filter Menu is not accessible

---
 packages/ra-ui-materialui/src/list/filter/FilterButton.tsx  | 3 ++-
 .../src/list/filter/FilterButtonMenuItem.tsx                | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/ra-ui-materialui/src/list/filter/FilterButton.tsx b/packages/ra-ui-materialui/src/list/filter/FilterButton.tsx
index aa7c43e33a0..4a06f97fad2 100644
--- a/packages/ra-ui-materialui/src/list/filter/FilterButton.tsx
+++ b/packages/ra-ui-materialui/src/list/filter/FilterButton.tsx
@@ -91,12 +91,13 @@ const FilterButton = (props: FilterButtonProps): JSX.Element => {
                 anchorEl={anchorEl.current}
                 onClose={handleRequestClose}
             >
-                {hiddenFilters.map((filterElement: JSX.Element) => (
+                {hiddenFilters.map((filterElement: JSX.Element, index) => (
                     <FilterButtonMenuItem
                         key={filterElement.props.source}
                         filter={filterElement}
                         resource={resource}
                         onShow={handleShow}
+                        autoFocus={index === 0}
                     />
                 ))}
             </Menu>
diff --git a/packages/ra-ui-materialui/src/list/filter/FilterButtonMenuItem.tsx b/packages/ra-ui-materialui/src/list/filter/FilterButtonMenuItem.tsx
index 1677efc6a42..4cfdbb8c466 100644
--- a/packages/ra-ui-materialui/src/list/filter/FilterButtonMenuItem.tsx
+++ b/packages/ra-ui-materialui/src/list/filter/FilterButtonMenuItem.tsx
@@ -6,7 +6,7 @@ import { FieldTitle, useResourceContext } from 'ra-core';
 
 export const FilterButtonMenuItem = forwardRef<any, FilterButtonMenuItemProps>(
     (props, ref) => {
-        const { filter, onShow } = props;
+        const { filter, onShow, autoFocus } = props;
         const resource = useResourceContext(props);
         const handleShow = useCallback(() => {
             onShow({
@@ -22,6 +22,8 @@ export const FilterButtonMenuItem = forwardRef<any, FilterButtonMenuItemProps>(
                 data-default-value={filter.props.defaultValue}
                 key={filter.props.source}
                 onClick={handleShow}
+                aria-disabled={false}
+                autoFocus={autoFocus}
                 ref={ref}
             >
                 <FieldTitle
@@ -38,10 +40,12 @@ FilterButtonMenuItem.propTypes = {
     filter: PropTypes.element.isRequired,
     onShow: PropTypes.func.isRequired,
     resource: PropTypes.string,
+    autoFocus: PropTypes.bool,
 };
 
 export interface FilterButtonMenuItemProps {
     filter: JSX.Element;
     onShow: (params: { source: string; defaultValue: any }) => void;
     resource: string;
+    autoFocus: boolean;
 }

From b2c2307c27b3b12d309283685e1a50baf209f062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?An=C3=ADbal=20Svarcas?= <WiXSL@users.noreply.github.com>
Date: Thu, 9 Dec 2021 20:30:48 -0300
Subject: [PATCH 2/3] Revert unnecessary change

---
 .../ra-ui-materialui/src/list/filter/FilterButtonMenuItem.tsx    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/ra-ui-materialui/src/list/filter/FilterButtonMenuItem.tsx b/packages/ra-ui-materialui/src/list/filter/FilterButtonMenuItem.tsx
index 4cfdbb8c466..b8fe9cdfdbc 100644
--- a/packages/ra-ui-materialui/src/list/filter/FilterButtonMenuItem.tsx
+++ b/packages/ra-ui-materialui/src/list/filter/FilterButtonMenuItem.tsx
@@ -22,7 +22,6 @@ export const FilterButtonMenuItem = forwardRef<any, FilterButtonMenuItemProps>(
                 data-default-value={filter.props.defaultValue}
                 key={filter.props.source}
                 onClick={handleShow}
-                aria-disabled={false}
                 autoFocus={autoFocus}
                 ref={ref}
             >

From 24b3a883d743afd38f99726a34246c893552ae83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?An=C3=ADbal=20Svarcas?= <WiXSL@users.noreply.github.com>
Date: Fri, 10 Dec 2021 07:52:24 -0300
Subject: [PATCH 3/3] Add aria-haspopup to Button component

---
 packages/ra-ui-materialui/src/list/filter/FilterButton.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/ra-ui-materialui/src/list/filter/FilterButton.tsx b/packages/ra-ui-materialui/src/list/filter/FilterButton.tsx
index 4a06f97fad2..d9178d7f18d 100644
--- a/packages/ra-ui-materialui/src/list/filter/FilterButton.tsx
+++ b/packages/ra-ui-materialui/src/list/filter/FilterButton.tsx
@@ -82,6 +82,7 @@ const FilterButton = (props: FilterButtonProps): JSX.Element => {
             <Button
                 className="add-filter"
                 label="ra.action.add_filter"
+                aria-haspopup="true"
                 onClick={handleClickButton}
             >
                 <ContentFilter />