Skip to content

Commit 8bdf8c3

Browse files
committed
Add camera and video icon to galleries caption
1 parent fb04714 commit 8bdf8c3

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

dotcom-rendering/src/components/Caption.tsx

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ type Props = {
3535

3636
type IconProps = {
3737
format: ArticleFormat;
38+
isMainMedia: boolean;
3839
};
3940

4041
const captionStyle = (isMainMedia: boolean) => css`
@@ -169,8 +170,10 @@ const hideIconBelowLeftCol = css`
169170
const pictureRatio = (13 / 18) * 100;
170171
const videoRatio = (23 / 36) * 100;
171172

172-
const iconStyle = css`
173-
fill: ${palette('--caption-text')};
173+
const iconStyle = (format: ArticleFormat, isMainMedia: boolean) => css`
174+
fill: ${format.design === ArticleDesign.Gallery && isMainMedia
175+
? palette('--caption-main-media-text')
176+
: palette('--caption-text')};
174177
margin-right: ${space[1]}px;
175178
display: inline-block;
176179
position: relative;
@@ -236,13 +239,12 @@ const galleryStyles = css`
236239
}
237240
`;
238241

239-
const CameraIcon = ({ format }: IconProps) => {
242+
const CameraIcon = ({ format, isMainMedia }: IconProps) => {
240243
return (
241244
<span
242245
css={[
243-
iconStyle,
244-
(format.display === ArticleDisplay.Immersive ||
245-
format.design === ArticleDesign.Gallery) &&
246+
iconStyle(format, isMainMedia),
247+
format.display === ArticleDisplay.Immersive &&
246248
hideIconBelowLeftCol,
247249
]}
248250
>
@@ -251,11 +253,11 @@ const CameraIcon = ({ format }: IconProps) => {
251253
);
252254
};
253255

254-
const VideoIcon = ({ format }: IconProps) => {
256+
const VideoIcon = ({ format, isMainMedia }: IconProps) => {
255257
return (
256258
<span
257259
css={[
258-
iconStyle,
260+
iconStyle(format, isMainMedia),
259261
format.display === ArticleDisplay.Immersive &&
260262
hideIconBelowLeftCol,
261263
videoIconStyle,
@@ -307,9 +309,9 @@ export const Caption = ({
307309
data-spacefinder-role="inline"
308310
>
309311
{mediaType === 'Video' ? (
310-
<VideoIcon format={format} />
312+
<VideoIcon format={format} isMainMedia={isMainMedia} />
311313
) : (
312-
<CameraIcon format={format} />
314+
<CameraIcon format={format} isMainMedia={isMainMedia} />
313315
)}
314316
{!!captionText && (
315317
<span

0 commit comments

Comments
 (0)