From 83e1902e83e6068fa351f168d3bccaf595da4b4b Mon Sep 17 00:00:00 2001 From: Fedor Katurov Date: Thu, 24 Jun 2021 12:17:03 +0700 Subject: [PATCH] added fallback for single images --- src/components/media/ImagePreloader/index.tsx | 1 + .../node/NodeImageSwiperBlock/index.tsx | 19 +++++++++++++++---- .../{ => _obsolete}/ImageSwitcher/index.tsx | 0 .../ImageSwitcher/styles.module.scss | 0 .../{ => _obsolete}/NodeImageBlock/index.tsx | 0 .../NodeImageBlock/styles.module.scss | 0 .../NodeImageSlideBlock/index.tsx | 0 .../NodeImageSlideBlock/styles.module.scss | 0 8 files changed, 16 insertions(+), 4 deletions(-) rename src/components/node/{ => _obsolete}/ImageSwitcher/index.tsx (100%) rename src/components/node/{ => _obsolete}/ImageSwitcher/styles.module.scss (100%) rename src/components/node/{ => _obsolete}/NodeImageBlock/index.tsx (100%) rename src/components/node/{ => _obsolete}/NodeImageBlock/styles.module.scss (100%) rename src/components/node/{ => _obsolete}/NodeImageSlideBlock/index.tsx (100%) rename src/components/node/{ => _obsolete}/NodeImageSlideBlock/styles.module.scss (100%) diff --git a/src/components/media/ImagePreloader/index.tsx b/src/components/media/ImagePreloader/index.tsx index e75ee5dd..7431f315 100644 --- a/src/components/media/ImagePreloader/index.tsx +++ b/src/components/media/ImagePreloader/index.tsx @@ -81,6 +81,7 @@ const ImagePreloader: FC = ({ file, onLoad, onClick, className }) => { width="100%" height="100%" filter="url(#f1)" + onLoad={onLoad} /> )} diff --git a/src/components/node/NodeImageSwiperBlock/index.tsx b/src/components/node/NodeImageSwiperBlock/index.tsx index 501eef34..0463f00f 100644 --- a/src/components/node/NodeImageSwiperBlock/index.tsx +++ b/src/components/node/NodeImageSwiperBlock/index.tsx @@ -1,4 +1,4 @@ -import React, { FC, useCallback, useEffect, useState } from 'react'; +import React, { FC, useCallback, useState } from 'react'; import { INodeComponentProps } from '~/redux/node/constants'; import { Swiper, SwiperSlide } from 'swiper/react'; @@ -14,9 +14,6 @@ import { useNodeImages } from '~/utils/hooks/node/useNodeImages'; import SwiperClass from 'swiper/types/swiper-class'; import { modalShowPhotoswipe } from '~/redux/modal/actions'; import { useDispatch } from 'react-redux'; -import classNames from 'classnames'; -import { getURL } from '~/utils/dom'; -import { PRESETS } from '~/constants/urls'; import { ImagePreloader } from '~/components/media/ImagePreloader'; SwiperCore.use([Navigation, Pagination, Keyboard]); @@ -56,9 +53,23 @@ const NodeImageSwiperBlock: FC = ({ node }) => { return null; } + if (images.length === 1) { + return ( +
+ onOpenPhotoSwipe(0)} + className={styles.image} + /> +
+ ); + } + return (
1} initialSlide={0} slidesPerView="auto" onSwiper={setControlledSwiper} diff --git a/src/components/node/ImageSwitcher/index.tsx b/src/components/node/_obsolete/ImageSwitcher/index.tsx similarity index 100% rename from src/components/node/ImageSwitcher/index.tsx rename to src/components/node/_obsolete/ImageSwitcher/index.tsx diff --git a/src/components/node/ImageSwitcher/styles.module.scss b/src/components/node/_obsolete/ImageSwitcher/styles.module.scss similarity index 100% rename from src/components/node/ImageSwitcher/styles.module.scss rename to src/components/node/_obsolete/ImageSwitcher/styles.module.scss diff --git a/src/components/node/NodeImageBlock/index.tsx b/src/components/node/_obsolete/NodeImageBlock/index.tsx similarity index 100% rename from src/components/node/NodeImageBlock/index.tsx rename to src/components/node/_obsolete/NodeImageBlock/index.tsx diff --git a/src/components/node/NodeImageBlock/styles.module.scss b/src/components/node/_obsolete/NodeImageBlock/styles.module.scss similarity index 100% rename from src/components/node/NodeImageBlock/styles.module.scss rename to src/components/node/_obsolete/NodeImageBlock/styles.module.scss diff --git a/src/components/node/NodeImageSlideBlock/index.tsx b/src/components/node/_obsolete/NodeImageSlideBlock/index.tsx similarity index 100% rename from src/components/node/NodeImageSlideBlock/index.tsx rename to src/components/node/_obsolete/NodeImageSlideBlock/index.tsx diff --git a/src/components/node/NodeImageSlideBlock/styles.module.scss b/src/components/node/_obsolete/NodeImageSlideBlock/styles.module.scss similarity index 100% rename from src/components/node/NodeImageSlideBlock/styles.module.scss rename to src/components/node/_obsolete/NodeImageSlideBlock/styles.module.scss