From 10040dd4246348f6c8c7378e0f934913ee869063 Mon Sep 17 00:00:00 2001 From: Fredrik Thorsson Date: Tue, 25 Mar 2025 18:43:51 +0000 Subject: [PATCH] Merged in fix/SW-1955-image-gallery-hide-room-label (pull request #1621) fix(SW-1955): hide label on room sidepeek * fix(SW-1955): hide label on room sidepeek Approved-by: Erik Tiekstra --- .../ContentType/HotelPage/SidePeeks/Room/index.tsx | 1 + apps/scandic-web/components/ImageGallery/index.tsx | 2 ++ apps/scandic-web/components/Lightbox/FullView.tsx | 5 ++++- apps/scandic-web/components/Lightbox/Gallery.tsx | 3 ++- apps/scandic-web/components/Lightbox/index.tsx | 3 +++ apps/scandic-web/types/components/imageGallery.ts | 1 + apps/scandic-web/types/components/lightbox/lightbox.ts | 3 +++ 7 files changed, 16 insertions(+), 2 deletions(-) diff --git a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Room/index.tsx b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Room/index.tsx index c845341ff..c03b34191 100644 --- a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Room/index.tsx +++ b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Room/index.tsx @@ -81,6 +81,7 @@ export default async function RoomSidePeek({ images={galleryImages} title={room.name} height={280} + hideLabel={true} /> diff --git a/apps/scandic-web/components/ImageGallery/index.tsx b/apps/scandic-web/components/ImageGallery/index.tsx index ecafeaa4e..150edfe59 100644 --- a/apps/scandic-web/components/ImageGallery/index.tsx +++ b/apps/scandic-web/components/ImageGallery/index.tsx @@ -19,6 +19,7 @@ function ImageGallery({ fill, height = 280, sizes, + hideLabel, }: ImageGalleryProps) { const intl = useIntl() const [lightboxIsOpen, setLightboxIsOpen] = useState(false) @@ -58,6 +59,7 @@ function ImageGallery({ dialogTitle={title} isOpen={lightboxIsOpen} onClose={() => setLightboxIsOpen(false)} + hideLabel={hideLabel} /> ) diff --git a/apps/scandic-web/components/Lightbox/FullView.tsx b/apps/scandic-web/components/Lightbox/FullView.tsx index c6a316f08..7d6d293f9 100644 --- a/apps/scandic-web/components/Lightbox/FullView.tsx +++ b/apps/scandic-web/components/Lightbox/FullView.tsx @@ -21,6 +21,7 @@ export default function FullView({ onPrev, currentIndex, totalImages, + hideLabel, }: FullViewProps) { const [animateLeft, setAnimateLeft] = useState(true) @@ -97,7 +98,9 @@ export default function FullView({ />
- {image.caption && {image.caption}} + {image.caption && !hideLabel && ( + {image.caption} + )}
diff --git a/apps/scandic-web/components/Lightbox/Gallery.tsx b/apps/scandic-web/components/Lightbox/Gallery.tsx index 21cca522d..e0c134596 100644 --- a/apps/scandic-web/components/Lightbox/Gallery.tsx +++ b/apps/scandic-web/components/Lightbox/Gallery.tsx @@ -20,6 +20,7 @@ export default function Gallery({ onSelectImage, onImageClick, selectedImage, + hideLabel, }: GalleryProps) { const intl = useIntl() const [animateLeft, setAnimateLeft] = useState(true) @@ -79,7 +80,7 @@ export default function Gallery({ {/* Desktop Gallery */}
- {mainImage.caption && ( + {mainImage.caption && !hideLabel && (
{mainImage.caption}
diff --git a/apps/scandic-web/components/Lightbox/index.tsx b/apps/scandic-web/components/Lightbox/index.tsx index fcc011b36..3520dcbd4 100644 --- a/apps/scandic-web/components/Lightbox/index.tsx +++ b/apps/scandic-web/components/Lightbox/index.tsx @@ -16,6 +16,7 @@ export default function Lightbox({ onClose, isOpen, activeIndex = 0, + hideLabel, }: LightboxProps) { const [selectedImageIndex, setSelectedImageIndex] = useState(activeIndex) const [isFullView, setIsFullView] = useState(false) @@ -73,6 +74,7 @@ export default function Lightbox({ onPrev={handlePrev} currentIndex={selectedImageIndex} totalImages={images.length} + hideLabel={hideLabel} /> ) : ( setIsFullView(true)} selectedImage={images[selectedImageIndex]} + hideLabel={hideLabel} /> )} diff --git a/apps/scandic-web/types/components/imageGallery.ts b/apps/scandic-web/types/components/imageGallery.ts index f5f18cfe6..fce3b9e4c 100644 --- a/apps/scandic-web/types/components/imageGallery.ts +++ b/apps/scandic-web/types/components/imageGallery.ts @@ -12,4 +12,5 @@ export type ImageGalleryProps = { width?: number height?: number sizes?: string + hideLabel?: boolean } diff --git a/apps/scandic-web/types/components/lightbox/lightbox.ts b/apps/scandic-web/types/components/lightbox/lightbox.ts index abfff51d4..1391c9516 100644 --- a/apps/scandic-web/types/components/lightbox/lightbox.ts +++ b/apps/scandic-web/types/components/lightbox/lightbox.ts @@ -6,6 +6,7 @@ export interface LightboxProps { onClose: () => void isOpen: boolean activeIndex?: number + hideLabel?: boolean } export interface GalleryProps { @@ -14,6 +15,7 @@ export interface GalleryProps { onSelectImage: (image: GalleryImage) => void onImageClick: () => void selectedImage: GalleryImage | null + hideLabel?: boolean } export interface FullViewProps { @@ -23,4 +25,5 @@ export interface FullViewProps { onPrev: () => void currentIndex: number totalImages: number + hideLabel?: boolean }