@astral/ui 4.51.0 → 4.52.1

package/components/DashboardContext/DashboardContext.d.ts

@@ -1,10 +1,12 @@
 import { type RefObject } from 'react';
 export type DashboardContextProps = {
     isFocusedMode: boolean;
+    mobileHeaderPriorityFeature: 'profile' | 'menuOrg';
     setAlertElement?: (element: HTMLElement | null) => void;
     alertHeight: number;
     isLoading: boolean;
     hasMenuOrganizationRef: RefObject<boolean | null>;
+    hasProfileRef: RefObject<boolean | null>;
     setFocusedMode: (isFocusedMode: boolean) => void;
 };
 export declare const DashboardContext: import("react").Context<DashboardContextProps>;

package/components/DashboardContext/DashboardContext.js

@@ -1,8 +1,10 @@
 import { createContext, createRef } from 'react';
 export const DashboardContext = createContext({
     isFocusedMode: false,
+    mobileHeaderPriorityFeature: 'menuOrg',
     alertHeight: 0,
     isLoading: false,
     hasMenuOrganizationRef: createRef(),
+    hasProfileRef: createRef(),
     setFocusedMode: () => undefined,
 });

package/components/DashboardContext/DashboardContextProvider/DashboardContextProvider.d.ts

@@ -1,8 +1,8 @@
 import { type ReactNode } from 'react';
 import { type DashboardContextProps } from '../DashboardContext';
-type Props = Pick<DashboardContextProps, 'isFocusedMode'> & {
+type Props = Pick<DashboardContextProps, 'isFocusedMode' | 'mobileHeaderPriorityFeature'> & {
     children: ReactNode;
     isLoading: boolean;
 };
-export declare const DashboardContextProvider: ({ children, isFocusedMode, isLoading, }: Props) => import("react/jsx-runtime").JSX.Element;
+export declare const DashboardContextProvider: ({ children, isFocusedMode, isLoading, mobileHeaderPriorityFeature, }: Props) => import("react/jsx-runtime").JSX.Element;
 export {};

package/components/DashboardContext/DashboardContextProvider/DashboardContextProvider.js

@@ -1,11 +1,12 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useEffect, useRef, useState } from 'react';
 import { DashboardContext, } from '../DashboardContext';
