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: (tiles) Fix content tile description #30

Merged
merged 1 commit into from
Nov 21, 2024
Merged

fix: (tiles) Fix content tile description #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions lib/components/atoms/BaseTile/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,14 @@ const BaseTileHeader: FC<{ children?: ReactNode }> = ({ children }) => {

const BaseTileMedia: FC<ImagePropsNoSource> = (props) => {
const tile = useTileContext();
const { artworkUrl, title, body } = tile.configuration as ContentTileConfig;
const { artworkUrl, title, description } =
tile.configuration as ContentTileConfig;
const { isHalfSize } = useTileSize(tile);

if (!artworkUrl) return null;

const hasTitle = !!title;
const hasDescription = !!body;
const hasDescription = !!description;

return (
<ProgressiveImage
Expand Down Expand Up @@ -204,14 +205,14 @@ const BaseTileTitle: FC = () => {

const BaseTileBody: FC = (props) => {
const tile = useTileContext();
const { body, artworkUrl } = tile.configuration as ContentTileConfig;
const { description, artworkUrl } = tile.configuration as ContentTileConfig;
const { isHalfSize } = useTileSize(tile);

if ((isHalfSize && artworkUrl) || !body) return null;
if ((isHalfSize && artworkUrl) || !description) return null;

return (
<Text variant="body" {...props} accessibilityLabel={body}>
{body}
<Text variant="body" {...props} accessibilityLabel={description}>
{description}
</Text>
);
};
Expand Down
13 changes: 7 additions & 6 deletions lib/components/organisms/ContentTile/ContentTile.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ FullSizeImageAndText.args = {
priority: 1,
configuration: {
title: 'Welcome Nick!',
body: 'Lorem ipsum dolor sit amet',
description: 'Lorem ipsum dolor sit amet',
artworkUrl:
'https://images.pexels.com/photos/1362534/pexels-photo-1362534.jpeg',
},
Expand Down Expand Up @@ -63,7 +63,7 @@ FullSizeTextOnly.args = {
priority: 1,
configuration: {
title: 'Welcome Nick!',
body: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.',
description: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.',
},
},
};
Expand All @@ -79,7 +79,8 @@ FullSizeTextOnlyLongBody.args = {
priority: 1,
configuration: {
title: 'Welcome Nick!',
body: 'Lorem ipsum dolor, sit amet consectetur adipisicing elit. Molestias sequi non accusamus veniam iste? Aut assumenda explicabo, beatae, vero illum, saepe perspiciatis soluta tempora consequuntur ipsa voluptates. Placeat, libero! Omnis!',
description:
'Lorem ipsum dolor, sit amet consectetur adipisicing elit. Molestias sequi non accusamus veniam iste? Aut assumenda explicabo, beatae, vero illum, saepe perspiciatis soluta tempora consequuntur ipsa voluptates. Placeat, libero! Omnis!',
},
},
};
Expand Down Expand Up @@ -113,7 +114,7 @@ HalfSizeTextOnly.args = {
priority: 1,
configuration: {
title: 'Welcome Nick!',
body: 'Lorem ipsum dolor sit amet',
description: 'Lorem ipsum dolor sit amet',
},
},
};
Expand All @@ -130,7 +131,7 @@ HalfSizeTextOnlyWithLink.args = {
priority: 1,
configuration: {
title: 'Welcome Nick!',
body: 'Lorem ipsum dolor sit amet',
description: 'Lorem ipsum dolor sit amet',
ctaLink: 'https://www.google.com',
ctaLinkTarget: CTALinkTarget.sameWindow,
},
Expand All @@ -149,7 +150,7 @@ FullSizeWithLink.args = {
priority: 1,
configuration: {
title: 'Welcome Nick!',
body: 'Click here to learn more',
description: 'Click here to learn more',
artworkUrl:
'https://images.pexels.com/photos/1362534/pexels-photo-1362534.jpeg',
ctaLink: 'https://www.google.com',
Expand Down
2 changes: 1 addition & 1 deletion lib/types/tile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export class PointsTileConfig {

export class ContentTileConfig {
title?: string | null;
body?: string | null;
description?: string | null;
artworkUrl?: string | null;
ctaLinkTarget?: CTALinkTarget;
ctaLink?: string | null;
Expand Down