From fd38542863f54c1d3e767c0279db3e00de302b31 Mon Sep 17 00:00:00 2001
From: Anton Gunnarsson <anton.gunnarsson@scandichotels.com>
Date: Fri, 30 Jan 2026 12:55:46 +0000
Subject: [PATCH] Merged in fix/sw-3703-fix-focus-in-lightbox-gallery (pull
 request #3521)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix(SW-3703): Fix focus management in lightbox gallery

* Add keys to fix focus


Approved-by: Matilda Landström
---
 .../design-system/lib/components/Lightbox/Gallery/index.tsx    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/design-system/lib/components/Lightbox/Gallery/index.tsx b/packages/design-system/lib/components/Lightbox/Gallery/index.tsx
index 3db21691f..17e66c82d 100644
--- a/packages/design-system/lib/components/Lightbox/Gallery/index.tsx
+++ b/packages/design-system/lib/components/Lightbox/Gallery/index.tsx
@@ -151,6 +151,7 @@ export function Gallery({
             {hasPrevImage && (
               <ThumbnailImage
                 image={thumbnail.previous!}
+                key="prev-lightbox-image"
                 index={0}
                 onSelect={onSelectImage}
               />
@@ -158,6 +159,7 @@ export function Gallery({
             <span className={styles.thumbnail}>
               {thumbnail.images.map((image, index) => (
                 <ThumbnailImage
+                  key={image.src}
                   image={image}
                   index={hasPrevImage ? index + 1 : index}
                   onSelect={onSelectImage}
@@ -168,6 +170,7 @@ export function Gallery({
             {hasNextImage && (
               <ThumbnailImage
                 image={thumbnail.next!}
+                key="next-lightbox-image"
                 index={6}
                 onSelect={onSelectImage}
               />