Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b714bbeb1b | |||
| 21c18f94a0 | |||
| 0402c74824 | |||
| e3c13c989b | |||
| 15db77186b | |||
| 573d5c12e5 | |||
| 2bd9f6849c |
@@ -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>
|
||||
@@ -69,22 +69,31 @@
|
||||
}
|
||||
|
||||
#eventfilters .widget-select.active .ts-control {
|
||||
outline: 2px solid currentColor;
|
||||
outline-offset: 2px;
|
||||
outline: 3px solid currentColor;
|
||||
outline-offset: 3px;
|
||||
}
|
||||
|
||||
#eventfilters .ts-control:focus-within {
|
||||
outline: 2px solid currentColor;
|
||||
outline-offset: 2px;
|
||||
outline: 3px solid currentColor;
|
||||
outline-offset: 3px;
|
||||
}
|
||||
|
||||
#eventfilters .eventfilter-reset[hidden] {
|
||||
display: none;
|
||||
}
|
||||
|
||||
#eventfilters .ts-dropdown-content {
|
||||
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;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/tom-select@2.4.3/dist/css/tom-select.css">
|
||||
@@ -118,7 +127,7 @@
|
||||
|
||||
const animationMs = 220;
|
||||
let hideTimers = new WeakMap();
|
||||
let currentFilter = { type: 'all', value: 'all' };
|
||||
let currentFilter = { type: 'all', value: '' };
|
||||
let suppressedChangeEvents = 0;
|
||||
|
||||
const initTomSelect = (selectElement) => {
|
||||
@@ -126,14 +135,46 @@
|
||||
return null;
|
||||
}
|
||||
|
||||
let shouldBlurOnChange = false;
|
||||
|
||||
return new window.TomSelect(selectElement, {
|
||||
create: false,
|
||||
maxItems: 1,
|
||||
closeAfterSelect: true,
|
||||
allowEmptyOption: true,
|
||||
searchField: [],
|
||||
controlInput: null,
|
||||
dropdownParent: selectElement.closest('.widget-select') || undefined,
|
||||
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;
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
@@ -196,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);
|
||||
@@ -215,7 +256,7 @@
|
||||
.filter(Boolean);
|
||||
|
||||
const matches = (eventItem, filterState) => {
|
||||
if (filterState.value === 'all') {
|
||||
if (!filterState.value || filterState.type === 'all') {
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -231,10 +272,6 @@
|
||||
return parseIdList(eventItem.dataset.org).includes(filterState.value);
|
||||
}
|
||||
|
||||
if (filterState.type === 'all') {
|
||||
return true;
|
||||
}
|
||||
|
||||
return true;
|
||||
};
|
||||
|
||||
@@ -286,12 +323,12 @@
|
||||
|
||||
const selectedValue = tagSelect.value;
|
||||
|
||||
setSelectValue(locationSelect, locationTom, 'all');
|
||||
setSelectValue(orgSelect, orgTom, 'all');
|
||||
setSelectValue(locationSelect, locationTom, '');
|
||||
setSelectValue(orgSelect, orgTom, '');
|
||||
|
||||
applyFilter(
|
||||
selectedValue === 'all'
|
||||
? { type: 'all', value: 'all' }
|
||||
!selectedValue
|
||||
? { type: 'all', value: '' }
|
||||
: { type: 'tag', value: selectedValue.replace('tag-', '') },
|
||||
);
|
||||
});
|
||||
@@ -303,12 +340,12 @@
|
||||
|
||||
const selectedValue = locationSelect.value;
|
||||
|
||||
setSelectValue(tagSelect, tagTom, 'all');
|
||||
setSelectValue(orgSelect, orgTom, 'all');
|
||||
setSelectValue(tagSelect, tagTom, '');
|
||||
setSelectValue(orgSelect, orgTom, '');
|
||||
|
||||
applyFilter(
|
||||
selectedValue === 'all'
|
||||
? { type: 'all', value: 'all' }
|
||||
!selectedValue
|
||||
? { type: 'all', value: '' }
|
||||
: { type: 'location', value: selectedValue.replace('location-', '') },
|
||||
);
|
||||
});
|
||||
@@ -320,125 +357,23 @@
|
||||
|
||||
const selectedValue = orgSelect.value;
|
||||
|
||||
setSelectValue(tagSelect, tagTom, 'all');
|
||||
setSelectValue(locationSelect, locationTom, '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, tagTom, 'all');
|
||||
setSelectValue(locationSelect, locationTom, 'all');
|
||||
setSelectValue(orgSelect, orgTom, '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('.ts-dropdown-content, .ts-dropdown');
|
||||
};
|
||||
|
||||
const getScrollContainer = (targetDropdown) => {
|
||||
if (!targetDropdown) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (targetDropdown.scrollHeight > targetDropdown.clientHeight) {
|
||||
return targetDropdown;
|
||||
}
|
||||
|
||||
const dropdownContent = targetDropdown.classList.contains('ts-dropdown-content')
|
||||
? targetDropdown
|
||||
: targetDropdown.querySelector('.ts-dropdown-content');
|
||||
|
||||
if (dropdownContent && dropdownContent.scrollHeight > dropdownContent.clientHeight) {
|
||||
return dropdownContent;
|
||||
}
|
||||
|
||||
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>
|
||||
|
||||
Reference in New Issue
Block a user