Fix Tom Select input wrapping and restore arrow icon

contao/templates/frontend/event_filter.html.twig

@@ -2,8 +2,8 @@
     <div class="select-filters">
         <div class="widget-select category">
             <label for="tag-filter" class="visually-hidden">Kategorie wählen</label>
-            <select id="tag-filter">
-                <option value="all" data-placeholder="true">Kategorie wählen</option>
+            <select id="tag-filter" placeholder="Kategorie wählen" autocomplete="off">
+                <option value="">Kategorie wählen</option>
                 {% for tag in tagButtons|default([]) %}
                     <option value="tag-{{ tag.id }}">{{ tag.title }} ({{ tag.count }})</option>
                 {% endfor %}
@@ -12,8 +12,8 @@
 
         <div class="widget-select places">
             <label for="location-filter" class="visually-hidden">Ort wählen</label>
-            <select id="location-filter">
-                <option value="all" data-placeholder="true">Ort wählen</option>
+            <select id="location-filter" placeholder="Ort wählen" autocomplete="off">
+                <option value="">Ort wählen</option>
                 {% for location in locations|default([]) %}
                     <option value="location-{{ location.id }}">{{ location.title }} ({{ location.count }})</option>
                 {% endfor %}
@@ -22,8 +22,8 @@
 
         <div class="widget-select org">
             <label for="org-filter" class="visually-hidden">Veranstalter wählen</label>
-            <select id="org-filter">
-                <option value="all" data-placeholder="true">Veranstalter wählen</option>
+            <select id="org-filter" placeholder="Veranstalter wählen" autocomplete="off">
+                <option value="">Veranstalter wählen</option>
                 {% for organization in organizations|default([]) %}
                     <option value="org-{{ organization.id }}">{{ organization.title }} ({{ organization.count }})</option>
                 {% endfor %}
@@ -68,12 +68,12 @@
         pointer-events: none;
     }
 
-    #eventfilters .widget-select.active .ss-main {
+    #eventfilters .widget-select.active .ts-control {
         outline: 2px solid currentColor;
         outline-offset: 2px;
     }
 
-    #eventfilters .ss-main:focus-visible {
+    #eventfilters .ts-control:focus-within {
         outline: 2px solid currentColor;
         outline-offset: 2px;
     }
@@ -82,14 +82,24 @@
         display: none;
     }
 
-    #eventfilters .ss-content,
-    #eventfilters .ss-list {
-        overscroll-behavior: contain;
+    #eventfilters .ts-wrapper.single .ts-control {
+        background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath fill='none' stroke='%23343a40' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='m2 5 6 6 6-6'/%3E%3C/svg%3E");
+        background-repeat: no-repeat;
+        background-position: right 0.75rem center;
+        background-size: 16px 12px;
+        padding-right: 2rem;
     }
+
+    #eventfilters .ts-wrapper.single .ts-control > input {
+        width: auto !important;
+        min-width: 0 !important;
+        flex: 0 0 auto;
+    }
+
 </style>
 
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/slim-select@3/dist/slimselect.css">
-<script src="https://cdn.jsdelivr.net/npm/slim-select@3/dist/slimselect.min.js"></script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/tom-select@2.4.3/dist/css/tom-select.css">
+<script src="https://cdn.jsdelivr.net/npm/tom-select@2.4.3/dist/js/tom-select.complete.min.js"></script>
 
 <script type="module">
     const filters = document.getElementById('eventfilters');
@@ -119,28 +129,28 @@
 
     const animationMs = 220;
     let hideTimers = new WeakMap();
-    let currentFilter = { type: 'all', value: 'all' };
+    let currentFilter = { type: 'all', value: '' };
     let suppressedChangeEvents = 0;
 
