WS-1674 Implement Temporary UX Solution for Portrait Video Promo Display on Index Pages #13432
+488
−69
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,4 +10,4 @@ | |
| export const VARIANCE = 5; | ||
|
|
||
| export const MIN_SIZE = 916; | ||
| export const MAX_SIZE = 1269; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,15 @@ | ||
| /** @jsx jsx */ | ||
| /* @jsxFrag React.Fragment */ | ||
| import React, { | ||
| Fragment, | ||
| PropsWithChildren, | ||
| useState, | ||
| use, | ||
| useEffect, | ||
| } from 'react'; | ||
| import { Global, jsx, useTheme } from '@emotion/react'; | ||
| import { Helmet } from 'react-helmet'; | ||
| import useImageColour from '#app/hooks/useImageColour'; | ||
| import styles from './index.styles'; | ||
| import { RequestContext } from '../../contexts/RequestContext'; | ||
| import { HOME_PAGE } from '../../routes/utils/pageTypes'; | ||
|
|
@@ -27,6 +34,7 @@ export type ImageProps = { | |
| fetchPriority?: 'high'; | ||
| hasCaption?: boolean; | ||
| isPortraitOrientation?: boolean; | ||
| isCurationPromo?: boolean; | ||
| }; | ||
|
|
||
| const roundNumber = (num: number) => Math.round(num * 100) / 100; | ||
|
|
@@ -56,9 +64,32 @@ const Image = ({ | |
| fetchPriority, | ||
| hasCaption, | ||
| isPortraitOrientation, | ||
| isCurationPromo, | ||
| }: PropsWithChildren<ImageProps>) => { | ||
| const { pageType, isLite, isAmp } = use(RequestContext); | ||
| const [isLoaded, setIsLoaded] = useState(false); | ||
| const [isPortrait, setIsPortrait] = useState(true); | ||
emilysaffron marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| const imgRef = React.useRef<HTMLImageElement | null>(null); | ||
|
|
||
| useEffect(() => { | ||
| const img = imgRef.current; | ||
| if (img?.complete) { | ||
| setIsPortrait(img.naturalHeight > img.naturalWidth); | ||
| setIsLoaded(true); | ||
| } | ||
| }, []); | ||
emilysaffron marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| const { | ||
| palette: { GREY_8 }, | ||
| } = useTheme(); | ||
|
|
||
| const { isLoading, colour } = useImageColour(src, { | ||
| fallbackColour: GREY_8, | ||
| minimumContrast: 0, | ||
| contrastColour: '#ffffff', | ||
emilysaffron marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| paletteSize: 10, | ||
emilysaffron marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| }); | ||
|
|
||
| if (isLite) return null; | ||
|
|
||
| const showPlaceholder = placeholder && !isLoaded; | ||
|
|
@@ -164,8 +195,25 @@ const Image = ({ | |
| /> | ||
| </> | ||
| )} | ||
| {isPortrait && isCurationPromo && ( | ||
| <div | ||
| css={[ | ||
| styles.gradientBackground, | ||
| { | ||
| background: colour | ||
| ? `linear-gradient(200deg,rgba(${colour.rgb.join(',')}, 0.6) 0%, #180109 54%, #180109 90%)` | ||
| : `linear-gradient(200deg, ${GREY_8} 0%, #180109 54%, #180109 90%)`, | ||
emilysaffron marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| }, | ||
| ]} | ||
| /> | ||
| )} | ||
| <img | ||
| ref={imgRef} | ||
| onLoad={e => { | ||
| const img = e.currentTarget; | ||
| setIsPortrait(img.naturalHeight > img.naturalWidth); | ||
| setIsLoaded(true); | ||
| }} | ||
| src={src} | ||
| {...(srcSet && { srcSet: imgSrcSet })} | ||
| {...(imgSizes && { sizes: imgSizes })} | ||
|
|
@@ -174,10 +222,21 @@ const Image = ({ | |
| width={width} | ||
| height={height} | ||
| css={[ | ||
| isPortrait && isCurationPromo | ||
| ? styles.portraitImage | ||
| : styles.image, | ||
| hasFixedAspectRatio | ||
| ? styles.imageFixedAspectRatio | ||
| : styles.imageResponsiveRatio, | ||
| isCurationPromo && | ||
| !isLoading && { | ||
| [`@supports (filter: blur(15px))`]: { | ||
| background: `rgba(${colour?.rgb?.join(',')}, 0.62)`, | ||
| }, | ||
| }, | ||
|
Contributor
There was a problem hiding this comment. I agree with Aaron on making a separate component for this as I'm not 100% sure about having these changes in our native image component for this "temporary" fix. It feels like the colour stuff should be encapsulated within it's own component to prevent any accidental re-rendering or other side effects. This feels more permanent than temporary. Is there something simpler we could do like just having a black background across the board? If we stick with the isPortrait mechanism, we should probably align the API we have already for the orientation value that we use on media players, to make it a lil more consistent. Maybe we do a huddle on this to discuss our options? |
||
| isCurationPromo && { | ||
| background: `rgb(${colour?.rgb?.join(',')})`, | ||
| }, | ||
emilysaffron marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| ]} | ||
| fetchPriority={fetchPriority} | ||
| style={{ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.