Skip to content
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

IBX-3922: Fix dropdown inside modal #584

Merged
merged 3 commits into from
Oct 6, 2022
Merged

IBX-3922: Fix dropdown inside modal #584

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d18bb6f
IBX-3922: Fix dropdown inside modal
tischsoic Sep 28, 2022
c5e3979
Fix for bootstrap 5.2.2 and for removing one of multiple options in b…
tischsoic Oct 6, 2022
70fa694
Attach preexisting selected items listeners
tischsoic Oct 6, 2022
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/Resources/public/js/scripts/core/dropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,16 +444,14 @@
return;
}

const modalDialog = this.container.closest('.modal-dialog');

this.itemsPopover = new DropdownPopover(
this.selectedItemsContainer,
{
html: true,
placement: 'bottom',
customClass: 'ibexa-dropdown-popover',
content: this.itemsPopoverContent,
container: modalDialog || 'body',
Copy link
Contributor Author

@tischsoic tischsoic Sep 28, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Having a dropdown popup inside a modal caused problems when the modal was embedded inside a tab, which has overflow: hidden CSS style.

container: 'body',
},
{ dropdown: this },
);
Expand All @@ -478,6 +476,31 @@
.forEach((option) => option.addEventListener('click', this.onOptionClick, false));

if (this.itemsFilterInput) {
const modal = this.container.closest('.modal');
const popupInputs = this.itemsContainer.querySelectorAll('input');

popupInputs.forEach((popupInput) =>
popupInput.addEventListener(
'focusin',
() => {
const modalInstance = bootstrap.Modal.getInstance(modal);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I get an instance every time just in case it changes etc. I also assume that this event may be in some very rare cases called before any instance was created and I don't want to create an instance inside the dropdown class.
Maybe it is too cautious.


if (modalInstance) {
modalInstance._focustrap.deactivate();
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bootstrap modal uses FocusTrap which steals focus if it is outside the modal
https://github.com/twbs/bootstrap/blob/597c4023141dc48868889b85676b2d7269411d23/js/src/modal.js#L163


this.itemsFilterInput.addEventListener(
'focusout',
() => {
modalInstance._focustrap.activate();
},
{ once: true },
);
}
},
false,
),
);

this.itemsFilterInput.addEventListener('keyup', this.filterItems, false);
this.itemsFilterInput.addEventListener('input', this.filterItems, false);
}
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown_item.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
{% if multiple is defined and multiple %}
<input type="checkbox" name="dropdown-checkbox" class="ibexa-input ibexa-input--checkbox" {% if is_selected %}checked{% endif %} />
{% endif %}
{% if icon is defined %}
{% if icon is defined and icon != '' %}
<svg class="ibexa-icon ibexa-icon--small {{ icon_class|default('') }}">
<use xlink:href="{{ ibexa_icon_path(icon) }}"></use>
</svg>
Expand Down