Skip to content

IBX-11371: [Product picker] Floating opened dropdown on filters #1935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OstafinL wants to merge 2 commits into
base: 4.6
Choose a base branch
from
+30 −5
Open

IBX-11371: [Product picker] Floating opened dropdown on filters #1935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55a0081
IBX-11371: [Product picker] Floating opened dropdown on filters
OstafinL Jun 10, 2026
8dbd0ef
After CR
OstafinL Jun 25, 2026
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
29 changes: 26 additions & 3 deletions src/bundle/ui-dev/src/modules/common/dropdown/dropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ const RESTRICTED_AREA_ITEMS_CONTAINER = 190;

const Dropdown = ({
dropdownListRef,
scrollContainerNode,
shouldCloseOutsideContainer,
value,
options,
onChange,
Expand Down Expand Up @@ -46,6 +48,9 @@ const Dropdown = ({
'ibexa-dropdown--expanded': isExpanded,
[extraClasses]: true,
});
const getScrollContainer = () => {
return scrollContainerNode || document.querySelector('.ibexa-main-container__content-column');
};
const toggleExpanded = () => {
calculateAndSetItemsListStyles();
setIsExpanded((prevState) => !prevState && !disabled);
Expand Down Expand Up @@ -113,6 +118,18 @@ const Dropdown = ({
itemsStyles.transform = 'translateY(-100%)';
}

if (shouldCloseOutsideContainer) {
const scrollContainer = getScrollContainer();
const scrollContainerRect = scrollContainer.getBoundingClientRect();
const { top: scrollContainerTop, bottom: scrollContainerBottom } = scrollContainerRect;

if (top <= scrollContainerTop || top >= scrollContainerBottom) {
setIsExpanded(false);

return;
}
}

setItemsListStyles(itemsStyles);
};
const renderItemsList = () => {
Expand Down Expand Up @@ -181,7 +198,6 @@ const Dropdown = ({
return;
}

const scrollContainer = document.querySelector('.ibexa-main-container__content-column');
const onInteractionOutside = (event) => {
if (containerRef.current.contains(event.target) || containerItemsRef.current?.contains(event.target)) {
return;
Expand All @@ -191,11 +207,14 @@ const Dropdown = ({
};

document.body.addEventListener('click', onInteractionOutside, false);
scrollContainer?.addEventListener('scroll', calculateAndSetItemsListStyles, false);

const scrollContainer = getScrollContainer();

scrollContainer.addEventListener('scroll', calculateAndSetItemsListStyles, false);

return () => {
document.body.removeEventListener('click', onInteractionOutside);
scrollContainer?.removeEventListener('scroll', calculateAndSetItemsListStyles);
scrollContainer.removeEventListener('scroll', calculateAndSetItemsListStyles);

setItemsListStyles({});
};
Expand Down Expand Up @@ -280,6 +299,8 @@ Dropdown.propTypes = {
extraClasses: PropTypes.string,
renderSelectedItem: PropTypes.func,
minSearchItems: PropTypes.number,
scrollContainerNode: PropTypes.node,
shouldCloseOutsideContainer: PropTypes.bool,
};

Dropdown.defaultProps = {
Expand All @@ -290,6 +311,8 @@ Dropdown.defaultProps = {
extraClasses: '',
renderSelectedItem: (item) => item?.label,
minSearchItems: MIN_SEARCH_ITEMS_DEFAULT,
scrollContainerNode: null,
shouldCloseOutsideContainer: false,
};

export default Dropdown;
6 changes: 4 additions & 2 deletions src/bundle/ui-dev/src/modules/universal-discovery/components/filters/filters.panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import PropTypes from 'prop-types';

import { getTranslator } from '@ibexa-admin-ui/src/bundle/Resources/public/js/scripts/helpers/context.helper';

const FiltersPanel = ({ children, isApplyButtonEnabled, makeSearch, clearFilters }) => {
const FiltersPanel = ({ children, isApplyButtonEnabled, makeSearch, clearFilters, containerRef }) => {
const Translator = getTranslator();
const filtersLabel = Translator.trans(/*@Desc("Filters")*/ 'filters.title', {}, 'ibexa_universal_discovery_widget');
const clearLabel = Translator.trans(/*@Desc("Clear")*/ 'filters.clear', {}, 'ibexa_universal_discovery_widget');
const applyLabel = Translator.trans(/*@Desc("Apply")*/ 'filters.apply', {}, 'ibexa_universal_discovery_widget');

return (
<div className="c-filters-panel">
<div className="c-filters-panel" ref={containerRef}>
<div className="c-filters-panel__header">
<div className="c-filters-panel__header-content">{filtersLabel}</div>
<div className="c-filters-panel__header-actions">
Expand All @@ -37,10 +37,12 @@ FiltersPanel.propTypes = {
isApplyButtonEnabled: PropTypes.bool.isRequired,
makeSearch: PropTypes.func.isRequired,
clearFilters: PropTypes.func.isRequired,
containerRef: PropTypes.shape({ current: PropTypes.instanceOf(Element) }),
};

FiltersPanel.defaultProps = {
children: null,
containerRef: null,
};

export default FiltersPanel;
Loading