yet-another-react-lightbox 3.30.1 → 3.32.0

package/dist/index.js

@@ -165,6 +165,7 @@ const LightboxDefaultProps = {
         closeOnPullUp: false,
         closeOnPullDown: false,
         closeOnBackdropClick: false,
+        closeOnEscape: true,
         preventDefaultWheelX: true,
         preventDefaultWheelY: false,
         disableSwipeNavigation: false,
@@ -1361,7 +1362,7 @@ function useKeyboardNavigation(subscribeSensors) {
     var _a;
     const isRTL = useRTL();
     const { publish } = useEvents();
-    const { animation } = useLightboxProps();
+    const { animation, controller } = useLightboxProps();
     const { prevDisabled, nextDisabled } = useNavigationState();
     const throttle = ((_a = animation.navigation) !== null && _a !== void 0 ? _a : animation.swipe) / 2;
     const prev = useThrottle(() => publish(ACTION_PREV), throttle);
@@ -1369,6 +1370,8 @@ function useKeyboardNavigation(subscribeSensors) {
     const handleKeyDown = useEventCallback((event) => {
         switch (event.key) {
             case VK_ESCAPE:
+                if (!controller.closeOnEscape)
+                    return;
                 publish(ACTION_CLOSE);
                 break;
             case VK_ARROW_LEFT:
@@ -1380,7 +1383,9 @@ function useKeyboardNavigation(subscribeSensors) {
                     (isRTL ? prev : next)();
                 break;
             default:
+                return;
         }
+        event.stopPropagation();
     });
     React.useEffect(() => subscribeSensors(EVENT_ON_KEY_DOWN, handleKeyDown), [subscribeSensors, handleKeyDown]);
 }
@@ -1541,7 +1546,7 @@ function Portal({ portal: { root, container: { className: containerClassName, st
                 if (!restoreFocus.current) {
                     restoreFocus.current = event.relatedTarget;
                 }
-            }, ...containerRest }, children), root || document.body)
+            }, ...containerRest }, children), (typeof root === "function" ? root() : root) || document.body)
         : null;
 }
 const PortalModule = createModule(MODULE_PORTAL, Portal);

package/dist/plugins/zoom/index.d.ts

