This repository has been archived by the owner on Aug 13, 2023. It is now read-only.
Add primaryMimeType and fallbackMimeType props to psammead-image
#4608
There are no files selected for viewing
This file contains 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 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 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 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 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 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 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 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 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 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 | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -32,13 +32,45 @@ const StyledImg = styled.img` | |||||||||
| width: 100%; | ||||||||||
| `; | ||||||||||
|
|
||||||||||
| const getMimeType = srcset => { | ||||||||||
| if (!srcset) return null; | ||||||||||
|
|
||||||||||
| const firstSrcsetUrl = srcset.split(',')[0].split(' ')[0]; | ||||||||||
|
There was a problem hiding this comment.
Suggested change
This reads a bit more clearly imo. The main bit is we need to be a bit defensive if the src set is invalid, so null or contains an unexpected format. I believe if the srcset was invalid in this way the page would not render at all with the code as it is; I'd write a test to cover this eventuality. I'd agree with @jroebu14 that this logic may be better to be in Simorgh, is that where the srcset is constructed; you could pass the mime type in as a prop? There was a problem hiding this comment. I'll move this logic over to Simorgh and pass through the mime-types as props for each of the srcsets |
||||||||||
| const urlFileExtension = firstSrcsetUrl.split('.').pop(); | ||||||||||
|
|
||||||||||
| switch (urlFileExtension) { | ||||||||||
| case 'webp': | ||||||||||
| return 'image/webp'; | ||||||||||
| case 'jpg': | ||||||||||
| case 'jpeg': | ||||||||||
| return 'image/jpeg'; | ||||||||||
| case 'png': | ||||||||||
| return 'image/png'; | ||||||||||
| case 'gif': | ||||||||||
| return 'image/gif'; | ||||||||||
| default: | ||||||||||
| return null; | ||||||||||
|
There was a problem hiding this comment. don't we support the There was a problem hiding this comment.
|
||||||||||
| } | ||||||||||
| }; | ||||||||||
|
|
||||||||||
| export const Img = props => { | ||||||||||
| const { src, srcset, fallbackSrcset, onLoad, ...otherProps } = props; | ||||||||||
|
|
||||||||||
| const primaryMimeType = getMimeType(srcset); | ||||||||||
| const secondaryMimeType = getMimeType(fallbackSrcset); | ||||||||||
|
|
||||||||||
| return ( | ||||||||||
| <StyledPicture onLoad={onLoad}> | ||||||||||
| <source | ||||||||||
| srcSet={srcset} | ||||||||||
| {...(primaryMimeType && { type: primaryMimeType })} | ||||||||||
|
There was a problem hiding this comment. not sure you need to conditionally spread like this. I think if the value is null then the attribute doesn't get rendered |
||||||||||
| /> | ||||||||||
| {fallbackSrcset && ( | ||||||||||
| <source | ||||||||||
| srcSet={fallbackSrcset} | ||||||||||
| {...(secondaryMimeType && { type: secondaryMimeType })} | ||||||||||
| /> | ||||||||||
| )} | ||||||||||
| <StyledImg src={src} {...otherProps} /> | ||||||||||
| </StyledPicture> | ||||||||||
| ); | ||||||||||
|
|
||||||||||
This file contains 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.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just wondering if this is easier to work out in simorgh
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think its much of a muchness really. It would probably be a bit more work in Simorgh to pass through amimeTypeprop or something similar to the Psammead component, with similar checking done in Simorgh. Conscious not having too much rendering logic in Psammead though.Moved this over to Simorgh and passed through as props