From 3fed8154c373ef19d457f7e7c375b84dd5c12b5c Mon Sep 17 00:00:00 2001
From: ronronscelestes <julie.plantey@gmail.com>
Date: Tue, 9 Nov 2021 11:13:22 +0100
Subject: [PATCH] onblur event on filters url query removed

---
 .../components/AttributeFilter/Filters.js      | 18 ------------------
 .../pages/Users/ListPage/Filters/index.js      | 16 ----------------
 .../admin/src/pages/App/components/Filters.js  | 18 ------------------
 3 files changed, 52 deletions(-)

diff --git a/packages/core/admin/admin/src/content-manager/components/AttributeFilter/Filters.js b/packages/core/admin/admin/src/content-manager/components/AttributeFilter/Filters.js
index d3269facf1..2e93de492d 100644
--- a/packages/core/admin/admin/src/content-manager/components/AttributeFilter/Filters.js
+++ b/packages/core/admin/admin/src/content-manager/components/AttributeFilter/Filters.js
@@ -12,23 +12,6 @@ const Filters = ({ displayedFilters }) => {
   const buttonRef = useRef();
   const { trackUsage } = useTracking();
 
-  const handleBlur = e => {
-    // TO FIX - select's modals prevent blur to work correctly
-    const notNull = e.currentTarget !== null && e.relatedTarget !== null;
-    const ulListBox = document.querySelector('[role="listbox"]');
-    const selectDate = document.querySelector('[role="dialog"]');
-
-    if (
-      !e.currentTarget.contains(e.relatedTarget) &&
-      e.relatedTarget !== buttonRef.current &&
-      e.relatedTarget !== ulListBox &&
-      !selectDate.contains(e.relatedTarget) &&
-      notNull
-    ) {
-      setIsVisible(false);
-    }
-  };
-
   const handleToggle = () => {
     if (!isVisible) {
       trackUsage('willFilterEntries');
@@ -52,7 +35,6 @@ const Filters = ({ displayedFilters }) => {
           <FilterPopoverURLQuery
             displayedFilters={displayedFilters}
             isVisible={isVisible}
-            onBlur={handleBlur}
             onToggle={handleToggle}
             source={buttonRef}
           />
diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/Filters/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/Filters/index.js
index 4f2e22e61c..d3e8beeff3 100644
--- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/Filters/index.js
+++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/Filters/index.js
@@ -11,21 +11,6 @@ const Filters = ({ displayedFilters }) => {
   const { formatMessage } = useIntl();
   const buttonRef = useRef();
 
-  const handleBlur = e => {
-    // TO FIX - select's modals prevent blur to work correctly
-    const notNull = e.currentTarget !== null && e.relatedTarget !== null;
-    const ulListBox = document.querySelector('[role="listbox"]');
-
-    if (
-      !e.currentTarget.contains(e.relatedTarget) &&
-      e.relatedTarget !== buttonRef.current &&
-      e.relatedTarget !== ulListBox &&
-      notNull
-    ) {
-      setIsVisible(false);
-    }
-  };
-
   const handleToggle = () => {
     setIsVisible(prev => !prev);
   };
@@ -46,7 +31,6 @@ const Filters = ({ displayedFilters }) => {
           <FilterPopoverURLQuery
             displayedFilters={displayedFilters}
             isVisible={isVisible}
-            onBlur={handleBlur}
             onToggle={handleToggle}
             source={buttonRef}
           />
diff --git a/packages/core/upload/admin/src/pages/App/components/Filters.js b/packages/core/upload/admin/src/pages/App/components/Filters.js
index d50ae2147a..eda2830a05 100644
--- a/packages/core/upload/admin/src/pages/App/components/Filters.js
+++ b/packages/core/upload/admin/src/pages/App/components/Filters.js
@@ -45,23 +45,6 @@ export const Filters = () => {
 
   const toggleFilter = () => setVisible(prev => !prev);
 
-  const handleBlur = e => {
-    // TO FIX - select's modals prevent blur to work correctly
-    const notNull = e.currentTarget !== null && e.relatedTarget !== null;
-    const ulListBox = document.querySelector('[role="listbox"]');
-    const selectDate = document.querySelector('[role="dialog"]');
-
-    if (
-      !e.currentTarget.contains(e.relatedTarget) &&
-      e.relatedTarget !== buttonRef.current &&
-      e.relatedTarget !== ulListBox &&
-      !selectDate.contains(e.relatedTarget) &&
-      notNull
-    ) {
-      setVisible(false);
-    }
-  };
-
   const handleRemoveFilter = nextFilters => {
     setQuery({ filters: { $and: nextFilters }, page: 1 });
   };
@@ -85,7 +68,6 @@ export const Filters = () => {
         <FilterPopover
           displayedFilters={displayedFilters}
           filters={filters}
-          onBlur={handleBlur}
           onSubmit={handleSubmit}
           onToggle={toggleFilter}
           source={buttonRef}