-export const DashboardContextProvider = ({ children, isFocusedMode, isLoading, }) => {
+export const DashboardContextProvider = ({ children, isFocusedMode, isLoading, mobileHeaderPriorityFeature, }) => {
     const [alertElement, setAlertElement] = useState(null);
     const [alertHeight, setAlertHeight] = useState(0);
     const [isFocusedModeInternal, setFocusedMode] = useState(isFocusedMode);
     const hasMenuOrganizationRef = useRef(false);
+    const hasProfileRef = useRef(false);
     useEffect(() => {
         if (isFocusedMode !== isFocusedModeInternal) {
             setFocusedMode(isFocusedMode);
@@ -27,9 +28,11 @@ export const DashboardContextProvider = ({ children, isFocusedMode, isLoading, }
     }, [alertElement]);
     return (_jsx(DashboardContext.Provider, { value: {
             isFocusedMode: isFocusedModeInternal,
+            mobileHeaderPriorityFeature,
             setAlertElement,
             alertHeight,
             isLoading,
+            hasProfileRef,
             hasMenuOrganizationRef,
             setFocusedMode,
         }, children: children }));

package/components/DashboardLayout/DashboardLayout.d.ts

@@ -4,7 +4,7 @@ import { type DashboardLayoutProps } from './types';
  * Общий Layout приложения
  */
 export declare const DashboardLayout: {
-    ({ children, isFocusedMode, isLoading, }: DashboardLayoutProps): import("react/jsx-runtime").JSX.Element;
+    ({ children, isFocusedMode, isLoading, mobileHeaderPriorityFeature, }: DashboardLayoutProps): import("react/jsx-runtime").JSX.Element;
     Header: import("react").ForwardRefExoticComponent<import("./Header").HeaderProps & import("react").RefAttributes<HTMLDivElement>>;
     Sidebar: import("react").ForwardRefExoticComponent<import("../DashboardSidebar").DashboardSidebarProps & import("react").RefAttributes<HTMLBaseElement>>;
     Main: import("react").ForwardRefExoticComponent<import("./Main").MainProps & import("react").RefAttributes<HTMLDivElement>>;

package/components/DashboardLayout/DashboardLayout.js

@@ -7,8 +7,8 @@ import { Main } from './Main';
 /**
  * Общий Layout приложения
  */
-export const DashboardLayout = ({ children, isFocusedMode = false, isLoading = false, }) => {
-    return (_jsx(DashboardContextProvider, { isFocusedMode: isFocusedMode, isLoading: isLoading, children: _jsx(DashboardWrapper, { children: children }) }));
+export const DashboardLayout = ({ children, isFocusedMode = false, isLoading = false, mobileHeaderPriorityFeature = 'menuOrg', }) => {
+    return (_jsx(DashboardContextProvider, { isFocusedMode: isFocusedMode, isLoading: isLoading, mobileHeaderPriorityFeature: mobileHeaderPriorityFeature, children: _jsx(DashboardWrapper, { children: children }) }));
 };
 DashboardLayout.Header = Header;
 DashboardLayout.Sidebar = DashboardSidebar;

package/components/DashboardLayout/Header/Header.js

@@ -6,15 +6,40 @@ import { QuitOutlineMd } from '../../../icons/QuitOutlineMd';
 import { Button } from '../../Button';
 import { Product } from '../../Product';
 import { Profile } from '../../Profile';
+import { cva } from '../../utils/cva';
 import { getInertProps } from '../../utils/getInertProps';
 import { dashboardLayoutHeaderClassnames } from './constants';
-import { ExitButton, HeaderContent, HeaderContentSection, HeaderRoot, HeaderSection, MenuOrganizationWrapper, MobileSidebarTogglerWrapper, ProductSwitcherWrapper, ProfileWrapper, } from './styles';
+import { ExitButton, HeaderContent, HeaderContentSection, HeaderRoot, HeaderSection, MobileSidebarTogglerWrapper, PriorityFeatureWrapper, ProductSwitcherWrapper, ProfileWrapper, } from './styles';
 import { useLogic } from './useLogic';
+const headerPriorityFeature = cva('', {
+    variants: {
+        feature: {
+            menuOrg: dashboardLayoutHeaderClassnames.priorityFeatureMenuOrg,
+            profile: dashboardLayoutHeaderClassnames.priorityFeatureProfile,
+        },
+        isPinned: {
+            true: dashboardLayoutHeaderClassnames.mobileSidebarPriorityFeatureVisible,
+        },
+        featureInSidebar: {
+            true: dashboardLayoutHeaderClassnames.featureInSidebar,
+        },
+    },
+});
 /**
  * Основной header приложения
  */
 export const Header = forwardRef((props, ref) => {
     const { productSwitcher: ProductSwitcher, product, profile, menuOrganization, children, } = props;
-    const { isShowExitButton, isShowProfile, isFocusedMode, isMobile, collapsedIn, onToggleSidebar, isLoading, alertHeight, menuOrganizationClassnames, } = useLogic(props);
-    return (_jsx(HeaderRoot, { ref: ref, "$isFocusedMode": isFocusedMode, ...getInertProps(!isMobile && isFocusedMode), className: dashboardLayoutHeaderClassnames.root, children: _jsxs(HeaderContent, { children: [_jsx(MobileSidebarTogglerWrapper, { className: dashboardLayoutHeaderClassnames.mobileSidebarButton, children: _jsx(Button, { startIcon: collapsedIn ? _jsx(CrossOutlineMd, {}) : _jsx(MenuOnOutlineMd, {}), variant: "text", onClick: () => onToggleSidebar(), title: "\u041F\u0435\u0440\u0435\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0431\u043E\u043A\u043E\u0432\u043E\u0435 \u043C\u0435\u043D\u044E" }) }), _jsxs(HeaderSection, { children: [ProductSwitcher && (_jsx(ProductSwitcherWrapper, { children: _jsx(ProductSwitcher, {}) })), _jsx(Product, { ...product })] }), _jsxs(HeaderContentSection, { children: [children, menuOrganization && (_jsx(MenuOrganizationWrapper, { className: menuOrganizationClassnames, "$alertHeight": alertHeight, children: menuOrganization() })), profile && (_jsx(ProfileWrapper, { "$isShow": isShowProfile, children: _jsx(Profile, { isLoading: isLoading, ...profile }) })), _jsx(ExitButton, { "$isShow": isShowExitButton, onClick: profile?.exitButton?.onClick, title: "\u0412\u044B\u0445\u043E\u0434", variant: "text", children: _jsx(QuitOutlineMd, {}) })] })] }) }));
+    const { isShowExitButton, isShowProfile, isFocusedMode, isMobile, collapsedIn, onToggleSidebar, isLoading, mobileHeaderPriorityFeature, headerStyle, isPinned, } = useLogic(props);
+    return (_jsx(HeaderRoot, { ref: ref, "$isFocusedMode": isFocusedMode, ...getInertProps(!isMobile && isFocusedMode), className: dashboardLayoutHeaderClassnames.root, style: headerStyle, children: _jsxs(HeaderContent, { children: [_jsx(MobileSidebarTogglerWrapper, { className: dashboardLayoutHeaderClassnames.mobileSidebarButton, children: _jsx(Button, { startIcon: collapsedIn ? _jsx(CrossOutlineMd, {}) : _jsx(MenuOnOutlineMd, {}), variant: "text", onClick: () => onToggleSidebar(), title: "\u041F\u0435\u0440\u0435\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0431\u043E\u043A\u043E\u0432\u043E\u0435 \u043C\u0435\u043D\u044E" }) }), _jsxs(HeaderSection, { children: [ProductSwitcher && (_jsx(ProductSwitcherWrapper, { children: _jsx(ProductSwitcher, {}) })), _jsx(Product, { ...product })] }), _jsxs(HeaderContentSection, { className: headerPriorityFeature({
+                        feature: mobileHeaderPriorityFeature,
+                    }), children: [children, menuOrganization && (_jsx(PriorityFeatureWrapper, { className: headerPriorityFeature({
+                                feature: mobileHeaderPriorityFeature,
+                                isPinned,
+                                featureInSidebar: mobileHeaderPriorityFeature === 'profile',
+                            }), children: menuOrganization() })), profile && (_jsx(PriorityFeatureWrapper, { className: headerPriorityFeature({
+                                feature: mobileHeaderPriorityFeature,
+                                isPinned,
+                                featureInSidebar: mobileHeaderPriorityFeature === 'menuOrg',
+                            }), children: _jsx(ProfileWrapper, { className: dashboardLayoutHeaderClassnames.profile, "$isShow": isShowProfile, children: _jsx(Profile, { isLoading: isLoading, ...profile }) }) })), _jsx(ExitButton, { "$isShow": isShowExitButton, onClick: profile?.exitButton?.onClick, title: "\u0412\u044B\u0445\u043E\u0434", variant: "text", children: _jsx(QuitOutlineMd, {}) })] })] }) }));
 });

package/components/DashboardLayout/Header/constants.d.ts

@@ -1,5 +1,9 @@
 export declare const dashboardLayoutHeaderClassnames: {
     root: string;
     mobileSidebarButton: string;
-    mobileMenuOrganizationVisible: string;
+    priorityFeatureMenuOrg: string;
+    priorityFeatureProfile: string;
+    mobileSidebarPriorityFeatureVisible: string;
+    featureInSidebar: string;
+    profile: string;
 };

package/components/DashboardLayout/Header/constants.js

@@ -2,5 +2,9 @@ import { createUIKitClassname } from '../../utils/createUIKitClassname';
 export const dashboardLayoutHeaderClassnames = {
     root: createUIKitClassname('dashboard-layout-header'),
     mobileSidebarButton: createUIKitClassname('dashboard-layout-header__sidebar-button_mobile'),
-    mobileMenuOrganizationVisible: createUIKitClassname('dashboard-layout-header__menu-organization_visible'),
+    priorityFeatureMenuOrg: createUIKitClassname('dashboard-layout-header__priority-feature_menu-org'),
+    priorityFeatureProfile: createUIKitClassname('dashboard-layout-header__priority-feature_profile'),
+    mobileSidebarPriorityFeatureVisible: createUIKitClassname('dashboard-layout-header__sidebar-priority-feature_visible'),
+    featureInSidebar: createUIKitClassname('dashboard-layout-header__feature-in-sidebar'),
+    profile: createUIKitClassname('dashboard-layout-header__profile'),
 };

package/components/DashboardLayout/Header/styles.d.ts

@@ -44,9 +44,10 @@ export declare const HeaderContent: import("../../styled").StyledComponent<{
     theme?: import("@emotion/react").Theme | undefined;
     as?: import("react").ElementType<any, keyof import("react").JSX.IntrinsicElements> | undefined;
 }, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, {}>;
-export declare const MenuOrganizationWrapper: import("../../styled").StyledComponent<{
+/**
+ * Обертка для элементов которые должны быть в мобильном хедере или помещены в sidebar.
+ */
+export declare const PriorityFeatureWrapper: import("../../styled").StyledComponent<{
     theme?: import("@emotion/react").Theme | undefined;
     as?: import("react").ElementType<any, keyof import("react").JSX.IntrinsicElements> | undefined;
-} & {
-    $alertHeight?: number | undefined;
 }, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, {}>;

package/components/DashboardLayout/Header/styles.js

@@ -3,6 +3,7 @@ import { dashboardSidebarClassnames } from '../../DashboardSidebar/constants';
 import { IconButton } from '../../IconButton';
 import { menuOrganizationClassnames } from '../../MenuOrganization/constants';
 import { MOBILE_BUTTON_HEIGHT } from '../../MenuOrganization/OrganizationButton/constants';
+import { profileClassnames } from '../../Profile/constants';
 import { styled } from '../../styled';
 import { dashboardLayoutClassnames, HEADER_HEIGHT_DESKTOP, HEADER_HEIGHT_LAPTOP, HEADER_HEIGHT_MOBILE, } from '../constants';
 import { dashboardLayoutHeaderClassnames } from './constants';
@@ -77,6 +78,15 @@ export const HeaderContentSection = styled(HeaderSection) `
 
   ${({ theme }) => theme.breakpoints.down('sm')} {
     gap: ${({ theme }) => theme.spacing(2)};
+
+    &.${dashboardLayoutHeaderClassnames.priorityFeatureMenuOrg} {
+      & .${menuOrganizationClassnames.organizationData} {
+        display: none;
+      }
+      & .${menuOrganizationClassnames.button} {
+        border-radius: ${({ theme }) => theme.shape.medium};
+      }
+    }
   }
 `;
 export const ProductSwitcherWrapper = styled.div `
@@ -111,45 +121,77 @@ export const HeaderContent = styled.div `
     padding: 0;
   }
 `;
-export const MenuOrganizationWrapper = styled.div `
+/**
+ * Обертка для элементов которые должны быть в мобильном хедере или помещены в sidebar.
+ */
+export const PriorityFeatureWrapper = styled.div `
   ${({ theme }) => theme.breakpoints.down('sm')} {
-    position: absolute;
-    z-index: ${({ theme }) => theme.zIndex.appBar - 1};
-    top: ${({ $alertHeight }) => `calc(${$alertHeight}px + ${HEADER_HEIGHT_MOBILE}) `};
-    left: 0;
-    
-    /* Необходимо для анимации компонента вместе с sidebar */
-    transform: translateX(-100vw);
 
-    display: flex;
-    flex-direction: column;
+    &.${dashboardLayoutHeaderClassnames.featureInSidebar} {
+      position: absolute;
+      z-index: ${({ theme }) => theme.zIndex.appBar - 1};
+      top: calc(var(--alert-height, 0px) + ${HEADER_HEIGHT_MOBILE});
+      left: 0;
+      
+      /* Необходимо для анимации компонента вместе с sidebar */
+      transform: translateX(-100vw);
 
-    width: 100vw;
+      display: flex;
+      flex-direction: column;
 
-    background-color: ${({ theme }) => theme.palette.background.default};
+      width: 100vw;
 
-    transition: ${({ theme }) => {
+      background-color: ${({ theme }) => theme.palette.background.default};
+
+      transition: ${({ theme }) => {
     return theme.transitions.create(['transform'], {
         duration: theme.transitions.duration.standard,
     });
 }};
 
-    &.${dashboardLayoutHeaderClassnames.mobileMenuOrganizationVisible} {
-      transform: translateX(0);
-    }
-
-    & .${menuOrganizationClassnames.button} {
-      height: ${MOBILE_BUTTON_HEIGHT};
-      padding: ${({ theme }) => theme.spacing(3, 4)};
+      &.${dashboardLayoutHeaderClassnames.mobileSidebarPriorityFeatureVisible} {
+        transform: translateX(0);
+      }
 
-      border-bottom: 1px solid ${({ theme }) => theme.palette.grey[300]};
+      & .${menuOrganizationClassnames.button}, & .${profileClassnames.button} {
+        height: ${MOBILE_BUTTON_HEIGHT};
+        padding: ${({ theme }) => theme.spacing(3, 4)};
 
-      &:hover {
         border-bottom: 1px solid ${({ theme }) => theme.palette.grey[300]};
+
+        &:hover {
+          border-bottom: 1px solid ${({ theme }) => theme.palette.grey[300]};
+        }
+
+        &:active {
+          border-bottom: 1px solid ${({ theme }) => theme.palette.grey[300]};
+        }
       }
 
-      &:active {
-        border-bottom: 1px solid ${({ theme }) => theme.palette.grey[300]};
+      &.${dashboardLayoutHeaderClassnames.priorityFeatureMenuOrg} {
+        & .${dashboardLayoutHeaderClassnames.profile} {
+          display: block;
+        }
+
+
+        & .${profileClassnames.button} {
+          width: 100%;
+          max-width: unset;
+
+          border-radius: 0;
+        }
+
+        & .${profileClassnames.avatar} {
+          display: none;
+        }
+
+        & .${profileClassnames.user} {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+
+          width: 100%;
+        }
       }
     }
   }

package/components/DashboardLayout/Header/useLogic/useLogic.d.ts

@@ -1,12 +1,15 @@
+import { type CSSProperties } from 'react';
 import { type HeaderProps } from '../types';
 export declare const useLogic: ({ profile, menuOrganization }: HeaderProps) => {
     isShowExitButton: boolean;
     isShowProfile: boolean;
     isMobile: boolean;
     isFocusedMode: boolean;
+    mobileHeaderPriorityFeature: "profile" | "menuOrg";
     isLoading: boolean;
     collapsedIn: boolean;
     onToggleSidebar: (newValue?: boolean | undefined) => void;
     alertHeight: number;
-    menuOrganizationClassnames: string;
+    isPinned: boolean;
+    headerStyle: CSSProperties;
 };

package/components/DashboardLayout/Header/useLogic/useLogic.js

@@ -1,31 +1,36 @@
-import { useContext, useEffect, useMemo } from 'react';
+import { useContext, useEffect } from 'react';
 import { DashboardContext } from '../../../DashboardContext';
 import { DashboardSidebarContext } from '../../../DashboardSidebarProvider';
 import { useViewportType } from '../../../useViewportType';
-import { classNames } from '../../../utils/classNames';
-import { dashboardLayoutHeaderClassnames } from '../constants';
 export const useLogic = ({ profile, menuOrganization }) => {
-    const { isFocusedMode, isLoading, hasMenuOrganizationRef, alertHeight } = useContext(DashboardContext);
+    const { isFocusedMode, isLoading, hasMenuOrganizationRef, hasProfileRef, alertHeight, mobileHeaderPriorityFeature, } = useContext(DashboardContext);
     const { collapsedIn, onToggleSidebar, isPinned } = useContext(DashboardSidebarContext);
     useEffect(() => {
         hasMenuOrganizationRef.current = Boolean(menuOrganization);
-    }, [menuOrganization]);
+        hasProfileRef.current = Boolean(profile);
+    }, [menuOrganization, profile]);
     const { isMobile } = useViewportType();
     const hasMenu = Boolean(profile?.menu || profile?.menuList);
-    const isShowProfile = (Boolean(profile) && !isMobile) || (hasMenu && isMobile);
-    const isShowExitButton = isMobile && !hasMenu && Boolean(profile?.exitButton);
-    const menuOrganizationClassnames = useMemo(() => classNames({
-        [dashboardLayoutHeaderClassnames.mobileMenuOrganizationVisible]: isPinned,
-    }), [isPinned]);
+    const isShowProfile = (Boolean(profile) && !isMobile) ||
+        (hasMenu && isMobile && mobileHeaderPriorityFeature === 'profile');
+    const isShowExitButton = isMobile &&
+        !hasMenu &&
+        Boolean(profile?.exitButton) &&
+        mobileHeaderPriorityFeature === 'profile';
+    const headerStyle = {
+        '--alert-height': `${alertHeight}px`,
+    };
     return {
         isShowExitButton,
         isShowProfile,
         isMobile,
         isFocusedMode,
+        mobileHeaderPriorityFeature,
         isLoading,
         collapsedIn,
         onToggleSidebar,
         alertHeight,
-        menuOrganizationClassnames,
+        isPinned,
+        headerStyle,
     };
 };

package/components/DashboardLayout/types.d.ts

@@ -10,4 +10,9 @@ export type DashboardLayoutProps = {
      * Если true, отображается состояние загрузки
      */
     isLoading?: boolean;
+    /**
+     * Элемент, отображаемый в мобильном хедере.
+     * Второстепенный будет помещен в sidebar.
+     */
+    mobileHeaderPriorityFeature?: 'profile' | 'menuOrg';
 };

package/components/DashboardSidebar/DashboardSidebar.js

@@ -3,17 +3,32 @@ import { forwardRef } from 'react';
 import { DashboardSidebarSkeleton } from '../DashboardSidebarSkeleton';
 import { NavMenu } from '../NavMenu';
 import { PinButton } from '../PinButton';
+import { cva } from '../utils/cva';
 import { getInertProps } from '../utils/getInertProps';
+import { dashboardSidebarClassnames } from './constants';
 import { SidebarNav } from './SidebarNav';
 import { Footer, SidebarContent, SidebarHeader, SidebarRoot, StyledPaper, Wrapper, } from './styles';
 import { useLogic } from './useLogic';
+const sidebar = cva('', {
+    variants: {
+        hasProfile: {
+            true: dashboardSidebarClassnames.hasProfile,
+        },
+        hasMenuOrganization: {
+            true: dashboardSidebarClassnames.hasMenuOrganization,
+        },
+    },
+});
 /**
  * Основной sidebar приложения
  */
 export const DashboardSidebar = forwardRef((props, ref) => {
-    const { isPinned, isMobile, collapsedIn, onTogglePin, onMouseEnter, onMouseLeave, alertHeight, classnames, wrapperClassnames, menu, header, isLoading, } = useLogic(props);
+    const { isPinned, isMobile, collapsedIn, onTogglePin, onMouseEnter, onMouseLeave, alertHeight, classnames, menu, header, isLoading, hasMenuOrganization, hasProfile, } = useLogic(props);
     if (isLoading) {
         return _jsx(DashboardSidebarSkeleton, {});
     }
-    return (_jsx(Wrapper, { "$isPinned": isPinned, "$alertHeight": alertHeight, className: wrapperClassnames, children: _jsx(SidebarRoot, { ref: ref, "$isPinned": isPinned, "$collapsedIn": collapsedIn, className: classnames, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave, ...getInertProps(isMobile && !isPinned), children: _jsxs(StyledPaper, { variant: "outlined", children: [_jsxs(SidebarContent, { "$collapsedIn": collapsedIn, "$isPinned": isPinned, "$hasHeader": Boolean(header), children: [header && _jsx(SidebarHeader, { children: header }), _jsx(SidebarNav, { menu: _jsx(NavMenu, { collapsedIn: collapsedIn, items: menu.items }) })] }), _jsx(Footer, { children: _jsx(PinButton, { isPinned: isPinned, collapsedIn: collapsedIn, onClick: onTogglePin }) })] }) }) }));
+    return (_jsx(Wrapper, { "$isPinned": isPinned, "$alertHeight": alertHeight, className: sidebar({
+            hasProfile,
+            hasMenuOrganization,
+        }), children: _jsx(SidebarRoot, { ref: ref, "$isPinned": isPinned, "$collapsedIn": collapsedIn, className: classnames, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave, ...getInertProps(isMobile && !isPinned), children: _jsxs(StyledPaper, { variant: "outlined", children: [_jsxs(SidebarContent, { "$collapsedIn": collapsedIn, "$isPinned": isPinned, "$hasHeader": Boolean(header), children: [header && _jsx(SidebarHeader, { children: header }), _jsx(SidebarNav, { menu: _jsx(NavMenu, { collapsedIn: collapsedIn, items: menu.items }) })] }), _jsx(Footer, { children: _jsx(PinButton, { isPinned: isPinned, collapsedIn: collapsedIn, onClick: onTogglePin }) })] }) }) }));
 });

package/components/DashboardSidebar/constants.d.ts

@@ -1,5 +1,6 @@
 export declare const dashboardSidebarClassnames: {
     root: string;
+    hasProfile: string;
     hasMenuOrganization: string;
 };
 export declare const LABEL_WIDTH: {

package/components/DashboardSidebar/constants.js

@@ -1,6 +1,7 @@
 import { createUIKitClassname } from '../utils/createUIKitClassname';
 export const dashboardSidebarClassnames = {
     root: createUIKitClassname('dashboard-layout-sidebar'),
+    hasProfile: createUIKitClassname('dashboard-layout-sidebar_has-profile'),
     hasMenuOrganization: createUIKitClassname('dashboard-layout-sidebar_has-menu-organization'),
 };
 export const LABEL_WIDTH = {

package/components/DashboardSidebar/styles.js

@@ -35,7 +35,7 @@ export const Wrapper = styled('div', {
     });
 }};
 
-    &.${dashboardSidebarClassnames.hasMenuOrganization} {
+    &.${dashboardSidebarClassnames.hasMenuOrganization}, &.${dashboardSidebarClassnames.hasProfile} {
       top: ${({ $alertHeight }) => `calc(${$alertHeight}px + ${HEADER_HEIGHT_MOBILE} + ${MOBILE_BUTTON_HEIGHT}) `};
     }
   }

package/components/DashboardSidebar/useLogic/useLogic.d.ts

@@ -28,5 +28,6 @@ export declare const useLogic: (props: DashboardSidebarProps) => {
     header: import("react").ReactNode;
     isLoading: boolean;
     classnames: string;
-    wrapperClassnames: string;
+    hasMenuOrganization: boolean | null;
+    hasProfile: boolean | null;
 };

package/components/DashboardSidebar/useLogic/useLogic.js

@@ -1,4 +1,4 @@
-import { useContext, useEffect, useMemo, useRef } from 'react';
+import { useContext, useEffect, useRef } from 'react';
 import { DashboardContext } from '../../DashboardContext';
 import { dashboardLayoutHeaderClassnames } from '../../DashboardLayout/Header';
 import { dashboardLayoutMainClassnames } from '../../DashboardLayout/Main';
@@ -10,7 +10,7 @@ import { dashboardSidebarClassnames } from '../constants';
 export const useLogic = (props) => {
     const { className, menu, header, isLoading } = props;
     const { onToggleSidebar, isPinned, onTogglePin, collapsedIn, setIsPopupOpen, } = useContext(DashboardSidebarContext);
-    const { alertHeight, isLoading: isDashboardLoading, hasMenuOrganizationRef, } = useContext(DashboardContext);
+    const { alertHeight, isLoading: isDashboardLoading, hasMenuOrganizationRef, hasProfileRef, mobileHeaderPriorityFeature, } = useContext(DashboardContext);
     const { isMobile } = useViewportType();
     const hoverTimerRef = useRef(null);
     const theme = useTheme();
@@ -80,9 +80,6 @@ export const useLogic = (props) => {
             }
         };
     }, [collapsedIn, isPinned]);
-    const wrapperClassnames = useMemo(() => classNames({
-        [dashboardSidebarClassnames.hasMenuOrganization]: hasMenuOrganizationRef.current,
-    }), [hasMenuOrganizationRef.current]);
     const classnames = classNames(className, dashboardSidebarClassnames.root);
     return {
         isPinned,
@@ -96,6 +93,8 @@ export const useLogic = (props) => {
         header,
         isLoading: isLoading || isDashboardLoading,
         classnames,
-        wrapperClassnames,
+        hasMenuOrganization: hasMenuOrganizationRef.current &&
+            mobileHeaderPriorityFeature === 'profile',
+        hasProfile: hasProfileRef.current && mobileHeaderPriorityFeature === 'menuOrg',
     };
 };

package/components/DatePicker/hooks/useDatePickerOptions/useDatePickerOptions.d.ts

@@ -30,6 +30,8 @@ type UseMaskedValueAndSelectedBaseDateReturn = {
          */
         value: string;
     };
+    /** При blur неполной даты - в onChange уходит Invalid Date (тот же стейт, что у маски). */
+    onMaskedValueBlur: () => void;
 };
 /**
  * хук объединяющий повторяющуюся логику в работе DatePicker и RangeDatePicker:

package/components/DatePicker/hooks/useDatePickerOptions/useDatePickerOptions.js

@@ -12,7 +12,7 @@ import { useSelectedBaseDate } from '../useSelectedBaseDate';
  */
 export const useDatePickerOptions = ({ onChange, mask, currentValue, minDate, maxDate, monthOffset, onDatePick, }) => {
     const baseDate = useBaseDateInRange({ minDate, maxDate, monthOffset });
-    const { maskedValue, onMaskedValueChange, onMaskedDateChange } = useMaskedValue({
+    const { maskedValue, onMaskedValueChange, onMaskedValueBlur, onMaskedDateChange, } = useMaskedValue({
         currentValue,
         mask,
         onChangeValue: onChange,
@@ -39,5 +39,6 @@ export const useDatePickerOptions = ({ onChange, mask, currentValue, minDate, ma
             onChange: handleDatePick,
             date: selectedBaseDate || baseDate,
         },
+        onMaskedValueBlur,
     };
 };

package/components/DatePicker/hooks/useMaskedValue/useMaskedValue.d.ts

@@ -19,6 +19,10 @@ type Returned = {
      * Изменение maskedValue
      * */
     onMaskedValueChange: (value: string) => void;
+    /**
+     * Реакция на blur maskedValue
+     * */
+    onMaskedValueBlur: () => void;
 };
 /**
  * Хук для управления значением для MaskField

package/components/DatePicker/hooks/useMaskedValue/useMaskedValue.js

@@ -1,24 +1,48 @@
 import { isDate } from '@astral/utils/date/isDate';
-import { useEffect, useState } from 'react';
-import { formatDate, parseDate } from '../../../utils/date';
+import { useEffect, useRef, useState } from 'react';
+import { formatDate, isMaskedDateSyntacticallyComplete, parseDate, } from '../../../utils/date';
 /**
  * Хук для управления значением для MaskField
  */
 export const useMaskedValue = ({ currentValue, mask, onChangeValue, }) => {
     const [maskedValue, setMaskedValue] = useState(() => currentValue ? formatDate(currentValue, mask) : '');
+    const maskedValueRef = useRef(maskedValue);
+    /**
+     * Ввод в маску: синхронизируем локальное значение и ref (ref нужен на blur и после выбора даты из календаря,
+     * чтобы не читать устаревший state).
+     * `onChangeValue` вызываем только при пустой строке (`null`) или когда маска синтаксически полная —
+     * иначе partial не уходит наружу до завершения ввода или до blur (см. `handleMaskedValueBlur`).
+     */
     const handleMaskedValueChange = (value) => {
         setMaskedValue(value);
-        // При отсутствии value указываем null, так как если задать undefined, то отобразится defaultValue при наличии
+        maskedValueRef.current = value;
         if (!value) {
             onChangeValue?.(null, value);
+            return;
+        }
+        if (!isMaskedDateSyntacticallyComplete(value, mask)) {
+            return;
         }
-        else {
-            onChangeValue?.(parseDate(value, mask), value);
+        onChangeValue?.(parseDate(value, mask), value);
+    };
+    /**
+     * Blur поля: если осталась непустая неполная маска — один раз отдаём `Invalid Date` в `onChangeValue`,
+     * чтобы формы могли показать ошибку. Пустая строка и полная маска не дублируют уже отправленный `onChange`.
+     */
+    const handleMaskedValueBlur = () => {
+        const currentMaskedValue = maskedValueRef.current;
+        if (!currentMaskedValue) {
+            return;
+        }
+        if (isMaskedDateSyntacticallyComplete(currentMaskedValue, mask)) {
+            return;
         }
+        onChangeValue?.(new Date(Number.NaN), currentMaskedValue);
     };
     const handleChangeMaskedDate = (date) => {
         const formatted = formatDate(date, mask);
         setMaskedValue(formatted);
+        maskedValueRef.current = formatted;
         onChangeValue?.(date, formatted);
     };
     // здесь происходит реакция на изменение value из вне (управляемый компонент)
@@ -26,6 +50,7 @@ export const useMaskedValue = ({ currentValue, mask, onChangeValue, }) => {
         // если новое значение пустое, то сбрасываем значение MaskField
         if (!currentValue) {
             setMaskedValue('');
+            maskedValueRef.current = '';
             return;
         }
         // здесь обрабатывается сценарий, когда в инпут вводится невалидная дата и при этом currentValue становится Invalid Date
@@ -33,16 +58,20 @@ export const useMaskedValue = ({ currentValue, mask, onChangeValue, }) => {
         if (!isDate(currentValue) && maskedValue) {
             return;
         }
-        // проверяем равны ли даты
-        const isEqualValueAndMaskedDate = currentValue.getTime() === parseDate(maskedValue, mask).getTime();
+        // сравнение только при полной маске, иначе getTime() от parseDate может быть NaN
+        const isEqualValueAndMaskedDate = isMaskedDateSyntacticallyComplete(maskedValue, mask) &&
+            currentValue.getTime() === parseDate(maskedValue, mask).getTime();
         // если даты не равны, то значит изменился currentValue из вне и надо синхронизировать maskedValue
         if (!isEqualValueAndMaskedDate) {
-            setMaskedValue(formatDate(currentValue, mask));
+            const formatted = formatDate(currentValue, mask);
+            setMaskedValue(formatted);
+            maskedValueRef.current = formatted;
         }
     }, [currentValue]);
     return {
         maskedValue,
         onMaskedValueChange: handleMaskedValueChange,
+        onMaskedValueBlur: handleMaskedValueBlur,
         onMaskedDateChange: handleChangeMaskedDate,
     };
 };

package/components/DatePicker/useLogic/useLogic.d.ts

@@ -13,6 +13,7 @@ export declare const useLogic: ({ label, value, maxDate, minDate, mask, onOpen,
     };
     DatePickerInputProps: {
         value: string;
+        onBlur: () => void;
     };
     onAccept: ((value: string, maskRef: import("imask").default.InputMask<import("imask").default.AnyMaskedOptions>, e?: InputEvent | undefined, onChange?: ((changeValue: string) => void) | undefined) => void) | undefined;
     pickerProps: import("../types").PickerProps;