diff --git a/src/themes/default/src/js/index.esm.js b/src/themes/default/src/js/index.esm.js index 83e0f3f8a..f435ecbc9 100644 --- a/src/themes/default/src/js/index.esm.js +++ b/src/themes/default/src/js/index.esm.js @@ -21,7 +21,6 @@ import Tooltip from "@openeuropa/bcl-bootstrap/js/src/tooltip"; import Gallery from "@openeuropa/bcl-theme-default/src/js/gallery/gallery"; import AccordionToggle from "@openeuropa/bcl-theme-default/src/js/accordion-toggle/accordion-toggle"; import AccessibleToggle from "@openeuropa/bcl-theme-default/src/js/accessible-toggle/accessible-toggle"; -import SlimSelectWrapper from "@openeuropa/bcl-theme-default/src/js/slim-select-wrapper/slim-select-wrapper"; export { Alert, @@ -40,5 +39,4 @@ export { Gallery, AccessibleToggle, AccordionToggle, - SlimSelectWrapper, }; diff --git a/src/themes/default/src/js/index.umd.js b/src/themes/default/src/js/index.umd.js index cb35baecc..a92a95a1f 100644 --- a/src/themes/default/src/js/index.umd.js +++ b/src/themes/default/src/js/index.umd.js @@ -21,7 +21,6 @@ import Tooltip from "@openeuropa/bcl-bootstrap/js/src/tooltip"; import AccordionToggle from "@openeuropa/bcl-theme-default/src/js/accordion-toggle/accordion-toggle"; import Gallery from "@openeuropa/bcl-theme-default/src/js/gallery/gallery"; import AccessibleToggle from "@openeuropa/bcl-theme-default/src/js/accessible-toggle/accessible-toggle"; -import SlimSelectWrapper from "@openeuropa/bcl-theme-default/src/js/slim-select-wrapper/slim-select-wrapper"; export default { Alert, @@ -40,5 +39,4 @@ export default { Gallery, AccessibleToggle, AccordionToggle, - SlimSelectWrapper, }; diff --git a/src/themes/default/src/js/slim-select-wrapper/slim-select-wrapper.js b/src/themes/default/src/js/slim-select-wrapper/slim-select-wrapper.js deleted file mode 100644 index 86b48d5ad..000000000 --- a/src/themes/default/src/js/slim-select-wrapper/slim-select-wrapper.js +++ /dev/null @@ -1,48 +0,0 @@ -function wrapSlimSelect() { - const ActualSlimSelect = window.SlimSelect; - - function SlimSelectWrapper(config) { - const selectEl = - typeof config.select === 'string' - ? document.querySelector(config.select) - : config.select; - - const offcanvasContainer = - selectEl?.closest('.offcanvas-body') || selectEl?.closest('.offcanvas'); - - const enhancedConfig = { - ...config, - settings: { - ...(config.settings || {}), - ...(offcanvasContainer && { contentLocation: offcanvasContainer }), - }, - }; - - const instance = new ActualSlimSelect(enhancedConfig); - - instance.render.main.main.classList.add('ss-2'); - instance.render.content.main.classList.add('ss-content-2'); - - return instance; - } - - window.SlimSelect = SlimSelectWrapper; - return SlimSelectWrapper; -} - -let SlimSelectWrapper = null; - -if (window.SlimSelect) { - SlimSelectWrapper = wrapSlimSelect(); -} else { - // Fallback if SlimSelect isn't loaded yet - document.addEventListener('DOMContentLoaded', () => { - if (window.SlimSelect) { - SlimSelectWrapper = wrapSlimSelect(); - } else { - console.warn('SlimSelect is still not available.'); - } - }); -} - -export default SlimSelectWrapper; diff --git a/src/themes/default/src/scss/_multiselect-2.scss b/src/themes/default/src/scss/_multiselect-2.scss index e0865f920..21c82846c 100644 --- a/src/themes/default/src/scss/_multiselect-2.scss +++ b/src/themes/default/src/scss/_multiselect-2.scss @@ -59,6 +59,7 @@ } // Main container +.ss-main:not(.ss-1):not(.ss-2), .ss-main.ss-2 { display: flex; flex-direction: row; @@ -251,7 +252,8 @@ } // Content container -.ss-content.ss-content-2 { +.ss-content:not(.ss-1):not(.ss-2), +.ss-content.ss-2 { position: absolute; // default position display: flex; height: auto; diff --git a/src/themes/joinup/src/js/index.esm.js b/src/themes/joinup/src/js/index.esm.js index 55b9df3d3..6c9b74370 100644 --- a/src/themes/joinup/src/js/index.esm.js +++ b/src/themes/joinup/src/js/index.esm.js @@ -21,7 +21,6 @@ import ScrollSpy from "@openeuropa/bcl-bootstrap/js/src/scrollspy-legacy"; import Tab from "@openeuropa/bcl-bootstrap/js/src/tab"; import Toast from "@openeuropa/bcl-bootstrap/js/src/toast"; import Tooltip from "@openeuropa/bcl-bootstrap/js/src/tooltip"; -import SlimSelectWrapper from "@openeuropa/bcl-theme-default/src/js/slim-select-wrapper/slim-select-wrapper"; export { Alert, @@ -40,5 +39,4 @@ export { Tab, Toast, Tooltip, - SlimSelectWrapper, }; diff --git a/src/themes/joinup/src/js/index.umd.js b/src/themes/joinup/src/js/index.umd.js index 80a2c828e..50096558f 100644 --- a/src/themes/joinup/src/js/index.umd.js +++ b/src/themes/joinup/src/js/index.umd.js @@ -21,7 +21,6 @@ import ScrollSpy from "@openeuropa/bcl-bootstrap/js/src/scrollspy-legacy"; import Tab from "@openeuropa/bcl-bootstrap/js/src/tab"; import Toast from "@openeuropa/bcl-bootstrap/js/src/toast"; import Tooltip from "@openeuropa/bcl-bootstrap/js/src/tooltip"; -import SlimSelectWrapper from "@openeuropa/bcl-theme-default/src/js/slim-select-wrapper/slim-select-wrapper"; export default { Alert, @@ -40,5 +39,4 @@ export default { Tab, Toast, Tooltip, - SlimSelectWrapper, };