Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fix disappearing product variants while clicking #42

Merged
merged 2 commits into from
Oct 23, 2024
Merged

fix: Fix disappearing product variants while clicking #42

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74ade8b
Fix disappearing product variants
soniaklimas Oct 23, 2024
856e9c9
Improve if condition
soniaklimas Oct 23, 2024
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
112 changes: 55 additions & 57 deletions apps/storefront/src/app/[locale]/(main)/products/[slug]/components/variant-selector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const generateFullAttributeMap = (variants: ProductVariant[]) => {
type: Attribute["type"];
values: AttributeValue[];
}) => {
if (slug && values) {
if (slug && values?.length > 0) {
const attributeMatch = selectionAttributesMap.find(
(attribute) => attribute.slug === slug,
);
Expand Down Expand Up @@ -303,64 +303,62 @@ export const VariantSelector = ({
<p className="pb-6 pt-2">{getPrice()}</p>

<div className="[&>div]:pb-4" key={selectedVariantId}>
{selectionAttributesMap
.filter(({ values }) => values.length > 0)
.map(({ slug, name, values }, index) => {
const arePreviousAttributesSelected =
index < selectedAttributes.length + 1;
const hasValues = values.length > 0;

if (!(arePreviousAttributesSelected && hasValues)) {
return null;
{selectionAttributesMap.map(({ slug, name, values }, index) => {
const arePreviousAttributesSelected =
index < selectedAttributes.length + 1;
const hasValues = values.length > 0;

if (!(arePreviousAttributesSelected && hasValues)) {
return null;
}

const defaultValue = selectedAttributes.find((val) => {
if (val.slug === slug) {
return values.some((v) => v.slug === val.value);
}

const defaultValue = selectedAttributes.find((val) => {
if (val.slug === slug) {
return values.some((v) => v.slug === val.value);
}

return false;
})?.value;

return (
<div key={slug} className="flex flex-col gap-1.5">
<Label id={`label-${slug}`}>{name}</Label>
<ToggleGroup
type="single"
defaultValue={defaultValue}
className="grid grid-cols-2 md:grid-cols-3"
aria-labelledby={t("products.label-slug", { slug })}
onValueChange={(valueSlug) => {
setVariants([]);
setSelectedVariantId("");
setSelectedAttributes((values) => {
if (index < values.length - 1) {
// Undo if someone selects one of the previous attribute.
values.splice(index, values.length - index, {
slug,
value: valueSlug,
});
} else if (valueSlug) {
// Insert new attribute choice.
values.splice(index, 1, { slug, value: valueSlug });
} else {
// Replace current attribute choice.
values.splice(index, 1);
}

return [...values];
});
}}
>
{values.map(({ slug, name }) => (
<ToggleGroupItem variant="outline" key={slug} value={slug}>
{name}
</ToggleGroupItem>
))}
</ToggleGroup>
</div>
);
})}
return false;
})?.value;

return (
<div key={slug} className="flex flex-col gap-1.5">
<Label id={`label-${slug}`}>{name}</Label>
<ToggleGroup
type="single"
defaultValue={defaultValue}
className="grid grid-cols-2 md:grid-cols-3"
aria-labelledby={t("products.label-slug", { slug })}
onValueChange={(valueSlug) => {
setVariants([]);
setSelectedVariantId("");
setSelectedAttributes((values) => {
if (index < values.length - 1) {
// Undo if someone selects one of the previous attribute.
values.splice(index, values.length - index, {
slug,
value: valueSlug,
});
} else if (valueSlug) {
// Insert new attribute choice.
values.splice(index, 1, { slug, value: valueSlug });
} else {
// Replace current attribute choice.
values.splice(index, 1);
}

return [...values];
});
}}
>
{values.map(({ slug, name }) => (
<ToggleGroupItem variant="outline" key={slug} value={slug}>
{name}
</ToggleGroupItem>
))}
</ToggleGroup>
</div>
);
})}

<div className="flex flex-col gap-1.5">
<VariantDropdown
Expand Down