Blur Tom Select only for mouse and touch selection

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 %}
@@ -31,7 +31,7 @@
         </div>
     </div>
 
-    <button type="button" id="eventfilter-reset" class="eventfilter-reset" hidden>Filter zurücksetzen</button>
+    <button type="button" id="eventfilter-reset" class="eventfilter-reset" aria-label="Alle Filter zurücksetzen" aria-controls="{{ targetEventListId|default('eventlist')|e('html_attr') }}" hidden>Filter zurücksetzen</button>
 
     <p id="eventfilter-status" class="visually-hidden" aria-live="polite"></p>
 </div>
@@ -68,23 +68,36 @@
         pointer-events: none;
     }
 
-    #eventfilters .widget-select.active .ss-main {
-        outline: 2px solid currentColor;
-        outline-offset: 2px;
+    #eventfilters .widget-select.active .ts-control {
+        outline: 3px solid currentColor;
+        outline-offset: 3px;
     }
 
-    #eventfilters .ss-main:focus-visible {
-        outline: 2px solid currentColor;
-        outline-offset: 2px;
+    #eventfilters .ts-control:focus-within {
+        outline: 3px solid currentColor;
+        outline-offset: 3px;
     }
 
     #eventfilters .eventfilter-reset[hidden] {
         display: none;
     }
+
+    #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;
+    }
+
 </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');
@@ -114,28 +127,62 @@
 
     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,
+        let shouldBlurOnChange = false;
+
+        return new window.TomSelect(selectElement, {
+            create: false,
+            sortField: {
+                field: 'text',
+                direction: 'asc',
+            },
+            render: {
+                no_results() {
+                    return '<div class="no-results" role="option" aria-disabled="true">Keine Ergebnisse gefunden</div>';
+                },
+                no_more_results() {
+                    return '<div class="no-more-results" role="option" aria-disabled="true">Keine weiteren Ergebnisse</div>';
+                },
+            },
+            onInitialize() {
+                const markPointerInteraction = () => {
+                    shouldBlurOnChange = true;
+                };
+
+                const markKeyboardInteraction = () => {
+                    shouldBlurOnChange = false;
+                };
+
+                this.control.addEventListener('pointerdown', markPointerInteraction);
+                this.control.addEventListener('touchstart', markPointerInteraction, { passive: true });
+                this.control.addEventListener('keydown', markKeyboardInteraction);
+                this.dropdown.addEventListener('pointerdown', markPointerInteraction);
+                this.dropdown.addEventListener('touchstart', markPointerInteraction, { passive: true });
+                this.dropdown.addEventListener('keydown', markKeyboardInteraction);
+            },
+            onChange() {
+                if (!shouldBlurOnChange) {
+                    return;
+                }
+
+                this.blur();
+                shouldBlurOnChange = false;
             },
         });
     };
 
-    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;
         }
@@ -147,8 +194,8 @@
         suppressedChangeEvents += 1;
 
         try {
-            if (slimInstance) {
-                slimInstance.setSelected(value);
+            if (tomInstance) {
+                tomInstance.setValue(value, true);
             } else {
                 selectElement.value = value;
             }
@@ -190,9 +237,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);
@@ -209,7 +256,7 @@
         .filter(Boolean);
 
     const matches = (eventItem, filterState) => {
-        if (filterState.value === 'all') {
+        if (!filterState.value || filterState.type === 'all') {
             return true;
         }
 
@@ -225,10 +272,6 @@
             return parseIdList(eventItem.dataset.org).includes(filterState.value);
         }
 
-        if (filterState.type === 'all') {
-            return true;
-        }
-
         return true;
     };
 
@@ -280,12 +323,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-', '') },
         );
     });
@@ -297,12 +340,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-', '') },
         );
     });
@@ -314,22 +357,22 @@
 
         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: '' });
     });
 
     applyFilter(currentFilter);

src/EventListener/OrganizationListingTemplateDataListener.php

@@ -55,16 +55,10 @@ class OrganizationListingTemplateDataListener
         $organizationTagMap = $this->fetchOrganizationTagMap($organizationIds);
         $organizationLogoUuidMap = $this->fetchOrganizationLogoUuidMap($organizationIds);
 
-        $organizationTagIdsMap = [];
         $organizationTagLabelMap = [];
-        $rowTagIdsMap = [];
         $rowTagIdsList = [];
 
