Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 30 additions & 18 deletions js/ui/form/filter.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,33 +38,45 @@ const initFilters = ({ container, pictures, onChange }) => {
throw new Error('Filter container not found');
}

const filterFormElement = container.querySelector('.img-filters__form');
const filterButtonElements = filterFormElement ?
[...filterFormElement.querySelectorAll('.img-filters__button')] :
[];

if (!filterFormElement || filterButtonElements.length === 0) {
throw new Error('Filter buttons not found');
}

let currentFilter = Filter.DEFAULT;
let activeButtonElement = filterFormElement.querySelector('.img-filters__button--active');

container.classList.remove('img-filters--inactive');

container.addEventListener('click', (evt) => {
const button = evt.target.closest('.img-filters__button');
if (!button) {
return;
}

const newFilter = button.id;
filterButtonElements.forEach((buttonElement) => {
buttonElement.addEventListener('click', (evt) => {
evt.preventDefault();

if (newFilter === currentFilter) {
return;
}
const button = evt.currentTarget;
if (!(button instanceof HTMLButtonElement)) {
return;
}

const activeButton = container.querySelector('.img-filters__button--active');
if (activeButton) {
activeButton.classList.remove('img-filters__button--active');
}
const newFilter = button.id;
if (newFilter === currentFilter) {
return;
}

button.classList.add('img-filters__button--active');
if (activeButtonElement) {
activeButtonElement.classList.remove('img-filters__button--active');
}

currentFilter = newFilter;
button.classList.add('img-filters__button--active');
activeButtonElement = button;
currentFilter = newFilter;

const filtered = filterPictures(pictures, currentFilter);
onChange(filtered);
const filtered = filterPictures(pictures, currentFilter);
onChange(filtered);
});
});
};

Expand Down
2 changes: 2 additions & 0 deletions js/ui/form/modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ const fileField = form.querySelector('.img-upload__input');
let onCloseCallback = null;

const showModal = () => {
hashtagField.disabled = false;
commentField.disabled = false;
overlay.classList.remove('hidden');
body.classList.add('modal-open');
document.addEventListener('keydown', onDocumentKeydown);
Expand Down
Loading