Compare commits

...

2 Commits

Author SHA1 Message Date
Jürgen Mummert 8aa09e893b Switch event filter selects back to native controls 2026-02-24 17:46:25 +01:00
Jürgen Mummert ac203b37ce Persist event filter state across reload and navigation 2026-02-23 21:54:27 +01:00
+120 -74
View File
@@ -68,12 +68,12 @@
pointer-events: none; pointer-events: none;
} }
#eventfilters .widget-select.active .ts-control { #eventfilters .widget-select.active select {
outline: 3px solid currentColor; outline: 3px solid currentColor;
outline-offset: 3px; outline-offset: 3px;
} }
#eventfilters .ts-control:focus-within { #eventfilters select:focus-visible {
outline: 3px solid currentColor; outline: 3px solid currentColor;
outline-offset: 3px; outline-offset: 3px;
} }
@@ -82,23 +82,8 @@
display: none; 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> </style>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/tom-select@2/dist/css/tom-select.css">
<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');
@@ -124,65 +109,118 @@
const orgWidget = orgSelect?.closest('.widget-select'); const orgWidget = orgSelect?.closest('.widget-select');
const resetButton = filters.querySelector('#eventfilter-reset'); const resetButton = filters.querySelector('#eventfilter-reset');
const status = filters.querySelector('#eventfilter-status'); const status = filters.querySelector('#eventfilter-status');
const stateStorageKey = 'event-filter-state';
const stateQueryKey = 'event_filter';
const animationMs = 220; const animationMs = 220;
let hideTimers = new WeakMap(); let hideTimers = new WeakMap();
let currentFilter = { type: 'all', value: '' }; let currentFilter = { type: 'all', value: '' };
let suppressedChangeEvents = 0; let suppressedChangeEvents = 0;
const initTomSelect = (selectElement) => { const hasOptionValue = (selectElement, value) => {
if (!selectElement || 'undefined' === typeof window.TomSelect) { if (!selectElement) {
return null; return false;
} }
let shouldBlurOnChange = false; return Array.from(selectElement.options).some((option) => option.value === value);
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 = () => { const rawValueToFilterState = (rawValue) => {
shouldBlurOnChange = false; const value = (rawValue || '').trim();
};
this.control.addEventListener('pointerdown', markPointerInteraction); if (!value) {
this.control.addEventListener('touchstart', markPointerInteraction, { passive: true }); return { type: 'all', value: '' };
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(); if (value.startsWith('tag-') && hasOptionValue(tagSelect, value)) {
shouldBlurOnChange = false; return { type: 'tag', value: value.replace('tag-', '') };
}, }
});
if (value.startsWith('location-') && hasOptionValue(locationSelect, value)) {
return { type: 'location', value: value.replace('location-', '') };
}
if (value.startsWith('org-') && hasOptionValue(orgSelect, value)) {
return { type: 'org', value: value.replace('org-', '') };
}
return { type: 'all', value: '' };
}; };
const tagTom = initTomSelect(tagSelect); const filterStateToRawValue = (filterState) => {
const locationTom = initTomSelect(locationSelect); if (!filterState.value || filterState.type === 'all') {
const orgTom = initTomSelect(orgSelect); return '';
}
const setSelectValue = (selectElement, tomInstance, value) => { if (filterState.type === 'tag') {
return `tag-${filterState.value}`;
}
if (filterState.type === 'location') {
return `location-${filterState.value}`;
}
if (filterState.type === 'org') {
return `org-${filterState.value}`;
}
return '';
};
const readUrlState = () => {
const url = new URL(window.location.href);
return (url.searchParams.get(stateQueryKey) || '').trim();
};
const writeUrlState = (value) => {
const url = new URL(window.location.href);
if (value) {
url.searchParams.set(stateQueryKey, value);
} else {
url.searchParams.delete(stateQueryKey);
}
window.history.replaceState(window.history.state, '', url);
};
const readStoredState = () => {
try {
return (window.sessionStorage.getItem(stateStorageKey) || '').trim();
} catch (error) {
return '';
}
};
const writeStoredState = (value) => {
try {
if (value) {
window.sessionStorage.setItem(stateStorageKey, value);
} else {
window.sessionStorage.removeItem(stateStorageKey);
}
} catch (error) {
// noop
}
};
const syncState = (filterState) => {
const rawValue = filterStateToRawValue(filterState);
writeStoredState(rawValue);
writeUrlState(rawValue);
};
const applyControlState = (filterState) => {
const tagValue = filterState.type === 'tag' ? `tag-${filterState.value}` : '';
const locationValue = filterState.type === 'location' ? `location-${filterState.value}` : '';
const orgValue = filterState.type === 'org' ? `org-${filterState.value}` : '';
setSelectValue(tagSelect, tagValue);
setSelectValue(locationSelect, locationValue);
setSelectValue(orgSelect, orgValue);
};
const setSelectValue = (selectElement, value) => {
if (!selectElement) { if (!selectElement) {
return; return;
} }
@@ -194,11 +232,7 @@
suppressedChangeEvents += 1; suppressedChangeEvents += 1;
try { try {
if (tomInstance) {
tomInstance.setValue(value, true);
} else {
selectElement.value = value; selectElement.value = value;
}
} finally { } finally {
queueMicrotask(() => { queueMicrotask(() => {
suppressedChangeEvents = Math.max(0, suppressedChangeEvents - 1); suppressedChangeEvents = Math.max(0, suppressedChangeEvents - 1);
@@ -314,6 +348,7 @@
}); });
updateStatus(filterState); updateStatus(filterState);
syncState(filterState);
}; };
tagSelect?.addEventListener('change', () => { tagSelect?.addEventListener('change', () => {
@@ -323,8 +358,8 @@
const selectedValue = tagSelect.value; const selectedValue = tagSelect.value;
setSelectValue(locationSelect, locationTom, ''); setSelectValue(locationSelect, '');
setSelectValue(orgSelect, orgTom, ''); setSelectValue(orgSelect, '');
applyFilter( applyFilter(
!selectedValue !selectedValue
@@ -340,8 +375,8 @@
const selectedValue = locationSelect.value; const selectedValue = locationSelect.value;
setSelectValue(tagSelect, tagTom, ''); setSelectValue(tagSelect, '');
setSelectValue(orgSelect, orgTom, ''); setSelectValue(orgSelect, '');
applyFilter( applyFilter(
!selectedValue !selectedValue
@@ -357,8 +392,8 @@
const selectedValue = orgSelect.value; const selectedValue = orgSelect.value;
setSelectValue(tagSelect, tagTom, ''); setSelectValue(tagSelect, '');
setSelectValue(locationSelect, locationTom, ''); setSelectValue(locationSelect, '');
applyFilter( applyFilter(
!selectedValue !selectedValue
@@ -368,12 +403,23 @@
}); });
resetButton?.addEventListener('click', () => { resetButton?.addEventListener('click', () => {
setSelectValue(tagSelect, tagTom, ''); setSelectValue(tagSelect, '');
setSelectValue(locationSelect, locationTom, ''); setSelectValue(locationSelect, '');
setSelectValue(orgSelect, orgTom, ''); setSelectValue(orgSelect, '');
applyFilter({ type: 'all', value: '' }); applyFilter({ type: 'all', value: '' });
}); });
applyFilter(currentFilter); const urlState = readUrlState();
const storedState = readStoredState();
const initialState = rawValueToFilterState(urlState || storedState);
applyControlState(initialState);
applyFilter(initialState);
window.addEventListener('popstate', () => {
const stateFromUrl = rawValueToFilterState(readUrlState());
applyControlState(stateFromUrl);
applyFilter(stateFromUrl);
});
</script> </script>