-    const initSlimSelect = (selectElement) => {
-        if (!selectElement || 'undefined' === typeof window.SlimSelect) {
+    const initTomSelect = (selectElement) => {
+        if (!selectElement || 'undefined' === typeof window.TomSelect) {
             return null;
         }
 
-        return new window.SlimSelect({
-            select: selectElement,
-            settings: {
-                showSearch: false,
-                allowDeselect: false,
+        return new window.TomSelect(selectElement, {
+            create: true,
+            sortField: {
+                field: 'text',
+                direction: 'asc',
             },
         });
     };
 
-    const tagSlim = initSlimSelect(tagSelect);
-    const locationSlim = initSlimSelect(locationSelect);
-    const orgSlim = initSlimSelect(orgSelect);
+    const tagTom = initTomSelect(tagSelect);
+    const locationTom = initTomSelect(locationSelect);
+    const orgTom = initTomSelect(orgSelect);
 
-    const setSelectValue = (selectElement, slimInstance, value) => {
+    const setSelectValue = (selectElement, tomInstance, value) => {
         if (!selectElement) {
             return;
         }
@@ -152,8 +162,8 @@
         suppressedChangeEvents += 1;
 
         try {
-            if (slimInstance) {
-                slimInstance.setSelected(value);
+            if (tomInstance) {
+                tomInstance.setValue(value, true);
             } else {
                 selectElement.value = value;
             }
@@ -195,9 +205,9 @@
     };
 
     const setActiveControl = ({ type, value }) => {
-        const hasActiveTag = type === 'tag' && value !== 'all';
-        const hasActiveLocation = type === 'location' && value !== 'all';
-        const hasActiveOrg = type === 'org' && value !== 'all';
+        const hasActiveTag = type === 'tag' && Boolean(value);
+        const hasActiveLocation = type === 'location' && Boolean(value);
+        const hasActiveOrg = type === 'org' && Boolean(value);
 
         tagWidget?.classList.toggle('active', hasActiveTag);
         locationWidget?.classList.toggle('active', hasActiveLocation);
@@ -214,7 +224,7 @@
         .filter(Boolean);
 
     const matches = (eventItem, filterState) => {
-        if (filterState.value === 'all') {
+        if (!filterState.value || filterState.type === 'all') {
             return true;
         }
 
@@ -230,10 +240,6 @@
             return parseIdList(eventItem.dataset.org).includes(filterState.value);
         }
 
-        if (filterState.type === 'all') {
-            return true;
-        }
-
         return true;
     };
 
@@ -285,12 +291,12 @@
 
         const selectedValue = tagSelect.value;
 
-        setSelectValue(locationSelect, locationSlim, 'all');
-        setSelectValue(orgSelect, orgSlim, 'all');
+        setSelectValue(locationSelect, locationTom, '');
+        setSelectValue(orgSelect, orgTom, '');
 
         applyFilter(
-            selectedValue === 'all'
-                ? { type: 'all', value: 'all' }
+            !selectedValue
+                ? { type: 'all', value: '' }
                 : { type: 'tag', value: selectedValue.replace('tag-', '') },
         );
     });
@@ -302,12 +308,12 @@
 
         const selectedValue = locationSelect.value;
 
-        setSelectValue(tagSelect, tagSlim, 'all');
-        setSelectValue(orgSelect, orgSlim, 'all');
+        setSelectValue(tagSelect, tagTom, '');
+        setSelectValue(orgSelect, orgTom, '');
 
         applyFilter(
-            selectedValue === 'all'
-                ? { type: 'all', value: 'all' }
+            !selectedValue
+                ? { type: 'all', value: '' }
                 : { type: 'location', value: selectedValue.replace('location-', '') },
         );
     });
@@ -319,128 +325,23 @@
 
         const selectedValue = orgSelect.value;
 
-        setSelectValue(tagSelect, tagSlim, 'all');
-        setSelectValue(locationSelect, locationSlim, 'all');
+        setSelectValue(tagSelect, tagTom, '');
+        setSelectValue(locationSelect, locationTom, '');
 
         applyFilter(
-            selectedValue === 'all'
-                ? { type: 'all', value: 'all' }
+            !selectedValue
+                ? { type: 'all', value: '' }
                 : { type: 'org', value: selectedValue.replace('org-', '') },
         );
     });
 
     resetButton?.addEventListener('click', () => {
-        setSelectValue(tagSelect, tagSlim, 'all');
-        setSelectValue(locationSelect, locationSlim, 'all');
-        setSelectValue(orgSelect, orgSlim, 'all');
+        setSelectValue(tagSelect, tagTom, '');
+        setSelectValue(locationSelect, locationTom, '');
+        setSelectValue(orgSelect, orgTom, '');
 
-        applyFilter({ type: 'all', value: 'all' });
+        applyFilter({ type: 'all', value: '' });
     });
 
-    const getDropdownFromTarget = (target) => {
-        if (!(target instanceof Element)) {
-            return null;
-        }
-
-        return target.closest('.ss-content, .ss-list');
-    };
-
-    const getScrollContainer = (targetDropdown) => {
-        if (!targetDropdown) {
-            return null;
-        }
-
-        if (targetDropdown.scrollHeight > targetDropdown.clientHeight) {
-            return targetDropdown;
-        }
-
-        const contentContainer = targetDropdown.closest('.ss-content') || targetDropdown;
-        const listContainer = contentContainer.querySelector('.ss-list');
-
-        if (listContainer && listContainer.scrollHeight > listContainer.clientHeight) {
-            return listContainer;
-        }
-
-        if (contentContainer.scrollHeight > contentContainer.clientHeight) {
-            return contentContainer;
-        }
-
-        return null;
-    };
-
-    const shouldBlockBoundaryScroll = (scrollContainer, delta) => {
-        if (!scrollContainer || delta === 0) {
-            return false;
-        }
-
-        const top = scrollContainer.scrollTop;
-        const height = scrollContainer.clientHeight;
-        const scrollHeight = scrollContainer.scrollHeight;
-
-        const atTop = top <= 0;
-        const atBottom = top + height >= scrollHeight - 1;
-
-        return (atTop && delta < 0) || (atBottom && delta > 0);
-    };
-
-    let lastTouchY = null;
-
-    document.addEventListener('wheel', (event) => {
-        const dropdown = getDropdownFromTarget(event.target);
-        if (!dropdown) {
-            return;
-        }
-
-        const scrollContainer = getScrollContainer(dropdown);
-
-        if (shouldBlockBoundaryScroll(scrollContainer, event.deltaY)) {
-            event.preventDefault();
-        }
-
-        event.stopPropagation();
-    }, { passive: false, capture: true });
-
-    document.addEventListener('touchstart', (event) => {
-        const dropdown = getDropdownFromTarget(event.target);
-        if (!dropdown || event.touches.length === 0) {
-            lastTouchY = null;
-            return;
-        }
-
-        lastTouchY = event.touches[0].clientY;
-    }, { passive: true, capture: true });
-
-    document.addEventListener('touchmove', (event) => {
-        const dropdown = getDropdownFromTarget(event.target);
-        if (!dropdown || event.touches.length === 0 || lastTouchY === null) {
-            return;
-        }
-
-        const scrollContainer = getScrollContainer(dropdown);
-
-        if (!scrollContainer) {
-            return;
-        }
-
-        const currentTouchY = event.touches[0].clientY;
-        const delta = lastTouchY - currentTouchY;
-
-        if (shouldBlockBoundaryScroll(scrollContainer, delta)) {
-            event.preventDefault();
-        }
-
-        event.stopPropagation();
-
-        lastTouchY = currentTouchY;
-    }, { passive: false, capture: true });
-
-    document.addEventListener('touchend', () => {
-        lastTouchY = null;
-    }, { passive: true, capture: true });
-
-    document.addEventListener('touchcancel', () => {
-        lastTouchY = null;
-    }, { passive: true, capture: true });
-
     applyFilter(currentFilter);
 </script>