@gravity-ui/page-constructor 2.0.0-beta.0 → 2.0.0

package/build/cjs/navigation/components/NavigationListItem/NavigationListItem.css

@@ -0,0 +1,11 @@
+.pc-navigation-list-item__slider-container {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  left: 0;
+}
+.pc-navigation-list-item__slider {
+  width: 100%;
+  height: 2px;
+  background-color: var(--yc-color-text-link);
+}

package/build/cjs/navigation/components/NavigationListItem/NavigationListItem.d.ts

@@ -0,0 +1,16 @@
+import React from 'react';
+import { ClassNameProps, NavigationItemModel } from '../../../models';
+import { ItemColumnName } from '../../constants';
+type NavigationListItemProps = {
+    item: NavigationItemModel;
+    index: number;
+    column: ItemColumnName;
+    activeItemId?: string;
+    itemPositions?: number[];
+    itemRefs?: React.MutableRefObject<(HTMLLIElement | null)[]>;
+    highlightActiveItem?: boolean;
+    hidePopup: () => void;
+    onActiveItemChange: (id?: string) => void;
+} & ClassNameProps;
+export declare const NavigationListItem: ({ item, itemRefs, className, index, activeItemId, highlightActiveItem, hidePopup, itemPositions, column, onActiveItemChange, }: NavigationListItemProps) => JSX.Element;
+export {};

