From b718bf627b69482ef6021ffe665f91f9e9f6e8f7 Mon Sep 17 00:00:00 2001 From: HarveyPeachey Date: Tue, 18 Feb 2025 15:14:44 +0000 Subject: [PATCH 1/4] replaces childwrapper targetting method --- .../Curation/CurationGrid/index.styles.tsx | 4 ---- .../Curation/CurationPromo/index.styles.ts | 6 ++++++ src/app/components/Curation/CurationPromo/index.tsx | 1 + src/app/legacy/components/Promo/image.jsx | 12 ++++++++++-- src/app/legacy/components/Promo/media-icon.jsx | 2 +- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/app/components/Curation/CurationGrid/index.styles.tsx b/src/app/components/Curation/CurationGrid/index.styles.tsx index f93860b14ae..bd6781afb06 100644 --- a/src/app/components/Curation/CurationGrid/index.styles.tsx +++ b/src/app/components/Curation/CurationGrid/index.styles.tsx @@ -13,10 +13,6 @@ const styles = { width: '100%', paddingInlineStart: 0, }, - - '[class*="ChildWrapper" i]': { - position: 'relative', - }, }, }), }), diff --git a/src/app/components/Curation/CurationPromo/index.styles.ts b/src/app/components/Curation/CurationPromo/index.styles.ts index 773c001388b..24924946165 100644 --- a/src/app/components/Curation/CurationPromo/index.styles.ts +++ b/src/app/components/Curation/CurationPromo/index.styles.ts @@ -9,4 +9,10 @@ export default { }, }), }), + image: ({ isLite }: Theme) => + css({ + ...(isLite && { + position: 'relative', + }), + }), }; diff --git a/src/app/components/Curation/CurationPromo/index.tsx b/src/app/components/Curation/CurationPromo/index.tsx index 7b03da57c2a..d1b6eef3f0a 100644 --- a/src/app/components/Curation/CurationPromo/index.tsx +++ b/src/app/components/Curation/CurationPromo/index.tsx @@ -55,6 +55,7 @@ const CurationPromo = ({ alt={imageAlt} lazyLoad={lazy} isAmp={isAmp} + css={styles.image} > {isMedia && ( diff --git a/src/app/legacy/components/Promo/image.jsx b/src/app/legacy/components/Promo/image.jsx index 8d824ad0a34..5a89d4d8b83 100644 --- a/src/app/legacy/components/Promo/image.jsx +++ b/src/app/legacy/components/Promo/image.jsx @@ -58,7 +58,13 @@ const createSizes = (useLargeImages, isProgrammeImage) => { }; const Image = props => { - const { children = null, src, useLargeImages = false, ...rest } = props; + const { + children = null, + src, + useLargeImages = false, + className, + ...rest + } = props; const isProgrammeImage = src.startsWith( 'https://ichef.bbci.co.uk/images/ic/', ); @@ -83,7 +89,9 @@ const Image = props => { sizes={sizes} aspectRatio={[16, 9]} /> - {children && {children}} + {children && ( + {children} + )} ); }; diff --git a/src/app/legacy/components/Promo/media-icon.jsx b/src/app/legacy/components/Promo/media-icon.jsx index 97de63f155b..6d8a1172aed 100644 --- a/src/app/legacy/components/Promo/media-icon.jsx +++ b/src/app/legacy/components/Promo/media-icon.jsx @@ -51,8 +51,8 @@ const MediaIcon = ({