Skip to content

Commit

Permalink
feat(web): Generic List - Stop date from taking up space if it is not…
Browse files Browse the repository at this point in the history
… present (#17188)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
  • Loading branch information
RunarVestmann and kodiakhq[bot] authored Dec 10, 2024
1 parent 22c5b52 commit 818f74e
Showing 1 changed file with 47 additions and 20 deletions.
67 changes: 47 additions & 20 deletions apps/web/components/GenericList/GenericList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
GridColumn,
GridContainer,
GridRow,
Hyphen,
Icon,
type IconProps,
Inline,
Expand Down Expand Up @@ -85,9 +86,11 @@ export const NonClickableItem = ({ item }: ItemProps) => {
<Stack space={3}>
<Stack space={0}>
<Stack space={0}>
<Text variant="eyebrow" color="purple400">
{item.date && format(new Date(item.date), 'dd.MM.yyyy')}
</Text>
{item.date && (
<Text variant="eyebrow" color="purple400">
{format(new Date(item.date), 'dd.MM.yyyy')}
</Text>
)}
<Text variant="h3" as="span" color="dark400">
{item.title}
</Text>
Expand Down Expand Up @@ -153,24 +156,48 @@ export const ClickableItem = ({ item, baseUrl }: ClickableItemProps) => {
<Stack space={3}>
<Box width="full">
<Box width="full">
<Box className={styles.clickableItemTopRowContainer}>
<Inline space={2} justifyContent="spaceBetween">
<Text variant="eyebrow" color="purple400">
{item.date && format(new Date(item.date), 'dd.MM.yyyy')}
{item.date && (
<Box className={styles.clickableItemTopRowContainer}>
<Inline space={2} justifyContent="spaceBetween">
<Text variant="eyebrow" color="purple400">
{format(new Date(item.date), 'dd.MM.yyyy')}
</Text>
{icon && (
<Icon
size="medium"
type="outline"
color="blue400"
icon={icon}
/>
)}
</Inline>
</Box>
)}
<GridRow>
<GridColumn
span={
!item.date && icon
? ['10/12', '10/12', '10/12', '10/12', '11/12']
: '1/1'
}
>
<Text variant="h3" as="span" color="blue400">
<Hyphen>{item.title}</Hyphen>
</Text>
{icon && (
<Icon
size="medium"
type="outline"
color="blue400"
icon={icon}
/>
)}
</Inline>
</Box>
<Text variant="h3" as="span" color="blue400">
{item.title}
</Text>
</GridColumn>
{!item.date && icon && (
<GridColumn span={['2/12', '2/12', '2/12', '2/12', '1/12']}>
<Box display="flex" justifyContent="flexEnd">
<Icon
size="medium"
type="outline"
color="blue400"
icon={icon}
/>
</Box>
</GridColumn>
)}
</GridRow>
</Box>
{item.cardIntro?.length > 0 && (
<Box>{webRichText(item.cardIntro ?? [])}</Box>
Expand Down

0 comments on commit 818f74e

Please sign in to comment.