@@ -32,6 +32,10 @@ declare module "yet-another-react-lightbox" {
             pinchZoomV4?: boolean;
             /** if `true`, enables image zoom via scroll gestures for mouse and trackpad users */
             scrollToZoom?: boolean;
+            /** custom slide types that support zoom */
+            supports?: readonly SlideTypeKey[];
+            /** maximum zoom level for custom slide types; when a function, return `undefined` to use the default (default: 8) */
+            maxZoom?: number | ((slide: Slide) => number | undefined);
         };
     }
     interface AnimationSettings {

package/dist/plugins/zoom/index.js

@@ -14,6 +14,7 @@ const defaultZoomProps = {
     pinchZoomDistanceFactor: 100,
     pinchZoomV4: false,
     scrollToZoom: false,
+    maxZoom: 8,
 };
 function validateMinZoom(minZoom) {
     return Math.min(Math.max(minZoom, Number.EPSILON), 1);
@@ -77,13 +78,18 @@ function useZoomProps() {
     return resolveZoomProps(zoom);
 }
 
+function resolveMaxZoom(maxZoom, slide) {
+    var _a;
+    const resolved = typeof maxZoom === "function" ? ((_a = maxZoom(slide)) !== null && _a !== void 0 ? _a : defaultZoomProps.maxZoom) : maxZoom;
+    return Math.max(resolved, 1);
+}
 function useZoomImageRect(slideRect, imageDimensions) {
     var _a, _b;
     let imageRect = { width: 0, height: 0 };
     let maxImageRect = { width: 0, height: 0 };
     const { currentSlide } = useLightboxState();
     const { imageFit } = useLightboxProps().carousel;
-    const { maxZoomPixelRatio } = useZoomProps();
+    const { maxZoomPixelRatio, maxZoom: maxZoomInProps } = useZoomProps();
     if (slideRect && currentSlide) {
         const slide = { ...currentSlide, ...imageDimensions };
         if (isImageSlide(slide)) {
@@ -112,8 +118,23 @@ function useZoomImageRect(slideRect, imageDimensions) {
                     };
             }
         }
+        else if (slideRect.width > 0 && slideRect.height > 0) {
+            if (imageDimensions && imageDimensions.width > 0 && imageDimensions.height > 0) {
+                imageRect = {
+                    width: Math.min(slideRect.width, imageDimensions.width),
+                    height: Math.min(slideRect.height, imageDimensions.height),
+                };
+            }
+            else {
+                imageRect = { width: slideRect.width, height: slideRect.height };
+            }
+        }
     }
-    const maxZoom = imageRect.width ? Math.max(round(maxImageRect.width / imageRect.width, 5), 1) : 1;
+    const maxZoom = currentSlide && imageRect.width
+        ? isImageSlide(currentSlide)
+            ? Math.max(round(maxImageRect.width / imageRect.width, 5), 1)
+            : resolveMaxZoom(maxZoomInProps, currentSlide)
+        : 1;
     return { imageRect, maxZoom };
 }
 
@@ -296,7 +317,7 @@ function useZoomState(imageRect, maxZoom, zoomWrapperRef) {
     const { containerRect, slideRect } = useController();
     const { minZoom, zoomInMultiplier } = useZoomProps();
     const currentSource = currentSlide && isImageSlide(currentSlide) ? currentSlide.src : undefined;
-    const disabled = !currentSource || !(zoomWrapperRef === null || zoomWrapperRef === void 0 ? void 0 : zoomWrapperRef.current);
+    const disabled = !(zoomWrapperRef === null || zoomWrapperRef === void 0 ? void 0 : zoomWrapperRef.current);
     useLayoutEffect(() => {
         setZoom(1);
         setOffsetX(0);
@@ -468,10 +489,37 @@ function ZoomWrapper({ render, slide, offset, rect }) {
     var _a;
     const [imageDimensions, setImageDimensions] = React.useState();
     const zoomWrapperRef = React.useRef(null);
+    const isImage = isImageSlide(slide);
     const { zoom, maxZoom, offsetX, offsetY, setZoomWrapper } = useZoom();
     const interactive = zoom > 1;
     const { carousel, on } = useLightboxProps();
     const { currentIndex } = useLightboxState();
+    useLayoutEffect(() => {
+        if (offset !== 0 || isImage || !zoomWrapperRef.current)
+            return () => { };
+        const measure = () => {
+            const wrapper = zoomWrapperRef.current;
+            if (!wrapper)
+                return;
+            let width = 0;
+            let height = 0;
+            for (const child of wrapper.children) {
+                if (child instanceof HTMLElement) {
+                    width = Math.max(width, child.offsetWidth);
+                    height = Math.max(height, child.offsetHeight);
+                }
+            }
+            setImageDimensions((prev) => (prev && prev.width === width && prev.height === height ? prev : { width, height }));
+        };
+        measure();
+        if (typeof ResizeObserver === "undefined")
+            return () => { };
+        const observer = new ResizeObserver(measure);
+        for (const child of zoomWrapperRef.current.children) {
+            observer.observe(child);
+        }
+        return () => observer.disconnect();
+    }, [offset, isImage, rect]);
     useLayoutEffect(() => {
         if (offset === 0) {
             setZoomWrapper({ zoomWrapperRef, imageDimensions });
@@ -480,7 +528,7 @@ function ZoomWrapper({ render, slide, offset, rect }) {
         return () => { };
     }, [offset, imageDimensions, setZoomWrapper]);
     let rendered = (_a = render.slide) === null || _a === void 0 ? void 0 : _a.call(render, { slide, offset, rect, zoom, maxZoom });
-    if (!rendered && isImageSlide(slide)) {
+    if (!rendered && isImage) {
         const slideProps = {
             slide,
             offset,
@@ -505,7 +553,10 @@ const Zoom = ({ augment, addModule }) => {
             toolbar: addToolbarButton(toolbar, PLUGIN_ZOOM, React.createElement(ZoomToolbarControl, null)),
             render: {
                 ...render,
-                slide: (props) => { var _a; return isImageSlide(props.slide) ? React.createElement(ZoomWrapper, { render: render, ...props }) : (_a = render.slide) === null || _a === void 0 ? void 0 : _a.call(render, props); },
+                slide: (props) => {
+                    var _a, _b;
+                    return isImageSlide(props.slide) || (props.slide.type != null && ((_a = zoom.supports) === null || _a === void 0 ? void 0 : _a.includes(props.slide.type))) ? (React.createElement(ZoomWrapper, { render: render, ...props })) : ((_b = render.slide) === null || _b === void 0 ? void 0 : _b.call(render, props));
+                },
             },
             controller: { ...controller, preventDefaultWheelY: zoom.scrollToZoom },
             ...restProps,

package/dist/styles.css

@@ -1 +1 @@
-.yarl__fullsize{height:100%;width:100%}.yarl__relative{position:relative}.yarl__portal{bottom:0;left:0;opacity:0;overflow:hidden;position:fixed;right:0;top:0;transition:opacity var(--yarl__fade_animation_duration,.25s) var(--yarl__fade_animation_timing_function,ease);z-index:var(--yarl__portal_zindex,9999)}.yarl__portal_open{opacity:1}.yarl__container{background-color:var(--yarl__container_background_color,var(--yarl__color_backdrop,#000));bottom:0;left:0;outline:none;overflow:hidden;overscroll-behavior:var(--yarl__controller_overscroll_behavior,contain);position:absolute;right:0;top:0;touch-action:var(--yarl__controller_touch_action,none);-webkit-user-select:none;-moz-user-select:none;user-select:none}.yarl__carousel{align-content:center;align-items:stretch;display:flex;flex:0 0 auto;height:100%;justify-content:center;opacity:var(--yarl__pull_opacity,1);transform:translate(var(--yarl__swipe_offset,0),var(--yarl__pull_offset,0));width:calc(100% + (var(--yarl__carousel_slides_count) - 1)*(100% + var(--yarl__carousel_spacing_px, 0)*1px + var(--yarl__carousel_spacing_percent, 0)*1%))}.yarl__carousel_with_slides{-moz-column-gap:calc(var(--yarl__carousel_spacing_px, 0)*1px + 100/(var(--yarl__carousel_slides_count)*100 + (var(--yarl__carousel_slides_count) - 1)*var(--yarl__carousel_spacing_percent, 0))*var(--yarl__carousel_spacing_percent, 0)*1%);column-gap:calc(var(--yarl__carousel_spacing_px, 0)*1px + 100/(var(--yarl__carousel_slides_count)*100 + (var(--yarl__carousel_slides_count) - 1)*var(--yarl__carousel_spacing_percent, 0))*var(--yarl__carousel_spacing_percent, 0)*1%)}.yarl__flex_center{align-content:center;align-items:center;display:flex;justify-content:center}.yarl__slide{flex:1;overflow:hidden;padding:calc(var(--yarl__carousel_padding_px, 0)*1px + 100/(var(--yarl__carousel_slides_count)*100 + (var(--yarl__carousel_slides_count) - 1)*var(--yarl__carousel_spacing_percent, 0))*var(--yarl__carousel_padding_percent, 0)*1%);position:relative}[dir=rtl] .yarl__slide{--yarl__direction:-1}.yarl__slide_image{max-height:100%;max-width:100%;-o-object-fit:contain;object-fit:contain;touch-action:var(--yarl__controller_touch_action,none);-webkit-user-select:none;-moz-user-select:none;user-select:none;-webkit-touch-callout:none}.yarl__slide_image_cover{height:100%;-o-object-fit:cover;object-fit:cover;width:100%}.yarl__slide_image_loading{opacity:0}@media screen and (min-width:800px){.yarl__slide_wrapper:not(.yarl__slide_wrapper_interactive) .yarl__slide_image{-webkit-backface-visibility:hidden;-webkit-transform:translateZ(0);-webkit-transform-style:preserve-3d}}.yarl__slide_placeholder{left:50%;line-height:0;position:absolute;top:50%;transform:translateX(-50%) translateY(-50%)}.yarl__slide_loading{animation:yarl__delayed_fadein 1s linear;color:var(--yarl__slide_icon_loading_color,var(--yarl__color_button,hsla(0,0%,100%,.8)))}.yarl__slide_loading line{animation:yarl__stroke_opacity 1s linear infinite}.yarl__slide_loading line:first-of-type{animation-delay:-1.875s}.yarl__slide_loading line:nth-of-type(2){animation-delay:-1.75s}.yarl__slide_loading line:nth-of-type(3){animation-delay:-1.625s}.yarl__slide_loading line:nth-of-type(4){animation-delay:-1.5s}.yarl__slide_loading line:nth-of-type(5){animation-delay:-1.375s}.yarl__slide_loading line:nth-of-type(6){animation-delay:-1.25s}.yarl__slide_loading line:nth-of-type(7){animation-delay:-1.125s}.yarl__slide_loading line:nth-of-type(8){animation-delay:-1s}.yarl__slide_error{color:var(--yarl__slide_icon_error_color,red);height:var(--yarl__slide_icon_error_size,48px);width:var(--yarl__slide_icon_error_size,48px)}@media (prefers-reduced-motion){.yarl__portal,.yarl__slide{transition:unset}.yarl__slide_loading,.yarl__slide_loading line{animation:unset}}.yarl__toolbar{bottom:auto;display:flex;justify-content:flex-end;left:auto;padding:var(--yarl__toolbar_padding,8px);position:absolute;right:0;top:0}[dir=rtl] .yarl__toolbar{bottom:auto;left:0;right:auto;top:0}.yarl__icon{height:var(--yarl__icon_size,32px);width:var(--yarl__icon_size,32px)}.yarl__button{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:var(--yarl__button_background_color,transparent);border:var(--yarl__button_border,0);color:var(--yarl__color_button,hsla(0,0%,100%,.8));cursor:pointer;filter:var(--yarl__button_filter,drop-shadow(2px 2px 2px rgba(0,0,0,.8)));line-height:0;margin:var(--yarl__button_margin,0);outline:none;padding:var(--yarl__button_padding,8px);-webkit-tap-highlight-color:transparent}.yarl__button:focus{color:var(--yarl__color_button_active,#fff)}.yarl__button:focus:not(:focus-visible){color:var(--yarl__color_button,hsla(0,0%,100%,.8))}.yarl__button:focus-visible{color:var(--yarl__color_button_active,#fff)}@media (hover:hover){.yarl__button:focus-visible:hover,.yarl__button:focus:hover,.yarl__button:hover{color:var(--yarl__color_button_active,#fff)}}.yarl__button:disabled{color:var(--yarl__color_button_disabled,hsla(0,0%,100%,.4));cursor:default}.yarl__navigation_next,.yarl__navigation_prev{padding:var(--yarl__navigation_button_padding,24px 16px);position:absolute;top:50%;transform:translateY(-50%)}.yarl__navigation_prev{left:0}[dir=rtl] .yarl__navigation_prev{left:unset;right:0;transform:translateY(-50%) rotate(180deg)}.yarl__navigation_next{right:0}[dir=rtl] .yarl__navigation_next{left:0;right:unset;transform:translateY(-50%) rotate(180deg)}.yarl__no_scroll{height:100%;overflow:hidden;overscroll-behavior:none}@keyframes yarl__delayed_fadein{0%{opacity:0}80%{opacity:0}to{opacity:1}}@keyframes yarl__stroke_opacity{0%{stroke-opacity:1}to{stroke-opacity:.125}}
+.yarl__fullsize{height:100%;width:100%}.yarl__relative{position:relative}.yarl__portal{bottom:0;left:0;opacity:0;overflow:hidden;pointer-events:auto;position:fixed;right:0;top:0;transition:opacity var(--yarl__fade_animation_duration,.25s) var(--yarl__fade_animation_timing_function,ease);z-index:var(--yarl__portal_zindex,9999)}.yarl__portal_open{opacity:1}.yarl__container{background-color:var(--yarl__container_background_color,var(--yarl__color_backdrop,#000));bottom:0;left:0;outline:none;overflow:hidden;overscroll-behavior:var(--yarl__controller_overscroll_behavior,contain);position:absolute;right:0;top:0;touch-action:var(--yarl__controller_touch_action,none);-webkit-user-select:none;-moz-user-select:none;user-select:none}.yarl__carousel{align-content:center;align-items:stretch;display:flex;flex:0 0 auto;height:100%;justify-content:center;opacity:var(--yarl__pull_opacity,1);transform:translate(var(--yarl__swipe_offset,0),var(--yarl__pull_offset,0));width:calc(100% + (var(--yarl__carousel_slides_count) - 1)*(100% + var(--yarl__carousel_spacing_px, 0)*1px + var(--yarl__carousel_spacing_percent, 0)*1%))}.yarl__carousel_with_slides{-moz-column-gap:calc(var(--yarl__carousel_spacing_px, 0)*1px + 100/(var(--yarl__carousel_slides_count)*100 + (var(--yarl__carousel_slides_count) - 1)*var(--yarl__carousel_spacing_percent, 0))*var(--yarl__carousel_spacing_percent, 0)*1%);column-gap:calc(var(--yarl__carousel_spacing_px, 0)*1px + 100/(var(--yarl__carousel_slides_count)*100 + (var(--yarl__carousel_slides_count) - 1)*var(--yarl__carousel_spacing_percent, 0))*var(--yarl__carousel_spacing_percent, 0)*1%)}.yarl__flex_center{align-content:center;align-items:center;display:flex;justify-content:center}.yarl__slide{flex:1;overflow:hidden;padding:calc(var(--yarl__carousel_padding_px, 0)*1px + 100/(var(--yarl__carousel_slides_count)*100 + (var(--yarl__carousel_slides_count) - 1)*var(--yarl__carousel_spacing_percent, 0))*var(--yarl__carousel_padding_percent, 0)*1%);position:relative}[dir=rtl] .yarl__slide{--yarl__direction:-1}.yarl__slide_image{max-height:100%;max-width:100%;-o-object-fit:contain;object-fit:contain;touch-action:var(--yarl__controller_touch_action,none);-webkit-user-select:none;-moz-user-select:none;user-select:none;-webkit-touch-callout:none}.yarl__slide_image_cover{height:100%;-o-object-fit:cover;object-fit:cover;width:100%}.yarl__slide_image_loading{opacity:0}@media screen and (min-width:800px){.yarl__slide_wrapper:not(.yarl__slide_wrapper_interactive) .yarl__slide_image{-webkit-backface-visibility:hidden;-webkit-transform:translateZ(0);-webkit-transform-style:preserve-3d}}.yarl__slide_placeholder{left:50%;line-height:0;position:absolute;top:50%;transform:translateX(-50%) translateY(-50%)}.yarl__slide_loading{animation:yarl__delayed_fadein 1s linear;color:var(--yarl__slide_icon_loading_color,var(--yarl__color_button,hsla(0,0%,100%,.8)))}.yarl__slide_loading line{animation:yarl__stroke_opacity 1s linear infinite}.yarl__slide_loading line:first-of-type{animation-delay:-1.875s}.yarl__slide_loading line:nth-of-type(2){animation-delay:-1.75s}.yarl__slide_loading line:nth-of-type(3){animation-delay:-1.625s}.yarl__slide_loading line:nth-of-type(4){animation-delay:-1.5s}.yarl__slide_loading line:nth-of-type(5){animation-delay:-1.375s}.yarl__slide_loading line:nth-of-type(6){animation-delay:-1.25s}.yarl__slide_loading line:nth-of-type(7){animation-delay:-1.125s}.yarl__slide_loading line:nth-of-type(8){animation-delay:-1s}.yarl__slide_error{color:var(--yarl__slide_icon_error_color,red);height:var(--yarl__slide_icon_error_size,48px);width:var(--yarl__slide_icon_error_size,48px)}@media (prefers-reduced-motion){.yarl__portal,.yarl__slide{transition:unset}.yarl__slide_loading,.yarl__slide_loading line{animation:unset}}.yarl__toolbar{bottom:auto;display:flex;justify-content:flex-end;left:auto;padding:var(--yarl__toolbar_padding,8px);position:absolute;right:0;top:0}[dir=rtl] .yarl__toolbar{bottom:auto;left:0;right:auto;top:0}.yarl__icon{height:var(--yarl__icon_size,32px);width:var(--yarl__icon_size,32px)}.yarl__button{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:var(--yarl__button_background_color,transparent);border:var(--yarl__button_border,0);color:var(--yarl__color_button,hsla(0,0%,100%,.8));cursor:pointer;filter:var(--yarl__button_filter,drop-shadow(2px 2px 2px rgba(0,0,0,.8)));line-height:0;margin:var(--yarl__button_margin,0);outline:none;padding:var(--yarl__button_padding,8px);-webkit-tap-highlight-color:transparent}.yarl__button:focus{color:var(--yarl__color_button_active,#fff)}.yarl__button:focus:not(:focus-visible){color:var(--yarl__color_button,hsla(0,0%,100%,.8))}.yarl__button:focus-visible{color:var(--yarl__color_button_active,#fff)}@media (hover:hover){.yarl__button:focus-visible:hover,.yarl__button:focus:hover,.yarl__button:hover{color:var(--yarl__color_button_active,#fff)}}.yarl__button:disabled{color:var(--yarl__color_button_disabled,hsla(0,0%,100%,.4));cursor:default}.yarl__navigation_next,.yarl__navigation_prev{padding:var(--yarl__navigation_button_padding,24px 16px);position:absolute;top:50%;transform:translateY(-50%)}.yarl__navigation_prev{left:0}[dir=rtl] .yarl__navigation_prev{left:unset;right:0;transform:translateY(-50%) rotate(180deg)}.yarl__navigation_next{right:0}[dir=rtl] .yarl__navigation_next{left:0;right:unset;transform:translateY(-50%) rotate(180deg)}.yarl__no_scroll{height:100%;overflow:hidden;overscroll-behavior:none}@keyframes yarl__delayed_fadein{0%{opacity:0}80%{opacity:0}to{opacity:1}}@keyframes yarl__stroke_opacity{0%{stroke-opacity:1}to{stroke-opacity:.125}}

package/dist/types.d.ts

@@ -238,6 +238,8 @@ interface ControllerSettings {
     closeOnPullDown: boolean;
     /** if `true`, close the lightbox when the backdrop is clicked */
     closeOnBackdropClick: boolean;
+    /** if `true`, close the lightbox on Escape key press (default: `true`) */
+    closeOnEscape: boolean;
     /** if `true`, prevent default for horizontal wheel scroll events (for internal use only) */
     preventDefaultWheelX: boolean;
     /** if `true`, prevent default for vertical wheel scroll events (for internal use only) */
@@ -263,7 +265,7 @@ interface ControllerRef {
 /** Portal settings */
 interface PortalSettings {
     /** portal mount point */
-    root?: DocumentFragment | Element | null;
+    root?: (() => DocumentFragment | Element | null) | DocumentFragment | Element | null;
     /** HTML attributes for the portal container */
     container?: React.HTMLAttributes<HTMLDivElement>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yet-another-react-lightbox",
-  "version": "3.30.1",
+  "version": "3.32.0",
   "description": "Modern React lightbox component",
   "author": "Igor Danchenko",
   "license": "MIT",