Skip to content

Commit 9f0fba6

Browse files
authored
chore: Revert "feat: add media images fullscreen slider (#889)" (#917)
This reverts commit eec646d.
1 parent eec646d commit 9f0fba6

File tree

6 files changed

+7
-83
lines changed

6 files changed

+7
-83
lines changed

src/blocks/Slider/Slider.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ export interface SliderProps
6161
dotsClassName?: string;
6262
blockClassName?: string;
6363
arrowSize?: number;
64-
initialIndex?: number;
6564
}
6665

6766
export const SliderBlock = (props: WithChildren<SliderProps>) => {
@@ -84,7 +83,6 @@ export const SliderBlock = (props: WithChildren<SliderProps>) => {
8483
arrowSize,
8584
onAfterChange: handleAfterChange,
8685
onBeforeChange: handleBeforeChange,
87-
initialIndex = 0,
8886
} = props;
8987

9088
const {isServer} = useContext(SSRContext);
@@ -109,7 +107,7 @@ export const SliderBlock = (props: WithChildren<SliderProps>) => {
109107
const slidesToShowCount = getSlidesToShowCount(slidesToShow);
110108
const slidesCountByBreakpoint = getSlidesCountByBreakpoint(breakpoint, slidesToShow);
111109

112-
const [currentIndex, setCurrentIndex] = useState<number>(initialIndex);
110+
const [currentIndex, setCurrentIndex] = useState<number>(0);
113111
const [childStyles, setChildStyles] = useState<Object>({});
114112
const [slider, setSlider] = useState<SlickSlider>();
115113
const autoplayTimeId = useRef<Timeout>();
@@ -348,7 +346,7 @@ export const SliderBlock = (props: WithChildren<SliderProps>) => {
348346
responsive: getSliderResponsiveParams(slidesToShow),
349347
beforeChange: onBeforeChange,
350348
afterChange: onAfterChange,
351-
initialSlide: initialIndex,
349+
initialSlide: 0,
352350
nextArrow: <Arrow type="right" handleClick={handleArrowClick} size={arrowSize} />,
353351
prevArrow: <Arrow type="left" handleClick={handleArrowClick} size={arrowSize} />,
354352
lazyLoad,

src/components/FullscreenImage/FullscreenImage.scss

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,6 @@ $closeButtonSize: 36px;
3232
overflow: hidden;
3333
}
3434

35-
&__modal-slider {
36-
max-width: $newContentWidth;
37-
width: 100%;
38-
max-height: 70vh;
39-
overflow: hidden;
40-
border-radius: $borderRadius;
41-
42-
&_item {
43-
height: 100%;
44-
45-
&-image {
46-
display: block;
47-
max-height: 70vh;
48-
max-width: 100%;
49-
width: 100%;
50-
object-fit: contain;
51-
object-position: center;
52-
}
53-
}
54-
}
55-
5635
&__modal .yc-modal__content,
5736
&__modal-image {
5837
border-radius: $borderRadius;

src/components/FullscreenImage/FullscreenImage.tsx

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@ import React, {CSSProperties, HTMLProps, useState} from 'react';
33
import {ChevronsExpandUpRight, Xmark} from '@gravity-ui/icons';
44
import {Icon, Modal} from '@gravity-ui/uikit';
55

6-
import SliderBlock from '../../blocks/Slider/Slider';
7-
import {ImageProps as ModelImageProps, SliderType} from '../../models';
86
import {block} from '../../utils';
97
import Image, {ImageProps} from '../Image/Image';
10-
import {getMediaImage} from '../Media/Image/utils';
118

129
import {i18n} from './i18n';
1310

@@ -18,22 +15,14 @@ export interface FullscreenImageProps extends ImageProps {
1815
modalImageClass?: string;
1916
imageStyle?: CSSProperties;
2017
extraProps?: HTMLProps<HTMLDivElement>;
21-
sliderData?: {items: ModelImageProps[]; initialIndex: number};
2218
}
2319

2420
const b = block('fullscreen-image');
2521
const FULL_SCREEN_ICON_SIZE = 18;
2622
const CLOSE_ICON_SIZE = 24;
2723

2824
const FullscreenImage = (props: FullscreenImageProps) => {
29-
const {
30-
imageClassName,
31-
sliderData,
32-
modalImageClass,
33-
imageStyle,
34-
alt = i18n('img-alt'),
35-
extraProps,
36-
} = props;
25+
const {imageClassName, modalImageClass, imageStyle, alt = i18n('img-alt'), extraProps} = props;
3726
const [isOpened, setIsOpened] = useState(false);
3827

3928
const openModal = () => setIsOpened(true);
@@ -77,29 +66,7 @@ const FullscreenImage = (props: FullscreenImageProps) => {
7766
className={b('icon', {hover: true})}
7867
/>
7968
</button>
80-
{sliderData ? (
81-
<div className={b('modal-slider')}>
82-
<SliderBlock
83-
initialIndex={sliderData.initialIndex}
84-
slidesToShow={1}
85-
type={SliderType.MediaCard}
86-
>
87-
{sliderData.items.map((item, index) => (
88-
<div key={index} className={b('modal-slider_item')}>
89-
<Image
90-
className={b(
91-
'modal-slider_item-image',
92-
modalImageClass,
93-
)}
94-
{...getMediaImage(item)}
95-
/>
96-
</div>
97-
))}
98-
</SliderBlock>
99-
</div>
100-
) : (
101-
<Image {...props} className={b('modal-image', modalImageClass)} />
102-
)}
69+
<Image {...props} className={b('modal-image', modalImageClass)} />
10370
</Modal>
10471
)}
10572
</div>

src/components/Media/Image/Image.tsx

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import SliderBlock from '../../../blocks/Slider/Slider';
77
import {ImageProps, MediaComponentImageProps, QAProps, SliderType} from '../../../models';
88
import {block, getQaAttrubutes} from '../../../utils';
99
import BackgroundImage from '../../BackgroundImage/BackgroundImage';
10-
import FullscreenImage, {FullscreenImageProps} from '../../FullscreenImage/FullscreenImage';
10+
import FullscreenImage from '../../FullscreenImage/FullscreenImage';
1111
import ImageView from '../../Image/Image';
1212

1313
import {getMediaImage} from './utils';
@@ -20,7 +20,6 @@ export interface ImageAdditionProps {
2020
imageClassName?: string;
2121
isBackground?: boolean;
2222
fullscreen?: boolean;
23-
fullscreenClassName?: string;
2423
onLoad?: () => void;
2524
}
2625

@@ -37,7 +36,6 @@ const Image = (props: ImageAllProps) => {
3736
parallax,
3837
height,
3938
imageClassName,
40-
fullscreenClassName,
4139
isBackground,
4240
hasVideoFallback,
4341
video,
@@ -89,21 +87,16 @@ const Image = (props: ImageAllProps) => {
8987

9088
const imageClass = b('item', {withVideo: Boolean(video) && !hasVideoFallback}, imageClassName);
9189

92-
const renderFullscreenImage = (
93-
item: ImageProps,
94-
sliderData?: FullscreenImageProps['sliderData'],
95-
) => {
90+
const renderFullscreenImage = (item: ImageProps) => {
9691
const itemData = getMediaImage(item);
9792

9893
return (
9994
<FullscreenImage
10095
key={itemData.alt}
10196
{...itemData}
10297
imageClassName={imageClass}
103-
modalImageClass={fullscreenClassName}
10498
imageStyle={{height}}
10599
qa={qaAttributes.fullscreenImage}
106-
sliderData={sliderData}
107100
/>
108101
);
109102
};
@@ -142,9 +135,7 @@ const Image = (props: ImageAllProps) => {
142135
<SliderBlock slidesToShow={1} type={SliderType.MediaCard}>
143136
{imageArray.map((item, index) => (
144137
<Fragment key={index}>
145-
{fullscreenItem
146-
? renderFullscreenImage(item, {items: imageArray, initialIndex: index})
147-
: imageOnly(item)}
138+
{fullscreenItem ? renderFullscreenImage(item) : imageOnly(item)}
148139
</Fragment>
149140
))}
150141
</SliderBlock>

src/components/Media/Media.scss

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,4 @@ $block: '.#{$ns}Media';
1313
display: flex;
1414
align-items: center;
1515
}
16-
17-
&__fullscreen-image-cover {
18-
object-fit: cover;
19-
object-position: top;
20-
}
2116
}

src/components/Media/Media.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ const b = block('Media');
1616

1717
export interface MediaAllProps extends MediaProps, VideoAdditionProps, ImageAdditionProps, QAProps {
1818
className?: string;
19-
isFullscreenImageCover?: boolean;
2019
youtubeClassName?: string;
2120
autoplay?: boolean;
2221
onImageLoad?: () => void;
@@ -33,7 +32,6 @@ export const Media = (props: MediaAllProps) => {
3332
previewImg,
3433
parallax = false,
3534
fullscreen,
36-
isFullscreenImageCover,
3735
analyticsEvents,
3836
className,
3937
imageClassName,
@@ -68,9 +66,6 @@ export const Media = (props: MediaAllProps) => {
6866
disableImageSliderForArrayInput={disableImageSliderForArrayInput}
6967
height={height}
7068
imageClassName={imageClassName}
71-
fullscreenClassName={
72-
isFullscreenImageCover ? b('fullscreen-image-cover') : undefined
73-
}
7469
isBackground={isBackground}
7570
video={video}
7671
hasVideoFallback={hasVideoFallback}
@@ -142,7 +137,6 @@ export const Media = (props: MediaAllProps) => {
142137
isBackground,
143138
hasVideoFallback,
144139
fullscreen,
145-
isFullscreenImageCover,
146140
qaAttributes.image,
147141
qaAttributes.video,
148142
onImageLoad,

0 commit comments

Comments
 (0)