@gravity-ui/navigation 2.31.1-beta.0 → 2.32.0

package/build/cjs/{PageLayoutAside-BzYF9W7M.js → PageLayoutAside-30f2015c.js}

@@ -4,16 +4,20 @@ var React = require('react');
 var uikit = require('@gravity-ui/uikit');
 var icons = require('@gravity-ui/icons');
 var AsideHeaderContext = require('./AsideHeaderContext.js');
-var cn = require('./cn-DSlPZbcs.js');
-var styleInject_es = require('./style-inject.es-CsU6UJbw.js');
+var cn = require('./cn-9933321a.js');
+var styleInject_es = require('./style-inject.es-dcee06b6.js');
 var i18n$2 = require('@gravity-ui/uikit/i18n');
-var constants = require('./constants-B0DLAQY9.js');
-var Item = require('./Item-B_-IH1_h.js');
-var utils = require('./utils-BrRoop7o.js');
-var dividerCollapsed = require('./divider-collapsed-BLSp99lJ.js');
+var constants = require('./constants-d81c3867.js');
+var Item = require('./Item-ff6bc440.js');
+var utils = require('./utils-db3e03c2.js');
+var dividerCollapsed = require('./divider-collapsed-b743122e.js');
 var Drawer = require('./Drawer.js');
+require('./debounce-8772fd80.js');
 
