@astral/ui 4.52.0 → 4.53.0

package/components/DashboardContext/DashboardContext.d.ts

@@ -1,7 +1,6 @@
 import { type RefObject } from 'react';
-export type DashboardContextProps = {
-    isFocusedMode: boolean;
-    mobileHeaderPriorityFeature: 'profile' | 'menuOrg';
+import { type DashboardLayoutProps } from '../DashboardLayout';
+export type DashboardContextProps = Required<Pick<DashboardLayoutProps, 'isFocusedMode' | 'mobileHeaderPriorityFeature' | 'desktopViewMode'>> & {
     setAlertElement?: (element: HTMLElement | null) => void;
     alertHeight: number;
     isLoading: boolean;

package/components/DashboardContext/DashboardContext.js

@@ -2,6 +2,7 @@ import { createContext, createRef } from 'react';
 export const DashboardContext = createContext({
     isFocusedMode: false,
     mobileHeaderPriorityFeature: 'menuOrg',
+    desktopViewMode: 'compact',
     alertHeight: 0,
     isLoading: false,
     hasMenuOrganizationRef: createRef(),

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' | 'mobileHeaderPriorityFeature'> & {
+type Props = Pick<DashboardContextProps, 'isFocusedMode' | 'mobileHeaderPriorityFeature' | 'desktopViewMode'> & {
     children: ReactNode;
     isLoading: boolean;
 };
-export declare const DashboardContextProvider: ({ children, isFocusedMode, isLoading, mobileHeaderPriorityFeature, }: Props) => import("react/jsx-runtime").JSX.Element;
+export declare const DashboardContextProvider: ({ children, isFocusedMode, isLoading, mobileHeaderPriorityFeature, desktopViewMode, }: Props) => import("react/jsx-runtime").JSX.Element;
 export {};

package/components/DashboardContext/DashboardContextProvider/DashboardContextProvider.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useEffect, useRef, useState } from 'react';
 import { DashboardContext, } from '../DashboardContext';
-export const DashboardContextProvider = ({ children, isFocusedMode, isLoading, mobileHeaderPriorityFeature, }) => {
+export const DashboardContextProvider = ({ children, isFocusedMode, isLoading, mobileHeaderPriorityFeature, desktopViewMode, }) => {
     const [alertElement, setAlertElement] = useState(null);
     const [alertHeight, setAlertHeight] = useState(0);
     const [isFocusedModeInternal, setFocusedMode] = useState(isFocusedMode);
@@ -29,6 +29,7 @@ export const DashboardContextProvider = ({ children, isFocusedMode, isLoading, m
     return (_jsx(DashboardContext.Provider, { value: {
             isFocusedMode: isFocusedModeInternal,
             mobileHeaderPriorityFeature,
+            desktopViewMode,
             setAlertElement,
             alertHeight,
             isLoading,

package/components/DashboardLayout/Container/Container.d.ts

@@ -0,0 +1,6 @@
+import { type ReactNode } from 'react';
+type Props = {
+    children: ReactNode;
+};
+export declare const Container: ({ children }: Props) => import("react/jsx-runtime").JSX.Element;
+export {};

package/components/DashboardLayout/Container/Container.js

@@ -0,0 +1,24 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useContext } from 'react';
+import { DashboardContext } from '../../DashboardContext';
+import { cva } from '../../utils/cva';
+import { containerClassnames } from './constants';
+import { Root } from './styles';
+const containerCva = cva(containerClassnames.root, {
+    variants: {
+        desktopViewMode: {
+            compact: containerClassnames.compact,
+            wide: containerClassnames.wide,
+        },
+        isFocusedMode: {
+            true: containerClassnames.focusedMode,
+        },
+    },
+});
+export const Container = ({ children }) => {
+    const { isFocusedMode, desktopViewMode } = useContext(DashboardContext);
+    return (_jsx(Root, { className: containerCva({
+            desktopViewMode,
+            isFocusedMode,
+        }), children: children }));
+};

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

@@ -0,0 +1,6 @@
+export declare const containerClassnames: {
+    root: string;
+    compact: string;
+    wide: string;
+    focusedMode: string;
+};

package/components/DashboardLayout/Container/constants.js

@@ -0,0 +1,7 @@
+import { createUIKitClassname } from '../../utils/createUIKitClassname';
+export const containerClassnames = {
+    root: createUIKitClassname('dashboard-layout__container'),
+    compact: createUIKitClassname('dashboard-layout__container_compact'),
+    wide: createUIKitClassname('dashboard-layout__container_wide'),
+    focusedMode: createUIKitClassname('dashboard-layout__container_focused-mode'),
+};

package/components/DashboardLayout/Container/index.d.ts

@@ -0,0 +1 @@
+export * from './Container';

package/components/DashboardLayout/Container/index.js

@@ -0,0 +1 @@
+export * from './Container';

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

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+export declare const Root: 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>, {}>;

package/components/DashboardLayout/Container/styles.js

@@ -0,0 +1,55 @@
+import { dashboardSidebarClassnames } from '../../DashboardSidebar/constants';
+import { styled } from '../../styled';
+import { containerClassnames } from './constants';
+export const Root = styled.div `
+  display: grid;
+  grid-template-columns: auto 1fr;
+  grid-template-rows: auto auto 1fr;
+  flex-grow: 1;
+
+  height: 100vh;
+  padding: ${({ theme }) => theme.spacing(0, 4, 4)};
+
+  transition: ${({ theme }) => {
+    return theme.transitions.create(['max-width'], {
+        duration: theme.transitions.duration.complex,
+    });
+}};
+
+  /* Причина игнора: Не критично для отображения */
+  /* stylelint-disable-next-line plugin/no-unsupported-browser-features */
+  &:has(.${dashboardSidebarClassnames.root}) {
+    column-gap: ${({ theme }) => theme.spacing(4)};
+
+    ${({ theme }) => theme.breakpoints.down('sm')} {
+      column-gap: 0;
+    }
+  }
+
+  /* Причина игнора: Прогрессивное улучшение */
+  /* stylelint-disable plugin/no-unsupported-browser-features */
+  @supports (height: 100dvh) {
+    height: 100dvh;
+  }
+  /* stylelint-enable plugin/no-unsupported-browser-features */
+
+  ${({ theme }) => theme.breakpoints.down('sm')} {
+    column-gap: 0;
+
+    min-width: unset;
+    max-width: unset;
+    padding: 0;
+  }
+
+  &.${containerClassnames.compact} {
+    max-width: 1572px;
+  }
+
+  &.${containerClassnames.wide} {
+    max-width: 1920px;
+  }
+
+  &.${containerClassnames.focusedMode} {
+    max-width: 100%;
+  }
+`;

package/components/DashboardLayout/DashboardLayout.d.ts

@@ -4,7 +4,7 @@ import { type DashboardLayoutProps } from './types';
  * Общий Layout приложения
  */
 export declare const DashboardLayout: {
-    ({ children, isFocusedMode, isLoading, mobileHeaderPriorityFeature, }: DashboardLayoutProps): import("react/jsx-runtime").JSX.Element;
+    ({ children, isFocusedMode, isLoading, mobileHeaderPriorityFeature, desktopViewMode, }: 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, mobileHeaderPriorityFeature = 'menuOrg', }) => {
-    return (_jsx(DashboardContextProvider, { isFocusedMode: isFocusedMode, isLoading: isLoading, mobileHeaderPriorityFeature: mobileHeaderPriorityFeature, children: _jsx(DashboardWrapper, { children: children }) }));
+export const DashboardLayout = ({ children, isFocusedMode = false, isLoading = false, mobileHeaderPriorityFeature = 'menuOrg', desktopViewMode = 'compact', }) => {
+    return (_jsx(DashboardContextProvider, { isFocusedMode: isFocusedMode, isLoading: isLoading, desktopViewMode: desktopViewMode, mobileHeaderPriorityFeature: mobileHeaderPriorityFeature, children: _jsx(DashboardWrapper, { children: children }) }));
 };
 DashboardLayout.Header = Header;
 DashboardLayout.Sidebar = DashboardSidebar;

package/components/DashboardLayout/DashboardWrapper/DashboardWrapper.js

@@ -2,9 +2,10 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useContext } from 'react';
 import { DashboardContext } from '../../DashboardContext';
 import { DashboardSidebarProvider } from '../../DashboardSidebarProvider';
+import { Container } from '../Container';
 import { dashboardLayoutClassnames } from '../constants';
-import { DecorativeHeaderBackground, LayoutContent, Wrapper } from './styles';
+import { DecorativeHeaderBackground, Wrapper } from './styles';
 export const DashboardWrapper = ({ children }) => {
     const { isFocusedMode } = useContext(DashboardContext);
-    return (_jsx(DashboardSidebarProvider, { isFocusedMode: isFocusedMode, children: _jsxs(Wrapper, { className: dashboardLayoutClassnames.root, children: [_jsx(DecorativeHeaderBackground, { role: "presentation", "$isFocusedMode": isFocusedMode }), _jsx(LayoutContent, { "$isFocusedMode": isFocusedMode, children: children })] }) }));
+    return (_jsx(DashboardSidebarProvider, { isFocusedMode: isFocusedMode, children: _jsxs(Wrapper, { className: dashboardLayoutClassnames.root, children: [_jsx(DecorativeHeaderBackground, { role: "presentation", "$isFocusedMode": isFocusedMode }), _jsx(Container, { children: children })] }) }));
 };

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

@@ -0,0 +1,6 @@
+export declare const dashboardLayoutContainerClassnames: {
+    root: string;
+    compact: string;
+    wide: string;
+    focusedMode: string;
+};

package/components/DashboardLayout/DashboardWrapper/constants.js

@@ -0,0 +1,7 @@
+import { createUIKitClassname } from '../../utils/createUIKitClassname';
+export const dashboardLayoutContainerClassnames = {
+    root: createUIKitClassname('dashboard-layout__container'),
+    compact: createUIKitClassname('dashboard-layout__container_compact'),
+    wide: createUIKitClassname('dashboard-layout__container_wide'),
+    focusedMode: createUIKitClassname('dashboard-layout__container_focused-mode'),
+};

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

@@ -9,9 +9,3 @@ export declare const DecorativeHeaderBackground: import("../../styled").StyledCo
 } & {
     $isFocusedMode: boolean;
 }, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, {}>;
-export declare const LayoutContent: import("../../styled").StyledComponent<{
-    theme?: import("@emotion/react").Theme | undefined;
-    as?: import("react").ElementType<any, keyof import("react").JSX.IntrinsicElements> | undefined;
-} & {
-    $isFocusedMode: boolean;
-}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, {}>;

package/components/DashboardLayout/DashboardWrapper/styles.js

@@ -1,4 +1,3 @@
-import { dashboardSidebarClassnames } from '../../DashboardSidebar/constants';
 import { styled } from '../../styled';
 import { HEADER_HEIGHT_DESKTOP, HEADER_HEIGHT_LAPTOP } from '../constants';
 export const Wrapper = styled('div') `
@@ -36,47 +35,3 @@ export const DecorativeHeaderBackground = styled.div `
     display: none;
   }
 `;
-export const LayoutContent = styled('div', {
-    shouldForwardProp: (prop) => !['$isFocusedMode'].includes(prop),
-}) `
-  display: grid;
-  grid-template-columns: auto 1fr;
-  grid-template-rows: auto auto 1fr;
-  flex-grow: 1;
-
-  /* Максимальная ширина с отступами */
-  max-width: ${({ $isFocusedMode }) => ($isFocusedMode ? '100%' : '1572px')};
-  height: 100vh;
-  padding: ${({ theme }) => theme.spacing(0, 4, 4)};
-
-  transition: ${({ theme }) => {
-    return theme.transitions.create(['max-width'], {
-        duration: theme.transitions.duration.complex,
-    });
-}};
-
-  /* Причина игнора: Не критично для отображения */
-  /* stylelint-disable-next-line plugin/no-unsupported-browser-features */
-  &:has(.${dashboardSidebarClassnames.root}) {
-    column-gap: ${({ theme }) => theme.spacing(4)};
-
-    ${({ theme }) => theme.breakpoints.down('sm')} {
-      column-gap: 0;
-    }
-  }
-
-  /* Причина игнора: Прогрессивное улучшение */
-  /* stylelint-disable plugin/no-unsupported-browser-features */
-  @supports (height: 100dvh) {
-    height: 100dvh;
-  }
-  /* stylelint-enable plugin/no-unsupported-browser-features */
-
-  ${({ theme }) => theme.breakpoints.down('sm')} {
-    column-gap: 0;
-
-    min-width: unset;
-    max-width: unset;
-    padding: 0;
-  }
-`;

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

@@ -5,7 +5,7 @@ export declare const useLogic: ({ profile, menuOrganization }: HeaderProps) => {
     isShowProfile: boolean;
     isMobile: boolean;
     isFocusedMode: boolean;
-    mobileHeaderPriorityFeature: "profile" | "menuOrg";
+    mobileHeaderPriorityFeature: "menuOrg" | "profile";
     isLoading: boolean;
     collapsedIn: boolean;
     onToggleSidebar: (newValue?: boolean | undefined) => void;

package/components/DashboardLayout/types.d.ts

@@ -15,4 +15,9 @@ export type DashboardLayoutProps = {
      * Второстепенный будет помещен в sidebar.
      */
     mobileHeaderPriorityFeature?: 'profile' | 'menuOrg';
+    /**
+     * Compact - ширина layout ограничена 1572px. Необходимо для удобного чтения контента, без лишнего растягивания
+     * Wide - ширина layout ограничена 1920px. Применяйте, когда в вашем приложении отображается много табличных данных с большим количеством колонок. Пример - админки
+     */
+    desktopViewMode?: 'wide' | 'compact';
 };

package/components/DashboardLayoutSkeleton/DashboardLayoutSkeleton.js

@@ -1,7 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Container } from '../DashboardLayout/Container';
 import { dashboardLayoutClassnames } from '../DashboardLayout/constants';
 import { DashboardLayout } from '../DashboardLayout/DashboardLayout';
-import { DecorativeHeaderBackground, LayoutContent, Wrapper, } from '../DashboardLayout/DashboardWrapper/styles';
+import { DecorativeHeaderBackground, Wrapper, } from '../DashboardLayout/DashboardWrapper/styles';
 import { Header } from '../DashboardLayout/Header';
 import { DashboardSidebarSkeleton } from '../DashboardSidebarSkeleton';
 import { MenuOrganizationSkeleton } from '../MenuOrganization';
@@ -11,7 +12,7 @@ import { Content } from './styles';
  * Компонент можно использовать для отображения состояния загрузки дашборда
  */
 export const DashboardLayoutSkeleton = ({ product, productSwitcher, hasSidebar = true, hasProfile = true, hasMenuOrganization = true, }) => {
-    return (_jsxs(Wrapper, { className: dashboardLayoutClassnames.root, children: [_jsx(DecorativeHeaderBackground, { role: "presentation", "$isFocusedMode": false }), _jsxs(LayoutContent, { "$isFocusedMode": false, children: [hasSidebar && _jsx(DashboardSidebarSkeleton, {}), _jsx(Header, { productSwitcher: productSwitcher, product: product, menuOrganization: hasMenuOrganization ? () => _jsx(MenuOrganizationSkeleton, {}) : undefined, profile: hasProfile
+    return (_jsxs(Wrapper, { className: dashboardLayoutClassnames.root, children: [_jsx(DecorativeHeaderBackground, { role: "presentation", "$isFocusedMode": false }), _jsxs(Container, { children: [hasSidebar && _jsx(DashboardSidebarSkeleton, {}), _jsx(Header, { productSwitcher: productSwitcher, product: product, menuOrganization: hasMenuOrganization ? () => _jsx(MenuOrganizationSkeleton, {}) : undefined, profile: hasProfile
                             ? { displayName: '', isLoading: true, menuList: [] }
                             : undefined }), _jsx(DashboardLayout.Main, { children: _jsx(Content, { children: _jsx(LoadingPlaceholder, { title: "\u0417\u0430\u0433\u0440\u0443\u0437\u043A\u0430 \u0434\u0430\u043D\u043D\u044B\u0445" }) }) })] })] }));
 };

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;

package/components/DatePicker/useLogic/useLogic.js

@@ -4,7 +4,6 @@ import { usePopover } from '../../usePopover';
 import { useViewportType } from '../../useViewportType';
 import { DEFAULT_DATE_MASK } from '../constants';
 import { useDatePickerOptions } from '../hooks/useDatePickerOptions';
-import { useMaskedValue } from '../hooks/useMaskedValue';
 import { DEFAULT_MAX_DATE, DEFAULT_MIN_DATE } from '../MinMaxDateContext';
 export const useLogic = ({ label, value, maxDate = DEFAULT_MAX_DATE, minDate = DEFAULT_MIN_DATE, mask = DEFAULT_DATE_MASK, onOpen, onClose, onBlur, onChange, forwardedRef, }) => {
     const ref = useForwardedRef(forwardedRef);
@@ -12,21 +11,11 @@ export const useLogic = ({ label, value, maxDate = DEFAULT_MAX_DATE, minDate = D
     const { isOpen, actions } = usePopover();
     const { open, close } = actions;
     const { isMobile } = useViewportType();
-    const { maskedValue } = useMaskedValue({
-        currentValue: value,
-        mask,
-        onChangeValue: onChange,
-    });
     const isTitleShow = isMobile && typeof label === 'string';
     const handleOpen = (event) => {
         onOpen?.();
         open(event);
     };
-    const handleClose = () => {
-        onBlur?.();
-        onClose?.();
-        close();
-    };
     const handleDayPick = (date) => {
         if (isMobile) {
             setSelectedDate(date);
@@ -39,7 +28,7 @@ export const useLogic = ({ label, value, maxDate = DEFAULT_MAX_DATE, minDate = D
             onChange?.(date);
         }
     };
-    const { onAccept, inputProps: calculatedInputProps, pickerProps, } = useDatePickerOptions({
+    const { onAccept, inputProps: calculatedInputProps, pickerProps, onMaskedValueBlur, } = useDatePickerOptions({
         currentValue: value,
         maxDate,
         minDate,
@@ -47,6 +36,22 @@ export const useLogic = ({ label, value, maxDate = DEFAULT_MAX_DATE, minDate = D
         onDatePick: handleDayPick,
         onChange: handleChange,
     });
+    /** Blur: неполный ввод -Invalid Date в onChange (при isMobile onChange не шлём), потом внешний onBlur. */
+    const flushMaskedValueAndCallOnBlur = () => {
+        onMaskedValueBlur();
+        onBlur?.();
+    };
+    function handleClose() {
+        flushMaskedValueAndCallOnBlur();
+        onClose?.();
+        close();
+    }
+    const handleInputBlur = () => {
+        if (isOpen) {
+            return;
+        }
+        flushMaskedValueAndCallOnBlur();
+    };
     const handleConfirm = () => {
         onChange?.(selectedDate);
         handleClose();
@@ -58,7 +63,8 @@ export const useLogic = ({ label, value, maxDate = DEFAULT_MAX_DATE, minDate = D
         title: isTitleShow ? label : undefined,
     };
     const DatePickerInputProps = {
-        value: isMobile ? maskedValue : calculatedInputProps.value,
+        value: calculatedInputProps.value,
+        onBlur: handleInputBlur,
     };
     const confirmButtonProps = {
         onClick: handleConfirm,

package/components/DateRangePicker/useLogic/useLogic.d.ts

@@ -7,12 +7,14 @@ export declare const useLogic: ({ value, minDate, maxDate, mask, onChange, onOpe
         ref: import("react").RefObject<HTMLInputElement | null>;
         value: string;
         onAccept: (_: string, maskRef: IMask.InputMask<IMask.AnyMaskedOptions>) => void;
+        onBlur: () => void;
         onClick: (e: SyntheticEvent) => void;
     };
     endDatePickerInputProps: {
         ref: import("react").RefObject<HTMLInputElement | null>;
         value: string;
         onAccept: (_: string, maskRef: IMask.InputMask<IMask.AnyMaskedOptions>) => void;
+        onBlur: () => void;
         onClick: (e: SyntheticEvent) => void;
     };
     popoverHoveredContextProviderProps: {

package/components/DateRangePicker/useLogic/useLogic.js

@@ -2,8 +2,9 @@ import { useEffect, useRef, useState, } from 'react';
 import { DEFAULT_DATE_MASK, DEFAULT_MAX_DATE, DEFAULT_MIN_DATE, useMaskedValue, useSelectedBaseDate, } from '../../DatePicker';
 import { useForwardedRef } from '../../useForwardedRef';
 import { usePopover } from '../../usePopover';
+import { isMaskedDateSyntacticallyComplete } from '../../utils/date';
 import { useBaseRangeDates } from './hooks';
-import { getBoundaryDate, isMaskedDateSyntacticallyComplete } from './utils';
+import { getBoundaryDate } from './utils';
 export const useLogic = ({ value, minDate = DEFAULT_MIN_DATE, maxDate = DEFAULT_MAX_DATE, mask = DEFAULT_DATE_MASK, onChange, onOpen, onClose, onBlur, }, forwardedRef) => {
     const ref = useForwardedRef(forwardedRef);
     const startInputRef = useRef(null);
@@ -65,12 +66,12 @@ export const useLogic = ({ value, minDate = DEFAULT_MIN_DATE, maxDate = DEFAULT_
         }
         onChange?.({ ...value, end: endDateValue });
     };
-    const { maskedValue: startMaskedValue, onMaskedValueChange: onMaskedStartValueChange, onMaskedDateChange: onMaskedStartDateChange, } = useMaskedValue({
+    const { maskedValue: startMaskedValue, onMaskedValueChange: onMaskedStartValueChange, onMaskedValueBlur: onMaskedStartValueBlur, onMaskedDateChange: onMaskedStartDateChange, } = useMaskedValue({
         currentValue: value?.start,
         mask,
         onChangeValue: handleChangeStartDate,
     });
-    const { maskedValue: endMaskedValue, onMaskedValueChange: onMaskedEndValueChange, onMaskedDateChange: onMaskedEndDateChange, } = useMaskedValue({
+    const { maskedValue: endMaskedValue, onMaskedValueChange: onMaskedEndValueChange, onMaskedValueBlur: onMaskedEndValueBlur, onMaskedDateChange: onMaskedEndDateChange, } = useMaskedValue({
         currentValue: value?.end,
         mask,
         onChangeValue: handleChangeEndDate,
@@ -79,11 +80,32 @@ export const useLogic = ({ value, minDate = DEFAULT_MIN_DATE, maxDate = DEFAULT_
         onOpen?.();
         open(event);
     };
+    const flushActiveMaskedValueOnClose = () => {
+        if (activeInput === 'startDate') {
+            onMaskedStartValueBlur();
+        }
+        if (activeInput === 'endDate') {
+            onMaskedEndValueBlur();
+        }
+    };
     const handleClose = () => {
+        flushActiveMaskedValueOnClose();
         onBlur?.();
         onClose?.();
         close();
     };
+    const handleStartInputBlur = () => {
+        if (isOpen) {
+            return;
+        }
+        onMaskedStartValueBlur();
+    };
+    const handleEndInputBlur = () => {
+        if (isOpen) {
+            return;
+        }
+        onMaskedEndValueBlur();
+    };
     const handleClickStartInput = (e) => {
         setActiveInput('startDate');
         startInputRef.current?.focus();
@@ -138,12 +160,14 @@ export const useLogic = ({ value, minDate = DEFAULT_MIN_DATE, maxDate = DEFAULT_
             ref: startInputRef,
             value: startMaskedValue,
             onAccept: handleAcceptStart,
+            onBlur: handleStartInputBlur,
             onClick: handleClickStartInput,
         },
         endDatePickerInputProps: {
             ref: endInputRef,
             value: endMaskedValue,
             onAccept: handleAcceptEnd,
+            onBlur: handleEndInputBlur,
             onClick: handleClickEndInput,
         },
         popoverHoveredContextProviderProps: {

package/components/DateRangePicker/useLogic/utils/index.d.ts

@@ -1,2 +1 @@
 export * from './getBoundaryDate';
-export * from './isMaskedDateSyntacticallyComplete';

package/components/DateRangePicker/useLogic/utils/index.js

@@ -1,2 +1 @@
 export * from './getBoundaryDate';
-export * from './isMaskedDateSyntacticallyComplete';

package/components/utils/date/format/index.d.ts

@@ -1,3 +1,4 @@
 export * from './formatDate';
+export * from './isMaskedDateSyntacticallyComplete';
 export * from './maskDate';
 export * from './parseDate';