Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: migrate to new slider, fix new slider styles #978

Merged
merged 52 commits into from
Nov 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
28bd617
feat: version 6
niktverd Sep 25, 2024
1ba6c64
feat: version 6
niktverd Sep 25, 2024
4bfa045
feat: version 6
niktverd Sep 25, 2024
59eddf7
feat!: migrate to new slider
qradle-yndx Aug 12, 2024
54b7f05
5.18.1-alpha.0
gravity-ui-bot Aug 12, 2024
bbcd5d1
fix: new slider indents for header and media blocks
qradle-yndx Aug 28, 2024
1aa07ef
5.18.1-alpha.1
gravity-ui-bot Aug 28, 2024
16b682e
fix: new slider fix md indents
qradle-yndx Aug 29, 2024
56147ba
feat: add media images fullscreen slider
qradle-yndx Apr 11, 2024
e2f2475
fix: boolean eslint
qradle-yndx Apr 11, 2024
2423876
fix: add fullscreenImage slider loaded condition
qradle-yndx Apr 12, 2024
88184e9
feat: add media images fullscreen new slider
qradle-yndx Jul 29, 2024
80182cf
fix: slider new arrow
qradle-yndx Aug 13, 2024
15264ea
fix: new slider indents for header and media blocks
qradle-yndx Aug 28, 2024
da45d04
fix: new slider fix md indents
qradle-yndx Aug 29, 2024
e37de80
fix: fullscreen slider styles
qradle-yndx Aug 29, 2024
f5d096e
fix: slider arrows merge
qradle-yndx Aug 30, 2024
9fc943e
5.18.1-alpha.2
gravity-ui-bot Aug 30, 2024
5f794be
fix: fullscreen image icon, fs slider paddings
qradle-yndx Sep 27, 2024
968c6c6
fix: mobile slider padding, margins
qradle-yndx Sep 27, 2024
f227774
fix: update media imageSlider screenshots
Sep 30, 2024
5a6caae
fix: skip mediacard imageslider test
qradle-yndx Sep 30, 2024
a8f3c4c
5.18.1-alpha.3
gravity-ui-bot Sep 30, 2024
173f337
fix: slider new slide item
qradle-yndx Oct 1, 2024
2146315
fix: add support header slider theming with new slider
qradle-yndx Oct 1, 2024
722fa34
5.18.1-alpha.4
gravity-ui-bot Oct 2, 2024
9423651
fix: header slider new sm, md width
qradle-yndx Oct 28, 2024
4039e87
fix: revert package version
qradle-yndx Oct 28, 2024
8138aaf
5.27.1-alpha.0
gravity-ui-bot Oct 28, 2024
578d3bb
fix: slidernew, fullscreenImage icon paddings styles
qradle-yndx Nov 1, 2024
9a986f5
5.27.1-alpha.1
gravity-ui-bot Nov 1, 2024
0981ae0
fix: fullscreen slider styles
qradle-yndx Nov 7, 2024
d86d636
fix: fullscreen image slider add space for close icon
qradle-yndx Nov 8, 2024
56a4314
fix: mark Slider block as SliderOld and deprecated
qradle-yndx Nov 8, 2024
1ce2ab8
fix: make SliderNewBlock as main slider-block
qradle-yndx Nov 11, 2024
54e492e
5.27.1-alpha.2
gravity-ui-bot Nov 11, 2024
5e5d8fc
fix: header slider schema
qradle-yndx Nov 11, 2024
3acf5ef
fix: return package version
qradle-yndx Nov 11, 2024
64cbb28
fix: fullscreen slider mobile padding
qradle-yndx Nov 22, 2024
4e2d3cc
fix: fullscreen image/slider mobile padding
qradle-yndx Nov 22, 2024
1adf700
fix: fullscreen slider modal margin
qradle-yndx Nov 25, 2024
0e27d01
feat: add fullscreen image case to media block stories
qradle-yndx Nov 25, 2024
75d8fba
fix: safari swiper width
qradle-yndx Nov 25, 2024
c8ef567
fix: slider pagination mobile
qradle-yndx Nov 25, 2024
b5091fb
fix: update Media block screenshot test
qradle-yndx Nov 25, 2024
93698ce
fix: handleImagesReady set 100ms for timeout
qradle-yndx Nov 25, 2024
302ba92
fix: cut fullscreen image xl width
qradle-yndx Nov 26, 2024
986fdb1
fix: restore next branch package version
qradle-yndx Nov 27, 2024
132907b
fix: slider storybook & tests
qradle-yndx Nov 27, 2024
ca9d90d
fix: rename fsImageMobilePadding var
qradle-yndx Nov 27, 2024
b041d56
fix: review
qradle-yndx Nov 27, 2024
0f04c66
fix: rename fsArrowArea var
qradle-yndx Nov 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .storybook/stories/documentation/Blocks.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ _[Common field types](?id=documentation-types&viewMode=docs)_