-function _interopNamespaceDefault(e) {
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+function _interopNamespace(e) {
+    if (e && e.__esModule) return e;
     var n = Object.create(null);
     if (e) {
         Object.keys(e).forEach(function (k) {
@@ -26,18 +30,19 @@ function _interopNamespaceDefault(e) {
             }
         });
     }
-    n.default = e;
+    n["default"] = e;
     return Object.freeze(n);
 }
 
-var React__namespace = /*#__PURE__*/_interopNamespaceDefault(React);
+var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
-var css_248z$5 = ".gn-all-pages-list-item{align-items:center;background:none;border:none;color:inherit;column-gap:var(--g-spacing-4);display:flex;font:inherit;height:40px;outline:inherit;padding:0 var(--g-spacing-6);text-decoration:inherit;width:100%}.gn-all-pages-list-item:focus-visible{outline:solid var(--g-color-line-misc);outline-offset:-2px}.gn-all-pages-list-item__text{flex:1;text-align:initial}.gn-all-pages-list-item__icon{color:var(--g-color-text-misc)}";
+var css_248z$5 = ".gn-all-pages-list-item{align-items:center;column-gap:var(--g-spacing-4);display:flex;height:40px;padding:0 var(--g-spacing-6);width:100%}.gn-all-pages-list-item__text{flex:1}.gn-all-pages-list-item__icon{color:var(--g-color-text-misc)}.gn-all-pages-list-item_edit-mode{padding:0 0 0 var(--g-spacing-4)}";
 styleInject_es.styleInject(css_248z$5);
 
 const b$5 = cn.block('all-pages-list-item');
 const AllPagesListItem = (props) => {
-    const { item, editMode, onToggle } = props;
+    const { item, editMode, onToggle, enableSorting, onDragStart, onDragEnd } = props;
     const onPinButtonClick = React.useCallback((e) => {
         e.stopPropagation();
         e.preventDefault();
@@ -49,19 +54,32 @@ const AllPagesListItem = (props) => {
             e.preventDefault();
         }
     };
-    const [Tag, tagProps] = item.link ? ['a', { href: item.link }] : ['button', {}];
-    return (React.createElement(Tag, Object.assign({}, tagProps, { className: b$5(), onClick: onItemClick }),
-        item.icon ? (React.createElement(uikit.Icon, { className: b$5('icon'), data: item.icon, size: item.iconSize })) : null,
-        React.createElement("span", { className: b$5('text') }, item.title),
-        editMode && !item.preventUserRemoving && (React.createElement(uikit.Button, { onClick: onPinButtonClick, view: item.hidden ? 'flat-secondary' : 'flat-action' },
-            React.createElement(uikit.Button.Icon, null, item.hidden ? React.createElement(icons.Pin, null) : React.createElement(icons.PinFill, null))))));
+    const onItemDragStart = (e) => {
+        if (editMode && onDragStart) {
+            e.stopPropagation();
+            e.preventDefault();
+            onDragStart();
+        }
+    };
+    const onItemDragEnd = (e) => {
+        if (editMode && onDragEnd) {
+            e.stopPropagation();
+            e.preventDefault();
+            onDragEnd();
+        }
+    };
+    return (React__default["default"].createElement("div", { key: item.id, className: b$5({ 'edit-mode': editMode && enableSorting }), onClick: onItemClick, draggable: editMode && enableSorting, onMouseDown: onItemDragStart, onMouseUp: onItemDragEnd },
+        item.icon ? (React__default["default"].createElement(uikit.Icon, { className: b$5('icon'), data: item.icon, size: item.iconSize })) : null,
+        React__default["default"].createElement("span", { className: b$5('text') }, item.title),
+        editMode && !item.preventUserRemoving && (React__default["default"].createElement(uikit.Button, { onClick: onPinButtonClick, view: item.hidden ? 'flat-secondary' : 'flat-action' },
+            React__default["default"].createElement(uikit.Button.Icon, null, item.hidden ? React__default["default"].createElement(icons.Pin, null) : React__default["default"].createElement(icons.PinFill, null))))));
 };
 
 var en$1 = {
 	"menu-item.all-pages.title": "All pages",
 	"all-panel.menu.category.allOther": "All other",
 	"all-panel.resetToDefault": "Reset to default",
-	"all-panel.title.editing": "Editing",
+	"all-panel.title.editing": "Configuring the menu bar",
 	"all-panel.title.main": "All pages"
 };
 
@@ -69,7 +87,7 @@ var ru$1 = {
 	"menu-item.all-pages.title": "Все страницы",
 	"all-panel.menu.category.allOther": "Остальное",
 	"all-panel.resetToDefault": "Сбросить по умолчанию",
-	"all-panel.title.editing": "Редактирование",
+	"all-panel.title.editing": "Настройка панели меню",
 	"all-panel.title.main": "Все страницы"
 };
 
@@ -111,31 +129,32 @@ const useGroupedMenuItems = (items) => {
     return allPagesMenuItems;
 };
 
-var css_248z$4 = ".gn-all-pages-panel{box-sizing:border-box;height:100%;min-width:300px;padding:var(--g-spacing-4) var(--g-spacing-6)}.gn-all-pages-panel__content{flex:1;margin:0 calc(var(--g-spacing-6)*-1);overflow:auto}.gn-all-pages-panel__category{padding:0 var(--g-spacing-6)}.gn-all-pages-panel__discoverable-feature-wrapper{display:flex}";
+var css_248z$4 = ".gn-all-pages-panel{box-sizing:border-box;height:100%;min-width:300px;padding:var(--g-spacing-4) var(--g-spacing-6)}.gn-all-pages-panel__content{flex:1;margin:0 calc(var(--g-spacing-6)*-1);overflow:auto}.gn-all-pages-panel__category{padding:0 var(--g-spacing-6)}.gn-all-pages-panel__discoverable-feature-wrapper{display:flex}.gn-all-pages-panel__item_editMode{padding:0 var(--g-spacing-6)}.gn-all-pages-panel__drag-placeholder{text-wrap:nowrap;padding-left:88px;padding-right:68px;visibility:hidden}";
 styleInject_es.styleInject(css_248z$4);
 
 const b$4 = cn.block('all-pages-panel');
 const AllPagesPanel = (props) => {
     const { startEditIcon, onEditModeChanged, className } = props;
-    const { menuItems, onMenuItemsChanged, editMenuProps } = AsideHeaderContext.useAsideHeaderInnerContext();
+    const { menuItems, defaultMenuItems, onMenuItemsChanged, editMenuProps } = AsideHeaderContext.useAsideHeaderInnerContext();
     const menuItemsRef = React.useRef(menuItems);
     menuItemsRef.current = menuItems;
     const [isEditMode, setIsEditMode] = React.useState(false);
+    const [draggingItemTitle, setDraggingItemTitle] = React.useState(null);
     const toggleEditMode = React.useCallback(() => {
         setIsEditMode((prev) => !prev);
     }, []);
     const groupedItems = useGroupedMenuItems(menuItems);
     React.useEffect(() => {
         var _a;
-        onEditModeChanged === null || onEditModeChanged === undefined ? undefined : onEditModeChanged(isEditMode);
+        onEditModeChanged === null || onEditModeChanged === void 0 ? void 0 : onEditModeChanged(isEditMode);
         if (isEditMode) {
-            (_a = editMenuProps === null || editMenuProps === undefined ? undefined : editMenuProps.onOpenEditMode) === null || _a === undefined ? undefined : _a.call(editMenuProps);
+            (_a = editMenuProps === null || editMenuProps === void 0 ? void 0 : editMenuProps.onOpenEditMode) === null || _a === void 0 ? void 0 : _a.call(editMenuProps);
         }
     }, [isEditMode, onEditModeChanged, editMenuProps]);
     const onItemClick = React.useCallback((item) => {
         var _a;
         //@ts-ignore TODO fix when @gravity-ui/uikit/List will provide event arg on item click
-        (_a = item.onItemClick) === null || _a === undefined ? undefined : _a.call(item, item, false);
+        (_a = item.onItemClick) === null || _a === void 0 ? void 0 : _a.call(item, item, false);
     }, []);
     const togglePageVisibility = React.useCallback((item) => {
         var _a;
@@ -144,7 +163,7 @@ const AllPagesPanel = (props) => {
         }
         const changedItem = Object.assign(Object.assign({}, item), { hidden: !item.hidden });
         const originItems = menuItemsRef.current.filter((menuItem) => menuItem.id !== ALL_PAGES_ID);
-        (_a = editMenuProps === null || editMenuProps === undefined ? undefined : editMenuProps.onToggleMenuItem) === null || _a === undefined ? undefined : _a.call(editMenuProps, changedItem);
+        (_a = editMenuProps === null || editMenuProps === void 0 ? void 0 : editMenuProps.onToggleMenuItem) === null || _a === void 0 ? void 0 : _a.call(editMenuProps, changedItem);
         onMenuItemsChanged(originItems.map((menuItem) => {
             if (menuItem.id !== changedItem.id) {
                 return menuItem;
@@ -152,26 +171,51 @@ const AllPagesPanel = (props) => {
             return changedItem;
         }));
     }, [onMenuItemsChanged, editMenuProps]);
-    const itemRender = React.useCallback((item, _isActive, _itemIndex) => (React.createElement(AllPagesListItem, { item: item, editMode: isEditMode, onToggle: () => togglePageVisibility(item) })), [isEditMode, togglePageVisibility]);
+    const onDragEnd = React.useCallback(() => {
+        setDraggingItemTitle(null);
+    }, [setDraggingItemTitle]);
+    const itemRender = React.useCallback((item, _isActive, _itemIndex) => {
+        const onDragStart = () => {
+            setDraggingItemTitle(item.title);
+        };
+        return (React__default["default"].createElement(AllPagesListItem, { item: item, onDragStart: onDragStart, onDragEnd: onDragEnd, editMode: isEditMode, onToggle: () => togglePageVisibility(item), enableSorting: editMenuProps === null || editMenuProps === void 0 ? void 0 : editMenuProps.enableSorting }));
+    }, [isEditMode, togglePageVisibility, onDragEnd, setDraggingItemTitle, editMenuProps]);
     const onResetToDefaultClick = React.useCallback(() => {
         var _a;
         if (!onMenuItemsChanged) {
             return;
         }
-        (_a = editMenuProps === null || editMenuProps === undefined ? undefined : editMenuProps.onResetSettingsToDefault) === null || _a === undefined ? undefined : _a.call(editMenuProps);
-        const originItems = menuItemsRef.current.filter((item) => item.id !== ALL_PAGES_ID);
-        onMenuItemsChanged(originItems.map((item) => (Object.assign(Object.assign({}, item), { hidden: false }))));
+        (_a = editMenuProps === null || editMenuProps === void 0 ? void 0 : editMenuProps.onResetSettingsToDefault) === null || _a === void 0 ? void 0 : _a.call(editMenuProps);
+        const originItems = defaultMenuItems === null || defaultMenuItems === void 0 ? void 0 : defaultMenuItems.filter((item) => item.id !== ALL_PAGES_ID);
+        if (originItems) {
+            onMenuItemsChanged(originItems);
+        }
+    }, [onMenuItemsChanged, editMenuProps, defaultMenuItems]);
+    const changeItemsOrder = React.useCallback(({ oldIndex, newIndex }) => {
+        var _a;
+        const newItems = menuItemsRef.current.filter((item) => item.id !== ALL_PAGES_ID);
+        const element = newItems.splice(oldIndex, 1)[0];
+        newItems.splice(newIndex, 0, element);
+        onMenuItemsChanged === null || onMenuItemsChanged === void 0 ? void 0 : onMenuItemsChanged(newItems.filter((item) => item.type !== 'divider'));
+        setDraggingItemTitle(null);
+        (_a = editMenuProps === null || editMenuProps === void 0 ? void 0 : editMenuProps.onChangeItemsOrder) === null || _a === void 0 ? void 0 : _a.call(editMenuProps, element, oldIndex, newIndex);
     }, [onMenuItemsChanged, editMenuProps]);
-    return (React.createElement(uikit.Flex, { className: b$4(null, className), gap: "5", direction: "column" },
-        React.createElement(uikit.Flex, { gap: "4", alignItems: "center", justifyContent: "space-between" },
-            React.createElement(uikit.Text, { variant: "subheader-2" }, isEditMode ? i18n$1('all-panel.title.editing') : i18n$1('all-panel.title.main')),
-            React.createElement(uikit.Button, { selected: isEditMode, view: "normal", onClick: toggleEditMode }, startEditIcon ? startEditIcon : React.createElement(uikit.Icon, { data: icons.Gear }))),
-        React.createElement(uikit.Flex, { className: b$4('content'), gap: "5", direction: "column" }, Object.keys(groupedItems).map((category) => {
-            return (React.createElement(uikit.Flex, { key: category, direction: "column", gap: "3" },
-                React.createElement(uikit.Text, { className: b$4('category'), variant: "body-1", color: "secondary" }, category),
-                React.createElement(uikit.List, { virtualized: false, filterable: false, items: groupedItems[category], onItemClick: onItemClick, renderItem: itemRender })));
-        })),
-        isEditMode && (React.createElement(uikit.Button, { onClick: onResetToDefaultClick }, i18n$1('all-panel.resetToDefault')))));
+    const sortableItems = React.useMemo(() => {
+        return menuItemsRef.current.filter((item) => item.id !== ALL_PAGES_ID && !item.afterMoreButton && item.type !== 'divider');
+    }, [menuItems]);
+    return (React__default["default"].createElement(uikit.Flex, { className: b$4(null, className), gap: "5", direction: "column" },
+        React__default["default"].createElement(uikit.Flex, { gap: "4", alignItems: "center", justifyContent: "space-between" },
+            React__default["default"].createElement(uikit.Text, { variant: "subheader-2" }, isEditMode ? i18n$1('all-panel.title.editing') : i18n$1('all-panel.title.main')),
+            React__default["default"].createElement(uikit.Tooltip, { content: i18n$1('all-panel.title.editing') },
+                React__default["default"].createElement(uikit.Button, { selected: isEditMode, view: "normal", onClick: toggleEditMode }, startEditIcon ? startEditIcon : React__default["default"].createElement(uikit.Icon, { data: icons.Gear })))),
+        React__default["default"].createElement(uikit.Flex, { className: b$4('content'), gap: "5", direction: "column" }, isEditMode && (editMenuProps === null || editMenuProps === void 0 ? void 0 : editMenuProps.enableSorting) ? (React__default["default"].createElement("div", null,
+            React__default["default"].createElement(uikit.List, { itemClassName: b$4('item', { editMode: true }), itemHeight: 40, onSortEnd: changeItemsOrder, sortable: true, virtualized: false, filterable: false, items: sortableItems, onItemClick: onItemClick, renderItem: itemRender }),
+            draggingItemTitle && (React__default["default"].createElement("div", { className: b$4('drag-placeholder') }, draggingItemTitle)))) : (Object.keys(groupedItems).map((category) => {
+            return (React__default["default"].createElement(uikit.Flex, { key: category, direction: "column", gap: "3" },
+                React__default["default"].createElement(uikit.Text, { className: b$4('category'), variant: "body-1", color: "secondary" }, category),
+                React__default["default"].createElement(uikit.List, { virtualized: false, filterable: false, items: groupedItems[category], onItemClick: onItemClick, renderItem: itemRender })));
+        }))),
+        isEditMode && (React__default["default"].createElement(uikit.Button, { onClick: onResetToDefaultClick }, i18n$1('all-panel.resetToDefault')))));
 };
 
 const useVisibleMenuItems = () => {
@@ -582,8 +626,8 @@ const multipleTooltipContextDefaults = {
     lastClickedItemIndex: undefined,
     setValue: () => { },
 };
-const MultipleTooltipContext = React.createContext(multipleTooltipContextDefaults);
-class MultipleTooltipProvider extends React.PureComponent {
+const MultipleTooltipContext = React__default["default"].createContext(multipleTooltipContextDefaults);
+class MultipleTooltipProvider extends React__default["default"].PureComponent {
     constructor() {
         super(...arguments);
         this.state = Object.assign({}, multipleTooltipContextDefaults);
@@ -593,7 +637,7 @@ class MultipleTooltipProvider extends React.PureComponent {
     }
     render() {
         const { children } = this.props;
-        return (React.createElement(MultipleTooltipContext.Provider, { value: Object.assign(Object.assign({}, this.state), { setValue: this.setValue }) }, children));
+        return (React__default["default"].createElement(MultipleTooltipContext.Provider, { value: Object.assign(Object.assign({}, this.state), { setValue: this.setValue }) }, children));
     }
 }
 
@@ -601,20 +645,26 @@ var css_248z$3 = ".g-root_theme_dark .gn-multiple-tooltip,.g-root_theme_dark-hc
 styleInject_es.styleInject(css_248z$3);
 
 const b$3 = cn.block('multiple-tooltip');
-const POPUP_OFFSET = { mainAxis: -32, crossAxis: 4 };
+const POPUP_OFFSET = [-32, 4];
+const POPUP_MODIFIERS = [
+    {
+        name: 'preventOverflow',
+        enabled: false,
+    },
+];
 const MultipleTooltip = ({ items, open, anchorRef, placement, }) => {
-    const { activeIndex, hideCollapseItemTooltip } = React.useContext(MultipleTooltipContext);
+    const { activeIndex, hideCollapseItemTooltip } = React__default["default"].useContext(MultipleTooltipContext);
     const activeItem = activeIndex === undefined ? null : items[activeIndex];
-    return (React.createElement(uikit.Popup, { open: open, anchorRef: anchorRef, placement: placement, offset: POPUP_OFFSET },
-        React.createElement("div", { className: b$3() }, items
+    return (React__default["default"].createElement(uikit.Popup, { open: open, anchorRef: anchorRef, placement: placement, offset: POPUP_OFFSET, contentClassName: b$3(null), modifiers: POPUP_MODIFIERS, disableLayer: true },
+        React__default["default"].createElement("div", { className: b$3('items-container') }, items
             .filter(({ type = 'regular', id }) => !hideCollapseItemTooltip ||
             (id !== Item.COLLAPSE_ITEM_ID && type !== 'action'))
             .map((item, idx) => {
             switch (item.type) {
                 case 'divider':
-                    return (React.createElement("div", { className: b$3('item', { divider: true }), key: idx }, item.title));
+                    return (React__default["default"].createElement("div", { className: b$3('item', { divider: true }), key: idx }, item.title));
                 default:
-                    return (React.createElement("div", { className: b$3('item', {
+                    return (React__default["default"].createElement("div", { className: b$3('item', {
                             active: item === activeItem,
                         }), key: idx }, item.title));
             }
@@ -630,7 +680,7 @@ const CompositeBarView = ({ type, items, onItemClick, onMoreClick, collapseItems
     const tooltipRef = React.useRef(null);
     const { setValue: setMultipleTooltipContextValue, active: multipleTooltipActive, activeIndex, lastClickedItemIndex, } = React.useContext(MultipleTooltipContext);
     const { compact } = AsideHeaderContext.useAsideHeaderContext();
-    React.useEffect(() => {
+    React__default["default"].useEffect(() => {
         function handleBlurWindow() {
             if (multipleTooltip && multipleTooltipActive) {
                 setMultipleTooltipContextValue({ active: false });
@@ -648,7 +698,7 @@ const CompositeBarView = ({ type, items, onItemClick, onMoreClick, collapseItems
             document.hasFocus() &&
             activeIndex !== lastClickedItemIndex &&
             e.clientX <= constants.ASIDE_HEADER_COMPACT_WIDTH) {
-            setMultipleTooltipContextValue === null || setMultipleTooltipContextValue === undefined ? undefined : setMultipleTooltipContextValue({
+            setMultipleTooltipContextValue === null || setMultipleTooltipContextValue === void 0 ? void 0 : setMultipleTooltipContextValue({
                 active: true,
             });
         }
@@ -662,7 +712,7 @@ const CompositeBarView = ({ type, items, onItemClick, onMoreClick, collapseItems
     ]);
     const onTooltipMouseLeave = React.useCallback(() => {
         if (multipleTooltip && multipleTooltipActive && document.hasFocus()) {
-            setMultipleTooltipContextValue === null || setMultipleTooltipContextValue === undefined ? undefined : setMultipleTooltipContextValue({
+            setMultipleTooltipContextValue === null || setMultipleTooltipContextValue === void 0 ? void 0 : setMultipleTooltipContextValue({
                 active: false,
                 lastClickedItemIndex: undefined,
             });
@@ -693,7 +743,7 @@ const CompositeBarView = ({ type, items, onItemClick, onMoreClick, collapseItems
     const onMouseLeave = React.useCallback(() => {
         var _a;
         if (compact && document.hasFocus()) {
-            (_a = ref.current) === null || _a === undefined ? undefined : _a.activateItem(undefined);
+            (_a = ref.current) === null || _a === void 0 ? void 0 : _a.activateItem(undefined);
             if (multipleTooltip &&
                 (activeIndex !== undefined || lastClickedItemIndex !== undefined)) {
                 setMultipleTooltipContextValue({
@@ -719,7 +769,7 @@ const CompositeBarView = ({ type, items, onItemClick, onMoreClick, collapseItems
                 active: false,
             });
         }
-        onItemClick === null || onItemClick === undefined ? undefined : onItemClick(item, collapsed, event);
+        onItemClick === null || onItemClick === void 0 ? void 0 : onItemClick(item, collapsed, event);
     }, [
         compact,
         lastClickedItemIndex,
@@ -727,16 +777,16 @@ const CompositeBarView = ({ type, items, onItemClick, onMoreClick, collapseItems
         onItemClick,
         setMultipleTooltipContextValue,
     ]);
-    return (React.createElement(React.Fragment, null,
-        React.createElement("div", { ref: tooltipRef, onMouseEnter: onTooltipMouseEnter, onMouseLeave: onTooltipMouseLeave },
-            React.createElement(uikit.List, { ref: ref, items: items, selectedItemIndex: type === 'menu' ? Item.getSelectedItemIndex(items) : undefined, itemHeight: Item.getItemHeight, itemsHeight: Item.getItemsHeight, itemClassName: b$2('root-menu-item'), virtualized: false, filterable: false, sortable: false, renderItem: (item, _isItemActive, itemIndex) => {
+    return (React__default["default"].createElement(React__default["default"].Fragment, null,
+        React__default["default"].createElement("div", { ref: tooltipRef, onMouseEnter: onTooltipMouseEnter, onMouseLeave: onTooltipMouseLeave },
+            React__default["default"].createElement(uikit.List, { ref: ref, items: items, selectedItemIndex: type === 'menu' ? Item.getSelectedItemIndex(items) : undefined, itemHeight: Item.getItemHeight, itemsHeight: Item.getItemsHeight, itemClassName: b$2('root-menu-item'), virtualized: false, filterable: false, sortable: false, renderItem: (item, _isItemActive, itemIndex) => {
                     const itemExtraProps = Item.isMenuItem(item) ? { item } : item;
                     const enableTooltip = Item.isMenuItem(item)
                         ? !multipleTooltip
                         : item.enableTooltip;
-                    return (React.createElement(Item.Item, Object.assign({}, itemExtraProps, { enableTooltip: enableTooltip, onMouseEnter: onMouseEnterByIndex(itemIndex), onMouseLeave: onMouseLeave, onItemClick: onItemClickByIndex(itemIndex), onCollapseItemClick: onMoreClick, collapseItems: collapseItems })));
+                    return (React__default["default"].createElement(Item.Item, Object.assign({}, itemExtraProps, { enableTooltip: enableTooltip, onMouseEnter: onMouseEnterByIndex(itemIndex), onMouseLeave: onMouseLeave, onItemClick: onItemClickByIndex(itemIndex), onCollapseItemClick: onMoreClick, collapseItems: collapseItems })));
                 } })),
-        type === 'menu' && multipleTooltip && (React.createElement(MultipleTooltip, { open: compact && multipleTooltipActive, anchorRef: tooltipRef, placement: ['right-start'], items: items }))));
+        type === 'menu' && multipleTooltip && (React__default["default"].createElement(MultipleTooltip, { open: compact && multipleTooltipActive, anchorRef: tooltipRef, placement: ['right-start'], items: items }))));
 };
 const CompositeBar = ({ type, items, menuMoreTitle, onItemClick, onMoreClick, multipleTooltip = false, }) => {
     if (items.length === 0) {
@@ -746,19 +796,19 @@ const CompositeBar = ({ type, items, menuMoreTitle, onItemClick, onMoreClick, mu
     if (type === 'menu') {
         const minHeight = Item.getItemsMinHeight(items);
         const collapseItem = Item.getMoreButtonItem(menuMoreTitle);
-        node = (React.createElement("div", { className: b$2({ autosizer: true }), style: { minHeight } }, items.length !== 0 && (React.createElement(AutoSizer, null, (size) => {
+        node = (React__default["default"].createElement("div", { className: b$2({ autosizer: true }), style: { minHeight } }, items.length !== 0 && (React__default["default"].createElement(AutoSizer, null, (size) => {
             const width = Number.isNaN(size.width) ? 0 : size.width;
             const height = Number.isNaN(size.height) ? 0 : size.height;
             const { listItems, collapseItems } = Item.getAutosizeListItems(items, height, collapseItem);
-            return (React.createElement("div", { style: { width, height } },
-                React.createElement(CompositeBarView, { type: "menu", items: listItems, onItemClick: onItemClick, onMoreClick: onMoreClick, collapseItems: collapseItems, multipleTooltip: multipleTooltip })));
+            return (React__default["default"].createElement("div", { style: { width, height } },
+                React__default["default"].createElement(CompositeBarView, { type: "menu", items: listItems, onItemClick: onItemClick, onMoreClick: onMoreClick, collapseItems: collapseItems, multipleTooltip: multipleTooltip })));
         }))));
     }
     else {
-        node = (React.createElement("div", { className: b$2({ subheader: true }) },
-            React.createElement(CompositeBarView, { type: "subheader", items: items, onItemClick: onItemClick })));
+        node = (React__default["default"].createElement("div", { className: b$2({ subheader: true }) },
+            React__default["default"].createElement(CompositeBarView, { type: "subheader", items: items, onItemClick: onItemClick })));
     }
-    return React.createElement(MultipleTooltipProvider, null, node);
+    return React__default["default"].createElement(MultipleTooltipProvider, null, node);
 };
 
 var button_collapse$1 = "Collapse";
@@ -786,15 +836,16 @@ var _path;
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 var SvgControlMenuButton = function SvgControlMenuButton(props) {
   return /*#__PURE__*/React__namespace.createElement("svg", _extends({
-    xmlns: "http://www.w3.org/2000/svg",
     width: 8,
     height: 8,
+    viewBox: "0 0 8 8",
     fill: "currentColor",
-    viewBox: "0 0 8 8"
+    xmlns: "http://www.w3.org/2000/svg"
   }, props), _path || (_path = /*#__PURE__*/React__namespace.createElement("path", {
-    d: "m.72 7.64 6.39-3.2a.5.5 0 0 0 0-.89L.72.36A.5.5 0 0 0 0 .81v6.38c0 .37.4.61.72.45"
+    d: "m.72 7.64 6.39-3.2a.5.5 0 0 0 0-.89L.72.36A.5.5 0 0 0 0 .81v6.38c0 .37.4.61.72.45Z"
   })));
 };
+var controlMenuButtonIcon = SvgControlMenuButton;
 
 var css_248z$1 = ".gn-collapse-button{--_--focus-outline-color:var(--g-color-line-focus);--_--focus-outline-offset:0;align-items:center;background:none;border:none;border-top:1px solid var(--gn-aside-header-divider-horizontal-color,var(--_--horizontal-divider-line-color));box-sizing:content-box;color:inherit;cursor:pointer;display:flex;font-family:var(--g-text-body-font-family);font-size:inherit;font-weight:var(--g-text-body-font-weight);justify-content:center;min-height:20px;outline:none;padding:0;position:relative;width:100%}.gn-collapse-button:before{content:\"\";inset:0 2px 2px;position:absolute;z-index:-1}.gn-collapse-button:focus-visible:before{outline:var(--_--focus-outline-color) solid 2px;outline-offset:var(--_--focus-outline-offset)}.gn-collapse-button:not(.gn-collapse-button_compact) .gn-collapse-button__icon{transform:rotate(180deg)}.gn-collapse-button:hover .gn-collapse-button__icon{color:var(--g-color-text-primary)}.gn-collapse-button__icon{color:var(--g-color-text-secondary)}";
 styleInject_es.styleInject(css_248z$1);
@@ -803,40 +854,44 @@ const b$1 = cn.block('collapse-button');
 const CollapseButton = ({ className }) => {
     const { onChangeCompact, compact, expandTitle, collapseTitle } = AsideHeaderContext.useAsideHeaderInnerContext();
     const onCollapseButtonClick = React.useCallback(() => {
-        onChangeCompact === null || onChangeCompact === undefined ? undefined : onChangeCompact(!compact);
+        onChangeCompact === null || onChangeCompact === void 0 ? void 0 : onChangeCompact(!compact);
     }, [compact, onChangeCompact]);
     const buttonTitle = compact
         ? expandTitle || i18n('button_expand')
         : collapseTitle || i18n('button_collapse');
-    return (React.createElement("button", { className: b$1({ compact }, className), onClick: onCollapseButtonClick, title: buttonTitle },
-        React.createElement(uikit.Icon, { data: SvgControlMenuButton, className: b$1('icon'), width: "16", height: "10" })));
+    return (React__default["default"].createElement("button", { className: b$1({ compact }, className), onClick: onCollapseButtonClick, title: buttonTitle },
+        React__default["default"].createElement(uikit.Icon, { data: controlMenuButtonIcon, className: b$1('icon'), width: "16", height: "10" })));
 };
 
-var css_248z = ".gn-logo{height:40px}.gn-logo,.gn-logo__btn-logo{align-items:center;display:flex}.gn-logo__btn-logo{flex-shrink:0;justify-content:center}.gn-logo__btn-logo,.gn-logo__btn-logo:active,.gn-logo__btn-logo:focus,.gn-logo__btn-logo:hover,.gn-logo__btn-logo:visited{color:inherit;outline:none;text-decoration:none}.gn-logo__btn-logo:focus-visible{outline:solid var(--g-color-line-misc);outline-offset:-2px}.gn-logo__logo-icon-place{align-items:center;display:flex;justify-content:center;width:36px}";
+var css_248z = ".gn-logo{height:40px}.gn-logo,.gn-logo__logo-btn-place{align-items:center;display:flex;flex-shrink:0}.gn-logo__logo-btn-place{cursor:pointer;justify-content:center}.gn-logo__logo-btn-place .g-button:before{background-color:transparent}.gn-logo__logo{cursor:pointer;font-size:var(--g-text-body-2-font-size);font-weight:var(--g-text-body-font-weight);line-height:var(--g-text-body-2-line-height);vertical-align:middle}.gn-logo__logo-link,.gn-logo__logo-link:active,.gn-logo__logo-link:focus,.gn-logo__logo-link:hover,.gn-logo__logo-link:visited{color:inherit;outline:none;text-decoration:none}.g-root .gn-logo__btn-logo.button2_theme_flat.button2_hovered_yes:before{background-color:transparent}";
 styleInject_es.styleInject(css_248z);
 
 const b = cn.block('logo');
-const Logo = ({ text, icon, iconSrc, iconClassName, iconPlaceClassName, iconSize = 24, textSize = 15, href, target = '_self', wrapper, onClick, compact, className, buttonClassName, 'aria-label': ariaLabel, 'aria-labelledby': ariaLabelledby, }) => {
+const Logo = ({ text, icon, iconSrc, iconClassName, iconSize = 24, textSize = 15, href, target = '_self', wrapper, onClick, compact, className, buttonWrapperClassName, buttonClassName, 'aria-label': ariaLabel, 'aria-labelledby': ariaLabelledby, }) => {
     const hasWrapper = typeof wrapper === 'function';
     let buttonIcon;
     if (iconSrc) {
-        buttonIcon = (React.createElement("span", { className: iconClassName },
-            React.createElement("img", { alt: "logo icon", src: iconSrc, width: iconSize, height: iconSize })));
+        buttonIcon = (React__default["default"].createElement(uikit.Button.Icon, { className: iconClassName },
+            React__default["default"].createElement("img", { alt: "logo icon", src: iconSrc, width: iconSize, height: iconSize })));
     }
     else if (icon) {
-        buttonIcon = React.createElement(uikit.Icon, { data: icon, size: iconSize, className: iconClassName });
+        buttonIcon = React__default["default"].createElement(uikit.Icon, { data: icon, size: iconSize, className: iconClassName });
     }
+    const button = (React__default["default"].createElement(uikit.Button, { view: "flat", size: "l", className: b('btn-logo', buttonClassName), component: hasWrapper ? 'span' : undefined, onClick: onClick, target: target, rel: target === '_self' ? undefined : 'noreferrer', href: href, extraProps: {
+            'aria-label': ariaLabel,
+            'aria-labelledby': ariaLabelledby,
+        } }, buttonIcon));
     let logo;
     if (typeof text === 'function') {
         logo = text();
     }
     else {
-        logo = (React.createElement("div", { className: b('logo'), style: { fontSize: textSize } }, text));
+        logo = (React__default["default"].createElement("div", { className: b('logo'), style: { fontSize: textSize } }, text));
     }
-    const button = (React.createElement("a", { className: b('btn-logo', buttonClassName), onClick: onClick, target: target, rel: target === '_self' ? undefined : 'noreferrer', href: href, "aria-label": href && ariaLabel, "aria-labelledby": href && ariaLabelledby },
-        React.createElement("span", { className: b('logo-icon-place', iconPlaceClassName) }, buttonIcon),
-        !compact && logo));
-    return (React.createElement("div", { className: b(null, className) }, hasWrapper ? wrapper(button, Boolean(compact)) : button));
+    return (React__default["default"].createElement("div", { className: b(null, className) },
+        React__default["default"].createElement("div", { className: b('logo-btn-place', buttonWrapperClassName) }, hasWrapper ? wrapper(button, Boolean(compact)) : button),
+        !compact &&
+            (hasWrapper ? (React__default["default"].createElement("div", { onClick: onClick }, wrapper(logo, Boolean(compact)))) : (React__default["default"].createElement("a", { href: href !== null && href !== void 0 ? href : '/', target: target, rel: target === '_self' ? undefined : 'noreferrer', className: b('logo-link'), onClick: onClick }, logo)))));
 };
 
 const DEFAULT_SUBHEADER_ITEMS = [];
@@ -845,41 +900,41 @@ const Header = () => {
     const { compact } = AsideHeaderContext.useAsideHeaderContext();
     const onLogoClick = React.useCallback((event) => {
         var _a;
-        onClosePanel === null || onClosePanel === undefined ? undefined : onClosePanel();
-        (_a = logo === null || logo === undefined ? undefined : logo.onClick) === null || _a === undefined ? undefined : _a.call(logo, event);
+        onClosePanel === null || onClosePanel === void 0 ? void 0 : onClosePanel();
+        (_a = logo === null || logo === void 0 ? void 0 : logo.onClick) === null || _a === void 0 ? void 0 : _a.call(logo, event);
     }, [onClosePanel, logo]);
-    return (React.createElement("div", { className: utils.b('header', { ['with-decoration']: headerDecoration }) },
-        logo && (React.createElement(Logo, Object.assign({}, logo, { onClick: onLogoClick, compact: compact, buttonClassName: utils.b('logo-button'), iconPlaceClassName: utils.b('logo-icon-place') }))),
-        React.createElement(CompositeBar, { type: "subheader", items: subheaderItems || DEFAULT_SUBHEADER_ITEMS, onItemClick: onItemClick }),
-        headerDecoration && (React.createElement(uikit.Icon, { data: dividerCollapsed.SvgDividerCollapsed, className: utils.b('header-divider'), width: constants.ASIDE_HEADER_COMPACT_WIDTH, height: constants.HEADER_DIVIDER_HEIGHT }))));
+    return (React__default["default"].createElement("div", { className: utils.b('header', { ['with-decoration']: headerDecoration }) },
+        logo && (React__default["default"].createElement(Logo, Object.assign({}, logo, { onClick: onLogoClick, compact: compact, buttonWrapperClassName: utils.b('logo-button-wrapper'), buttonClassName: utils.b('logo-button') }))),
+        React__default["default"].createElement(CompositeBar, { type: "subheader", items: subheaderItems || DEFAULT_SUBHEADER_ITEMS, onItemClick: onItemClick }),
+        headerDecoration && (React__default["default"].createElement(uikit.Icon, { data: dividerCollapsed.headerDividerCollapsedIcon, className: utils.b('header-divider'), width: constants.ASIDE_HEADER_COMPACT_WIDTH, height: constants.HEADER_DIVIDER_HEIGHT }))));
 };
 
 const Panels = () => {
     const { panelItems, onClosePanel, size } = AsideHeaderContext.useAsideHeaderInnerContext();
-    return panelItems ? (React.createElement(Drawer.Drawer, { className: utils.b('panels'), onVeilClick: onClosePanel, onEscape: onClosePanel, style: { left: size } }, panelItems.map((item) => (React.createElement(Drawer.DrawerItem, Object.assign({ key: item.id }, item)))))) : null;
+    return panelItems ? (React__default["default"].createElement(Drawer.Drawer, { className: utils.b('panels'), onVeilClick: onClosePanel, onEscape: onClosePanel, style: { left: size } }, panelItems.map((item) => (React__default["default"].createElement(Drawer.DrawerItem, Object.assign({ key: item.id }, item)))))) : null;
 };
 
-const FirstPanel = React.forwardRef((_props, ref) => {
+const FirstPanel = React__default["default"].forwardRef((_props, ref) => {
     const { size, onItemClick, headerDecoration, multipleTooltip, menuMoreTitle, onMenuMoreClick, renderFooter, compact, customBackground, customBackgroundClassName, className, hideCollapseButton, qa, } = AsideHeaderContext.useAsideHeaderInnerContext();
     const visibleMenuItems = useVisibleMenuItems();
     const asideRef = React.useRef(null);
-    React.useEffect(() => {
+    React__default["default"].useEffect(() => {
         uikit.setRef(ref, asideRef.current);
     }, [ref]);
-    return (React.createElement(React.Fragment, null,
-        React.createElement("div", { className: utils.b('aside', className), style: { width: size }, "data-qa": qa },
-            React.createElement("div", { className: utils.b('aside-popup-anchor'), ref: asideRef }),
-            React.createElement("div", { className: utils.b('aside-content', { ['with-decoration']: headerDecoration }) },
-                customBackground && (React.createElement("div", { className: utils.b('aside-custom-background', customBackgroundClassName) }, customBackground)),
-                React.createElement(Header, null),
-                (visibleMenuItems === null || visibleMenuItems === undefined ? undefined : visibleMenuItems.length) ? (React.createElement(CompositeBar, { type: "menu", items: visibleMenuItems, menuMoreTitle: menuMoreTitle !== null && menuMoreTitle !== undefined ? menuMoreTitle : i18n('label_more'), onItemClick: onItemClick, onMoreClick: onMenuMoreClick, multipleTooltip: multipleTooltip })) : (React.createElement("div", { className: utils.b('menu-items') })),
-                React.createElement("div", { className: utils.b('footer') }, renderFooter === null || renderFooter === undefined ? undefined : renderFooter({
+    return (React__default["default"].createElement(React__default["default"].Fragment, null,
+        React__default["default"].createElement("div", { className: utils.b('aside', className), style: { width: size }, "data-qa": qa },
+            React__default["default"].createElement("div", { className: utils.b('aside-popup-anchor'), ref: asideRef }),
+            React__default["default"].createElement("div", { className: utils.b('aside-content', { ['with-decoration']: headerDecoration }) },
+                customBackground && (React__default["default"].createElement("div", { className: utils.b('aside-custom-background', customBackgroundClassName) }, customBackground)),
+                React__default["default"].createElement(Header, null),
+                (visibleMenuItems === null || visibleMenuItems === void 0 ? void 0 : visibleMenuItems.length) ? (React__default["default"].createElement(CompositeBar, { type: "menu", items: visibleMenuItems, menuMoreTitle: menuMoreTitle !== null && menuMoreTitle !== void 0 ? menuMoreTitle : i18n('label_more'), onItemClick: onItemClick, onMoreClick: onMenuMoreClick, multipleTooltip: multipleTooltip })) : (React__default["default"].createElement("div", { className: utils.b('menu-items') })),
+                React__default["default"].createElement("div", { className: utils.b('footer') }, renderFooter === null || renderFooter === void 0 ? void 0 : renderFooter({
                     size,
                     compact: Boolean(compact),
                     asideRef,
                 })),
-                !hideCollapseButton && React.createElement(CollapseButton, null))),
-        React.createElement(Panels, null)));
+                !hideCollapseButton && React__default["default"].createElement(CollapseButton, null))),
+        React__default["default"].createElement(Panels, null)));
 });
 FirstPanel.displayName = 'FirstPanel';
 
@@ -892,30 +947,30 @@ const EMPTY_MENU_ITEMS = [];
 const useAsideHeaderInnerContextValue = (props) => {
     const { size, onClosePanel, menuItems, panelItems, onMenuItemsChanged, onAllPagesClick } = props;
     const [innerVisiblePanel, setInnerVisiblePanel] = React.useState();
-    const ALL_PAGES_MENU_ITEM = React.useMemo(() => {
+    const ALL_PAGES_MENU_ITEM = React__default["default"].useMemo(() => {
         return getAllPagesMenuItem();
     }, []);
-    const allPagesIsAvailable = Boolean(onMenuItemsChanged) && (!menuItems || (menuItems === null || menuItems === undefined ? undefined : menuItems.length) > 0);
+    const allPagesIsAvailable = Boolean(onMenuItemsChanged) && (!menuItems || (menuItems === null || menuItems === void 0 ? void 0 : menuItems.length) > 0);
     React.useEffect(() => {
         // If any user panel became visible we need to switch off all inner panels
-        if (panelItems === null || panelItems === undefined ? undefined : panelItems.some((x) => x.visible)) {
+        if (panelItems === null || panelItems === void 0 ? void 0 : panelItems.some((x) => x.visible)) {
             setInnerVisiblePanel(undefined);
         }
     }, [panelItems]);
     const innerOnClosePanel = React.useCallback(() => {
         setInnerVisiblePanel(undefined);
-        onClosePanel === null || onClosePanel === undefined ? undefined : onClosePanel();
+        onClosePanel === null || onClosePanel === void 0 ? void 0 : onClosePanel();
     }, [onClosePanel]);
     const onItemClick = React.useCallback((item, collapsed, event) => {
         var _a;
         if (item.id === ALL_PAGES_MENU_ITEM.id) {
-            onClosePanel === null || onClosePanel === undefined ? undefined : onClosePanel();
+            onClosePanel === null || onClosePanel === void 0 ? void 0 : onClosePanel();
             setInnerVisiblePanel((prev) => prev === InnerPanels.AllPages ? undefined : InnerPanels.AllPages);
         }
         else {
             innerOnClosePanel();
         }
-        (_a = item.onItemClick) === null || _a === undefined ? undefined : _a.call(item, item, collapsed, event);
+        (_a = item.onItemClick) === null || _a === void 0 ? void 0 : _a.call(item, item, collapsed, event);
     }, [innerOnClosePanel, ALL_PAGES_MENU_ITEM, onClosePanel]);
     const innerMenuItems = React.useMemo(() => allPagesIsAvailable
         ? [
@@ -931,7 +986,7 @@ const useAsideHeaderInnerContextValue = (props) => {
             ...(panelItems || []),
             {
                 id: InnerPanels.AllPages,
-                content: React.createElement(AllPagesPanel, null),
+                content: React__default["default"].createElement(AllPagesPanel, null),
                 visible: innerVisiblePanel === InnerPanels.AllPages,
             },
         ];
@@ -940,14 +995,14 @@ const useAsideHeaderInnerContextValue = (props) => {
         onItemClick });
 };
 
-const PageLayoutAside = React.forwardRef((props, ref) => {
+const PageLayoutAside = React__default["default"].forwardRef((props, ref) => {
     const { size, compact } = AsideHeaderContext.useAsideHeaderContext();
     const asideHeaderInnerContextValue = useAsideHeaderInnerContextValue(Object.assign({ size, compact }, props));
-    return (React.createElement(AsideHeaderContext.AsideHeaderInnerContextProvider, { value: asideHeaderInnerContextValue },
-        React.createElement(FirstPanel, { ref: ref })));
+    return (React__default["default"].createElement(AsideHeaderContext.AsideHeaderInnerContextProvider, { value: asideHeaderInnerContextValue },
+        React__default["default"].createElement(FirstPanel, { ref: ref })));
 });
 PageLayoutAside.displayName = 'PageLayoutAside';
 
 exports.Logo = Logo;
 exports.PageLayoutAside = PageLayoutAside;
-//# sourceMappingURL=PageLayoutAside-BzYF9W7M.js.map
+//# sourceMappingURL=PageLayoutAside-30f2015c.js.map