yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-17 04:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

onblur event on filters url query removed

Browse Source
This commit is contained in:
ronronscelestes 2021-11-09 11:13:22 +01:00
parent 197aaf7b58
commit 3fed8154c3
3 changed files with 0 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/core/admin/admin/src/content-manager/components/AttributeFilter/Filters.js
View File

@ -12,23 +12,6 @@ const Filters = ({ displayedFilters }) => {
const buttonRef = useRef(); const buttonRef = useRef();
const { trackUsage } = useTracking(); 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 = () => { const handleToggle = () => {
if (!isVisible) { if (!isVisible) {
trackUsage('willFilterEntries'); trackUsage('willFilterEntries');
@ -52,7 +35,6 @@ const Filters = ({ displayedFilters }) => {
<FilterPopoverURLQuery <FilterPopoverURLQuery
displayedFilters={displayedFilters} displayedFilters={displayedFilters}
isVisible={isVisible} isVisible={isVisible}
onBlur={handleBlur}
onToggle={handleToggle} onToggle={handleToggle}
source={buttonRef} source={buttonRef}
/> />

16
packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/Filters/index.js
View File

@ -11,21 +11,6 @@ const Filters = ({ displayedFilters }) => {
const { formatMessage } = useIntl(); const { formatMessage } = useIntl();
const buttonRef = useRef(); 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 = () => { const handleToggle = () => {
setIsVisible(prev => !prev); setIsVisible(prev => !prev);
}; };
@ -46,7 +31,6 @@ const Filters = ({ displayedFilters }) => {
<FilterPopoverURLQuery <FilterPopoverURLQuery
displayedFilters={displayedFilters} displayedFilters={displayedFilters}
isVisible={isVisible} isVisible={isVisible}
onBlur={handleBlur}
onToggle={handleToggle} onToggle={handleToggle}
source={buttonRef} source={buttonRef}
/> />

18
packages/core/upload/admin/src/pages/App/components/Filters.js
View File

@ -45,23 +45,6 @@ export const Filters = () => {
const toggleFilter = () => setVisible(prev => !prev); 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 => { const handleRemoveFilter = nextFilters => {
setQuery({ filters: { $and: nextFilters }, page: 1 }); setQuery({ filters: { $and: nextFilters }, page: 1 });
}; };
@ -85,7 +68,6 @@ export const Filters = () => {
<FilterPopover <FilterPopover
displayedFilters={displayedFilters} displayedFilters={displayedFilters}
filters={filters} filters={filters}
onBlur={handleBlur}
onSubmit={handleSubmit} onSubmit={handleSubmit}
onToggle={toggleFilter} onToggle={toggleFilter}
source={buttonRef} source={buttonRef}