-        foreach ($organizationTagMap as $organizationId => $tagData) {
-            if ([] !== ($tagData['ids'] ?? [])) {
-                $organizationTagIdsMap[(string) $organizationId] = implode(',', $tagData['ids']);
-            }
-
+        foreach ($organizationTagMap as $tagData) {
             foreach (($tagData['ids'] ?? []) as $index => $tagId) {
                 $label = trim((string) (($tagData['labels'][$index] ?? '') ?: ''));
 
@@ -79,26 +73,15 @@ class OrganizationListingTemplateDataListener
                 continue;
             }
 
-            $tagData = $organizationTagMap[$organizationId] ?? ['ids' => [], 'labels' => [], 'slugs' => []];
+            $tagData = $organizationTagMap[$organizationId] ?? ['ids' => [], 'labels' => []];
             $logoUuid = $organizationLogoUuidMap[$organizationId] ?? '';
             $tagIdsCsv = implode(',', $tagData['ids']);
             $tagLabelsCsv = implode(', ', $tagData['labels']);
-            $tagSlugsCsv = implode(',', $tagData['slugs']);
 
             $tbody[$rowIndex]['tag_ids']['content'] = $tagIdsCsv;
             $tbody[$rowIndex]['tag_labels']['content'] = $tagLabelsCsv;
-            $tbody[$rowIndex]['tag_slugs']['content'] = $tagSlugsCsv;
             $tbody[$rowIndex]['tags']['content'] = $tagLabelsCsv;
 
-            $tbody[$rowIndex]['tag_ids'] = $tagIdsCsv;
-            $tbody[$rowIndex]['tag_labels'] = $tagLabelsCsv;
-            $tbody[$rowIndex]['tag_slugs'] = $tagSlugsCsv;
-            $tbody[$rowIndex]['tags'] = $tagLabelsCsv;
-
-            if ('' !== $tagIdsCsv) {
-                $rowTagIdsMap[(string) $rowIndex] = $tagIdsCsv;
-            }
-
             if ('' !== $logoUuid) {
                 $tbody[$rowIndex]['logo_uuid']['content'] = $logoUuid;
             }
@@ -119,7 +102,7 @@ class OrganizationListingTemplateDataListener
         if (null !== $this->logger) {
             $rowsWithoutTagIds = 0;
 
-            foreach ($rowToOrganizationIdMap as $rowIndex => $organizationId) {
+            foreach ($rowToOrganizationIdMap as $organizationId) {
                 if (!isset($organizationTagMap[$organizationId]) || [] === ($organizationTagMap[$organizationId]['ids'] ?? [])) {
                     ++$rowsWithoutTagIds;
                 }
@@ -135,9 +118,7 @@ class OrganizationListingTemplateDataListener
             }
         }
 
-        $template->organization_tag_ids_map = $organizationTagIdsMap;
         $template->organization_tag_label_map = $organizationTagLabelMap;
-        $template->organization_row_tag_ids_map = $rowTagIdsMap;
         $template->organization_row_tag_ids_list = $rowTagIdsList;
 
         $template->tbody = $tbody;
@@ -229,7 +210,7 @@ class OrganizationListingTemplateDataListener
     }
 
     /** @param list<int> $organizationIds
-     *  @return array<int, array{ids: list<string>, labels: list<string>, slugs: list<string>}>
+     *  @return array<int, array{ids: list<string>, labels: list<string>}>
      */
     private function fetchOrganizationTagMap(array $organizationIds): array
     {
@@ -237,46 +218,25 @@ class OrganizationListingTemplateDataListener
             return [];
         }
 
-        $scope = $this->resolveTagRelationScope($organizationIds);
-
-        $conditions = ['r.pid IN (?)'];
-        $params = [$organizationIds];
-        $types = [ArrayParameterType::INTEGER];
-
-        if ('' === $scope['ptable']) {
-            $conditions[] = "(r.ptable = '' OR r.ptable IS NULL)";
-        } else {
-            $conditions[] = 'r.ptable = ?';
-            $params[] = $scope['ptable'];
-            $types[] = ParameterType::STRING;
-        }
-
-        if ('' === $scope['field']) {
-            $conditions[] = "(r.field = '' OR r.field IS NULL)";
-        } else {
-            $conditions[] = 'r.field = ?';
-            $params[] = $scope['field'];
-            $types[] = ParameterType::STRING;
-        }
-
         $rows = $this->connection->executeQuery(
-            'SELECT r.pid AS organization_id, r.tag_id, t.tag AS label FROM tl_tags_rel r INNER JOIN tl_tags t ON t.id = r.tag_id WHERE '.implode(' AND ', $conditions).' ORDER BY r.pid ASC, r.tag_id ASC',
-            $params,
-            $types,
+            'SELECT r.pid AS organization_id, r.tag_id, t.tag AS label
+             FROM tl_tags_rel r
+             INNER JOIN tl_tags t ON t.id = r.tag_id
+             WHERE r.ptable = ? AND r.field = ? AND r.pid IN (?)
+             ORDER BY r.pid ASC, r.tag_id ASC',
+            ['tl_organization', 'tags', $organizationIds],
+            [ParameterType::STRING, ParameterType::STRING, ArrayParameterType::INTEGER],
         )->fetchAllAssociative();
 
-        if ([] === $rows && '' !== $scope['field']) {
-            $fieldFreeConditions = array_values(array_filter($conditions, static fn (string $condition): bool => 'r.field = ?' !== $condition));
-            $fieldFreeParams = $params;
-            $fieldFreeTypes = $types;
-
-            array_pop($fieldFreeParams);
-            array_pop($fieldFreeTypes);
-
+        if ([] === $rows) {
             $rows = $this->connection->executeQuery(
-                'SELECT r.pid AS organization_id, r.tag_id, t.tag AS label FROM tl_tags_rel r INNER JOIN tl_tags t ON t.id = r.tag_id WHERE '.implode(' AND ', $fieldFreeConditions).' ORDER BY r.pid ASC, r.tag_id ASC',
-                $fieldFreeParams,
-                $fieldFreeTypes,
+                'SELECT r.pid AS organization_id, r.tag_id, t.tag AS label
+                 FROM tl_tags_rel r
+                 INNER JOIN tl_tags t ON t.id = r.tag_id
+                 WHERE r.ptable = ? AND r.pid IN (?)
+                 ORDER BY r.pid ASC, r.tag_id ASC',
+                ['tl_organization', $organizationIds],
+                [ParameterType::STRING, ArrayParameterType::INTEGER],
             )->fetchAllAssociative();
         }
 
@@ -295,62 +255,16 @@ class OrganizationListingTemplateDataListener
             $seen[$organizationId][$tagId] = true;
             $map[$organizationId]['ids'][] = (string) $tagId;
             $map[$organizationId]['labels'][] = $label;
-
-            $slug = $this->slugify($label);
-
-            if ('' !== $slug) {
-                $map[$organizationId]['slugs'][] = $slug;
-            }
         }
 
         foreach ($map as $organizationId => $tagData) {
             $map[$organizationId]['ids'] = array_values(array_unique($tagData['ids'] ?? []));
             $map[$organizationId]['labels'] = array_values(array_unique($tagData['labels'] ?? []));
-            $map[$organizationId]['slugs'] = array_values(array_unique($tagData['slugs'] ?? []));
         }
 
         return $map;
     }
 
-    /** @param list<int> $organizationIds
-     *  @return array{ptable: string, field: string}
-     */
-    private function resolveTagRelationScope(array $organizationIds): array
-    {
-        $rows = $this->connection->executeQuery(
-            "SELECT COALESCE(NULLIF(TRIM(r.ptable), ''), '') AS ptable_scope, COALESCE(NULLIF(TRIM(r.field), ''), '') AS field_scope, COUNT(DISTINCT r.pid) AS pid_count, COUNT(*) AS rel_count FROM tl_tags_rel r WHERE r.pid IN (?) GROUP BY COALESCE(NULLIF(TRIM(r.ptable), ''), ''), COALESCE(NULLIF(TRIM(r.field), ''), '') ORDER BY pid_count DESC, rel_count DESC",
-            [$organizationIds],
-            [ArrayParameterType::INTEGER],
-        )->fetchAllAssociative();
-
-        if ([] === $rows) {
-            return ['ptable' => 'tl_organization', 'field' => 'tags'];
-        }
-
-        foreach ($rows as $row) {
-            if ('tl_organization' === (string) ($row['ptable_scope'] ?? '') && 'tags' === (string) ($row['field_scope'] ?? '')) {
-                return ['ptable' => 'tl_organization', 'field' => 'tags'];
-            }
-        }
-
-        foreach ($rows as $row) {
-            if ('tl_organization' === (string) ($row['ptable_scope'] ?? '')) {
-                return ['ptable' => 'tl_organization', 'field' => (string) ($row['field_scope'] ?? '')];
-            }
-        }
-
-        foreach ($rows as $row) {
-            if ('tags' === (string) ($row['field_scope'] ?? '')) {
-                return ['ptable' => (string) ($row['ptable_scope'] ?? ''), 'field' => 'tags'];
-            }
-        }
-
-        return [
-            'ptable' => (string) ($rows[0]['ptable_scope'] ?? 'tl_organization'),
-            'field' => (string) ($rows[0]['field_scope'] ?? 'tags'),
-        ];
-    }
-
     /** @param list<int> $organizationIds
      *  @return array<int, string>
      */
@@ -409,24 +323,4 @@ class OrganizationListingTemplateDataListener
         return '';
     }
 
-    private function slugify(string $value): string
-    {
-        $value = trim(mb_strtolower($value));
-
-        if ('' === $value) {
-            return '';
-        }
-
-        $value = strtr($value, [
-            'ä' => 'ae',
-            'ö' => 'oe',
-            'ü' => 'ue',
-            'ß' => 'ss',
-        ]);
-
-        $value = preg_replace('/[^a-z0-9]+/u', '-', $value) ?? '';
-        $value = trim($value, '-');
-
-        return $value;
-    }
 }