Skip to content

Fix self-hosted video width for videos with non-5:4 dimensions #14975

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

Closed
domlander wants to merge 1 commit into from
Closed

Fix self-hosted video width for videos with non-5:4 dimensions #14975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions dotcom-rendering/src/components/Card/Card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,6 +999,7 @@ export const Card = ({
width={media.mainMedia.width}
videoStyle={media.mainMedia.videoStyle}
posterImage={media.mainMedia.image ?? ''}
containerAspectRatio={5 / 4}
fallbackImage={media.mainMedia.image ?? ''}
fallbackImageSize={mediaSize}
fallbackImageLoading={imageLoading}
Expand Down
27 changes: 25 additions & 2 deletions dotcom-rendering/src/components/SelfHostedVideo.importable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,31 @@ import type {
import { SelfHostedVideoPlayer } from './SelfHostedVideoPlayer';
import { ophanTrackerWeb } from './YoutubeAtom/eventEmitters';

const videoAndBackgroundStyles = (isCinemagraph: boolean) => css`
const videoAndBackgroundStyles = (
isCinemagraph: boolean,
aspectRatio?: number,
) => css`
position: relative;
display: flex;
justify-content: space-around;
background-color: ${palette('--video-background')};
${!isCinemagraph && `z-index: ${getZIndex('video-container')}`};

/**
* If the video and its containing slot have different dimensions, the slot will use the aspect
* ratio of the video on mobile, so that the video can take up the full width of the screen.
*
* From tablet breakpoints, the aspect ratio of the slot is maintained, for consistency with other content.
* This will result in grey bars on either side of the video if the video is narrower than the slot.
*/
${from.tablet} {
${typeof aspectRatio === 'number' && `aspect-ratio: ${aspectRatio};`}
}
`;

const videoContainerStyles = (width: number, height: number) => css`
position: relative;
aspect-ratio: ${width} / ${height};
height: 100%;
max-height: 100vh;
max-height: 100svh;
Expand Down Expand Up @@ -113,6 +128,11 @@ type Props = {
width: number;
videoStyle: VideoPlayerFormat;
posterImage: string;
/**
* The desired aspect ratio of the container of the video.
* This can differ from the aspect ratio of the video itself.
*/
containerAspectRatio?: number;
fallbackImage: CardPictureProps['mainImage'];
fallbackImageSize: CardPictureProps['imageSize'];
fallbackImageLoading: CardPictureProps['loading'];
Expand All @@ -132,6 +152,7 @@ export const SelfHostedVideo = ({
width: expectedWidth,
videoStyle,
posterImage,
containerAspectRatio,
fallbackImage,
fallbackImageSize,
fallbackImageLoading,
Expand Down Expand Up @@ -665,7 +686,9 @@ export const SelfHostedVideo = ({
: undefined;

return (
<div css={videoAndBackgroundStyles(isCinemagraph)}>
<div
css={videoAndBackgroundStyles(isCinemagraph, containerAspectRatio)}
>
<figure
ref={setNode}
css={videoContainerStyles(width, height)}
Expand Down
Loading