@gravity-ui/page-constructor 5.27.0 → 5.27.1

package/build/esm/blocks/Slider/Slider.css

@@ -105,7 +105,7 @@ unpredictable css rules order in build */
   height: auto;
 }
 .pc-SliderBlock .slick-track .slick-slide > div {
-  height: 100%;
+  display: flex;
 }
 .pc-SliderBlock .slick-arrow {
   position: absolute;

package/build/esm/blocks/Slider/Slider.js

@@ -1,4 +1,5 @@
 import React, { Fragment, useCallback, useContext, useEffect, useMemo, useRef, useState, } from 'react';
+import { useUniqId } from '@gravity-ui/uikit';
 import debounce from 'lodash/debounce';
 import get from 'lodash/get';
 import noop from 'lodash/noop';
@@ -15,7 +16,8 @@ import useFocus from '../../hooks/useFocus';
 import { SliderType, } from '../../models';
 import { block } from '../../utils';
 import Arrow from './Arrow/Arrow';
-import { getSliderResponsiveParams, getSlidesCountByBreakpoint, getSlidesToShowCount, getSlidesToShowWithDefaults, } from './utils';
+import { i18n } from './i18n';
+import { getSliderResponsiveParams, getSlidesCountByBreakpoint, getSlidesToShowCount, getSlidesToShowWithDefaults, isFocusable, useRovingTabIndex, } from './utils';
 import './Slider.css';
 const b = block('SliderBlock');
 const slick = block('slick-origin');
@@ -23,12 +25,15 @@ const DOT_WIDTH = 8;
 const DOT_GAP = 16;
 export const SliderBlock = (props) => {
     var _a;
-    const { animated, title, description, type, anchorId, arrows = true, adaptive, autoplay = undefined, dots = true, dotsClassName, disclaimer, children, className, blockClassName, lazyLoad, arrowSize, onAfterChange: handleAfterChange, onBeforeChange: handleBeforeChange, } = props;
+    const { animated, title, description, type, anchorId, arrows = true, adaptive, autoplay: autoplaySpeed, dots = true, dotsClassName, disclaimer, children, className, blockClassName, lazyLoad, arrowSize, onAfterChange: handleAfterChange, onBeforeChange: handleBeforeChange, } = props;
     const { isServer } = useContext(SSRContext);
     const isMobile = useContext(MobileContext);
     const [breakpoint, setBreakpoint] = useState(BREAKPOINTS.xl);
-    const disclosedChildren = useMemo(() => discloseAllNestedChildren(children), [children]);
+    const sliderId = useUniqId();
+    const disclosedChildren = useMemo(() => discloseAllNestedChildren(children, sliderId), [children, sliderId]);
     const childrenCount = disclosedChildren.length;
+    const isAutoplayEnabled = autoplaySpeed !== undefined && autoplaySpeed > 0;
+    const isUserInteractionRef = useRef(false);
     const [slidesToShow] = useState(getSlidesToShowWithDefaults({
         contentLength: childrenCount,
         breakpoints: props.slidesToShow,
@@ -39,8 +44,13 @@ export const SliderBlock = (props) => {
     const [currentIndex, setCurrentIndex] = useState(0);
     const [childStyles, setChildStyles] = useState({});
     const [slider, setSlider] = useState();
+    const prevIndexRef = useRef(0);
     const autoplayTimeId = useRef();
     const { hasFocus, unsetFocus } = useFocus((_a = slider === null || slider === void 0 ? void 0 : slider.innerSlider) === null || _a === void 0 ? void 0 : _a.list);
+    const asUserInteraction = (fn) => (...args) => {
+        isUserInteractionRef.current = true;
+        return fn(...args);
+    };
     // eslint-disable-next-line react-hooks/exhaustive-deps
     const onResize = useCallback(debounce(() => {
         if (!slider) {
@@ -55,7 +65,7 @@ export const SliderBlock = (props) => {
     }, 100), [slider, breakpoint]);
     const scrollLastSlide = useCallback((current) => {
         const lastSlide = childrenCount - slidesToShowCount;
-        if (autoplay && lastSlide === current) {
+        if (isAutoplayEnabled && lastSlide === current) {
             // Slick doesn't support autoplay with no infinity scroll
             autoplayTimeId.current = setTimeout(() => {
                 if (slider) {
@@ -67,9 +77,9 @@ export const SliderBlock = (props) => {
                         slider.slickPlay();
                     }
                 }, 500);
-            }, autoplay);
+            }, autoplaySpeed);
         }
-    }, [autoplay, childrenCount, slider, slidesToShowCount]);
+    }, [autoplaySpeed, childrenCount, isAutoplayEnabled, slider, slidesToShowCount]);
     useEffect(() => {
         if (hasFocus && autoplayTimeId.current) {
             clearTimeout(autoplayTimeId.current);
@@ -83,7 +93,7 @@ export const SliderBlock = (props) => {
         window.addEventListener('resize', onResize, { passive: true });
         return () => window.removeEventListener('resize', onResize);
     }, [onResize]);
-    const handleArrowClick = useCallback((direction) => {
+    const handleArrowClick = (direction) => {
         let nextIndex;
         if (direction === 'right') {
             nextIndex =
@@ -96,11 +106,12 @@ export const SliderBlock = (props) => {
         if (slider) {
             slider.slickGoTo(nextIndex);
         }
-    }, [childrenCount, currentIndex, slider, slidesCountByBreakpoint]);
+    };
     const onBeforeChange = useCallback((current, next) => {
         if (handleBeforeChange) {
             handleBeforeChange(current, next);
         }
+        prevIndexRef.current = current;
         setCurrentIndex(Math.ceil(next));
     }, [handleBeforeChange]);
     const onAfterChange = useCallback((current) => {
@@ -113,16 +124,33 @@ export const SliderBlock = (props) => {
         if (!hasFocus) {
             scrollLastSlide(current);
         }
-    }, [handleAfterChange, hasFocus, scrollLastSlide]);
-    const handleDotClick = useCallback((index) => {
+        if (isUserInteractionRef.current) {
+            const focusIndex = prevIndexRef.current >= current
+                ? current
+                : Math.max(current, prevIndexRef.current + slidesCountByBreakpoint);
+            const firstNewSlide = document.getElementById(getSlideId(sliderId, focusIndex));
+            if (firstNewSlide) {
+                const focusableChild = Array.from(firstNewSlide.querySelectorAll('*')).find(isFocusable);
+                focusableChild === null || focusableChild === void 0 ? void 0 : focusableChild.focus();
+            }
+        }
+        isUserInteractionRef.current = false;
+    }, [handleAfterChange, hasFocus, scrollLastSlide, sliderId, slidesCountByBreakpoint]);
+    const handleDotClick = (index) => {
         const nextIndex = index > currentIndex ? index + 1 - slidesCountByBreakpoint : index;
         if (slider) {
             slider.slickGoTo(nextIndex);
         }
-    }, [slider, currentIndex, slidesCountByBreakpoint]);
-    const barSlidesCount = childrenCount - slidesToShowCount + 1;
+    };
+    const barSlidesCount = childrenCount - slidesCountByBreakpoint + 1;
     const barPosition = (DOT_GAP + DOT_WIDTH) * currentIndex;
     const barWidth = DOT_WIDTH + (DOT_GAP + DOT_WIDTH) * (slidesCountByBreakpoint - 1);
+    const { getRovingItemProps, rovingListProps } = useRovingTabIndex({
+        itemCount: barSlidesCount,
+        activeIndex: currentIndex + 1,
+        firstIndex: 1,
+        uniqId: sliderId,
+    });
     const renderBar = () => {
         return (slidesCountByBreakpoint > 1 && (React.createElement("li", { className: b('bar'), style: {
                 left: barPosition,
@@ -133,19 +161,22 @@ export const SliderBlock = (props) => {
     const renderAccessibleBar = (index) => {
         return (
         // To have this key differ from keys used in renderDot function, added `-accessible-bar` part
-        React.createElement(Fragment, { key: `${index}-accessible-bar` }, slidesCountByBreakpoint > 0 && (React.createElement("li", { className: b('accessible-bar'), "aria-current": true, "aria-label": `Slide ${currentIndex + 1} of ${barSlidesCount}`, style: {
+        React.createElement(Fragment, { key: `${index}-accessible-bar` }, slidesCountByBreakpoint > 0 && (React.createElement("li", Object.assign({ className: b('accessible-bar'), role: "menuitemradio", "aria-checked": true, "aria-label": i18n('dot-label', {
+                index: currentIndex + 1,
+                count: barSlidesCount,
+            }), style: {
                 left: barPosition,
                 width: barWidth,
-            } }))));
+            } }, getRovingItemProps(currentIndex + 1))))));
     };
     const getCurrentSlideNumber = (index) => {
         const currentIndexDiff = index - currentIndex;
         let currentSlideNumber;
-        if (0 <= currentIndexDiff && currentIndexDiff < slidesToShowCount) {
+        if (0 <= currentIndexDiff && currentIndexDiff < slidesCountByBreakpoint) {
             currentSlideNumber = currentIndex + 1;
         }
-        else if (currentIndexDiff >= slidesToShowCount) {
-            currentSlideNumber = index - slidesToShowCount + 2;
+        else if (currentIndexDiff >= slidesCountByBreakpoint) {
+            currentSlideNumber = index - slidesCountByBreakpoint + 2;
         }
         else {
             currentSlideNumber = index + 1;
@@ -154,12 +185,24 @@ export const SliderBlock = (props) => {
     };
     const isVisibleSlide = (index) => {
         const currentIndexDiff = index - currentIndex;
-        return (slidesCountByBreakpoint > 0 &&
+        const result = slidesCountByBreakpoint > 0 &&
             0 <= currentIndexDiff &&
-            currentIndexDiff < slidesToShowCount);
+            currentIndexDiff < slidesCountByBreakpoint;
+        return result;
     };
     const renderDot = (index) => {
-        return (React.createElement("li", { key: index, className: b('dot', { active: index === currentIndex }), onClick: () => handleDotClick(index), "aria-hidden": isVisibleSlide(index) ? true : undefined, "aria-label": `Slide ${getCurrentSlideNumber(index)} of ${barSlidesCount}` }));
+        const isVisible = isVisibleSlide(index);
+        const currentSlideNumber = getCurrentSlideNumber(index);
+        const rovingItemProps = isVisible ? undefined : getRovingItemProps(currentSlideNumber);
+        return (React.createElement("li", Object.assign({ key: index, className: b('dot', { active: index === currentIndex }), onClick: asUserInteraction(() => handleDotClick(index)), onKeyDown: (e) => {
+                const key = e.key.toLowerCase();
+                if (key === 'space' || key === 'enter') {
+                    e.currentTarget.click();
+                }
+            }, role: "menuitemradio", "aria-checked": false, tabIndex: -1, "aria-hidden": isVisible, "aria-label": i18n('dot-label', {
+                index: currentSlideNumber,
+                count: barSlidesCount,
+            }) }, rovingItemProps)));
     };
     const renderNavigation = () => {
         if (childrenCount <= slidesCountByBreakpoint || !dots || childrenCount === 1) {
@@ -170,7 +213,7 @@ export const SliderBlock = (props) => {
             .map((_item, index) => renderDot(index));
         dotsList.splice(currentIndex, 0, renderAccessibleBar(currentIndex));
         return (React.createElement("div", { className: b('dots', dotsClassName) },
-            React.createElement("ul", { className: b('dots-list') },
+            React.createElement("ul", Object.assign({ className: b('dots-list'), role: "menu", "aria-label": i18n('pagination-label') }, rovingListProps),
                 renderBar(),
                 dotsList)));
     };
@@ -189,17 +232,18 @@ export const SliderBlock = (props) => {
             infinite: false,
             speed: 1000,
             adaptiveHeight: adaptive,
-            autoplay: Boolean(autoplay),
-            autoplaySpeed: autoplay,
+            autoplay: isAutoplayEnabled,
+            autoplaySpeed,
             slidesToShow: slidesToShowCount,
             slidesToScroll: 1,
             responsive: getSliderResponsiveParams(slidesToShow),
             beforeChange: onBeforeChange,
             afterChange: onAfterChange,
             initialSlide: 0,
-            nextArrow: React.createElement(Arrow, { type: "right", handleClick: handleArrowClick, size: arrowSize }),
-            prevArrow: React.createElement(Arrow, { type: "left", handleClick: handleArrowClick, size: arrowSize }),
+            nextArrow: (React.createElement(Arrow, { type: "right", handleClick: asUserInteraction(handleArrowClick), size: arrowSize })),
+            prevArrow: (React.createElement(Arrow, { type: "left", handleClick: asUserInteraction(handleArrowClick), size: arrowSize })),
             lazyLoad,
+            accessibility: false,
         };
         return (React.createElement(OutsideClick, { onOutsideClick: isMobile ? unsetFocus : noop },
             React.createElement(SlickSlider, Object.assign({}, settings), disclosedChildren),
@@ -219,23 +263,33 @@ export const SliderBlock = (props) => {
             React.createElement(Title, { title: title, subtitle: description, className: b('header', { 'no-description': !description }) }),
             React.createElement(AnimateBlock, { className: b('animate-slides'), animate: animated }, renderSlider()))));
 };
+function getSlideId(sliderId, index) {
+    return `slider-${sliderId}-child-${index}`;
+}
 // TODO remove this and rework PriceDetailed CLOUDFRONT-12230
-function discloseAllNestedChildren(children) {
+function discloseAllNestedChildren(children, sliderId) {
     if (!children) {
         return [];
     }
+    let childIndex = 0;
+    const wrapped = (child) => {
+        const id = getSlideId(sliderId, childIndex++);
+        return (React.createElement("div", { key: id, id: id }, child));
+    };
     return React.Children.map(children, (child) => {
         var _a;
         if (child) {
             // TODO: if child has 'items' then 'items' determinate like nested children for Slider.
             const nestedChildren = (_a = child.props.data) === null || _a === void 0 ? void 0 : _a.items;
             if (nestedChildren) {
-                return nestedChildren.map((nestedChild) => React.cloneElement(child, {
-                    data: Object.assign(Object.assign({}, child.props.data), { items: [nestedChild] }),
-                }));
+                return nestedChildren.map((nestedChild) => {
+                    return wrapped(React.cloneElement(child, {
+                        data: Object.assign(Object.assign({}, child.props.data), { items: [nestedChild] }),
+                    }));
+                });
             }
         }
-        return child;
+        return child && wrapped(child);
     }).filter(Boolean);
 }
 export default SliderBlock;

package/build/esm/blocks/Slider/i18n/en.json

@@ -1,4 +1,6 @@
 {
   "arrow-right": "Next",
-  "arrow-left": "Previous"
+  "arrow-left": "Previous",
+  "dot-label": "Page {{index}} of {{count}}",
+  "pagination-label": "Pages"
 }

package/build/esm/blocks/Slider/i18n/index.d.ts

@@ -1 +1 @@
-export declare const i18n: (key: "arrow-right" | "arrow-left", params?: import("@gravity-ui/i18n").Params | undefined) => string;
+export declare const i18n: (key: "arrow-right" | "arrow-left" | "dot-label" | "pagination-label", params?: import("@gravity-ui/i18n").Params | undefined) => string;

package/build/esm/blocks/Slider/i18n/ru.json

@@ -1,4 +1,6 @@
 {
   "arrow-right": "Дальше",
-  "arrow-left": "Назад"
+  "arrow-left": "Назад",
+  "dot-label": "Страница {{index}} из {{count}}",
+  "pagination-label": "Страницы"
 }

package/build/esm/blocks/Slider/utils.d.ts

@@ -10,6 +10,7 @@ export interface GetSlidesToShowParams {
     breakpoints?: SlidesToShow;
     mobileFullscreen?: boolean;
 }
+export declare const isFocusable: (element: Element) => boolean;
 export declare function getSlidesToShowWithDefaults({ contentLength, breakpoints, mobileFullscreen, }: GetSlidesToShowParams): {
     sm: number;
     xl: number;
@@ -24,3 +25,12 @@ export declare function getSliderResponsiveParams(breakpoints: SliderBreakpointP
 }[];
 export declare function getSlidesCountByBreakpoint(breakpoint: number, breakpoints: SliderBreakpointParams): number;
 export declare function getSlidesToShowCount(breakpoints: SliderBreakpointParams): number;
+export declare function useRovingTabIndex(props: {
+    itemCount: number;
+    activeIndex: number;
+    firstIndex?: number;
+    uniqId: string;
+}): {
+    getRovingItemProps: (index: number) => Pick<React.HTMLAttributes<HTMLElement>, 'id' | 'tabIndex' | 'onFocus'>;
+    rovingListProps: import("react").HTMLAttributes<HTMLElement>;
+};

package/build/esm/blocks/Slider/utils.js

@@ -1,3 +1,4 @@
+import { useEffect, useRef, useState } from 'react';
 import pickBy from 'lodash/pickBy';
 import { BREAKPOINTS } from '../../constants';
 import { SliderBreakpointNames } from './models';
@@ -8,6 +9,37 @@ export const DEFAULT_SLIDE_BREAKPOINTS = {
     [SliderBreakpointNames.Sm]: 1.15,
 };
 const BREAKPOINT_NAMES_BY_VALUES = Object.entries(BREAKPOINTS).reduce((acc, [key, value]) => (Object.assign(Object.assign({}, acc), { [value]: key })), {});
+export const isFocusable = (element) => {
+    if (!(element instanceof HTMLElement)) {
+        return false;
+    }
+    const tabIndexAttr = element.getAttribute('tabindex');
+    const hasTabIndex = tabIndexAttr !== null;
+    const tabIndex = Number(tabIndexAttr);
+    if (element.ariaHidden === 'true' || (hasTabIndex && tabIndex < 0)) {
+        return false;
+    }
+    if (hasTabIndex && tabIndex >= 0) {
+        return true;
+    }
+    // without this jest fails here for some reason
+    let htmlElement;
+    switch (true) {
+        case element instanceof HTMLAnchorElement:
+            htmlElement = element;
+            return Boolean(htmlElement.href);
+        case element instanceof HTMLInputElement:
+            htmlElement = element;
+            return htmlElement.type !== 'hidden' && !htmlElement.disabled;
+        case element instanceof HTMLSelectElement:
+        case element instanceof HTMLTextAreaElement:
+        case element instanceof HTMLButtonElement:
+            htmlElement = element;
+            return !htmlElement.disabled;
+        default:
+            return false;
+    }
+};
 export function getSlidesToShowWithDefaults({ contentLength, breakpoints, mobileFullscreen, }) {
     let result;
     if (typeof breakpoints === 'number') {
@@ -31,3 +63,53 @@ export function getSlidesCountByBreakpoint(breakpoint, breakpoints) {
 export function getSlidesToShowCount(breakpoints) {
     return Math.floor(Math.max(...Object.values(breakpoints)));
 }
+const getRovingListItemId = (uniqId, index) => `${uniqId}-roving-tabindex-item-${index}`;
+export function useRovingTabIndex(props) {
+    const { itemCount, activeIndex, firstIndex = 0, uniqId } = props;
+    const [currentIndex, setCurrentIndex] = useState(firstIndex);
+    const hasFocusRef = useRef(false);
+    const lastIndex = itemCount + firstIndex - 1;
+    const getRovingItemProps = (index) => {
+        return {
+            id: getRovingListItemId(uniqId, index),
+            tabIndex: index === activeIndex ? 0 : -1,
+            onFocus: () => {
+                setCurrentIndex(index);
+                hasFocusRef.current = true;
+            },
+        };
+    };
+    useEffect(() => {
+        var _a;
+        if (!hasFocusRef.current) {
+            return;
+        }
+        (_a = document.getElementById(getRovingListItemId(uniqId, currentIndex))) === null || _a === void 0 ? void 0 : _a.focus();
+    }, [activeIndex, currentIndex, uniqId]);
+    const setNextIndex = () => setCurrentIndex((prev) => (prev >= lastIndex ? firstIndex : prev + 1));
+    const setPrevIndex = () => setCurrentIndex((prev) => (prev <= firstIndex ? lastIndex : prev - 1));
+    const onRovingListKeyDown = (e) => {
+        const key = e.key.toLowerCase();
+        if (key !== 'tab' && key !== 'enter') {
+            e.preventDefault();
+        }
+        switch (key) {
+            case 'arrowleft':
+            case 'arrowup':
+                setPrevIndex();
+                return;
+            case 'arrowright':
+            case 'arrowdown':
+                setNextIndex();
+                return;
+        }
+    };
+    const onRovingListBlur = () => {
+        hasFocusRef.current = false;
+    };
+    const rovingListProps = {
+        onKeyDown: onRovingListKeyDown,
+        onBlur: onRovingListBlur,
+    };
+    return { getRovingItemProps, rovingListProps };
+}

package/build/esm/blocks/SliderNew/Arrow/Arrow.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { ClassNameProps } from '../../../models';
 import './Arrow.css';
 export type ArrowType = 'left' | 'right';
@@ -5,6 +6,7 @@ export interface ArrowProps {
     type: ArrowType;
     onClick?: () => void;
     size?: number;
+    extraProps?: React.ButtonHTMLAttributes<HTMLButtonElement>;
 }
-declare const Arrow: ({ type, onClick, className, size }: ArrowProps & ClassNameProps) => JSX.Element;
+declare const Arrow: ({ type, onClick, className, size, extraProps }: ArrowProps & ClassNameProps) => JSX.Element;
 export default Arrow;

package/build/esm/blocks/SliderNew/Arrow/Arrow.js

@@ -4,8 +4,8 @@ import { block } from '../../../utils';
 import { i18n } from '../i18n';
 import './Arrow.css';
 const b = block('slider-new-block-arrow');
-const Arrow = ({ type, onClick, className, size = 16 }) => (React.createElement("div", { className: b({ type }, className) },
-    React.createElement("button", { className: b('button'), onClick: onClick, "aria-label": i18n(`arrow-${type}`) },
+const Arrow = ({ type, onClick, className, size = 16, extraProps }) => (React.createElement("div", { className: b({ type }, className) },
+    React.createElement("button", Object.assign({ className: b('button'), onClick: onClick, "aria-label": i18n(`arrow-${type}`) }, extraProps),
         React.createElement("span", { className: b('icon-wrapper') },
             React.createElement(ToggleArrow, { size: size, type: 'horizontal', iconType: "navigation", className: b('icon') })))));
 export default Arrow;

package/build/esm/blocks/SliderNew/Slider.js

@@ -6,18 +6,30 @@ import AnimateBlock from '../../components/AnimateBlock/AnimateBlock';
 import Title from '../../components/Title/Title';
 import { block } from '../../utils';
 import Arrow from './Arrow/Arrow';
+import { i18n } from './i18n';
 import { useSlider } from './useSlider';
+import { useSliderPagination } from './useSliderPagination';
 import './Slider.css';
 import 'swiper/swiper-bundle.css';
 const b = block('SliderNewBlock');
 SwiperCore.use([Autoplay, A11y, Pagination]);
 export const SliderNewBlock = ({ animated, title, description, type, anchorId, arrows = true, adaptive, autoplay: autoplayMs, dots = true, className, dotsClassName, disclaimer, children, blockClassName, arrowSize, slidesToShow, onSlideChange, onSlideChangeTransitionStart, onSlideChangeTransitionEnd, onActiveIndexChange, onBreakpoint, }) => {
-    const { childrenCount, breakpoints, autoplay, onSwiper, onPrev, onNext, isLocked, setIsLocked } = useSlider({
+    const { autoplay, isLocked, childrenCount, breakpoints, onSwiper, onPrev, onNext, setIsLocked } = useSlider({
         slidesToShow,
         children,
         type,
         autoplayMs,
     });
+    const isA11yControlHidden = Boolean(autoplay);
+    const controlTabIndex = isA11yControlHidden ? -1 : 0;
+    const paginationProps = useSliderPagination({
+        enabled: dots,
+        isA11yControlHidden,
+        controlTabIndex,
+        bulletClass: b('dot', dotsClassName),
+        bulletActiveClass: b('dot_active'),
+        paginationLabel: i18n('pagination-label'),
+    });
     return (React.createElement("div", { className: b({
             'one-slide': childrenCount === 1,
             'only-arrows': !(title === null || title === void 0 ? void 0 : title.text) && !description && arrows,
@@ -27,14 +39,14 @@ export const SliderNewBlock = ({ animated, title, description, type, anchorId, a
         anchorId && React.createElement(Anchor, { id: anchorId }),
         React.createElement(Title, { title: title, subtitle: description, className: b('header', { 'no-description': !description }) }),
         React.createElement(AnimateBlock, { className: b('animate-slides'), animate: animated },
-            React.createElement(Swiper, { className: b('slider', className), onSwiper: onSwiper, pagination: dots && {
-                    clickable: true,
-                    bulletClass: b('dot', dotsClassName),
-                    bulletActiveClass: b('dot_active'),
-                }, speed: 1000, autoplay: autoplay, autoHeight: adaptive, initialSlide: 0, noSwiping: false, breakpoints: breakpoints, onSlideChange: onSlideChange, onSlideChangeTransitionStart: onSlideChangeTransitionStart, onSlideChangeTransitionEnd: onSlideChangeTransitionEnd, onActiveIndexChange: onActiveIndexChange, onBreakpoint: onBreakpoint, onLock: () => setIsLocked(true), onUnlock: () => setIsLocked(false), watchSlidesVisibility: true, watchOverflow: true }, React.Children.map(children, (elem, index) => (React.createElement(SwiperSlide, { className: b('slide'), key: index }, elem)))),
+            React.createElement(Swiper, Object.assign({ className: b('slider', className), onSwiper: onSwiper, speed: 1000, autoplay: autoplay, autoHeight: adaptive, initialSlide: 0, noSwiping: false, breakpoints: breakpoints, onSlideChange: onSlideChange, onSlideChangeTransitionStart: onSlideChangeTransitionStart, onSlideChangeTransitionEnd: onSlideChangeTransitionEnd, onActiveIndexChange: onActiveIndexChange, onBreakpoint: onBreakpoint, onLock: () => setIsLocked(true), onUnlock: () => setIsLocked(false), watchSlidesVisibility: true, watchOverflow: true, a11y: {
+                    slideLabelMessage: '',
+                    paginationBulletMessage: i18n('dot-label', { index: '{{index}}' }),
+                } }, paginationProps), React.Children.map(children, (elem, index) => (React.createElement(SwiperSlide, { className: b('slide'), key: index }, ({ isVisible }) => (React.createElement("div", { "aria-hidden": !isA11yControlHidden && !isVisible }, elem)))))),
             arrows && !isLocked && (React.createElement(Fragment, null,
-                React.createElement(Arrow, { className: b('arrow', { prev: true }), type: "left", onClick: onPrev, size: arrowSize }),
-                React.createElement(Arrow, { className: b('arrow', { next: true }), type: "right", onClick: onNext, size: arrowSize }))),
+                React.createElement("div", { "aria-hidden": isA11yControlHidden },
+                    React.createElement(Arrow, { className: b('arrow', { prev: true }), type: "left", onClick: onPrev, size: arrowSize, extraProps: { tabIndex: controlTabIndex } }),
+                    React.createElement(Arrow, { className: b('arrow', { next: true }), type: "right", onClick: onNext, size: arrowSize, extraProps: { tabIndex: controlTabIndex } })))),
             React.createElement("div", { className: b('footer') }, disclaimer ? (React.createElement("div", { className: b('disclaimer', { size: (disclaimer === null || disclaimer === void 0 ? void 0 : disclaimer.size) || 'm' }) }, disclaimer === null || disclaimer === void 0 ? void 0 : disclaimer.text)) : null))));
 };
 export default SliderNewBlock;

package/build/esm/blocks/SliderNew/i18n/en.json

@@ -1,4 +1,6 @@
 {
   "arrow-right": "Next",
-  "arrow-left": "Previous"
+  "arrow-left": "Previous",
+  "dot-label": "Page {{index}}",
+  "pagination-label": "Pages"
 }

package/build/esm/blocks/SliderNew/i18n/index.d.ts

@@ -1 +1 @@
-export declare const i18n: (key: "arrow-right" | "arrow-left", params?: import("@gravity-ui/i18n").Params | undefined) => string;
+export declare const i18n: (key: "arrow-right" | "arrow-left" | "dot-label" | "pagination-label", params?: import("@gravity-ui/i18n").Params | undefined) => string;

package/build/esm/blocks/SliderNew/i18n/ru.json

@@ -1,4 +1,6 @@
 {
   "arrow-right": "Дальше",
-  "arrow-left": "Назад"
+  "arrow-left": "Назад",
+  "dot-label": "Страница {{index}}",
+  "pagination-label": "Страницы"
 }

package/build/esm/blocks/SliderNew/useSlider.d.ts

@@ -1,11 +1,12 @@
 import React, { PropsWithChildren } from 'react';
 import type { Swiper } from 'swiper';
 import { SlidesToShow } from '../../models';
-export declare const useSlider: ({ children, autoplayMs, type, slidesToShow, }: React.PropsWithChildren<{
-    autoplayMs?: number | undefined;
-    type?: string | undefined;
-    slidesToShow?: SlidesToShow | undefined;
-}>) => {
+type UseSliderProps = PropsWithChildren<{
+    autoplayMs?: number;
+    type?: string;
+    slidesToShow?: SlidesToShow;
+}>;
+export declare const useSlider: ({ children, autoplayMs, type, ...props }: UseSliderProps) => {
     slider: Swiper | undefined;
     onSwiper: React.Dispatch<React.SetStateAction<Swiper | undefined>>;
     onNext: () => void;
@@ -15,7 +16,8 @@ export declare const useSlider: ({ children, autoplayMs, type, slidesToShow, }:
     isLocked: boolean;
     setIsLocked: React.Dispatch<React.SetStateAction<boolean>>;
     autoplay: false | {
-        delay: number | undefined;
+        delay: number;
         disableOnInteraction: boolean;
     };
 };
+export {};

package/build/esm/blocks/SliderNew/useSlider.js

@@ -1,11 +1,14 @@
+import { __rest } from "tslib";
 import React, { useEffect, useMemo, useState } from 'react';
 import { SliderType } from '../../models';
-import { getSliderResponsiveParams } from './utils';
-export const useSlider = ({ children, autoplayMs, type, slidesToShow, }) => {
+import { getSliderResponsiveParams, useMemoized } from './utils';
+export const useSlider = (_a) => {
+    var { children, autoplayMs, type } = _a, props = __rest(_a, ["children", "autoplayMs", "type"]);
     const [slider, setSlider] = useState();
     const [isLocked, setIsLocked] = useState(false);
+    const slidesToShow = useMemoized(props.slidesToShow);
     const childrenCount = React.Children.count(children);
-    const autoplayEnabled = useMemo(() => Boolean(autoplayMs), [autoplayMs]);
+    const autoplayEnabled = autoplayMs !== undefined && autoplayMs > 0;
     const breakpoints = useMemo(() => {
         return getSliderResponsiveParams({
             contentLength: childrenCount,

package/build/esm/blocks/SliderNew/useSliderPagination.d.ts

@@ -0,0 +1,9 @@
+import { Swiper as SwiperProps } from 'swiper/swiper-react';
+export declare const useSliderPagination: (props: {
+    enabled: boolean;
+    isA11yControlHidden: boolean;
+    controlTabIndex: number;
+    bulletClass: string;
+    bulletActiveClass: string;
+    paginationLabel: string;
+}) => Pick<SwiperProps, 'pagination' | 'onPaginationUpdate'> | undefined;

package/build/esm/blocks/SliderNew/useSliderPagination.js

@@ -0,0 +1,32 @@
+import { setElementAtrributes } from './utils';
+export const useSliderPagination = (props) => {
+    if (!props.enabled) {
+        return undefined;
+    }
+    const { isA11yControlHidden, controlTabIndex, bulletClass, bulletActiveClass, paginationLabel } = props;
+    return {
+        pagination: {
+            clickable: true,
+            bulletClass,
+            bulletActiveClass,
+        },
+        onPaginationUpdate: (slider) => {
+            const pagination = slider.pagination.el;
+            setElementAtrributes(pagination, {
+                role: 'menu',
+                'aria-hidden': isA11yControlHidden,
+                'aria-label': paginationLabel,
+            });
+            const bullets = pagination.querySelectorAll(`.${bulletClass}`);
+            bullets.forEach((bullet) => {
+                const isActive = bullet.classList.contains(bulletActiveClass);
+                setElementAtrributes(bullet, {
+                    role: 'menuitemradio',
+                    'aria-hidden': isA11yControlHidden,
+                    'aria-checked': isActive,
+                    tabindex: controlTabIndex,
+                });
+            });
+        },
+    };
+};

package/build/esm/blocks/SliderNew/utils.d.ts

@@ -12,3 +12,5 @@ export interface GetSlidesToShowParams {
     mobileFullscreen?: boolean;
 }
 export declare function getSliderResponsiveParams({ contentLength, slidesToShow, mobileFullscreen, }: GetSlidesToShowParams): Record<number, SwiperOptions>;
+export declare const useMemoized: <T>(value: T) => T;
+export declare const setElementAtrributes: (element: Element, attributes: Record<string, unknown>) => void;

package/build/esm/blocks/SliderNew/utils.js

@@ -1,3 +1,5 @@
+import { useEffect, useState } from 'react';
+import isEqual from 'lodash/isEqual';
 import pickBy from 'lodash/pickBy';
 import { BREAKPOINTS } from '../../constants';
 import { SliderBreakpointNames } from './models';
@@ -24,3 +26,11 @@ export function getSliderResponsiveParams({ contentLength, slidesToShow, mobileF
         return res;
     }, {});
 }
+export const useMemoized = (value) => {
+    const [memoizedValue, setMemoizedValue] = useState(value);
+    useEffect(() => {
+        setMemoizedValue((memoized) => value && typeof value === 'object' && isEqual(memoized, value) ? memoized : value);
+    }, [value]);
+    return memoizedValue;
+};
+export const setElementAtrributes = (element, attributes) => Object.entries(attributes).forEach(([attribute, value]) => element.setAttribute(attribute, String(value)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/page-constructor",
-  "version": "5.27.0",
+  "version": "5.27.1",
   "description": "Gravity UI Page Constructor",
   "license": "MIT",
   "repository": {
@@ -80,6 +80,7 @@
     "test:watch": "jest --watchAll",
     "playwright": "playwright test --config=playwright/playwright.config.ts",
     "playwright:update": "npm run playwright -- -u",
+    "playwright:clear-cache": "rm -rf ./playwright/.cache",
     "playwright:docker": "./scripts/playwright-docker.sh 'npm run playwright'",
     "playwright:docker:update": "./scripts/playwright-docker.sh 'npm run playwright:update'",
     "playwright:docker:clear-cache": "./scripts/playwright-docker.sh clear-cache",