package/build/cjs/navigation/components/NavigationListItem/NavigationListItem.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NavigationListItem = void 0;
+const tslib_1 = require("tslib");
+const react_1 = tslib_1.__importStar(require("react"));
+const utils_1 = require("../../../utils");
+const models_1 = require("../../../models");
+const utils_2 = require("../../utils");
+const NavigationDropdownItem_1 = tslib_1.__importDefault(require("../NavigationDropdownItem/NavigationDropdownItem"));
+const NavigationItem_1 = tslib_1.__importDefault(require("../NavigationItem/NavigationItem"));
+const b = (0, utils_1.block)('navigation');
+const NavigationListItem = ({ item, itemRefs, className, index, activeItemId, highlightActiveItem, hidePopup, itemPositions, column, onActiveItemChange, }) => {
+    var _a;
+    const ref = (0, react_1.useRef)(null);
+    const id = `${column}-${index}`;
+    const isActive = id === activeItemId;
+    const onClick = (0, utils_2.getItemClickHandler)({
+        column,
+        index,
+        activeItemId,
+        onActiveItemChange,
+    });
+    return (react_1.default.createElement("li", { ref: itemRefs ? (el) => itemRefs.current.push(el) : ref, className: className },
+        item.type === models_1.NavigationItemType.Dropdown ? (react_1.default.createElement(NavigationDropdownItem_1.default, { data: item, onClick: onClick, isActive: isActive, position: (itemPositions === null || itemPositions === void 0 ? void 0 : itemPositions[index]) || ((_a = ref.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect().left) || 0, hidePopup: hidePopup })) : (react_1.default.createElement(NavigationItem_1.default, { data: item, onClick: onClick })),
+        highlightActiveItem && isActive && (react_1.default.createElement("div", { className: b('slider-container') },
+            react_1.default.createElement("div", { className: b('slider') })))));
+};
+exports.NavigationListItem = NavigationListItem;

package/build/cjs/navigation/constants.d.ts

@@ -0,0 +1,6 @@
+export declare enum ItemColumnName {
+    Left = "left",
+    Right = "right",
+    Top = "top",
+    Bottom = "bottom"
+}

package/build/cjs/navigation/constants.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ItemColumnName = void 0;
+var ItemColumnName;
+(function (ItemColumnName) {
+    ItemColumnName["Left"] = "left";
+    ItemColumnName["Right"] = "right";
+    ItemColumnName["Top"] = "top";
+    ItemColumnName["Bottom"] = "bottom";
+})(ItemColumnName = exports.ItemColumnName || (exports.ItemColumnName = {}));

package/build/cjs/navigation/utils.d.ts

@@ -0,0 +1,10 @@
+import { MouseEventHandler } from 'react';
+import { ItemColumnName } from './constants';
+type GetItemClickHandlerArgs = {
+    column: ItemColumnName;
+    index: number;
+    activeItemId?: string;
+    onActiveItemChange: (id?: string) => void;
+};
+export declare const getItemClickHandler: ({ column, index, onActiveItemChange, }: GetItemClickHandlerArgs) => MouseEventHandler;
+export {};

package/build/cjs/navigation/utils.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getItemClickHandler = void 0;
+const getItemClickHandler = ({ column, index, onActiveItemChange, activeItemId }) => (e) => {
+    const id = `${column}-${index}`;
+    if (e) {
+        e.stopPropagation();
+    }
+    onActiveItemChange(id === activeItemId ? undefined : `${column}-${index}`);
+};
+exports.getItemClickHandler = getItemClickHandler;

package/build/cjs/schema/validators/common.d.ts

@@ -1168,12 +1168,6 @@ export declare const MapProps: {
     zoom: {
         type: string;
     };
-    center: {
-        type: string;
-        items: {
-            type: string;
-        };
-    };
     address: {
         type: string;
     };

package/build/cjs/schema/validators/common.js

@@ -493,10 +493,6 @@ exports.MapProps = {
     zoom: {
         type: 'number',
     },
-    center: {
-        type: 'array',
-        items: { type: 'number' },
-    },
     address: {
         type: 'string',
     },

package/build/cjs/sub-blocks/HubspotForm/HubspotForm.css

@@ -268,6 +268,7 @@ unpredictable css rules order in build */
 .pc-hubspot-form .hs-button.primary {
   margin: 0;
   padding: 0;
+  font-family: var(--yc-text-body-font-family);
   font-size: inherit;
   font-weight: 400;
   color: inherit;

package/build/esm/blocks/ExtendedFeatures/ExtendedFeatures.css

@@ -21,7 +21,7 @@ unpredictable css rules order in build */
   line-height: var(--yc-text-header-1-line-height);
   color: var(--pc-text-header-color);
   font-weight: var(--yc-text-accent-font-weight);
-  display: flex;
+  display: block;
   position: relative;
   margin-bottom: 8px;
 }
@@ -42,13 +42,13 @@ unpredictable css rules order in build */
   font-size: var(--yc-text-caption-2-font-size);
   line-height: var(--yc-text-caption-2-line-height);
   position: relative;
-  top: 5px;
+  top: -3px;
   height: 16px;
   margin-left: 8px;
-  padding: 0 5px;
+  padding: 1.5px 5px 2px;
   color: var(--yc-color-base-background);
   background-color: var(--yc-my-color-brand-normal);
-  border-radius: 3px;
+  border-radius: 4px;
 }
 .pc-ExtendedFeaturesBlock__item-text, .pc-ExtendedFeaturesBlock__item-link {
   font-size: var(--yc-text-body-2-font-size);

package/build/esm/blocks/ExtendedFeatures/ExtendedFeatures.js

@@ -30,7 +30,7 @@ export const ExtendedFeaturesBlock = ({ title, description, items, colSizes = DE
                     React.createElement("div", { className: b('container') },
                         itemTitle && (React.createElement("h5", { className: b('item-title') },
                             React.createElement(HTML, null, itemTitle),
-                            label && (React.createElement("div", { className: b('item-label') }, label)))),
+                            label && (React.createElement("span", { className: b('item-label') }, label)))),
                         React.createElement(Content, { text: text, links: itemLinks, size: "s", colSizes: { all: 12, md: 12 }, buttons: buttons, additionalInfo: additionalInfo }))));
             })))));
 };

package/build/esm/blocks/Map/schema.d.ts

