@lumx/react 3.7.6-alpha.4 → 3.7.6-alpha.5

package/index.js

@@ -8225,7 +8225,16 @@ const ImageSlideshow = _ref => {
     icon: mdiMagnifyMinusOutline,
     onClick: zoomOut
   })));
-  const getImgRef = React.useMemo(() => memoize(index => mergeRefs(images === null || images === void 0 ? void 0 : images[index].imgRef, index === activeImageIndex ? activeImageRef : undefined)), [images, activeImageIndex, activeImageRef]);
+  const getImgRef = React.useMemo(() => memoize((index, isActive) => {
+    return mergeRefs(images === null || images === void 0 ? void 0 : images[index].imgRef, isActive ? activeImageRef : undefined);
+  },
+  // memoize based on both arguments
+  function () {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    return args.join();
+  }), [images, activeImageRef]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Slides, {
     activeIndex: activeIndex,
     theme: "dark",
@@ -8247,7 +8256,7 @@ const ImageSlideshow = _ref => {
       key: image,
       image: _objectSpread2(_objectSpread2({}, imageProps), {}, {
         image,
-        imgRef: getImgRef(index)
+        imgRef: getImgRef(index, isActive)
       }),
       scale: isActive ? scale : undefined,
       onScaleChange: onScaleChange
@@ -8317,7 +8326,7 @@ async function startViewTransition(_ref) {
 }
 
 /** Find image in element including the element */
-const findImage = element => element !== null && element !== void 0 && element.matches('img') ? element : element === null || element === void 0 ? void 0 : element.querySelector('img');
+const findImage = element => element !== null && element !== void 0 && element.matches('img') ? element : (element === null || element === void 0 ? void 0 : element.querySelector('img')) || null;
 
 const _excluded$A = ["images"];
 
@@ -8433,10 +8442,12 @@ function useImageLightbox(initialProps) {
     }
     return memoize(options => ({
       ref(element) {
-        const triggerImage = findImage(element);
-        if ((options === null || options === void 0 ? void 0 : options.activeImageIndex) !== undefined && triggerImage) triggerImageRefs[options.activeImageIndex] = {
-          current: triggerImage
-        };
+        // Track trigger image ref if any
+        if ((options === null || options === void 0 ? void 0 : options.activeImageIndex) !== undefined && element) {
+          triggerImageRefs[options.activeImageIndex] = {
+            current: findImage(element)
+          };
+        }
       },
       onClick(e) {
         openLightbox(e.target, options);