Skip to content

Commit cc94e43

Browse files
committed
Fix extraneous arrow showing on home page if Meta 2 is empty string
1 parent 08ac8ee commit cc94e43

File tree

1 file changed

+55
-43
lines changed

1 file changed

+55
-43
lines changed

frontend/src/pages/home-page.tsx

Lines changed: 55 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -368,49 +368,61 @@ export const CategoryList: React.FC<{}> = () => {
368368
</Group>
369369
}
370370
contentInsideCollapse={meta2.map(
371-
([meta2display, categories]) => (
372-
<div
373-
key={meta2display}
374-
id={slugify(meta1display + meta2display)}
375-
>
376-
<CollapseWrapper
377-
title={
378-
<Title order={3} my="sm">
379-
{meta2display}
380-
</Title>
381-
}
382-
contentOutsideCollapse={
383-
<Group>
384-
{isAdmin && (
385-
<EditMeta2
386-
oldMeta2={meta2display}
387-
meta1={meta1display}
388-
onChange={onChange}
389-
/>
390-
)}
391-
</Group>
392-
}
393-
contentInsideCollapse={
394-
<Grid>
395-
{categories.map(category => (
396-
<CategoryCard
397-
category={category}
398-
key={category.slug}
399-
className={fadeClasses.fadeInOrder}
400-
onFavouriteToggle={onFavouriteToggle}
401-
/>
402-
))}
403-
</Grid>
404-
}
405-
is_collapsed={() =>
406-
is_collapsed(meta1display + meta2display)
407-
}
408-
collapse_expand={() =>
409-
collapse_expand(meta1display + meta2display)
410-
}
411-
/>
412-
</div>
413-
),
371+
([meta2display, categories]) =>
372+
meta2display === "" ? (
373+
<Grid key={meta2display}>
374+
{categories.map(category => (
375+
<CategoryCard
376+
category={category}
377+
key={category.slug}
378+
className={fadeClasses.fadeInOrder}
379+
onFavouriteToggle={onFavouriteToggle}
380+
/>
381+
))}
382+
</Grid>
383+
) : (
384+
<div
385+
key={meta2display}
386+
id={slugify(meta1display + meta2display)}
387+
>
388+
<CollapseWrapper
389+
title={
390+
<Title order={3} my="sm">
391+
{meta2display}
392+
</Title>
393+
}
394+
contentOutsideCollapse={
395+
<Group>
396+
{isAdmin && (
397+
<EditMeta2
398+
oldMeta2={meta2display}
399+
meta1={meta1display}
400+
onChange={onChange}
401+
/>
402+
)}
403+
</Group>
404+
}
405+
contentInsideCollapse={
406+
<Grid>
407+
{categories.map(category => (
408+
<CategoryCard
409+
category={category}
410+
key={category.slug}
411+
className={fadeClasses.fadeInOrder}
412+
onFavouriteToggle={onFavouriteToggle}
413+
/>
414+
))}
415+
</Grid>
416+
}
417+
is_collapsed={() =>
418+
is_collapsed(meta1display + meta2display)
419+
}
420+
collapse_expand={() =>
421+
collapse_expand(meta1display + meta2display)
422+
}
423+
/>
424+
</div>
425+
),
414426
)}
415427
is_collapsed={() => is_collapsed(meta1display)}
416428
collapse_expand={() => collapse_expand(meta1display)}

0 commit comments

Comments
 (0)