@@ -6,12 +6,6 @@ export declare const Map: {
         zoom: {
             type: string;
         };
-        center: {
-            type: string;
-            items: {
-                type: string;
-            };
-        };
         address: {
             type: string;
         };
@@ -70,12 +64,6 @@ export declare const MapBlock: {
                     zoom: {
                         type: string;
                     };
-                    center: {
-                        type: string;
-                        items: {
-                            type: string;
-                        };
-                    };
                     address: {
                         type: string;
                     };

package/build/esm/components/HTML/HTML.d.ts

@@ -7,7 +7,7 @@ export interface HTMLProps {
 }
 declare const HTML: ({ children, block, className }: WithChildren<HTMLProps>) => React.DetailedReactHTMLElement<{
     dangerouslySetInnerHTML: {
-        __html: string & (boolean | React.ReactChild | React.ReactFragment | React.ReactPortal | null);
+        __html: string | (string & React.ReactElement<any, string | React.JSXElementConstructor<any>>) | (string & React.ReactFragment) | (string & React.ReactPortal);
     };
     className: string | undefined;
 }, HTMLElement> | null;

package/build/esm/components/Map/GoogleMap.js

@@ -5,18 +5,20 @@ import { MapsContext } from '../../context/mapsContext/mapsContext';
 import { LocaleContext } from '../../context/localeContext/localeContext';
 import { MobileContext } from '../../context/mobileContext';
 import { getMapHeight } from './helpers';
+import { Lang } from '../../utils/configure';
 const b = block('map');
-function getScriptSrc(apiKey, scriptSrc, address, lang) {
-    return `${scriptSrc}?key=${apiKey}&language=${lang}&q=${encodeURI(address)}`;
+function getScriptSrc(params) {
+    const { apiKey, scriptSrc, address, lang, zoom } = params;
+    return `${scriptSrc}?key=${apiKey}&language=${lang}${zoom ? '&zoom=' + zoom : ''}&q=${encodeURI(address)}`;
 }
 const GoogleMap = (props) => {
-    const { address } = props;
+    const { address, zoom } = props;
     const { apiKey, scriptSrc } = useContext(MapsContext);
-    const { lang = 'ru' } = useContext(LocaleContext);
+    const { lang = Lang.Ru } = useContext(LocaleContext);
     const isMobile = useContext(MobileContext);
     const [height, setHeight] = useState(undefined);
     const ref = useRef(null);
-    const src = useMemo(() => getScriptSrc(apiKey, scriptSrc, address, lang), [apiKey, scriptSrc, address, lang]);
+    const src = useMemo(() => getScriptSrc({ apiKey, scriptSrc, address, lang, zoom }), [apiKey, scriptSrc, address, lang, zoom]);
     useEffect(() => {
         const updateSize = _.debounce(() => {
             if (ref.current) {

package/build/esm/components/Map/Map.css

@@ -7,9 +7,13 @@ unpredictable css rules order in build */
   overflow: hidden;
   display: flex;
 }
+.pc-map_hidden {
+  opacity: 0;
+}
 .pc-map__spinner {
   margin: 0 auto;
   align-self: center;
+  position: absolute;
 }
 .pc-map__wrapper {
   min-height: 300px;
@@ -17,4 +21,5 @@ unpredictable css rules order in build */
   flex-direction: column;
   align-items: center;
   justify-content: center;
+  position: relative;
 }

package/build/esm/components/Map/YMap/YMap.d.ts

@@ -1,13 +1,15 @@
-import { YMapMarker } from '../../../models';
+import { YMapProps, YMapMarker } from '../../../models';
+type PlacemarksProps = Pick<YMapProps, 'zoom' | 'markers'>;
 export declare class YMap {
     private ymap;
     private mapRef;
     private coords;
     constructor(ymap: Ymaps.Map, mapRef: HTMLDivElement | null);
-    showPlacemarks(markers: YMapMarker[]): Promise<void>;
+    showPlacemarks(props: PlacemarksProps): Promise<void>;
     findAddress(marker: YMapMarker): Promise<void>;
     findCoordinate(marker: YMapMarker): void;
     private drawPlaceMarkStyle;
     private recalcZoomAndCenter;
     private clearOldPlacemarks;
 }
+export {};

package/build/esm/components/Map/YMap/YMap.js

@@ -19,9 +19,9 @@ export class YMap {
         this.ymap = ymap;
         this.mapRef = mapRef;
     }
-    async showPlacemarks(markers) {
+    async showPlacemarks(props) {
         this.clearOldPlacemarks();
-        for (const marker of markers) {
+        for (const marker of props.markers) {
             if (marker.address) {
                 await this.findAddress(marker);
             }
@@ -29,7 +29,7 @@ export class YMap {
                 this.findCoordinate(marker);
             }
         }
-        this.recalcZoomAndCenter();
+        this.recalcZoomAndCenter(props);
     }
     async findAddress(marker) {
         try {
@@ -49,10 +49,7 @@ export class YMap {
         this.ymap.geoObjects.add(geoObject);
     }
     drawPlaceMarkStyle(geoObject, marker) {
-        if (!marker.label) {
-            return;
-        }
-        const { iconColor, preset = DEFAULT_PLACEMARKS_PRESET } = marker.label;
+        const { iconColor, preset = DEFAULT_PLACEMARKS_PRESET } = marker.label || {};
         let localIconColor = iconColor;
         // You can set the preset option together with the iconColor option only if it not a 'Stretchy' preset
         if (!preset.includes('Stretchy') && !iconColor) {
@@ -65,9 +62,10 @@ export class YMap {
             }
         });
     }
-    recalcZoomAndCenter() {
+    recalcZoomAndCenter(props) {
         var _a, _b;
         const coordsLength = this.coords.length;
+        const { zoom = 0 } = props;
         if (!coordsLength) {
             return;
         }
@@ -76,10 +74,20 @@ export class YMap {
             leftBottom = [Math.min(leftBottom[0], point[0]), Math.min(leftBottom[1], point[1])];
             rightTop = [Math.max(rightTop[0], point[0]), Math.max(rightTop[1], point[1])];
         });
-        const newMapParams = window.ymaps.util.bounds.getCenterAndZoom([leftBottom, rightTop], [(_a = this.mapRef) === null || _a === void 0 ? void 0 : _a.clientWidth, (_b = this.mapRef) === null || _b === void 0 ? void 0 : _b.clientHeight], undefined, { margin: DEFAULT_MAP_CONTROL_BUTTON_HEIGHT });
+        let newMapParams = {
+            zoom,
+            center: [],
+        };
+        if (zoom) {
+            // compute only the center
+            newMapParams.center = window.ymaps.util.bounds.getCenter([leftBottom, rightTop]);
+        }
+        else {
+            newMapParams = window.ymaps.util.bounds.getCenterAndZoom([leftBottom, rightTop], [(_a = this.mapRef) === null || _a === void 0 ? void 0 : _a.clientWidth, (_b = this.mapRef) === null || _b === void 0 ? void 0 : _b.clientHeight], undefined, { margin: DEFAULT_MAP_CONTROL_BUTTON_HEIGHT });
+        }
         this.ymap.setCenter(newMapParams.center);
         // Use default zoom for one placemark
-        if (coordsLength > 1) {
+        if (coordsLength > 1 && !zoom) {
             this.ymap.setZoom(newMapParams.zoom);
         }
     }

package/build/esm/components/Map/YMap/YandexMap.js

@@ -13,8 +13,12 @@ import { getMapHeight } from '../helpers';
 const b = block('map');
 const DEFAULT_CONTAINER_ID = 'ymap';
 const DEFAULT_ZOOM = 9;
+// Center - is a required parameter for creating a new map
+// We use this init center to create a map
+// The real center of the map will be calculated later, using the coordinates of the markers
+const INITIAL_CENTER = [0, 0];
 const YandexMap = (props) => {
-    const { markers, zoom, center, id } = props;
+    const { markers, zoom, id } = props;
     const { apiKey, scriptSrc, nonce } = useContext(MapsContext);
     const isMobile = useContext(MobileContext);
     const { lang = 'ru' } = useContext(LocaleContext);
@@ -23,6 +27,7 @@ const YandexMap = (props) => {
     const [height, setHeight] = useState(undefined);
     const ref = useRef(null);
     const [loading, setLoading] = useState(false);
+    const [ready, setReady] = useState(false);
     const [attemptsIndex, setAttemptsIndex] = useState(0);
     const onTryAgain = useCallback(() => {
         setAttemptsIndex(attemptsIndex + 1);
@@ -30,20 +35,17 @@ const YandexMap = (props) => {
     useEffect(() => {
         (async function () {
             var _a;
-            if (!center) {
-                return;
-            }
             setLoading(true);
             await YMapsApiLoader.loadApi(apiKey, scriptSrc, lang, nonce);
             (_a = window.ymaps) === null || _a === void 0 ? void 0 : _a.ready(() => {
                 setYmaps(new YMap(new window.ymaps.Map(containerId, {
-                    center,
+                    center: INITIAL_CENTER,
                     zoom: zoom || DEFAULT_ZOOM,
                 }, { autoFitToViewport: 'always' }), ref.current));
             });
             setLoading(false);
         })();
-    }, [apiKey, lang, scriptSrc, containerId, zoom, center, nonce, attemptsIndex, setLoading]);
+    }, [apiKey, lang, scriptSrc, containerId, zoom, nonce, attemptsIndex, setLoading]);
     useEffect(() => {
         const updateSize = _.debounce(() => {
             if (ref.current) {
@@ -58,12 +60,19 @@ const YandexMap = (props) => {
     }, [markers, ymap, setYmaps, isMobile]);
     useEffect(() => {
         if (ymap) {
-            ymap.showPlacemarks(markers);
+            // show with computed center and placemarks
+            const showPlacemarks = async () => {
+                await ymap.showPlacemarks({ markers, zoom });
+                setReady(true);
+            };
+            showPlacemarks();
         }
     });
-    if (!center)
+    if (!markers)
         return null;
     return (React.createElement(ErrorWrapper, { isError: YMapsApiLoader.status === MapApiStatus.Error, text: i18n('map-load-error'), buttonText: i18n('map-try-again'), handler: onTryAgain, className: b('wrapper') },
-        React.createElement("div", { id: containerId, className: b(), ref: ref, style: { height } }, loading ? React.createElement(Spin, { size: "xl", className: b('spinner') }) : null)));
+        React.createElement("div", { className: b('wrapper') },
+            React.createElement("div", { id: containerId, className: b({ hidden: !ready }), ref: ref, style: { height } }),
+            loading ? React.createElement(Spin, { size: "xl", className: b('spinner') }) : null)));
 };
 export default YandexMap;

package/build/esm/models/constructor-items/common.d.ts

@@ -189,7 +189,6 @@ export interface MediaProps extends Animatable, Partial<MediaComponentDataLensPr
 export type Coordinate = number[];
 export interface MapBaseProps {
     zoom?: number;
-    center?: Coordinate;
 }
 export interface GMapProps extends MapBaseProps {
     address: string;
@@ -197,7 +196,6 @@ export interface GMapProps extends MapBaseProps {
 export interface YMapProps extends MapBaseProps {
     markers: YMapMarker[];
     id: string;
-    center: Coordinate;
 }
 export interface YMapMarker {
     address?: string;

package/build/esm/navigation/components/Header/Header.css

@@ -41,6 +41,8 @@ unpredictable css rules order in build */
 .pc-header__right {
   flex: 0;
   justify-content: flex-end;
+  font-size: var(--yc-text-body-2-font-size);
+  line-height: var(--yc-text-body-2-line-height);
 }
 .pc-header__navigation-container {
   display: flex;
@@ -53,6 +55,9 @@ unpredictable css rules order in build */
 .pc-header__buttons {
   display: flex;
   align-items: center;
+  margin: 0;
+  padding: 0;
+  list-style: none;
 }
 @media (max-width: 768px) {
   .pc-header__buttons {
@@ -62,6 +67,24 @@ unpredictable css rules order in build */
 .pc-header__buttons > *:not(:last-child) {
   margin-right: 16px;
 }
+.pc-header__buttons-item {
+  position: relative;
+  height: var(--header-height);
+  line-height: var(--header-height);
+  cursor: pointer;
+  outline: none;
+  color: inherit;
+  text-decoration: none;
+}
+.utilityfocus .pc-header__buttons-item:focus {
+  outline: 2px solid #ffdb4d;
+}
+.pc-header__buttons-item:hover, .pc-header__buttons-item:active {
+  color: var(--yc-color-text-link);
+}
+.pc-header__buttons-item:not(:last-child) {
+  margin-right: 20px;
+}
 .pc-header__button {
   margin-top: 0;
 }

package/build/esm/navigation/components/Header/Header.js

@@ -3,11 +3,12 @@ import { block } from '../../../utils';
 import { Col, Grid, Row } from '../../../grid';
 import OutsideClick from '../../../components/OutsideClick/OutsideClick';
 import Control from '../../../components/Control/Control';
+import { NavigationClose, NavigationOpen } from '../../../icons';
+import { ItemColumnName } from '../../constants';
 import Navigation from '../Navigation/Navigation';
 import MobileNavigation from '../MobileNavigation/MobileNavigation';
-import NavigationItem from '../NavigationItem/NavigationItem';
 import Logo from '../Logo/Logo';
-import { NavigationClose, NavigationOpen } from '../../../icons';
+import { NavigationListItem } from '../NavigationListItem/NavigationListItem';
 import './Header.css';
 const b = block('header');
 const ICON_SIZE = 36;
@@ -24,10 +25,13 @@ const MobileMenuButton = ({ isSidebarOpened, onSidebarOpenedChange, }) => {
 export const Header = ({ data, logo }) => {
     const { leftItems, rightItems } = data;
     const [isSidebarOpened, setIsSidebarOpened] = useState(false);
-    const [activeItemIndex, setActiveItemIndex] = useState(-1);
-    const onActiveItemChange = useCallback((index) => {
-        setActiveItemIndex(index);
+    const [activeItemId, setactiveItemId] = useState(undefined);
+    const onActiveItemChange = useCallback((id) => {
+        setactiveItemId(id);
     }, []);
+    const hidePopup = useCallback(() => {
+        onActiveItemChange();
+    }, [onActiveItemChange]);
     const onSidebarOpenedChange = useCallback((isOpen) => {
         setIsSidebarOpened(isOpen);
     }, []);
@@ -41,11 +45,11 @@ export const Header = ({ data, logo }) => {
                     logo && (React.createElement("div", { className: b('left') },
                         React.createElement(Logo, Object.assign({}, logo, { className: b('logo') })))),
                     React.createElement("div", { className: b('navigation-container') },
-                        React.createElement(Navigation, { className: b('navigation'), links: leftItems, activeItemIndex: activeItemIndex, onActiveItemChange: onActiveItemChange })),
+                        React.createElement(Navigation, { className: b('navigation'), links: leftItems, activeItemId: activeItemId, onActiveItemChange: onActiveItemChange })),
                     React.createElement("div", { className: b('right') },
                         React.createElement(MobileMenuButton, { isSidebarOpened: isSidebarOpened, onSidebarOpenedChange: onSidebarOpenedChange }),
-                        rightItems && (React.createElement("div", { className: b('buttons') }, rightItems.map((button) => (React.createElement(NavigationItem, { key: button.text, data: button })))))),
+                        rightItems && (React.createElement("ul", { className: b('buttons') }, rightItems.map((button, index) => (React.createElement(NavigationListItem, { key: index, className: b('buttons-item'), item: button, index: index, activeItemId: activeItemId, hidePopup: hidePopup, column: ItemColumnName.Right, onActiveItemChange: onActiveItemChange })))))),
                     React.createElement(OutsideClick, { onOutsideClick: () => onSidebarOpenedChange(false) },
-                        React.createElement(MobileNavigation, { topItems: leftItems, bottomItems: rightItems, isOpened: isSidebarOpened, activeItemIndex: activeItemIndex, onActiveItemChange: onActiveItemChange, onClose: hideSidebar })))))));
+                        React.createElement(MobileNavigation, { topItems: leftItems, bottomItems: rightItems, isOpened: isSidebarOpened, activeItemId: activeItemId, onActiveItemChange: onActiveItemChange, onClose: hideSidebar })))))));
 };
 export default Header;

package/build/esm/navigation/components/MobileNavigation/MobileNavigation.css

@@ -24,7 +24,10 @@ unpredictable css rules order in build */
 .pc-mobile-navigation__button {
   margin-top: 24px;
 }
-.pc-mobile-navigation__links {
+.pc-mobile-navigation__nav {
+  margin-bottom: 24px;
+}
+.pc-mobile-navigation__rows {
   position: relative;
   display: flex;
   flex-direction: column;
@@ -33,7 +36,7 @@ unpredictable css rules order in build */
   padding: 0;
   list-style: none;
 }
-.pc-mobile-navigation__links-item:not(:last-child) {
+.pc-mobile-navigation__rows-item:not(:last-child) {
   margin-bottom: 24px;
 }
 .pc-mobile-navigation__dropdown-item:not(:last-child) {

package/build/esm/navigation/components/MobileNavigation/MobileNavigation.d.ts

@@ -6,9 +6,9 @@ export interface MobileNavigationProps {
     isOpened?: boolean;
     topItems?: NavigationItemModel[];
     bottomItems?: NavigationItemModel[];
-    activeItemIndex: number;
+    activeItemId?: string;
     onClose: () => void;
-    onActiveItemChange: (index: number) => void;
+    onActiveItemChange: (id?: string) => void;
 }
 declare const MobileNavigation: React.FC<MobileNavigationProps>;
 export default MobileNavigation;

package/build/esm/navigation/components/MobileNavigation/MobileNavigation.js

@@ -3,6 +3,7 @@ import { Popup, Portal } from '@gravity-ui/uikit';
 import { block } from '../../../utils';
 import Foldable from '../../../components/Foldable/Foldable';
 import { NavigationItemType } from '../../../models';
+import { ItemColumnName } from '../../constants';
 import NavigationItem from '../NavigationItem/NavigationItem';
 import './MobileNavigation.css';
 const b = block('mobile-navigation');
@@ -12,32 +13,31 @@ const MobileNavigationDropdown = ({ data, onItemClick, onToggle, isOpened = fals
         React.createElement(NavigationItem, { data: data, onClick: onToggle, isOpened: isOpened }),
         isOpened && (React.createElement(Popup, { anchorRef: ref, open: isOpened, className: b('popup') }, data.items.map((item) => (React.createElement(NavigationItem, { key: item.text, data: item, className: b('dropdown-item'), onClick: onItemClick })))))));
 };
-const MobileNavigationItem = ({ link, index, isActive, onActiveItemChange, onClose, }) => {
+const MobileNavigationItem = ({ item, index, isOpened, activeItemId, onActiveItemChange, column, onClose, }) => {
+    const id = `${column}-${index}`;
+    const isActive = id === activeItemId && isOpened;
     const toggleActive = useCallback((e) => {
         e.stopPropagation();
         if (onActiveItemChange) {
-            onActiveItemChange(isActive ? -1 : index);
+            onActiveItemChange(isActive ? undefined : `${column}-${index}`);
         }
-    }, [isActive, index, onActiveItemChange]);
+    }, [onActiveItemChange, isActive, column, index]);
     const onItemClick = useCallback((e) => {
         toggleActive(e);
         onClose();
     }, [toggleActive, onClose]);
-    return (React.createElement("li", { key: index, className: b('links-item') }, link.type === NavigationItemType.Dropdown ? (React.createElement(MobileNavigationDropdown, { data: link, onToggle: toggleActive, isOpened: isActive, onItemClick: onItemClick })) : (React.createElement(NavigationItem, { data: link, onClick: onItemClick }))));
+    return (React.createElement("li", { key: index, className: b('rows-item') }, item.type === NavigationItemType.Dropdown ? (React.createElement(MobileNavigationDropdown, { data: item, onToggle: toggleActive, isOpened: isActive, onItemClick: onItemClick })) : (React.createElement(NavigationItem, { data: item, onClick: onItemClick }))));
 };
 const MobileNavigation = (props) => {
     if (typeof window === 'undefined') {
         return null;
     }
-    const { isOpened, topItems, bottomItems, activeItemIndex, onActiveItemChange, onClose } = props;
+    const { isOpened, topItems, bottomItems, activeItemId, onActiveItemChange, onClose } = props;
     return (React.createElement(Portal, null,
         React.createElement(Foldable, { key: topItems === null || topItems === void 0 ? void 0 : topItems.length, className: b(), isOpened: Boolean(isOpened) },
             React.createElement("div", { className: b('wrapper') },
-                React.createElement("nav", null,
-                    React.createElement("ul", { className: b('links') }, topItems === null || topItems === void 0 ? void 0 : topItems.map((link, index) => {
-                        const isActive = index === activeItemIndex;
-                        return (React.createElement(MobileNavigationItem, { key: index, link: link, index: index, isActive: isOpened && isActive, onClose: onClose, onActiveItemChange: onActiveItemChange }));
-                    }))), bottomItems === null || bottomItems === void 0 ? void 0 :
-                bottomItems.map((item) => (React.createElement(NavigationItem, { key: item.text, data: item, className: b('button') })))))));
+                React.createElement("nav", { className: b('nav') },
+                    React.createElement("ul", { className: b('rows') }, topItems === null || topItems === void 0 ? void 0 : topItems.map((link, index) => (React.createElement(MobileNavigationItem, { key: index, item: link, column: ItemColumnName.Top, index: index, isOpened: isOpened, activeItemId: activeItemId, onClose: onClose, onActiveItemChange: onActiveItemChange }))))),
+                React.createElement("ul", { className: b('rows') }, bottomItems === null || bottomItems === void 0 ? void 0 : bottomItems.map((item, index) => (React.createElement(MobileNavigationItem, { key: index, item: item, column: ItemColumnName.Bottom, index: index, isOpened: isOpened, activeItemId: activeItemId, onClose: onClose, onActiveItemChange: onActiveItemChange }))))))));
 };
 export default MobileNavigation;

package/build/esm/navigation/components/Navigation/Navigation.css

@@ -29,15 +29,4 @@ unpredictable css rules order in build */
 }
 .pc-navigation__links-item:not(:last-child) {
   margin-right: 20px;
-}
-.pc-navigation__slider-container {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  left: 0;
-}
-.pc-navigation__slider {
-  width: 100%;
-  height: 2px;
-  background-color: var(--yc-color-text-link);
 }