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

Fix video only contentful visuals #59

Merged
merged 3 commits into from
Nov 20, 2024
Merged

Fix video only contentful visuals #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aafae1f
Add failing test for img presence
weotch Nov 20, 2024
f368cb5
Don’t render a picture if there is no img src
weotch Nov 20, 2024
1cb6a0e
Add a test that a video tag wasn’t rendered when no video src provided
weotch Nov 20, 2024
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
6 changes: 6 additions & 0 deletions packages/contentful/cypress/component/ContentfulVisual.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ describe('contentful visual entry props', () => {
portraitVideo: null,
}} />)

// There should be no vidoes rendered
cy.get("video").should("not.exist");

// Portrait asset
cy.get('img').hasDimensions(VW, VW)
cy.get('img').its('[0].currentSrc')
Expand All @@ -84,6 +87,9 @@ describe('contentful visual entry props', () => {
portraitImage: null,
}} />)

// There should be no imgs rendered
cy.get('img').should('not.exist')

// Portrait asset
cy.get('video').its('[0].currentSrc')
.should('contain', portraitVideoAsset.url)
Expand Down
3 changes: 3 additions & 0 deletions packages/contentful/src/lib/urlBuilding.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ export const defaultImageLoader: ImageLoader = ({
src.portraitImage.url :
src.image?.url || src.url

// If no URL found, return nothing
if (!url) return ''

// Make Contentful resizing instructions
const query = new URLSearchParams({ w: String(width) })

Expand Down
1 change: 1 addition & 0 deletions packages/react/src/PictureImage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export default function PictureImage(props: PictureImageProps): ReactNode {

// Make the img src url
const srcUrl = makeSrcUrl(src, imageLoader)
if (!srcUrl) return null

// Make array or props that will be used to make <source>s. A `null` type is
// always added to create fallback sources for native mime-type of the
Expand Down
Loading