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

Slideshow: allow carousel interaction in cards #12852

Merged
merged 4 commits into from
Nov 19, 2024
Merged

Slideshow: allow carousel interaction in cards #12852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a779de8
Make slideshow carousel importable
jamesmockett Nov 15, 2024
7e8a239
Use new slideshow component in flexible containers
jamesmockett Nov 15, 2024
08fda4a
Hide image overlay if new slideshow in flexible container
jamesmockett Nov 15, 2024
5e62b72
Add comment to `hideImageOverlay` prop
jamesmockett Nov 18, 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
36 changes: 29 additions & 7 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 @@ -33,6 +33,7 @@ import { LatestLinks } from '../LatestLinks.importable';
import { MediaDuration } from '../MediaDuration';
import { MediaMeta } from '../MediaMeta';
import { Slideshow } from '../Slideshow';
import { SlideshowCarousel } from '../SlideshowCarousel.importable';
import { Snap } from '../Snap';
import { SnapCssSandbox } from '../SnapCssSandbox';
import { StarRating } from '../StarRating/StarRating';
Expand Down Expand Up @@ -604,14 +605,35 @@ export const Card = ({
imagePositionOnDesktop={imagePositionOnDesktop}
imagePositionOnMobile={imagePositionOnMobile}
showPlayIcon={showPlayIcon}
hideImageOverlay={
media.type === 'slideshow' && isFlexibleContainer
}
>
{media.type === 'slideshow' && (
<Slideshow
images={media.slideshowImages}
imageSize={imageSize}
isDynamo={isDynamo}
/>
)}
{media.type === 'slideshow' &&
(isFlexibleContainer ? (
<div
css={css`
position: relative;
${getZIndex('card-nested-link')}
`}
>
<Island
priority="feature"
defer={{ until: 'visible' }}
>
<SlideshowCarousel
images={media.slideshowImages}
imageSize={imageSize}
/>
</Island>
</div>
) : (
<Slideshow
images={media.slideshowImages}
imageSize={imageSize}
isDynamo={isDynamo}
/>
))}
{media.type === 'avatar' && (
<AvatarContainer
imageSize={imageSize}
Expand Down
12 changes: 9 additions & 3 deletions dotcom-rendering/src/components/Card/components/ImageWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ type Props = {
imagePositionOnDesktop: ImagePositionType;
imagePositionOnMobile: ImagePositionType;
showPlayIcon: boolean;
/**
* Forces hiding the image overlay added to pictures & slideshows on hover.
* This is to allow hiding the overlay on slideshow carousels where we don't
* want it to be shown whilst retaining it for existing slideshows.
*/
hideImageOverlay?: boolean;
};

/**
Expand Down Expand Up @@ -117,6 +123,7 @@ export const ImageWrapper = ({
imagePositionOnDesktop,
imagePositionOnMobile,
showPlayIcon,
hideImageOverlay,
}: Props) => {
const isHorizontalOnDesktop =
imagePositionOnDesktop === 'left' || imagePositionOnDesktop === 'right';
Expand Down Expand Up @@ -168,9 +175,8 @@ export const ImageWrapper = ({
<>
{children}
{/* This image overlay is styled when the CardLink is hovered */}
{(imageType === 'picture' || imageType === 'slideshow') && (
<div className="image-overlay" />
)}
{(imageType === 'picture' || imageType === 'slideshow') &&
!hideImageOverlay && <div className="image-overlay" />}
jamesmockett marked this conversation as resolved.
Show resolved Hide resolved
{imageType === 'picture' && showPlayIcon && (
<PlayIcon
imageSize={imageSize}
Expand Down
0 ...ring/src/components/SlideshowCarousel.tsx → ...mponents/SlideshowCarousel.importable.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion dotcom-rendering/src/components/SlideshowCarousel.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { breakpoints, space } from '@guardian/source/foundations';
import type { Meta, StoryObj } from '@storybook/react';
import type { ReactNode } from 'react';
import type { DCRSlideshowImage } from '../types/front';
import { SlideshowCarousel } from './SlideshowCarousel';
import { SlideshowCarousel } from './SlideshowCarousel.importable';

const meta = {
component: SlideshowCarousel,
Expand Down
Loading