Skip to content

Move looping video caption inside island #15393

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

Draft
simonbyford wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Move looping video caption inside island #15393

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
16 changes: 16 additions & 0 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 @@ -8,6 +8,7 @@ import {
submitClickComponentEvent,
submitComponentEvent,
} from '../client/ophan/ophan';
import type { ArticleFormat } from '../lib/articleFormat';
import { getZIndex } from '../lib/getZIndex';
import { generateImageURL } from '../lib/image';
import { useIsInView } from '../lib/useIsInView';
Expand All @@ -21,6 +22,7 @@ import {
} from '../lib/video';
import { palette } from '../palette';
import type { VideoPlayerFormat } from '../types/mainMedia';
import { Caption } from './Caption';
import { CardPicture, type Props as CardPictureProps } from './CardPicture';
import { useConfig } from './ConfigContext';
import type {
Expand Down Expand Up @@ -245,6 +247,9 @@ type Props = {
*/
containerAspectRatioMobile?: number;
containerAspectRatioDesktop?: number;
caption?: string;
format?: ArticleFormat;
isMainMedia?: boolean;
};

export const SelfHostedVideo = ({
Expand All @@ -269,6 +274,9 @@ export const SelfHostedVideo = ({
maxAspectRatio,
containerAspectRatioMobile,
containerAspectRatioDesktop,
caption,
format,
isMainMedia,
}: Props) => {
const adapted = useShouldAdapt();
const { renderingTarget } = useConfig();
Expand Down Expand Up @@ -806,6 +814,14 @@ export const SelfHostedVideo = ({
controlsPosition={controlsPosition}
activeCue={activeCue}
/>
{!!caption && format && (
<Caption
captionText={caption}
format={format}
isMainMedia={isMainMedia}
mediaType="SelfHostedVideo"
/>
)}
</figure>
</div>
);
Expand Down
56 changes: 24 additions & 32 deletions dotcom-rendering/src/components/SelfHostedVideoInArticle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import {
} from '../lib/video';
import type { MediaAtomBlockElement } from '../types/content';
import type { VideoPlayerFormat } from '../types/mainMedia';
import { Caption } from './Caption';
import { Island } from './Island';
import { SelfHostedVideo } from './SelfHostedVideo.importable';

Expand All @@ -33,36 +32,29 @@ export const SelfHostedVideoInArticle = ({
}

return (
<>
<Island priority="critical" defer={{ until: 'visible' }}>
<SelfHostedVideo
atomId={element.id}
fallbackImage={posterImageUrl}
fallbackImageAlt={caption}
fallbackImageAspectRatio={
(firstVideoAsset?.aspectRatio ?? '5:4') as FEAspectRatio
}
fallbackImageLoading="lazy"
fallbackImageSize="small"
height={firstVideoAsset?.dimensions?.height ?? 400}
linkTo="Article-embed-MediaAtomBlockElement"
posterImage={posterImageUrl}
sources={convertAssetsToVideoSources(element.assets)}
subtitleSize="medium"
subtitleSource={getSubtitleAsset(element.assets)}
videoStyle={videoStyle}
uniqueId={element.id}
width={firstVideoAsset?.dimensions?.width ?? 500}
/>
</Island>
{!!caption && (
<Caption
captionText={caption}
format={format}
isMainMedia={isMainMedia}
mediaType="SelfHostedVideo"
/>
)}
</>
<Island priority="critical" defer={{ until: 'visible' }}>
<SelfHostedVideo
atomId={element.id}
fallbackImage={posterImageUrl}
fallbackImageAlt={caption}
fallbackImageAspectRatio={
(firstVideoAsset?.aspectRatio ?? '5:4') as FEAspectRatio
}
fallbackImageLoading="lazy"
fallbackImageSize="small"
height={firstVideoAsset?.dimensions?.height ?? 400}
linkTo="Article-embed-MediaAtomBlockElement"
posterImage={posterImageUrl}
sources={convertAssetsToVideoSources(element.assets)}
subtitleSize="medium"
subtitleSource={getSubtitleAsset(element.assets)}
videoStyle={videoStyle}
uniqueId={element.id}
width={firstVideoAsset?.dimensions?.width ?? 500}
caption={caption}
format={format}
isMainMedia={isMainMedia}
/>
</Island>
);
};
Loading