Compare commits

..

10 Commits

Author SHA1 Message Date
Jürgen Mummert 97e4f639a0 Use Tom Select CDN major version 2 2026-02-23 21:28:15 +01:00
Jürgen Mummert b714bbeb1b Blur Tom Select only for mouse and touch selection 2026-02-23 21:22:59 +01:00
Jürgen Mummert 21c18f94a0 Improve Tom Select usability and accessibility defaults 2026-02-23 20:54:25 +01:00
Jürgen Mummert 0402c74824 Fix Tom Select input wrapping and restore arrow icon 2026-02-23 20:49:26 +01:00
Jürgen Mummert e3c13c989b Keep Tom Select setup core-only 2026-02-23 20:43:43 +01:00
Jürgen Mummert 15db77186b Add Tom Select arrow and disable input autocomplete 2026-02-23 20:38:21 +01:00
Jürgen Mummert 573d5c12e5 Configure Tom Select placeholders and sortable options 2026-02-23 20:28:50 +01:00
Jürgen Mummert 2bd9f6849c Use Tom Select defaults for event filter 2026-02-23 20:23:23 +01:00
Jürgen Mummert 0e0a888fa9 Replace SlimSelect with Tom Select in event filter 2026-02-23 20:16:40 +01:00
Jürgen Mummert 5d3905632d Fix SlimSelect dropdown scrolling regression 2026-02-23 20:03:08 +01:00
+94 -176
View File
@@ -2,8 +2,8 @@
<div class="select-filters"> <div class="select-filters">
<div class="widget-select category"> <div class="widget-select category">
<label for="tag-filter" class="visually-hidden">Kategorie wählen</label> <label for="tag-filter" class="visually-hidden">Kategorie wählen</label>
<select id="tag-filter"> <select id="tag-filter" placeholder="Kategorie wählen" autocomplete="off">
<option value="all" data-placeholder="true">Kategorie wählen</option> <option value="">Kategorie wählen</option>
{% for tag in tagButtons|default([]) %} {% for tag in tagButtons|default([]) %}
<option value="tag-{{ tag.id }}">{{ tag.title }} ({{ tag.count }})</option> <option value="tag-{{ tag.id }}">{{ tag.title }} ({{ tag.count }})</option>
{% endfor %} {% endfor %}
@@ -12,8 +12,8 @@
<div class="widget-select places"> <div class="widget-select places">
<label for="location-filter" class="visually-hidden">Ort wählen</label> <label for="location-filter" class="visually-hidden">Ort wählen</label>
<select id="location-filter"> <select id="location-filter" placeholder="Ort wählen" autocomplete="off">
<option value="all" data-placeholder="true">Ort wählen</option> <option value="">Ort wählen</option>
{% for location in locations|default([]) %} {% for location in locations|default([]) %}
<option value="location-{{ location.id }}">{{ location.title }} ({{ location.count }})</option> <option value="location-{{ location.id }}">{{ location.title }} ({{ location.count }})</option>
{% endfor %} {% endfor %}
@@ -22,8 +22,8 @@
<div class="widget-select org"> <div class="widget-select org">
<label for="org-filter" class="visually-hidden">Veranstalter wählen</label> <label for="org-filter" class="visually-hidden">Veranstalter wählen</label>
<select id="org-filter"> <select id="org-filter" placeholder="Veranstalter wählen" autocomplete="off">
<option value="all" data-placeholder="true">Veranstalter wählen</option> <option value="">Veranstalter wählen</option>
{% for organization in organizations|default([]) %} {% for organization in organizations|default([]) %}
<option value="org-{{ organization.id }}">{{ organization.title }} ({{ organization.count }})</option> <option value="org-{{ organization.id }}">{{ organization.title }} ({{ organization.count }})</option>
{% endfor %} {% endfor %}
@@ -31,7 +31,7 @@
</div> </div>
</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> <p id="eventfilter-status" class="visually-hidden" aria-live="polite"></p>
</div> </div>
@@ -68,28 +68,36 @@
pointer-events: none; pointer-events: none;
} }
#eventfilters .widget-select.active .ss-main { #eventfilters .widget-select.active .ts-control {
outline: 2px solid currentColor; outline: 3px solid currentColor;
outline-offset: 2px; outline-offset: 3px;
} }
#eventfilters .ss-main:focus-visible { #eventfilters .ts-control:focus-within {
outline: 2px solid currentColor; outline: 3px solid currentColor;
outline-offset: 2px; outline-offset: 3px;
} }
#eventfilters .eventfilter-reset[hidden] { #eventfilters .eventfilter-reset[hidden] {
display: none; display: none;
} }
#eventfilters .ss-content, #eventfilters .ts-wrapper.single .ts-control {
#eventfilters .ss-list { 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");
overscroll-behavior: contain; 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> </style>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/slim-select@3/dist/slimselect.css"> <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/tom-select@2/dist/css/tom-select.css">
<script src="https://cdn.jsdelivr.net/npm/slim-select@3/dist/slimselect.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/tom-select@2/dist/js/tom-select.complete.min.js"></script>
<script type="module"> <script type="module">
const filters = document.getElementById('eventfilters'); const filters = document.getElementById('eventfilters');
@@ -119,28 +127,62 @@
const animationMs = 220; const animationMs = 220;
let hideTimers = new WeakMap(); let hideTimers = new WeakMap();
let currentFilter = { type: 'all', value: 'all' }; let currentFilter = { type: 'all', value: '' };
let suppressedChangeEvents = 0; let suppressedChangeEvents = 0;
const initSlimSelect = (selectElement) => { const initTomSelect = (selectElement) => {
if (!selectElement || 'undefined' === typeof window.SlimSelect) { if (!selectElement || 'undefined' === typeof window.TomSelect) {
return null; return null;
} }
return new window.SlimSelect({ let shouldBlurOnChange = false;
select: selectElement,
settings: { return new window.TomSelect(selectElement, {
showSearch: false, create: false,
allowDeselect: 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 tagTom = initTomSelect(tagSelect);
const locationSlim = initSlimSelect(locationSelect); const locationTom = initTomSelect(locationSelect);
const orgSlim = initSlimSelect(orgSelect); const orgTom = initTomSelect(orgSelect);
const setSelectValue = (selectElement, slimInstance, value) => { const setSelectValue = (selectElement, tomInstance, value) => {
if (!selectElement) { if (!selectElement) {
return; return;
} }
@@ -152,8 +194,8 @@
suppressedChangeEvents += 1; suppressedChangeEvents += 1;
try { try {
if (slimInstance) { if (tomInstance) {
slimInstance.setSelected(value); tomInstance.setValue(value, true);
} else { } else {
selectElement.value = value; selectElement.value = value;
} }
@@ -195,9 +237,9 @@
}; };
const setActiveControl = ({ type, value }) => { const setActiveControl = ({ type, value }) => {
const hasActiveTag = type === 'tag' && value !== 'all'; const hasActiveTag = type === 'tag' && Boolean(value);
const hasActiveLocation = type === 'location' && value !== 'all'; const hasActiveLocation = type === 'location' && Boolean(value);
const hasActiveOrg = type === 'org' && value !== 'all'; const hasActiveOrg = type === 'org' && Boolean(value);
tagWidget?.classList.toggle('active', hasActiveTag); tagWidget?.classList.toggle('active', hasActiveTag);
locationWidget?.classList.toggle('active', hasActiveLocation); locationWidget?.classList.toggle('active', hasActiveLocation);
@@ -214,7 +256,7 @@
.filter(Boolean); .filter(Boolean);
const matches = (eventItem, filterState) => { const matches = (eventItem, filterState) => {
if (filterState.value === 'all') { if (!filterState.value || filterState.type === 'all') {
return true; return true;
} }
@@ -230,10 +272,6 @@
return parseIdList(eventItem.dataset.org).includes(filterState.value); return parseIdList(eventItem.dataset.org).includes(filterState.value);
} }
if (filterState.type === 'all') {
return true;
}
return true; return true;
}; };
@@ -285,12 +323,12 @@
const selectedValue = tagSelect.value; const selectedValue = tagSelect.value;
setSelectValue(locationSelect, locationSlim, 'all'); setSelectValue(locationSelect, locationTom, '');
setSelectValue(orgSelect, orgSlim, 'all'); setSelectValue(orgSelect, orgTom, '');
applyFilter( applyFilter(
selectedValue === 'all' !selectedValue
? { type: 'all', value: 'all' } ? { type: 'all', value: '' }
: { type: 'tag', value: selectedValue.replace('tag-', '') }, : { type: 'tag', value: selectedValue.replace('tag-', '') },
); );
}); });
@@ -302,12 +340,12 @@
const selectedValue = locationSelect.value; const selectedValue = locationSelect.value;
setSelectValue(tagSelect, tagSlim, 'all'); setSelectValue(tagSelect, tagTom, '');
setSelectValue(orgSelect, orgSlim, 'all'); setSelectValue(orgSelect, orgTom, '');
applyFilter( applyFilter(
selectedValue === 'all' !selectedValue
? { type: 'all', value: 'all' } ? { type: 'all', value: '' }
: { type: 'location', value: selectedValue.replace('location-', '') }, : { type: 'location', value: selectedValue.replace('location-', '') },
); );
}); });
@@ -319,143 +357,23 @@
const selectedValue = orgSelect.value; const selectedValue = orgSelect.value;
setSelectValue(tagSelect, tagSlim, 'all'); setSelectValue(tagSelect, tagTom, '');
setSelectValue(locationSelect, locationSlim, 'all'); setSelectValue(locationSelect, locationTom, '');
applyFilter( applyFilter(
selectedValue === 'all' !selectedValue
? { type: 'all', value: 'all' } ? { type: 'all', value: '' }
: { type: 'org', value: selectedValue.replace('org-', '') }, : { type: 'org', value: selectedValue.replace('org-', '') },
); );
}); });
resetButton?.addEventListener('click', () => { resetButton?.addEventListener('click', () => {
setSelectValue(tagSelect, tagSlim, 'all'); setSelectValue(tagSelect, tagTom, '');
setSelectValue(locationSelect, locationSlim, 'all'); setSelectValue(locationSelect, locationTom, '');
setSelectValue(orgSelect, orgSlim, 'all'); 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 getOpenDropdown = () => {
const openContent = document.querySelector('.ss-content.ss-open');
if (openContent) {
return openContent;
}
const openMain = document.querySelector('.ss-main.ss-open');
if (!openMain) {
return null;
}
const scope = openMain.parentElement || document;
return scope.querySelector('.ss-content');
};
const getScrollContainer = (targetDropdown) => {
const openDropdown = getOpenDropdown();
if (!openDropdown) {
return null;
}
if (!targetDropdown) {
return openDropdown;
}
const contentContainer = targetDropdown.closest('.ss-content');
return contentContainer || openDropdown;
};
const shouldBlockBoundaryScroll = (scrollContainer, delta) => {
if (!scrollContainer) {
return false;
}
if (scrollContainer.scrollHeight <= scrollContainer.clientHeight) {
return true;
}
if (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);
const scrollContainer = getScrollContainer(dropdown);
if (!scrollContainer) {
return;
}
if (shouldBlockBoundaryScroll(scrollContainer, event.deltaY)) {
event.preventDefault();
}
event.stopPropagation();
}, { passive: false, capture: true });
document.addEventListener('touchstart', (event) => {
const dropdown = getDropdownFromTarget(event.target);
const scrollContainer = getScrollContainer(dropdown);
if (!scrollContainer || 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);
const scrollContainer = getScrollContainer(dropdown);
if (!scrollContainer || event.touches.length === 0 || lastTouchY === null) {
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); applyFilter(currentFilter);
</script> </script>