Skip to content

Fix library images, keep changes for research/questions #4568

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

Merged
jproberson merged 2 commits into from
Jan 14, 2026
+42 −21
Merged

Fix library images, keep changes for research/questions #4568

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d8ca51
attempting to fix library images while keeping changes to research/qu…
jproberson Jan 13, 2026
bb1aed8
Merge branch 'master' into fix/libary-image-fix
jproberson Jan 14, 2026
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
63 changes: 42 additions & 21 deletions packages/components/src/ImageGallery/ImageGallery.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,28 +50,48 @@ const NavButton = styled('button')`
`;

// Container that reserves space to prevent layout shift
const ImageContainer = styled('div')<{ $flexibleAspectRatio: boolean }>`
const ImageContainer = styled('div')<{
$flexibleAspectRatio: boolean;
$allowPortrait: boolean;
}>`
width: 100%;
position: relative;
display: flex;
align-items: center;
justify-content: center;

${(props) => {
if (!props.$allowPortrait) {
return `
min-height: 300px;
@media (min-width: 768px) {
min-height: 450px;
}
aspect-ratio: 16/9;
background: #f5f5f5;
`;
}

${(props) =>
!props.$flexibleAspectRatio
? `
aspect-ratio: 16/9;
min-height: 200px;

@media (min-width: 768px) {
min-height: 300px;
// Research/Questions with wide image: flexible, no aspect-ratio
if (props.$flexibleAspectRatio) {
return `
min-height: 200px;
@media (min-width: 768px) {
min-height: 300px;
}
`;
}

display: flex;
align-items: center;
justify-content: center;
background: #f5f5f5; /* Optional: subtle background while loading */
`
: `
display: block;
`}
// Research/Questions with normal image: use aspect-ratio
return `
min-height: 200px;
@media (min-width: 768px) {
min-height: 300px;
}
aspect-ratio: 16/9;
background: #f5f5f5;
`;
}}
`;

export const ImageGallery = (props: ImageGalleryProps) => {
Expand Down Expand Up @@ -240,11 +260,12 @@ export const ImageGallery = (props: ImageGalleryProps) => {
const isWideImage = state.activeImageAspectRatio
? state.activeImageAspectRatio > ASPECT_RATIO_16_9
: false;
const useFlexibleAspectRatio = isWideImage;
const useFlexibleAspectRatio = isWideImage && !!props.allowPortrait;
const allowPortrait = !!props.allowPortrait;

return (
<Flex sx={{ flexDirection: 'column' }}>
<ImageContainer $flexibleAspectRatio={useFlexibleAspectRatio}>
<ImageContainer $flexibleAspectRatio={useFlexibleAspectRatio} $allowPortrait={allowPortrait}>
{state.showActiveImgLoading && (
<Loader sx={{ position: 'absolute', alignSelf: 'center', zIndex: 1 }} />
)}
Expand All @@ -254,9 +275,9 @@ export const ImageGallery = (props: ImageGalleryProps) => {
data-testid="active-image"
sx={{
width: '100%',
height: useFlexibleAspectRatio ? 'auto' : '100%',
height: !allowPortrait || !useFlexibleAspectRatio ? '100%' : 'auto',
cursor: 'pointer',
objectFit: props.allowPortrait ? 'contain' : 'cover',
objectFit: allowPortrait ? 'contain' : 'cover',
opacity: state.showActiveImgLoading ? 0.3 : 1,
transition: 'opacity 0.2s ease-in-out',
}}
Expand Down
Loading