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

Jump to bottom

feat(MediaCard): add top icon support #824

Merged
merged 12 commits into from
Jul 28, 2023
Merged

feat(MediaCard): add top icon support #824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ce14917
feat(PTIECBC03-4665): media-card circle
thiagoaraujo-tlf Jul 18, 2023
6b3511d
fix: switch name from icon to asset
gabrielmarquesini-tlf Jul 19, 2023
ebbb6ac
fix: prettier executed in component story
gabrielmarquesini-tlf Jul 19, 2023
f8e5a89
feat: asset props in media card playroom
gabrielmarquesini-tlf Jul 20, 2023
518abbd
fix: resolving conflicting files
gabrielmarquesini-tlf Jul 20, 2023
c34aa8d
Merge branch 'master' into media-card-circle-component
gabrielmarquesini-tlf Jul 21, 2023
fb2824c
Merge branch 'master' into media-card-circle-component
gabrielmarquesini-tlf Jul 24, 2023
80be765
fix: switch name from asset to icon
gabrielmarquesini-tlf Jul 24, 2023
f5498ff
fix: media card padding when closing
gabrielmarquesini-tlf Jul 24, 2023
02fa71b
fix: media card screenshot test
gabrielmarquesini-tlf Jul 24, 2023
1917d9b
Merge branch 'master' into media-card-circle-component
gabrielmarquesini-tlf Jul 24, 2023
b1d3d00
fix: media card icon padding on desktop
gabrielmarquesini-tlf Jul 26, 2023
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
2 changes: 2 additions & 0 deletions playroom/snippets.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,7 @@ const cardSnippets: Array<Snippet> = [
title="Title"
subtitle="Subtitle"
description="Description"
icon={<Avatar size={40} src="https://source.unsplash.com/600x600/?face" />}
extra={<Placeholder />}
button={
<ButtonPrimary small onPress={() => {}}>
Expand All @@ -635,6 +636,7 @@ const cardSnippets: Array<Snippet> = [
title="Title"
subtitle="Subtitle"
description="Description"
icon={<Avatar size={40} src="https://source.unsplash.com/600x600/?face" />}
extra={<Placeholder />}
button={
<ButtonPrimary small onPress={() => {}}>
Expand Down
Binary file modified .../__image_snapshots__/media-card-screenshot-test-tsx-media-card-group-1-snap.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions src/__stories__/media-card-story.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@ import {
Image,
Tag,
IconMobileDeviceRegular,
Circle,
skinVars,
} from '..';
import ResponsiveLayout from '../responsive-layout';
import {Placeholder} from '../placeholder';
import tennisImg from './images/tennis.jpg';
import confettiVideo from './videos/confetti.mp4';
import avatarImg from './images/avatar.jpg';

import type {TagType} from '..';

Expand All @@ -26,6 +29,7 @@ const VIDEO_SRC = confettiVideo;
const IMAGE_SRC = tennisImg;

type Args = {
asset: 'icon' | 'circle + icon' | 'image' | 'circle + image';
media: 'image' | 'video';
headlineType: TagType;
headline: string;
Expand All @@ -51,7 +55,19 @@ export const Default: StoryComponent<Args> = ({
closable,
withTopAction,
media,
asset,
}) => {
let icon;
if (asset === 'circle + icon') {
icon = (
<Circle size={40} backgroundColor={skinVars.colors.brandLow}>
<IconMobileDeviceRegular color={skinVars.colors.brand} />
</Circle>
);
} else if (asset === 'circle + image') {
icon = <Circle size={40} backgroundImage={avatarImg} />;
}

const button = actions.includes('button') ? (
<ButtonPrimary small href="https://google.com">
Action
Expand Down Expand Up @@ -79,6 +95,7 @@ export const Default: StoryComponent<Args> = ({
title={title}
subtitle={subtitle}
description={description}
icon={icon}
media={
media === 'video' ? (
<Video src={VIDEO_SRC} aspectRatio="16:9" dataAttributes={{qsysid: 'video'}} />
Expand Down Expand Up @@ -108,6 +125,7 @@ export const Default: StoryComponent<Args> = ({

Default.storyName = 'Media card';
Default.args = {
asset: 'icon',
media: 'image',
headlineType: 'promo',
headline: 'Priority',
Expand All @@ -121,6 +139,10 @@ Default.args = {
withTopAction: false,
};
Default.argTypes = {
asset: {
options: ['circle + icon', 'circle + image', 'none'],
control: {type: 'select'},
},
media: {
options: ['image', 'video'],
control: {type: 'select'},
Expand Down
7 changes: 7 additions & 0 deletions src/card.css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,13 @@ export const mediaCardContent = style([
},
]);

export const mediaCardIcon = style([
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If icon get changed to Asset will need to change here too.

{
position: 'absolute',
zIndex: 1,
},
]);

export const nakedCardContent = style([
sprinkles({
display: 'flex',
Expand Down
11 changes: 11 additions & 0 deletions src/card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,7 @@ interface MediaCardBaseProps {
subtitle?: string;
subtitleLinesMax?: number;
description?: string;
icon?: React.ReactElement;
descriptionLinesMax?: number;
extra?: React.ReactNode;
actions?: Array<CardAction>;
Expand Down Expand Up @@ -469,6 +470,7 @@ export const MediaCard = React.forwardRef<HTMLDivElement, MediaCardProps>(
title,
titleLinesMax,
description,
icon,
descriptionLinesMax,
extra,
actions,
Expand Down Expand Up @@ -516,6 +518,15 @@ export const MediaCard = React.forwardRef<HTMLDivElement, MediaCardProps>(
buttonLink={buttonLink}
/>
</div>
{icon && (
<Box
className={styles.mediaCardIcon}
paddingLeft={{mobile: 16, desktop: 24}}
paddingTop={{mobile: 16, desktop: 24}}
>
{icon}
</Box>
)}
</div>
</BaseTouchable>
</Boxed>
Expand Down
Loading