yet-another-react-lightbox 2.4.2 → 2.5.0

package/dist/Lightbox.js

@@ -5,6 +5,11 @@ const renderNode = (node, props) => {
     var _a;
     return React.createElement(node.module.component, { key: node.module.name, ...props }, (_a = node.children) === null || _a === void 0 ? void 0 : _a.map((child) => renderNode(child, props)));
 };
+const fixupIndex = ({ index, slides, ...rest }) => ({
+    index: index >= 0 && index < slides.length ? index : 0,
+    slides,
+    ...rest,
+});
 export const Lightbox = (props) => {
     const { carousel, animation, render, toolbar, controller, on, plugins, ...restProps } = props;
     const { carousel: defaultCarousel, animation: defaultAnimation, render: defaultRender, toolbar: defaultToolbar, controller: defaultController, on: defaultOn, ...restDefaultProps } = LightboxDefaultProps;
@@ -18,7 +23,7 @@ export const Lightbox = (props) => {
                 ]),
             ]),
         ]),
-    ], plugins);
+    ], plugins, [fixupIndex]);
     const augmentedProps = augmentation({
         carousel: { ...defaultCarousel, ...carousel },
         animation: { ...defaultAnimation, ...animation },

package/dist/core/config.d.ts

@@ -1,7 +1,7 @@
 import { Augmentation, Component, Module, Node, Plugin } from "../types.js";
 export declare const createModule: (name: string, component: Component) => Module;
 export declare const createNode: (module: Module, children?: Node[]) => Node;
-export declare const withPlugins: (root: Node[], plugins?: Plugin[]) => {
+export declare const withPlugins: (root: Node[], plugins?: Plugin[], augmentations?: Augmentation[]) => {
     config: Node[];
     augmentation: Augmentation;
 };

package/dist/core/config.js

@@ -18,9 +18,8 @@ const traverseNode = (node, target, apply) => {
     return [node];
 };
 const traverse = (nodes, target, apply) => nodes.flatMap((node) => { var _a; return (_a = traverseNode(node, target, apply)) !== null && _a !== void 0 ? _a : []; });
-export const withPlugins = (root, plugins) => {
+export const withPlugins = (root, plugins = [], augmentations = []) => {
     let config = root;
-    const augmentations = [];
     const contains = (target) => {
         const nodes = [...config];
         while (nodes.length > 0) {
@@ -70,7 +69,7 @@ export const withPlugins = (root, plugins) => {
     const augment = (augmentation) => {
         augmentations.push(augmentation);
     };
-    plugins === null || plugins === void 0 ? void 0 : plugins.forEach((plugin) => {
+    plugins.forEach((plugin) => {
         plugin({
             contains,
             addParent,

package/dist/core/hooks/useDelay.d.ts

@@ -1 +1 @@
-export declare const useDelay: () => (callback: (...args: any[]) => void, delay: number) => void;
+export declare const useDelay: () => (callback: () => void, delay: number) => void;

package/dist/core/modules/Controller.d.ts

@@ -3,10 +3,14 @@ import { Component, ComponentProps, ContainerRect } from "../../types.js";
 import { SubscribeSensors } from "../hooks/index.js";
 import { LightboxStateAction } from "../contexts/index.js";
 import { ACTION_CLOSE, ACTION_NEXT, ACTION_PREV, ACTION_SWIPE, YARL_EVENT_BACKDROP_CLICK } from "../consts.js";
+export type NavigationAction = {
+    count?: number;
+    animationDuration?: number;
+};
 declare module "../" {
     interface EventTypes {
-        [ACTION_PREV]: number;
-        [ACTION_NEXT]: number;
+        [ACTION_PREV]: NavigationAction;
+        [ACTION_NEXT]: NavigationAction;
         [ACTION_SWIPE]: LightboxStateAction;
         [ACTION_CLOSE]: void;
         [YARL_EVENT_BACKDROP_CLICK]: void;

package/dist/core/modules/Controller.js

@@ -53,11 +53,11 @@ export const Controller = ({ children, ...props }) => {
         return undefined;
     });
     const swipe = useEventCallback((action) => {
-        var _a;
-        const swipeDuration = animation.swipe;
+        var _a, _b;
+        const swipeDuration = (_a = action.animationDuration) !== null && _a !== void 0 ? _a : animation.swipe;
         const currentSwipeOffset = action.offset || 0;
         let { direction } = action;
-        const count = (_a = action.count) !== null && _a !== void 0 ? _a : 1;
+        const count = (_b = action.count) !== null && _b !== void 0 ? _b : 1;
         let newSwipeState = SwipeState.ANIMATION;
         let newSwipeAnimationDuration = swipeDuration * count;
         if (!direction) {
@@ -146,7 +146,7 @@ export const Controller = ({ children, ...props }) => {
         (_a = on.view) === null || _a === void 0 ? void 0 : _a.call(on, state.currentIndex);
     });
     React.useEffect(handleIndexChange, [state.currentIndex, handleIndexChange]);
-    React.useEffect(() => cleanup(subscribe(ACTION_PREV, (count) => swipe({ direction: ACTION_PREV, count })), subscribe(ACTION_NEXT, (count) => swipe({ direction: ACTION_NEXT, count })), subscribe(ACTION_SWIPE, (action) => dispatch(action))), [subscribe, swipe, dispatch]);
+    React.useEffect(() => cleanup(subscribe(ACTION_PREV, (action) => swipe({ direction: ACTION_PREV, ...action })), subscribe(ACTION_NEXT, (action) => swipe({ direction: ACTION_NEXT, ...action })), subscribe(ACTION_SWIPE, (action) => dispatch(action))), [subscribe, swipe, dispatch]);
     React.useEffect(() => subscribeSensors(EVENT_ON_KEY_UP, (event) => {
         if (event.code === VK_ESCAPE) {
             publish(ACTION_CLOSE);

package/dist/core/modules/Navigation.d.ts

@@ -1,15 +1,14 @@
 import * as React from "react";
 import { Component, Labels } from "../../types.js";
-import { Publish } from "../contexts/index.js";
 export type NavigationButtonProps = {
-    publish: Publish;
     labels?: Labels;
     label: string;
     icon: React.ElementType;
     renderIcon?: () => React.ReactNode;
     action: "prev" | "next";
+    onClick: () => void;
     disabled?: boolean;
 };
-export declare const NavigationButton: ({ publish, labels, label, icon, renderIcon, action, disabled, }: NavigationButtonProps) => JSX.Element;
+export declare const NavigationButton: ({ labels, label, icon, renderIcon, action, onClick, disabled, }: NavigationButtonProps) => JSX.Element;
 export declare const Navigation: Component;
 export declare const NavigationModule: import("../../types.js").Module;

package/dist/core/modules/Navigation.js

@@ -6,15 +6,18 @@ import { IconButton, NextIcon, PreviousIcon } from "../components/index.js";
 import { useEvents, useLightboxState } from "../contexts/index.js";
 import { useController } from "./Controller.js";
 import { ACTION_NEXT, ACTION_PREV, EVENT_ON_KEY_DOWN, MODULE_NAVIGATION, VK_ARROW_LEFT, VK_ARROW_RIGHT, } from "../consts.js";
-export const NavigationButton = ({ publish, labels, label, icon, renderIcon, action, disabled, }) => (React.createElement(IconButton, { label: translateLabel(labels, label), icon: icon, renderIcon: renderIcon, className: cssClass(`navigation_${action}`), disabled: disabled, onClick: () => publish(action), ...useLoseFocus(disabled) }));
-export const Navigation = ({ slides, carousel: { finite }, animation: { swipe }, labels, render: { buttonPrev, buttonNext, iconPrev, iconNext }, }) => {
+export const NavigationButton = ({ labels, label, icon, renderIcon, action, onClick, disabled, }) => (React.createElement(IconButton, { label: translateLabel(labels, label), icon: icon, renderIcon: renderIcon, className: cssClass(`navigation_${action}`), disabled: disabled, onClick: onClick, ...useLoseFocus(disabled) }));
+export const Navigation = ({ slides, carousel: { finite }, animation: { swipe, navigation }, labels, render: { buttonPrev, buttonNext, iconPrev, iconNext }, }) => {
     const { currentIndex } = useLightboxState().state;
     const { subscribeSensors } = useController();
     const { publish } = useEvents();
     const isRTL = useRTL();
     const prevDisabled = slides.length === 0 || (finite && currentIndex === 0);
     const nextDisabled = slides.length === 0 || (finite && currentIndex === slides.length - 1);
-    const publishThrottled = useThrottle((action) => publish(action), swipe / 2);
+    const navigate = (action) => {
+        publish(action, { animationDuration: navigation });
+    };
+    const publishThrottled = useThrottle((action) => navigate(action), (navigation !== null && navigation !== void 0 ? navigation : swipe) / 2);
     const handleKeyDown = useEventCallback((event) => {
         if (event.key === VK_ARROW_LEFT && !(isRTL ? nextDisabled : prevDisabled)) {
             publishThrottled(isRTL ? ACTION_NEXT : ACTION_PREV);
@@ -25,7 +28,7 @@ export const Navigation = ({ slides, carousel: { finite }, animation: { swipe },
     });
     React.useEffect(() => subscribeSensors(EVENT_ON_KEY_DOWN, handleKeyDown), [subscribeSensors, handleKeyDown]);
     return (React.createElement(React.Fragment, null,
-        buttonPrev ? (buttonPrev()) : (React.createElement(NavigationButton, { label: "Previous", action: ACTION_PREV, icon: PreviousIcon, renderIcon: iconPrev, disabled: prevDisabled, labels: labels, publish: publish })),
-        buttonNext ? (buttonNext()) : (React.createElement(NavigationButton, { label: "Next", action: ACTION_NEXT, icon: NextIcon, renderIcon: iconNext, disabled: nextDisabled, labels: labels, publish: publish }))));
+        buttonPrev ? (buttonPrev()) : (React.createElement(NavigationButton, { label: "Previous", action: ACTION_PREV, icon: PreviousIcon, renderIcon: iconPrev, disabled: prevDisabled, labels: labels, onClick: () => navigate(ACTION_PREV) })),
+        buttonNext ? (buttonNext()) : (React.createElement(NavigationButton, { label: "Next", action: ACTION_NEXT, icon: NextIcon, renderIcon: iconNext, disabled: nextDisabled, labels: labels, onClick: () => navigate(ACTION_NEXT) }))));
 };
 export const NavigationModule = createModule(MODULE_NAVIGATION, Navigation);

package/dist/plugins/thumbnails/ThumbnailsTrack.js

@@ -5,14 +5,14 @@ import { Thumbnail } from "./Thumbnail.js";
 import { defaultThumbnailsProps } from "./Thumbnails.js";
 const isHorizontal = (position) => ["top", "bottom"].includes(position);
 const boxSize = (thumbnails, dimension, includeGap) => dimension + 2 * (thumbnails.border + thumbnails.padding) + (includeGap ? thumbnails.gap : 0);
-export const ThumbnailsTrack = ({ container, slides, carousel, render, thumbnails, thumbnailRect, styles, }) => {
+export const ThumbnailsTrack = ({ container, slides, carousel, render, thumbnails, thumbnailRect, styles, animation: { navigation }, }) => {
     const track = React.useRef(null);
     const { globalIndex, animation } = useLightboxState().state;
     const { publish, subscribe } = useEvents();
     const isRTL = useRTL();
     const index = globalIndex;
-    const offset = (animation === null || animation === void 0 ? void 0 : animation.increment) || 0;
     const animationDuration = (animation === null || animation === void 0 ? void 0 : animation.duration) || 0;
+    const offset = (animationDuration > 0 && (animation === null || animation === void 0 ? void 0 : animation.increment)) || 0;
     const animate = useAnimation(track, (snapshot) => ({
         keyframes: isHorizontal(thumbnails.position)
             ? [
@@ -78,10 +78,10 @@ export const ThumbnailsTrack = ({ container, slides, carousel, render, thumbnail
     }
     const handleClick = (slideIndex) => () => {
         if (slideIndex > index) {
-            publish(ACTION_NEXT, slideIndex - index);
+            publish(ACTION_NEXT, { count: slideIndex - index, animationDuration: navigation });
         }
         else if (slideIndex < index) {
-            publish(ACTION_PREV, index - slideIndex);
+            publish(ACTION_PREV, { count: index - slideIndex, animationDuration: navigation });
         }
     };
     const { width, height, border, borderRadius, padding, gap, imageFit, vignette } = thumbnails;

package/dist/plugins/zoom/ResponsiveImage.js

@@ -31,13 +31,12 @@ export const ResponsiveImage = (props) => {
     });
     const style = {
         WebkitTransform: "translateZ(0)",
-        ...(rect.width / rect.height < width / height
-            ? {
-                width: "100%",
-                height: "auto",
-            }
-            : { width: "auto", height: "100%" }),
     };
+    if (!cover) {
+        Object.assign(style, rect.width / rect.height < width / height
+            ? { width: "100%", height: "auto" }
+            : { width: "auto", height: "100%" });
+    }
     return (React.createElement(React.Fragment, null,
         preload && preload !== current && (React.createElement(ImageSlide, { key: "preload", ...props, slide: { ...image, src: preload, srcSet: undefined }, style: { position: "absolute", visibility: "hidden", ...style }, onLoad: () => handlePreload(preload), render: {
                 ...render,

package/dist/plugins/zoom/ZoomContainer.js

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { CLASS_FLEX_CENTER, CLASS_FULLSIZE, cleanup, clsx, cssClass, EVENT_ON_KEY_DOWN, EVENT_ON_POINTER_CANCEL, EVENT_ON_POINTER_DOWN, EVENT_ON_POINTER_LEAVE, EVENT_ON_POINTER_MOVE, EVENT_ON_POINTER_UP, EVENT_ON_WHEEL, ImageSlide, isImageSlide, round, useContainerRect, useController, useEventCallback, useEvents, useLayoutEffect, useLightboxState, useMotionPreference, } from "../../core/index.js";
+import { CLASS_FLEX_CENTER, CLASS_FULLSIZE, cleanup, clsx, cssClass, EVENT_ON_KEY_DOWN, EVENT_ON_POINTER_CANCEL, EVENT_ON_POINTER_DOWN, EVENT_ON_POINTER_LEAVE, EVENT_ON_POINTER_MOVE, EVENT_ON_POINTER_UP, EVENT_ON_WHEEL, IMAGE_FIT_COVER, ImageSlide, isImageSlide, round, useContainerRect, useController, useEventCallback, useEvents, useLayoutEffect, useLightboxState, useMotionPreference, } from "../../core/index.js";
 import { useZoom } from "./ZoomContext.js";
 import { defaultZoomProps } from "./Zoom.js";
 import { ACTION_ZOOM_IN, ACTION_ZOOM_OUT } from "./index.js";
@@ -24,12 +24,12 @@ const getSlideRects = (slide, cover, maxZoomPixelRatio, rect) => {
             };
             slideRect = cover
                 ? {
-                    width: Math.min(rect.width, maxSlideRect.width),
-                    height: Math.min(rect.height, maxSlideRect.height),
+                    width: Math.min(rect.width, maxSlideRect.width, width),
+                    height: Math.min(rect.height, maxSlideRect.height, height),
                 }
                 : {
-                    width: Math.round(Math.min(rect.width, (rect.height / height) * width)),
-                    height: Math.round(Math.min(rect.height, (rect.width / width) * height)),
+                    width: Math.round(Math.min(rect.width, (rect.height / height) * width, width)),
+                    height: Math.round(Math.min(rect.height, (rect.width / width) * height, height)),
                 };
         }
     }
@@ -54,8 +54,8 @@ export const ZoomContainer = ({ slide, offset, rect, render, carousel, animation
     const { subscribeSensors, containerRef: controllerRef, containerRect: controllerRect } = useController();
     const { subscribe } = useEvents();
     const reduceMotion = useMotionPreference();
-    const { slideRect, maxSlideRect: currentMaxSlideRect } = getSlideRects({ ...slide, ...imageDimensions }, carousel.imageFit === "cover" || ("imageFit" in slide && slide.imageFit === "cover"), zoomProps.maxZoomPixelRatio, containerRect);
-    const maxZoom = slideRect.width ? Math.max(round(currentMaxSlideRect.width / slideRect.width, 5), 1) : 1;
+    const { slideRect, maxSlideRect } = getSlideRects({ ...slide, ...imageDimensions }, carousel.imageFit === IMAGE_FIT_COVER || ("imageFit" in slide && slide.imageFit === IMAGE_FIT_COVER), zoomProps.maxZoomPixelRatio, containerRect);
+    const maxZoom = slideRect.width ? Math.max(round(maxSlideRect.width / slideRect.width, 5), 1) : 1;
     const changeOffsets = useEventCallback((dx, dy, targetZoom) => {
         const newZoom = targetZoom || zoom;
         const newOffsetX = offsetX - (dx || 0);

package/dist/types.d.ts

@@ -82,6 +82,8 @@ export interface AnimationSettings {
     fade: number;
     /** swipe animation duration */
     swipe: number;
+    /** override for `swipe` animation duration when using keyboard navigation or navigation buttons */
+    navigation?: number;
 }
 /** Controller settings */
 export interface ControllerSettings {

package/package.json

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