Compare commits

..

1 Commits

Author SHA1 Message Date
Jürgen Mummert 993b3aa774 Prevent recursive select change loops in event filter 2026-02-22 12:50:35 +01:00
+105 -54
View File
@@ -1,17 +1,19 @@
<div id="eventfilters" data-eventlist-id="{{ targetEventListId|default('eventlist')|e('html_attr') }}"> <div id="eventfilters" data-eventlist-id="{{ targetEventListId|default('eventlist')|e('html_attr') }}">
<div class="tag-buttons"> <div class="select-filters">
<button type="button" data-filter-tag="all" class="active" aria-pressed="true">Alle</button> <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>
{% for tag in tagButtons|default([]) %} {% for tag in tagButtons|default([]) %}
<button type="button" data-filter-tag="{{ tag.id }}" aria-pressed="false">{{ tag.title }} ({{ tag.count }})</button> <option value="tag-{{ tag.id }}">{{ tag.title }} ({{ tag.count }})</option>
{% endfor %} {% endfor %}
</select>
</div> </div>
<div class="select-filters">
<div class="widget-select places"> <div class="widget-select places">
<label for="location-filter" class="visually-hidden">Orte:</label> <label for="location-filter" class="visually-hidden">Ort wählen</label>
<select id="location-filter"> <select id="location-filter">
<option value="all">Orte</option> <option value="all" data-placeholder="true">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 %}
@@ -19,9 +21,9 @@
</div> </div>
<div class="widget-select org"> <div class="widget-select org">
<label for="org-filter" class="visually-hidden">Veranstalter:</label> <label for="org-filter" class="visually-hidden">Veranstalter wählen</label>
<select id="org-filter"> <select id="org-filter">
<option value="all">Veranstalter</option> <option value="all" data-placeholder="true">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 %}
@@ -64,19 +66,19 @@
pointer-events: none; pointer-events: none;
} }
#eventfilters .active, #eventfilters .widget-select.active .ss-main {
#eventfilters select.active {
outline: 2px solid currentColor; outline: 2px solid currentColor;
outline-offset: 2px; outline-offset: 2px;
} }
#eventfilters button:focus-visible, #eventfilters .ss-main:focus-visible {
#eventfilters select:focus-visible {
outline: 2px solid currentColor; outline: 2px solid currentColor;
outline-offset: 2px; outline-offset: 2px;
} }
</style> </style>
<script src="https://cdn.jsdelivr.net/npm/slim-select@3/dist/slimselect.min.js"></script>
<script type="module"> <script type="module">
const filters = document.getElementById('eventfilters'); const filters = document.getElementById('eventfilters');
@@ -94,16 +96,60 @@
list?.classList.add('event-filter-target-list'); list?.classList.add('event-filter-target-list');
const events = list ? Array.from(list.querySelectorAll(':scope > .event')) : []; const events = list ? Array.from(list.querySelectorAll(':scope > .event')) : [];
const tagButtons = Array.from(filters.querySelectorAll('button[data-filter-tag]')); const tagSelect = filters.querySelector('#tag-filter');
const locationSelect = filters.querySelector('#location-filter'); const locationSelect = filters.querySelector('#location-filter');
const orgSelect = filters.querySelector('#org-filter'); const orgSelect = filters.querySelector('#org-filter');
const tagWidget = tagSelect?.closest('.widget-select');
const locationWidget = locationSelect?.closest('.widget-select'); const locationWidget = locationSelect?.closest('.widget-select');
const orgWidget = orgSelect?.closest('.widget-select'); const orgWidget = orgSelect?.closest('.widget-select');
const status = filters.querySelector('#eventfilter-status'); const status = filters.querySelector('#eventfilter-status');
const animationMs = 220; const animationMs = 220;
let hideTimers = new WeakMap(); let hideTimers = new WeakMap();
let currentFilter = { type: 'tag', value: 'all' }; let currentFilter = { type: 'all', value: 'all' };
let suppressedChangeEvents = 0;
const initSlimSelect = (selectElement) => {
if (!selectElement || 'undefined' === typeof window.SlimSelect) {
return null;
}
return new window.SlimSelect({
select: selectElement,
settings: {
showSearch: false,
allowDeselect: false,
},
});
};
const tagSlim = initSlimSelect(tagSelect);
const locationSlim = initSlimSelect(locationSelect);
const orgSlim = initSlimSelect(orgSelect);
const setSelectValue = (selectElement, slimInstance, value) => {
if (!selectElement) {
return;
}
if (selectElement.value === value) {
return;
}
suppressedChangeEvents += 1;
try {
if (slimInstance) {
slimInstance.setSelected(value);
} else {
selectElement.value = value;
}
} finally {
queueMicrotask(() => {
suppressedChangeEvents = Math.max(0, suppressedChangeEvents - 1);
});
}
};
const clearHideTimer = (eventItem) => { const clearHideTimer = (eventItem) => {
const timer = hideTimers.get(eventItem); const timer = hideTimers.get(eventItem);
@@ -136,21 +182,13 @@
}; };
const setActiveControl = ({ type, value }) => { const setActiveControl = ({ type, value }) => {
tagButtons.forEach((button) => { const hasActiveTag = type === 'tag' && value !== 'all';
const isActive = type === 'tag' && button.dataset.filterTag === value; const hasActiveLocation = type === 'location' && value !== 'all';
button.classList.toggle('active', isActive); const hasActiveOrg = type === 'org' && value !== 'all';
button.setAttribute('aria-pressed', isActive ? 'true' : 'false');
});
if (locationSelect) { tagWidget?.classList.toggle('active', hasActiveTag);
locationSelect.classList.toggle('active', type === 'location'); locationWidget?.classList.toggle('active', hasActiveLocation);
locationWidget?.classList.toggle('active', type === 'location'); orgWidget?.classList.toggle('active', hasActiveOrg);
}
if (orgSelect) {
orgSelect.classList.toggle('active', type === 'org');
orgWidget?.classList.toggle('active', type === 'org');
}
}; };
const parseIdList = (rawValue) => (rawValue ?? '') const parseIdList = (rawValue) => (rawValue ?? '')
@@ -175,6 +213,10 @@
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;
}; };
@@ -186,9 +228,9 @@
const visibleCount = events.filter((eventItem) => !eventItem.hidden).length; const visibleCount = events.filter((eventItem) => !eventItem.hidden).length;
let filterText = 'alle'; let filterText = 'alle';
if (filterState.type === 'tag' && filterState.value !== 'all') { if (filterState.type === 'tag' && tagSelect) {
const activeButton = tagButtons.find((button) => button.dataset.filterTag === filterState.value); const option = tagSelect.options[tagSelect.selectedIndex];
filterText = activeButton ? activeButton.textContent.trim() : `Tag ${filterState.value}`; filterText = option ? option.textContent.trim() : 'Kategorie wählen';
} }
if (filterState.type === 'location' && locationSelect) { if (filterState.type === 'location' && locationSelect) {
@@ -219,44 +261,53 @@
updateStatus(filterState); updateStatus(filterState);
}; };
tagButtons.forEach((button) => { tagSelect?.addEventListener('change', () => {
button.addEventListener('click', () => { if (suppressedChangeEvents > 0) {
if (locationSelect) { return;
locationSelect.value = 'all';
} }
if (orgSelect) { const selectedValue = tagSelect.value;
orgSelect.value = 'all';
}
applyFilter({ type: 'tag', value: button.dataset.filterTag ?? 'all' }); setSelectValue(locationSelect, locationSlim, 'all');
}); setSelectValue(orgSelect, orgSlim, 'all');
});
locationSelect?.addEventListener('change', () => {
const selectedValue = locationSelect.value;
if (orgSelect) {
orgSelect.value = 'all';
}
applyFilter( applyFilter(
selectedValue === 'all' selectedValue === 'all'
? { type: 'tag', value: 'all' } ? { type: 'all', value: 'all' }
: { type: 'tag', value: selectedValue.replace('tag-', '') },
);
});
locationSelect?.addEventListener('change', () => {
if (suppressedChangeEvents > 0) {
return;
}
const selectedValue = locationSelect.value;
setSelectValue(tagSelect, tagSlim, 'all');
setSelectValue(orgSelect, orgSlim, 'all');
applyFilter(
selectedValue === 'all'
? { type: 'all', value: 'all' }
: { type: 'location', value: selectedValue.replace('location-', '') }, : { type: 'location', value: selectedValue.replace('location-', '') },
); );
}); });
orgSelect?.addEventListener('change', () => { orgSelect?.addEventListener('change', () => {
if (suppressedChangeEvents > 0) {
return;
}
const selectedValue = orgSelect.value; const selectedValue = orgSelect.value;
if (locationSelect) { setSelectValue(tagSelect, tagSlim, 'all');
locationSelect.value = 'all'; setSelectValue(locationSelect, locationSlim, 'all');
}
applyFilter( applyFilter(
selectedValue === 'all' selectedValue === 'all'
? { type: 'tag', value: 'all' } ? { type: 'all', value: 'all' }
: { type: 'org', value: selectedValue.replace('org-', '') }, : { type: 'org', value: selectedValue.replace('org-', '') },
); );
}); });