## [Share](?path=/story/blocks-share--docs&viewMode=docs)

## [<s>SliderOld</s>](?path=/story/blocks-sliderold-deprecated--docs&viewMode=docs) (Deprecated, use Slider instead)

## [Slider](?path=/story/blocks-slider--docs&viewMode=docs)

## [Table](?path=/story/blocks-table--docs&viewMode=docs)
Expand Down
14 changes: 0 additions & 14 deletions src/blocks/HeaderSlider/HeaderSlider.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,6 @@ $block: '.#{$ns}header-slider-block';
}
}

@media (max-width: map-get($gridBreakpoints, 'md')) {
&.#{$ns}SliderBlock {
margin-left: -$indentXXXS;
padding-left: 0;
width: calc(100% + #{$indentXXXS});
}
}

@media (max-width: map-get($gridBreakpoints, 'sm')) {
&__item-content {
.#{$ns}header-block__content {
Expand All @@ -66,11 +58,5 @@ $block: '.#{$ns}header-slider-block';
padding-left: $indentXS + $indentXXXS;
}
}

.slick-track {
.slick-slide {
max-width: 100%;
}
}
}
}
2 changes: 1 addition & 1 deletion src/blocks/HeaderSlider/HeaderSlider.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React, {useContext} from 'react';

import {SliderBlock} from '../../blocks';
import {MobileContext} from '../../context/mobileContext';
import {HeaderSliderBlockProps, SliderType} from '../../models';
import {block} from '../../utils';
import Header from '../Header/Header';
import {SliderBlock} from '../index';

import './HeaderSlider.scss';

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions src/blocks/Media/__stories__/Media.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,19 @@ const DefaultTemplate: StoryFn<MediaBlockModel> = (args) => (
}),
links: data.common.links as LinkProps[],
},
{
...args,
media: {
light: {
...data.default.content.media.light,
fullscreen: true,
},
dark: {
...data.default.content.media.dark,
fullscreen: true,
},
},
},
],
}}
/>
Expand Down
35 changes: 19 additions & 16 deletions src/blocks/Slider/Arrow/Arrow.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,43 @@ $block: '.#{$ns}slider-block-arrow';

$root: &;

width: $sliderArrowSize;
height: $sliderArrowSize;
cursor: pointer;

&_type_left {
#{$root}__icon-wrapper {
transform: rotate(180deg);
}
margin-right: 16px;
}

&__button {
@include reset-button-style();
@include focusable();
}

&__inner {
@include shadow();
@extend %flex;

width: $sliderArrowSize;
height: $sliderArrowSize;

color: var(--g-color-text-secondary);
border-radius: 100%;
background-color: var(--g-color-base-background);
box-shadow: 0 4px 24px var(--pc-color-sfx-shadow), 0 2px 8px var(--pc-color-sfx-shadow);

transition: box-shadow 0.3s $ease-out-cubic, color 1s $ease-out-cubic;

@include focusable();
}
&_type_left {
#{$root}__icon-wrapper {
transform: rotate(180deg);
}
}

&:hover {
#{$root}__button {
&:hover {
color: var(--g-color-text-primary);
box-shadow: 0 2px 12px var(--pc-color-sfx-shadow), 0 4px 24px var(--pc-color-sfx-shadow);
}

&_transparent {
background-color: transparent;
box-shadow: none;

&:hover {
box-shadow: none;
}
}
}

&__icon-wrapper {
Expand Down
36 changes: 24 additions & 12 deletions src/blocks/Slider/Arrow/Arrow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,37 @@ export type ArrowType = 'left' | 'right';

export interface ArrowProps {
type: ArrowType;
handleClick?: (direction: ArrowType) => void;
transparent?: boolean;
onClick?: () => void;
size?: number;
extraProps?: React.ButtonHTMLAttributes<HTMLButtonElement>;
}

const Arrow = ({type, handleClick, className, size = 16}: ArrowProps & ClassNameProps) => (
<div className={b({type}, className)}>
const Arrow = ({
type,
transparent,
onClick,
className,
size = 16,
extraProps,
}: ArrowProps & ClassNameProps) => (
<div className={b(null, className)}>
<button
className={b('button')}
onClick={() => handleClick && handleClick(type)}
onClick={onClick}
aria-label={i18n(`arrow-${type}`)}
{...extraProps}
>
<span className={b('icon-wrapper')}>
<ToggleArrow
size={size}
type={'horizontal'}
iconType="navigation"
className={b('icon')}
/>
</span>
<div className={b('inner', {type, transparent})}>
<span className={b('icon-wrapper')}>
<ToggleArrow
size={size}
type={'horizontal'}
iconType="navigation"
className={b('icon')}
/>
</span>
</div>
</button>
</div>
);
Expand Down
Loading