@alfalab/core-components 47.26.1-beta.0 → 47.26.1-beta.3254

package/gallery/components/image-viewer/component.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var React = require('react');
 var cn = require('classnames');
+var elementClosest = require('element-closest');
 var SwiperCore = require('swiper');
 var react = require('swiper/react');
 var hooks = require('@alfalab/hooks');
@@ -11,22 +12,23 @@ var ChevronForwardHeavyMIcon = require('@alfalab/icons-glyph/ChevronForwardHeavy
 var context = require('../../context.js');
 var utils_utils = require('../../utils/utils.js');
 var utils_constants = require('../../utils/constants.js');
-var components_imageViewer_hooks = require('./hooks.js');
-var components_imageViewer_slide = require('./slide.js');
+var components_imageViewer_slide = require('../../slide-c3eb8b7d.js');
 require('swiper/swiper.min.css');
-var index_module = require('../../index.module-c483ff15.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var cn__default = /*#__PURE__*/_interopDefaultCompat(cn);
+var elementClosest__default = /*#__PURE__*/_interopDefaultCompat(elementClosest);
 var SwiperCore__default = /*#__PURE__*/_interopDefaultCompat(SwiperCore);
 
 SwiperCore__default.default.use([SwiperCore.EffectFade, SwiperCore.A11y, SwiperCore.Controller]);
 var ImageViewer = function () {
     var _a, _b, _c;
-    var _d = React.useContext(context.GalleryContext), images = _d.images, imagesMeta = _d.imagesMeta, fullScreen = _d.fullScreen, currentSlideIndex = _d.currentSlideIndex, initialSlide = _d.initialSlide, setCurrentSlideIndex = _d.setCurrentSlideIndex, getSwiper = _d.getSwiper, setSwiper = _d.setSwiper, slidePrev = _d.slidePrev, slideNext = _d.slideNext, getCurrentImage = _d.getCurrentImage;
-    var _e = components_imageViewer_hooks.useHandleImageViewer(), handleLoad = _e.handleLoad, handleLoadError = _e.handleLoadError, handleWrapperClick = _e.handleWrapperClick, isMobile = _e.isMobile, rightArrowRef = _e.rightArrowRef, leftArrowRef = _e.leftArrowRef;
+    var _d = React.useContext(context.GalleryContext), singleSlide = _d.singleSlide, images = _d.images, imagesMeta = _d.imagesMeta, fullScreen = _d.fullScreen, currentSlideIndex = _d.currentSlideIndex, initialSlide = _d.initialSlide, onClose = _d.onClose, setImageMeta = _d.setImageMeta, setCurrentSlideIndex = _d.setCurrentSlideIndex, getSwiper = _d.getSwiper, setSwiper = _d.setSwiper, slidePrev = _d.slidePrev, slideNext = _d.slideNext, getCurrentImage = _d.getCurrentImage, view = _d.view;
+    var isMobile = view === 'mobile';
+    var leftArrowRef = React.useRef(null);
+    var rightArrowRef = React.useRef(null);
     var leftArrowFocused = hooks.useFocus(leftArrowRef, 'keyboard')[0];
     var rightArrowFocused = hooks.useFocus(rightArrowRef, 'keyboard')[0];
     var swiper = getSwiper();
@@ -51,6 +53,28 @@ var ImageViewer = function () {
             slideNext();
         }
     };
+    var handleLoad = function (event, index) {
+        var target = event.currentTarget;
+        var naturalWidth = target.naturalWidth, naturalHeight = target.naturalHeight;
+        setImageMeta({ width: naturalWidth, height: naturalHeight }, index);
+    };
+    var handleLoadError = function (index) {
+        setImageMeta({ width: 0, height: 0, broken: true }, index);
+    };
+    var handleWrapperClick = React.useCallback(function (event) {
+        var _a, _b;
+        var eventTarget = event.target;
+        var isArrow = ((_a = leftArrowRef.current) === null || _a === void 0 ? void 0 : _a.contains(eventTarget)) ||
+            ((_b = rightArrowRef.current) === null || _b === void 0 ? void 0 : _b.contains(eventTarget));
+        var isPlaceholder = Boolean(eventTarget.closest(".".concat(components_imageViewer_slide.styles.placeholder)));
+        var isImg = eventTarget.tagName === 'IMG';
+        if (!isImg && !isPlaceholder && !isArrow && !isMobile) {
+            onClose();
+        }
+    }, [isMobile, onClose]);
+    React.useEffect(function () {
+        elementClosest__default.default(window);
+    }, []);
     var swiperProps = React.useMemo(function () {
         var _a;
         return ({
@@ -59,11 +83,11 @@ var ImageViewer = function () {
             fadeEffect: {
                 crossFade: true,
             },
-            className: cn__default.default(index_module.styles.swiper, (_a = {},
-                _a[index_module.styles.hidden] = fullScreen && !utils_utils.isVideo(currentImage === null || currentImage === void 0 ? void 0 : currentImage.src),
-                _a[index_module.styles.fullScreenVideo] = fullScreen && utils_utils.isVideo(currentImage === null || currentImage === void 0 ? void 0 : currentImage.src),
-                _a[index_module.styles.mobile] = isMobile,
-                _a[index_module.styles.mobileVideo] = isMobile && utils_utils.isVideo(currentImage === null || currentImage === void 0 ? void 0 : currentImage.src),
+            className: cn__default.default(components_imageViewer_slide.styles.swiper, (_a = {},
+                _a[components_imageViewer_slide.styles.hidden] = fullScreen && !utils_utils.isVideo(currentImage === null || currentImage === void 0 ? void 0 : currentImage.src),
+                _a[components_imageViewer_slide.styles.fullScreenVideo] = fullScreen && !singleSlide && utils_utils.isVideo(currentImage === null || currentImage === void 0 ? void 0 : currentImage.src),
+                _a[components_imageViewer_slide.styles.mobile] = isMobile,
+                _a[components_imageViewer_slide.styles.mobileVideo] = isMobile && utils_utils.isVideo(currentImage === null || currentImage === void 0 ? void 0 : currentImage.src),
                 _a)),
             controller: { control: swiper },
             a11y: {
@@ -78,27 +102,29 @@ var ImageViewer = function () {
     }, [
         fullScreen,
         currentImage === null || currentImage === void 0 ? void 0 : currentImage.src,
+        singleSlide,
         isMobile,
         swiper,
         initialSlide,
         setSwiper,
         handleSlideChange,
     ]);
-    var showControls = !fullScreen && !isMobile && !!images.length;
+    var showControls = !singleSlide && !fullScreen && !isMobile && !!images.length;
     var swiperWidth = (swiper === null || swiper === void 0 ? void 0 : swiper.width) || 1;
     var swiperHeight = (swiper === null || swiper === void 0 ? void 0 : swiper.height) || (swiper === null || swiper === void 0 ? void 0 : swiper.width) || 1;
     var swiperAspectRatio = swiperWidth / swiperHeight;
     return (
     /* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions */
-    React__default.default.createElement("div", { className: cn__default.default(index_module.styles.component, (_a = {},
-            _a[index_module.styles.mobile] = isMobile,
-            _a[index_module.styles.mobileVideo] = isMobile && utils_utils.isVideo(currentImage === null || currentImage === void 0 ? void 0 : currentImage.src),
+    React__default.default.createElement("div", { className: cn__default.default(components_imageViewer_slide.styles.component, (_a = {},
+            _a[components_imageViewer_slide.styles.singleSlide] = singleSlide,
+            _a[components_imageViewer_slide.styles.mobile] = isMobile,
+            _a[components_imageViewer_slide.styles.mobileVideo] = isMobile && utils_utils.isVideo(currentImage === null || currentImage === void 0 ? void 0 : currentImage.src),
             _a)), onClick: handleWrapperClick },
-        showControls && (React__default.default.createElement("div", { className: cn__default.default(index_module.styles.arrow, (_b = {},
-                _b[index_module.styles.focused] = leftArrowFocused,
+        showControls && (React__default.default.createElement("div", { className: cn__default.default(components_imageViewer_slide.styles.arrow, (_b = {},
+                _b[components_imageViewer_slide.styles.focused] = leftArrowFocused,
                 _b)), onClick: handlePrevClick, role: 'button', onKeyDown: handleArrowLeftKeyDown, tabIndex: 0, ref: leftArrowRef, "aria-label": '\u041F\u0440\u0435\u0434\u044B\u0434\u0443\u0449\u0435\u0435 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435', "data-test-id": utils_constants.TestIds.PREV_SLIDE_BUTTON },
             React__default.default.createElement(ChevronBackHeavyMIcon.ChevronBackHeavyMIcon, null))),
-        fullScreen && !utils_utils.isVideo(currentImage === null || currentImage === void 0 ? void 0 : currentImage.src) && (React__default.default.createElement("img", { src: currentImage === null || currentImage === void 0 ? void 0 : currentImage.src, alt: currentImage ? utils_utils.getImageAlt(currentImage, currentSlideIndex) : '', className: index_module.styles.fullScreenImage })),
+        fullScreen && !utils_utils.isVideo(currentImage === null || currentImage === void 0 ? void 0 : currentImage.src) && (React__default.default.createElement("img", { src: currentImage === null || currentImage === void 0 ? void 0 : currentImage.src, alt: currentImage ? utils_utils.getImageAlt(currentImage, currentSlideIndex) : '', className: components_imageViewer_slide.styles.fullScreenImage })),
         React__default.default.createElement(react.Swiper, tslib.__assign({}, swiperProps), images.map(function (image, index) {
             var meta = imagesMeta[index];
             var imageWidth = (meta === null || meta === void 0 ? void 0 : meta.width) || 1;
@@ -110,11 +136,11 @@ var ImageViewer = function () {
                     transitionProperty: 'opacity',
                 } }, function (_a) {
                 var isActive = _a.isActive;
-                return (React__default.default.createElement(components_imageViewer_slide.Slide, { isActive: isActive, containerAspectRatio: swiperAspectRatio, image: image, containerHeight: swiperHeight, meta: meta, index: index, imageAspectRatio: imageAspectRatio, slideVisible: slideVisible, handleLoad: handleLoad, handleLoadError: handleLoadError }));
+                return (React__default.default.createElement(components_imageViewer_slide.Slide, { isActive: isActive, swiperAspectRatio: swiperAspectRatio, image: image, swiperHeight: swiperHeight, meta: meta, index: index, imageAspectRatio: imageAspectRatio, slideVisible: slideVisible, handleLoad: handleLoad, handleLoadError: handleLoadError }));
             }));
         })),
-        showControls && (React__default.default.createElement("div", { className: cn__default.default(index_module.styles.arrow, (_c = {},
-                _c[index_module.styles.focused] = rightArrowFocused,
+        showControls && (React__default.default.createElement("div", { className: cn__default.default(components_imageViewer_slide.styles.arrow, (_c = {},
+                _c[components_imageViewer_slide.styles.focused] = rightArrowFocused,
                 _c)), onClick: handleNextClick, role: 'button', onKeyDown: handleArrowRightKeyDown, tabIndex: 0, ref: rightArrowRef, "aria-label": '\u0421\u043B\u0435\u0434\u0443\u044E\u0449\u0435\u0435 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435', "data-test-id": utils_constants.TestIds.NEXT_SLIDE_BUTTON },
             React__default.default.createElement(ChevronForwardHeavyMIcon.ChevronForwardHeavyMIcon, null)))));
 };

package/gallery/components/image-viewer/index.css

@@ -53,18 +53,13 @@
         max-height: calc(100vh - 210px);
     } .gallery__swiper_1dsel.gallery__mobileVideo_1dsel {
         max-height: 100vh;
-    } .gallery__singleSlideContainer_1dsel {
-    display: flex;
-    width: 100%;
-    height: 100%;
-
+    } .gallery__singleSlide_1dsel .gallery__swiper_1dsel {
     max-height: calc(100vh - 80px);
-    padding: var(--gap-32);
-    box-sizing: border-box
-} .gallery__singleSlideContainer_1dsel.gallery__mobile_1dsel {
+    padding: var(--gap-32)
+} .gallery__singleSlide_1dsel .gallery__swiper_1dsel.gallery__mobile_1dsel {
         max-height: calc(100vh - 174px);
         padding: 0;
-    } .gallery__singleSlideContainer_1dsel.gallery__mobileVideo_1dsel {
+    } .gallery__singleSlide_1dsel .gallery__swiper_1dsel.gallery__mobileVideo_1dsel {
         max-height: 100vh;
     } .gallery__hidden_1dsel {
     display: none;

package/gallery/components/image-viewer/slide.d.ts

@@ -1,16 +0,0 @@
-import { FC, SyntheticEvent } from 'react';
-import { GalleryImage, ImageMeta } from "../../types";
-type SlideProps = {
-    isActive: boolean;
-    image: GalleryImage;
-    meta?: ImageMeta;
-    containerAspectRatio: number;
-    imageAspectRatio: number;
-    index: number;
-    containerHeight: number;
-    slideVisible: boolean;
-    handleLoad: (event: SyntheticEvent<HTMLImageElement>, index: number) => void;
-    handleLoadError: (index: number) => void;
-};
-declare const Slide: FC<SlideProps>;
-export { Slide };

package/gallery/components/image-viewer/slide.js

@@ -1,56 +1,15 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var React = require('react');
-var cn = require('classnames');
-var coreComponentsTypography = require('../../../typography');
-var context = require('../../context.js');
-var utils_utils = require('../../utils/utils.js');
-var utils_constants = require('../../utils/constants.js');
-var components_imageViewer_paths = require('./paths.js');
-var components_imageViewer_video_index = require('./video/index.js');
-var index_module = require('../../index.module-c483ff15.js');
+require('react');
+require('classnames');
+require('../../../typography');
+require('../../context.js');
+require('../../utils/utils.js');
+require('../../utils/constants.js');
+require('./paths.js');
+require('./video/index.js');
+var components_imageViewer_slide = require('../../slide-c3eb8b7d.js');
 
-function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
-var React__default = /*#__PURE__*/_interopDefaultCompat(React);
-var cn__default = /*#__PURE__*/_interopDefaultCompat(cn);
 
-var SlideInner = function (_a) {
-    var _b;
-    var children = _a.children, broken = _a.broken, loading = _a.loading, withPlaceholder = _a.withPlaceholder, isVideoView = _a.isVideoView;
-    var content = broken ? (React__default.default.createElement("div", { className: index_module.styles.brokenImgWrapper },
-        React__default.default.createElement("div", { className: index_module.styles.brokenImgIcon },
-            React__default.default.createElement("svg", { xmlns: 'http://www.w3.org/2000/svg', width: '80', height: '80', viewBox: '0 0 80 80', fill: 'none' },
-                React__default.default.createElement("rect", { width: '80', height: '80', fill: 'none' }),
-                React__default.default.createElement("path", { fillRule: 'evenodd', clipRule: 'evenodd', d: components_imageViewer_paths.NoImagePaths.baseImage, fill: '#89898A' }),
-                React__default.default.createElement("path", { d: components_imageViewer_paths.NoImagePaths.triangleImage, fill: '#89898A' }))),
-        React__default.default.createElement(coreComponentsTypography.Typography.Text, { view: 'primary-small', color: 'static-secondary-light' },
-            "\u041D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C ",
-            isVideoView ? 'видео' : 'изображение'))) : (children);
-    return (React__default.default.createElement("div", { className: cn__default.default(index_module.styles.slide, (_b = {}, _b[index_module.styles.slideLoading] = loading, _b)) }, withPlaceholder ? React__default.default.createElement("div", { className: index_module.styles.placeholder }, content) : content));
-};
-var Slide = function (_a) {
-    var _b;
-    var isActive = _a.isActive, meta = _a.meta, containerAspectRatio = _a.containerAspectRatio, imageAspectRatio = _a.imageAspectRatio, image = _a.image, index = _a.index, containerHeight = _a.containerHeight, slideVisible = _a.slideVisible, handleLoad = _a.handleLoad, handleLoadError = _a.handleLoadError;
-    var view = React.useContext(context.GalleryContext).view;
-    var broken = Boolean(meta === null || meta === void 0 ? void 0 : meta.broken);
-    var small = utils_utils.isSmallImage(meta);
-    var verticalImageFit = !small && containerAspectRatio > imageAspectRatio;
-    var horizontalImageFit = !small && containerAspectRatio <= imageAspectRatio;
-    if (utils_utils.isVideo(image.src)) {
-        return (React__default.default.createElement(SlideInner, { isVideoView: true, active: isActive, broken: broken, withPlaceholder: broken, loading: !meta },
-            React__default.default.createElement(components_imageViewer_video_index.Video, { url: image.src, index: index, isActive: isActive })));
-    }
-    return (React__default.default.createElement(SlideInner, { active: isActive, broken: broken, loading: !meta, withPlaceholder: small || broken },
-        React__default.default.createElement("img", { src: image.src, alt: utils_utils.getImageAlt(image, index), className: cn__default.default((_b = {},
-                _b[index_module.styles.smallImage] = small,
-                _b[index_module.styles.image] = !small && meta,
-                _b[index_module.styles.mobile] = view === 'mobile',
-                _b[index_module.styles.verticalImageFit] = verticalImageFit,
-                _b[index_module.styles.horizontalImageFit] = horizontalImageFit,
-                _b)), onLoad: function (event) { return handleLoad(event, index); }, onError: function () { return handleLoadError(index); }, style: {
-                maxHeight: "".concat(containerHeight, "px"),
-            }, "data-test-id": slideVisible ? utils_constants.TestIds.ACTIVE_IMAGE : undefined })));
-};
-
-exports.Slide = Slide;
+exports.Slide = components_imageViewer_slide.Slide;

package/gallery/cssm/Component.js

@@ -4,7 +4,6 @@ var React = require('react');
 var cn = require('classnames');
 var coreComponentsBaseModal = require('../../base-modal/cssm');
 var hooks = require('@alfalab/hooks');
-var components_imageViewer_single = require('./components/image-viewer/single.js');
 var components_navigationBar_Component = require('./components/navigation-bar/Component.js');
 var components_header_Component = require('./components/header/Component.js');
 var context = require('./context.js');
@@ -151,7 +150,7 @@ var Gallery = function (_a) {
         React__default.default.createElement(coreComponentsBaseModal.BaseModal, { open: open, className: cn__default.default(styles__default.default.modal, popupClassName), onEscapeKeyDown: handleEscapeKeyDown, Backdrop: Backdrop, onUnmount: onUnmount },
             React__default.default.createElement("div", { className: styles__default.default.container },
                 view === 'desktop' ? React__default.default.createElement(components_header_Component.Header, null) : React__default.default.createElement(components_headerMobile_Component.HeaderMobile, null),
-                images.length === 1 ? React__default.default.createElement(components_imageViewer_single.Single, null) : React__default.default.createElement(components_imageViewer_component.ImageViewer, null),
+                React__default.default.createElement(components_imageViewer_component.ImageViewer, null),
                 React__default.default.createElement("nav", { className: cn__default.default((_b = {},
                         _b[styles__default.default.navigationVideo] = isCurrentVideo && isMobile,
                         _b[styles__default.default.hideNavigation] = hideNavigation && isMobile,

package/gallery/cssm/components/image-viewer/component.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var React = require('react');
 var cn = require('classnames');
+var elementClosest = require('element-closest');
 var SwiperCore = require('swiper');
 var react = require('swiper/react');
 var hooks = require('@alfalab/hooks');
@@ -11,7 +12,6 @@ var ChevronForwardHeavyMIcon = require('@alfalab/icons-glyph/ChevronForwardHeavy
 var context = require('../../context.js');
 var utils_utils = require('../../utils/utils.js');
 var utils_constants = require('../../utils/constants.js');
-var components_imageViewer_hooks = require('./hooks.js');
 var components_imageViewer_slide = require('./slide.js');
 require('swiper/swiper.min.css');
 var styles = require('./index.module.css');
@@ -20,14 +20,17 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var cn__default = /*#__PURE__*/_interopDefaultCompat(cn);
+var elementClosest__default = /*#__PURE__*/_interopDefaultCompat(elementClosest);
 var SwiperCore__default = /*#__PURE__*/_interopDefaultCompat(SwiperCore);
 var styles__default = /*#__PURE__*/_interopDefaultCompat(styles);
 
 SwiperCore__default.default.use([SwiperCore.EffectFade, SwiperCore.A11y, SwiperCore.Controller]);
 var ImageViewer = function () {
     var _a, _b, _c;
-    var _d = React.useContext(context.GalleryContext), images = _d.images, imagesMeta = _d.imagesMeta, fullScreen = _d.fullScreen, currentSlideIndex = _d.currentSlideIndex, initialSlide = _d.initialSlide, setCurrentSlideIndex = _d.setCurrentSlideIndex, getSwiper = _d.getSwiper, setSwiper = _d.setSwiper, slidePrev = _d.slidePrev, slideNext = _d.slideNext, getCurrentImage = _d.getCurrentImage;
-    var _e = components_imageViewer_hooks.useHandleImageViewer(), handleLoad = _e.handleLoad, handleLoadError = _e.handleLoadError, handleWrapperClick = _e.handleWrapperClick, isMobile = _e.isMobile, rightArrowRef = _e.rightArrowRef, leftArrowRef = _e.leftArrowRef;
+    var _d = React.useContext(context.GalleryContext), singleSlide = _d.singleSlide, images = _d.images, imagesMeta = _d.imagesMeta, fullScreen = _d.fullScreen, currentSlideIndex = _d.currentSlideIndex, initialSlide = _d.initialSlide, onClose = _d.onClose, setImageMeta = _d.setImageMeta, setCurrentSlideIndex = _d.setCurrentSlideIndex, getSwiper = _d.getSwiper, setSwiper = _d.setSwiper, slidePrev = _d.slidePrev, slideNext = _d.slideNext, getCurrentImage = _d.getCurrentImage, view = _d.view;
+    var isMobile = view === 'mobile';
+    var leftArrowRef = React.useRef(null);
+    var rightArrowRef = React.useRef(null);
     var leftArrowFocused = hooks.useFocus(leftArrowRef, 'keyboard')[0];
     var rightArrowFocused = hooks.useFocus(rightArrowRef, 'keyboard')[0];
     var swiper = getSwiper();
@@ -52,6 +55,28 @@ var ImageViewer = function () {
             slideNext();
         }
     };
+    var handleLoad = function (event, index) {
+        var target = event.currentTarget;
+        var naturalWidth = target.naturalWidth, naturalHeight = target.naturalHeight;
+        setImageMeta({ width: naturalWidth, height: naturalHeight }, index);
+    };
+    var handleLoadError = function (index) {
+        setImageMeta({ width: 0, height: 0, broken: true }, index);
+    };
+    var handleWrapperClick = React.useCallback(function (event) {
+        var _a, _b;
+        var eventTarget = event.target;
+        var isArrow = ((_a = leftArrowRef.current) === null || _a === void 0 ? void 0 : _a.contains(eventTarget)) ||
+            ((_b = rightArrowRef.current) === null || _b === void 0 ? void 0 : _b.contains(eventTarget));
+        var isPlaceholder = Boolean(eventTarget.closest(".".concat(styles__default.default.placeholder)));
+        var isImg = eventTarget.tagName === 'IMG';
+        if (!isImg && !isPlaceholder && !isArrow && !isMobile) {
+            onClose();
+        }
+    }, [isMobile, onClose]);
+    React.useEffect(function () {
+        elementClosest__default.default(window);
+    }, []);
     var swiperProps = React.useMemo(function () {
         var _a;
         return ({
@@ -62,7 +87,7 @@ var ImageViewer = function () {
             },
             className: cn__default.default(styles__default.default.swiper, (_a = {},
                 _a[styles__default.default.hidden] = fullScreen && !utils_utils.isVideo(currentImage === null || currentImage === void 0 ? void 0 : currentImage.src),
-                _a[styles__default.default.fullScreenVideo] = fullScreen && utils_utils.isVideo(currentImage === null || currentImage === void 0 ? void 0 : currentImage.src),
+                _a[styles__default.default.fullScreenVideo] = fullScreen && !singleSlide && utils_utils.isVideo(currentImage === null || currentImage === void 0 ? void 0 : currentImage.src),
                 _a[styles__default.default.mobile] = isMobile,
                 _a[styles__default.default.mobileVideo] = isMobile && utils_utils.isVideo(currentImage === null || currentImage === void 0 ? void 0 : currentImage.src),
                 _a)),
@@ -79,19 +104,21 @@ var ImageViewer = function () {
     }, [
         fullScreen,
         currentImage === null || currentImage === void 0 ? void 0 : currentImage.src,
+        singleSlide,
         isMobile,
         swiper,
         initialSlide,
         setSwiper,
         handleSlideChange,
     ]);
-    var showControls = !fullScreen && !isMobile && !!images.length;
+    var showControls = !singleSlide && !fullScreen && !isMobile && !!images.length;
     var swiperWidth = (swiper === null || swiper === void 0 ? void 0 : swiper.width) || 1;
     var swiperHeight = (swiper === null || swiper === void 0 ? void 0 : swiper.height) || (swiper === null || swiper === void 0 ? void 0 : swiper.width) || 1;
     var swiperAspectRatio = swiperWidth / swiperHeight;
     return (
     /* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions */
     React__default.default.createElement("div", { className: cn__default.default(styles__default.default.component, (_a = {},
+            _a[styles__default.default.singleSlide] = singleSlide,
             _a[styles__default.default.mobile] = isMobile,
             _a[styles__default.default.mobileVideo] = isMobile && utils_utils.isVideo(currentImage === null || currentImage === void 0 ? void 0 : currentImage.src),
             _a)), onClick: handleWrapperClick },
@@ -111,7 +138,7 @@ var ImageViewer = function () {
                     transitionProperty: 'opacity',
                 } }, function (_a) {
                 var isActive = _a.isActive;
-                return (React__default.default.createElement(components_imageViewer_slide.Slide, { isActive: isActive, containerAspectRatio: swiperAspectRatio, image: image, containerHeight: swiperHeight, meta: meta, index: index, imageAspectRatio: imageAspectRatio, slideVisible: slideVisible, handleLoad: handleLoad, handleLoadError: handleLoadError }));
+                return (React__default.default.createElement(components_imageViewer_slide.Slide, { isActive: isActive, swiperAspectRatio: swiperAspectRatio, image: image, swiperHeight: swiperHeight, meta: meta, index: index, imageAspectRatio: imageAspectRatio, slideVisible: slideVisible, handleLoad: handleLoad, handleLoadError: handleLoadError }));
             }));
         })),
         showControls && (React__default.default.createElement("div", { className: cn__default.default(styles__default.default.arrow, (_c = {},

package/gallery/cssm/components/image-viewer/index.module.css

@@ -52,18 +52,13 @@
         max-height: calc(100vh - 210px);
     } .swiper.mobileVideo {
         max-height: 100vh;
-    } .singleSlideContainer {
-    display: flex;
-    width: 100%;
-    height: 100%;
-
+    } .singleSlide .swiper {
     max-height: calc(100vh - 80px);
-    padding: var(--gap-32);
-    box-sizing: border-box
-} .singleSlideContainer.mobile {
+    padding: var(--gap-32)
+} .singleSlide .swiper.mobile {
         max-height: calc(100vh - 174px);
         padding: 0;
-    } .singleSlideContainer.mobileVideo {
+    } .singleSlide .swiper.mobileVideo {
         max-height: 100vh;
     } .hidden {
     display: none;

package/gallery/cssm/components/image-viewer/slide.d.ts

@@ -4,10 +4,10 @@ type SlideProps = {
     isActive: boolean;
     image: GalleryImage;
     meta?: ImageMeta;
-    containerAspectRatio: number;
+    swiperAspectRatio: number;
     imageAspectRatio: number;
     index: number;
-    containerHeight: number;
+    swiperHeight: number;
     slideVisible: boolean;
     handleLoad: (event: SyntheticEvent<HTMLImageElement>, index: number) => void;
     handleLoadError: (index: number) => void;

package/gallery/cssm/components/image-viewer/slide.js

@@ -32,12 +32,12 @@ var SlideInner = function (_a) {
 };
 var Slide = function (_a) {
     var _b;
-    var isActive = _a.isActive, meta = _a.meta, containerAspectRatio = _a.containerAspectRatio, imageAspectRatio = _a.imageAspectRatio, image = _a.image, index = _a.index, containerHeight = _a.containerHeight, slideVisible = _a.slideVisible, handleLoad = _a.handleLoad, handleLoadError = _a.handleLoadError;
+    var isActive = _a.isActive, meta = _a.meta, swiperAspectRatio = _a.swiperAspectRatio, imageAspectRatio = _a.imageAspectRatio, image = _a.image, index = _a.index, swiperHeight = _a.swiperHeight, slideVisible = _a.slideVisible, handleLoad = _a.handleLoad, handleLoadError = _a.handleLoadError;
     var view = React.useContext(context.GalleryContext).view;
     var broken = Boolean(meta === null || meta === void 0 ? void 0 : meta.broken);
     var small = utils_utils.isSmallImage(meta);
-    var verticalImageFit = !small && containerAspectRatio > imageAspectRatio;
-    var horizontalImageFit = !small && containerAspectRatio <= imageAspectRatio;
+    var verticalImageFit = !small && swiperAspectRatio > imageAspectRatio;
+    var horizontalImageFit = !small && swiperAspectRatio <= imageAspectRatio;
     if (utils_utils.isVideo(image.src)) {
         return (React__default.default.createElement(SlideInner, { isVideoView: true, active: isActive, broken: broken, withPlaceholder: broken, loading: !meta },
             React__default.default.createElement(components_imageViewer_video_index.Video, { url: image.src, index: index, isActive: isActive })));
@@ -50,7 +50,7 @@ var Slide = function (_a) {
                 _b[styles__default.default.verticalImageFit] = verticalImageFit,
                 _b[styles__default.default.horizontalImageFit] = horizontalImageFit,
                 _b)), onLoad: function (event) { return handleLoad(event, index); }, onError: function () { return handleLoadError(index); }, style: {
-                maxHeight: "".concat(containerHeight, "px"),
+                maxHeight: "".concat(swiperHeight, "px"),
             }, "data-test-id": slideVisible ? utils_constants.TestIds.ACTIVE_IMAGE : undefined })));
 };
 

package/gallery/esm/Component.js

@@ -2,7 +2,6 @@ import React, { useState, useCallback, useEffect } from 'react';
 import cn from 'classnames';
 import { BaseModal } from '../../base-modal/esm';
 import { useMedia } from '@alfalab/hooks';
-import { Single } from './components/image-viewer/single.js';
 import { NavigationBar } from './components/navigation-bar/Component.js';
 import { Header } from './components/header/Component.js';
 import { GalleryContext } from './context.js';
@@ -10,17 +9,7 @@ import { ImageViewer } from './components/image-viewer/component.js';
 import { InfoBar } from './components/info-bar/Component.js';
 import { HeaderMobile } from './components/header-mobile/Component.js';
 import './utils/utils.js';
-import './components/image-viewer/hooks.js';
-import 'element-closest';
-import './index.module-36459066.js';
-import './components/image-viewer/slide.js';
-import '../../typography/esm';
 import './utils/constants.js';
-import './components/image-viewer/paths.js';
-import './components/image-viewer/video/index.js';
-import 'hls.js';
-import '@alfalab/core-components/icon-view/circle';
-import '@alfalab/icons-glyph/PlayCompactMIcon';
 import './components/image-preview/Component.js';
 import './components/image-preview/paths.js';
 import './components/buttons/index.js';
@@ -32,15 +21,23 @@ import '@alfalab/icons-glyph/ArrowsInwardMIcon';
 import '@alfalab/icons-glyph/ArrowsOutwardMIcon';
 import '@alfalab/icons-glyph/CrossMIcon';
 import '@alfalab/icons-glyph/PauseCompactMIcon';
+import '@alfalab/icons-glyph/PlayCompactMIcon';
 import '@alfalab/icons-glyph/PointerDownMIcon';
 import '@alfalab/icons-glyph/SoundCrossMIcon';
 import '@alfalab/icons-glyph/SoundMIcon';
 import './components/header-info-block/Component.js';
+import '../../typography/esm';
 import './utils/split-filename.js';
+import 'element-closest';
 import 'swiper';
 import 'swiper/react';
 import '@alfalab/icons-glyph/ChevronBackHeavyMIcon';
 import '@alfalab/icons-glyph/ChevronForwardHeavyMIcon';
+import './slide-1be24647.js';
+import './components/image-viewer/paths.js';
+import './components/image-viewer/video/index.js';
+import 'hls.js';
+import '@alfalab/core-components/icon-view/circle';
 import 'swiper/swiper.min.css';
 
 var styles = {"container":"gallery__container_nqzi4","modal":"gallery__modal_nqzi4","navigationVideo":"gallery__navigationVideo_nqzi4","hideNavigation":"gallery__hideNavigation_nqzi4"};
@@ -177,7 +174,7 @@ var Gallery = function (_a) {
         React.createElement(BaseModal, { open: open, className: cn(styles.modal, popupClassName), onEscapeKeyDown: handleEscapeKeyDown, Backdrop: Backdrop, onUnmount: onUnmount },
             React.createElement("div", { className: styles.container },
                 view === 'desktop' ? React.createElement(Header, null) : React.createElement(HeaderMobile, null),
-                images.length === 1 ? React.createElement(Single, null) : React.createElement(ImageViewer, null),
+                React.createElement(ImageViewer, null),
                 React.createElement("nav", { className: cn((_b = {},
                         _b[styles.navigationVideo] = isCurrentVideo && isMobile,
                         _b[styles.hideNavigation] = hideNavigation && isMobile,

package/gallery/esm/components/image-viewer/component.js

@@ -1,6 +1,7 @@
 import { __assign } from 'tslib';
-import React, { useContext, useCallback, useMemo } from 'react';
+import React, { useContext, useRef, useCallback, useEffect, useMemo } from 'react';
 import cn from 'classnames';
+import elementClosest from 'element-closest';
 import SwiperCore, { EffectFade, A11y, Controller } from 'swiper';
 import { Swiper, SwiperSlide } from 'swiper/react';
 import { useFocus } from '@alfalab/hooks';
@@ -9,11 +10,8 @@ import { ChevronForwardHeavyMIcon } from '@alfalab/icons-glyph/ChevronForwardHea
 import { GalleryContext } from '../../context.js';
 import { isVideo, getImageAlt, getImageKey } from '../../utils/utils.js';
 import { TestIds } from '../../utils/constants.js';
-import { useHandleImageViewer } from './hooks.js';
-import { Slide } from './slide.js';
+import { s as styles, S as Slide } from '../../slide-1be24647.js';
 import 'swiper/swiper.min.css';
-import { s as styles } from '../../index.module-36459066.js';
-import 'element-closest';
 import '../../../../typography/esm';
 import './paths.js';
 import './video/index.js';
@@ -24,8 +22,10 @@ import '@alfalab/icons-glyph/PlayCompactMIcon';
 SwiperCore.use([EffectFade, A11y, Controller]);
 var ImageViewer = function () {
     var _a, _b, _c;
-    var _d = useContext(GalleryContext), images = _d.images, imagesMeta = _d.imagesMeta, fullScreen = _d.fullScreen, currentSlideIndex = _d.currentSlideIndex, initialSlide = _d.initialSlide, setCurrentSlideIndex = _d.setCurrentSlideIndex, getSwiper = _d.getSwiper, setSwiper = _d.setSwiper, slidePrev = _d.slidePrev, slideNext = _d.slideNext, getCurrentImage = _d.getCurrentImage;
-    var _e = useHandleImageViewer(), handleLoad = _e.handleLoad, handleLoadError = _e.handleLoadError, handleWrapperClick = _e.handleWrapperClick, isMobile = _e.isMobile, rightArrowRef = _e.rightArrowRef, leftArrowRef = _e.leftArrowRef;
+    var _d = useContext(GalleryContext), singleSlide = _d.singleSlide, images = _d.images, imagesMeta = _d.imagesMeta, fullScreen = _d.fullScreen, currentSlideIndex = _d.currentSlideIndex, initialSlide = _d.initialSlide, onClose = _d.onClose, setImageMeta = _d.setImageMeta, setCurrentSlideIndex = _d.setCurrentSlideIndex, getSwiper = _d.getSwiper, setSwiper = _d.setSwiper, slidePrev = _d.slidePrev, slideNext = _d.slideNext, getCurrentImage = _d.getCurrentImage, view = _d.view;
+    var isMobile = view === 'mobile';
+    var leftArrowRef = useRef(null);
+    var rightArrowRef = useRef(null);
     var leftArrowFocused = useFocus(leftArrowRef, 'keyboard')[0];
     var rightArrowFocused = useFocus(rightArrowRef, 'keyboard')[0];
     var swiper = getSwiper();
@@ -50,6 +50,28 @@ var ImageViewer = function () {
             slideNext();
         }
     };
+    var handleLoad = function (event, index) {
+        var target = event.currentTarget;
+        var naturalWidth = target.naturalWidth, naturalHeight = target.naturalHeight;
+        setImageMeta({ width: naturalWidth, height: naturalHeight }, index);
+    };
+    var handleLoadError = function (index) {
+        setImageMeta({ width: 0, height: 0, broken: true }, index);
+    };
+    var handleWrapperClick = useCallback(function (event) {
+        var _a, _b;
+        var eventTarget = event.target;
+        var isArrow = ((_a = leftArrowRef.current) === null || _a === void 0 ? void 0 : _a.contains(eventTarget)) ||
+            ((_b = rightArrowRef.current) === null || _b === void 0 ? void 0 : _b.contains(eventTarget));
+        var isPlaceholder = Boolean(eventTarget.closest(".".concat(styles.placeholder)));
+        var isImg = eventTarget.tagName === 'IMG';
+        if (!isImg && !isPlaceholder && !isArrow && !isMobile) {
+            onClose();
+        }
+    }, [isMobile, onClose]);
+    useEffect(function () {
+        elementClosest(window);
+    }, []);
     var swiperProps = useMemo(function () {
         var _a;
         return ({
@@ -60,7 +82,7 @@ var ImageViewer = function () {
             },
             className: cn(styles.swiper, (_a = {},
                 _a[styles.hidden] = fullScreen && !isVideo(currentImage === null || currentImage === void 0 ? void 0 : currentImage.src),
-                _a[styles.fullScreenVideo] = fullScreen && isVideo(currentImage === null || currentImage === void 0 ? void 0 : currentImage.src),
+                _a[styles.fullScreenVideo] = fullScreen && !singleSlide && isVideo(currentImage === null || currentImage === void 0 ? void 0 : currentImage.src),
                 _a[styles.mobile] = isMobile,
                 _a[styles.mobileVideo] = isMobile && isVideo(currentImage === null || currentImage === void 0 ? void 0 : currentImage.src),
                 _a)),
@@ -77,19 +99,21 @@ var ImageViewer = function () {
     }, [
         fullScreen,
         currentImage === null || currentImage === void 0 ? void 0 : currentImage.src,
+        singleSlide,
         isMobile,
         swiper,
         initialSlide,
         setSwiper,
         handleSlideChange,
     ]);
-    var showControls = !fullScreen && !isMobile && !!images.length;
+    var showControls = !singleSlide && !fullScreen && !isMobile && !!images.length;
     var swiperWidth = (swiper === null || swiper === void 0 ? void 0 : swiper.width) || 1;
     var swiperHeight = (swiper === null || swiper === void 0 ? void 0 : swiper.height) || (swiper === null || swiper === void 0 ? void 0 : swiper.width) || 1;
     var swiperAspectRatio = swiperWidth / swiperHeight;
     return (
     /* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions */
     React.createElement("div", { className: cn(styles.component, (_a = {},
+            _a[styles.singleSlide] = singleSlide,
             _a[styles.mobile] = isMobile,
             _a[styles.mobileVideo] = isMobile && isVideo(currentImage === null || currentImage === void 0 ? void 0 : currentImage.src),
             _a)), onClick: handleWrapperClick },
@@ -109,7 +133,7 @@ var ImageViewer = function () {
                     transitionProperty: 'opacity',
                 } }, function (_a) {
                 var isActive = _a.isActive;
-                return (React.createElement(Slide, { isActive: isActive, containerAspectRatio: swiperAspectRatio, image: image, containerHeight: swiperHeight, meta: meta, index: index, imageAspectRatio: imageAspectRatio, slideVisible: slideVisible, handleLoad: handleLoad, handleLoadError: handleLoadError }));
+                return (React.createElement(Slide, { isActive: isActive, swiperAspectRatio: swiperAspectRatio, image: image, swiperHeight: swiperHeight, meta: meta, index: index, imageAspectRatio: imageAspectRatio, slideVisible: slideVisible, handleLoad: handleLoad, handleLoadError: handleLoadError }));
             }));
         })),
         showControls && (React.createElement("div", { className: cn(styles.arrow, (_c = {},

package/gallery/esm/components/image-viewer/index.css

@@ -53,18 +53,13 @@
         max-height: calc(100vh - 210px);
     } .gallery__swiper_1dsel.gallery__mobileVideo_1dsel {
         max-height: 100vh;
-    } .gallery__singleSlideContainer_1dsel {
-    display: flex;
-    width: 100%;
-    height: 100%;
-
+    } .gallery__singleSlide_1dsel .gallery__swiper_1dsel {
     max-height: calc(100vh - 80px);
-    padding: var(--gap-32);
-    box-sizing: border-box
-} .gallery__singleSlideContainer_1dsel.gallery__mobile_1dsel {
+    padding: var(--gap-32)
+} .gallery__singleSlide_1dsel .gallery__swiper_1dsel.gallery__mobile_1dsel {
         max-height: calc(100vh - 174px);
         padding: 0;
-    } .gallery__singleSlideContainer_1dsel.gallery__mobileVideo_1dsel {
+    } .gallery__singleSlide_1dsel .gallery__swiper_1dsel.gallery__mobileVideo_1dsel {
         max-height: 100vh;
     } .gallery__hidden_1dsel {
     display: none;