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
10 changes: 9 additions & 1 deletion client-app/pages/product.vue
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ const {
isFiltersSidebarVisible,
productsFilters,
applyFilters: _applyFilters,
hideFiltersSidebar,
hideFiltersSidebar: _hideFiltersSidebar,
resetFacetFilters: _resetFacetFilters,
showFiltersSidebar,
} = useProducts({
Expand Down Expand Up @@ -403,6 +403,14 @@ async function resetFacetFilters(): Promise<void> {
void applyFilters(productsFilters.value);
}

function hideFiltersSidebar(): void {
_hideFiltersSidebar();
const variationsFiltersButton = document.getElementById(`${productId.value}-variations-filters-button`);
if (variationsFiltersButton) {
variationsFiltersButton.focus();
}
}

function checkLineItemId() {
const cartItems = cart.value?.items;
return cartItems?.some((item) => item.id === lineItemId);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
>
<ProductsFilters
v-if="localFilters"
:id="productsFiltersId"
:keyword="keywordQueryParam"
:filters="localFilters"
:loading="loading || facetsLoading"
Expand Down Expand Up @@ -96,9 +97,10 @@
<script setup lang="ts">
import cloneDeep from "lodash/cloneDeep";
import isEqual from "lodash/isEqual";
import { watch, ref, computed } from "vue";
import { watch, ref, computed, nextTick, onMounted, onUnmounted } from "vue";
import { usePurchasedBefore } from "@/shared/catalog/composables";
import { useModal } from "@/shared/modal";
import { useComponentId } from "@/ui-kit/composables";
import type { SearchProductFilterResult } from "@/core/api/graphql/types.ts";
import type { ProductsFiltersType } from "@/shared/catalog";
import ProductsFilters from "@/shared/catalog/components/products-filters.vue";
Expand All @@ -124,6 +126,8 @@ interface IProps {
isExistSelectedFacets: boolean;
}

const productsFiltersId = useComponentId("products-filters");

const localFilters = ref<ProductsFiltersType>({
filters: [],
facets: [],
Expand Down Expand Up @@ -159,9 +163,11 @@ watch(

watch(
() => props.isVisible,
(visible) => {
async (visible) => {
if (visible) {
beforeChangeFilterState.value = cloneDeep(props.popupSidebarFilters);
await nextTick();
focusFirstElement();
}
},
);
Expand Down Expand Up @@ -196,6 +202,22 @@ function onApply() {
emit("hidePopupSidebar");
}

function focusFirstElement() {
const firstFocusableElement = document
.getElementById(productsFiltersId)
?.querySelector("input:not(:disabled), button:not(:disabled)");
if (firstFocusableElement && firstFocusableElement instanceof HTMLElement) {
firstFocusableElement.focus();
}
}

function handleKeydown(event: KeyboardEvent) {
if (event.key === "Escape" && props.isVisible) {
event.preventDefault();
emit("hidePopupSidebar");
}
}

const { openModal } = useModal();
function openBranchesModal() {
openModal({
Expand All @@ -213,6 +235,14 @@ function openBranchesModal() {
},
});
}

onMounted(() => {
document.addEventListener("keydown", handleKeydown);
});

onUnmounted(() => {
document.removeEventListener("keydown", handleKeydown);
});
</script>

<style lang="scss">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
/>
</div>

<VcButton variant="outline" @click="$emit('showFilters')">
<VcButton :id="`${productId}-variations-filters-button`" variant="outline" @click="$emit('showFilters')">
{{ $t("common.buttons.filters") }}
</VcButton>
</div>
Expand Down
Loading