@astral/ui 4.52.0 → 4.53.0

package/node/components/DatePicker/useLogic/useLogic.js

@@ -7,7 +7,6 @@ const usePopover_1 = require("../../usePopover");
 const useViewportType_1 = require("../../useViewportType");
 const constants_1 = require("../constants");
 const useDatePickerOptions_1 = require("../hooks/useDatePickerOptions");
-const useMaskedValue_1 = require("../hooks/useMaskedValue");
 const MinMaxDateContext_1 = require("../MinMaxDateContext");
 const useLogic = ({ label, value, maxDate = MinMaxDateContext_1.DEFAULT_MAX_DATE, minDate = MinMaxDateContext_1.DEFAULT_MIN_DATE, mask = constants_1.DEFAULT_DATE_MASK, onOpen, onClose, onBlur, onChange, forwardedRef, }) => {
     const ref = (0, useForwardedRef_1.useForwardedRef)(forwardedRef);
@@ -15,21 +14,11 @@ const useLogic = ({ label, value, maxDate = MinMaxDateContext_1.DEFAULT_MAX_DATE
     const { isOpen, actions } = (0, usePopover_1.usePopover)();
     const { open, close } = actions;
     const { isMobile } = (0, useViewportType_1.useViewportType)();
-    const { maskedValue } = (0, useMaskedValue_1.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);
@@ -42,7 +31,7 @@ const useLogic = ({ label, value, maxDate = MinMaxDateContext_1.DEFAULT_MAX_DATE
             onChange?.(date);
         }
     };
-    const { onAccept, inputProps: calculatedInputProps, pickerProps, } = (0, useDatePickerOptions_1.useDatePickerOptions)({
+    const { onAccept, inputProps: calculatedInputProps, pickerProps, onMaskedValueBlur, } = (0, useDatePickerOptions_1.useDatePickerOptions)({
         currentValue: value,
         maxDate,
         minDate,
@@ -50,6 +39,22 @@ const useLogic = ({ label, value, maxDate = MinMaxDateContext_1.DEFAULT_MAX_DATE
         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();
@@ -61,7 +66,8 @@ const useLogic = ({ label, value, maxDate = MinMaxDateContext_1.DEFAULT_MAX_DATE
         title: isTitleShow ? label : undefined,
     };
     const DatePickerInputProps = {
-        value: isMobile ? maskedValue : calculatedInputProps.value,
+        value: calculatedInputProps.value,
+        onBlur: handleInputBlur,
     };
     const confirmButtonProps = {
         onClick: handleConfirm,

package/node/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/node/components/DateRangePicker/useLogic/useLogic.js

@@ -5,6 +5,7 @@ const react_1 = require("react");
 const DatePicker_1 = require("../../DatePicker");
 const useForwardedRef_1 = require("../../useForwardedRef");
 const usePopover_1 = require("../../usePopover");
+const date_1 = require("../../utils/date");
 const hooks_1 = require("./hooks");
 const utils_1 = require("./utils");
 const useLogic = ({ value, minDate = DatePicker_1.DEFAULT_MIN_DATE, maxDate = DatePicker_1.DEFAULT_MAX_DATE, mask = DatePicker_1.DEFAULT_DATE_MASK, onChange, onOpen, onClose, onBlur, }, forwardedRef) => {
@@ -45,7 +46,7 @@ const useLogic = ({ value, minDate = DatePicker_1.DEFAULT_MIN_DATE, maxDate = Da
     const handleChangeStartDate = (startDateValue, startMaskString) => {
         const isStartComplete = startDateValue != null &&
             startMaskString != null &&
-            (0, utils_1.isMaskedDateSyntacticallyComplete)(startMaskString, mask);
+            (0, date_1.isMaskedDateSyntacticallyComplete)(startMaskString, mask);
         if (isStartComplete &&
             value?.end &&
             startDateValue &&
@@ -58,7 +59,7 @@ const useLogic = ({ value, minDate = DatePicker_1.DEFAULT_MIN_DATE, maxDate = Da
     const handleChangeEndDate = (endDateValue, endMaskString) => {
         const isEndComplete = endDateValue != null &&
             endMaskString != null &&
-            (0, utils_1.isMaskedDateSyntacticallyComplete)(endMaskString, mask);
+            (0, date_1.isMaskedDateSyntacticallyComplete)(endMaskString, mask);
         if (isEndComplete &&
             value?.start &&
             endDateValue &&
@@ -68,12 +69,12 @@ const useLogic = ({ value, minDate = DatePicker_1.DEFAULT_MIN_DATE, maxDate = Da
         }
         onChange?.({ ...value, end: endDateValue });
     };
-    const { maskedValue: startMaskedValue, onMaskedValueChange: onMaskedStartValueChange, onMaskedDateChange: onMaskedStartDateChange, } = (0, DatePicker_1.useMaskedValue)({
+    const { maskedValue: startMaskedValue, onMaskedValueChange: onMaskedStartValueChange, onMaskedValueBlur: onMaskedStartValueBlur, onMaskedDateChange: onMaskedStartDateChange, } = (0, DatePicker_1.useMaskedValue)({
         currentValue: value?.start,
         mask,
         onChangeValue: handleChangeStartDate,
     });
-    const { maskedValue: endMaskedValue, onMaskedValueChange: onMaskedEndValueChange, onMaskedDateChange: onMaskedEndDateChange, } = (0, DatePicker_1.useMaskedValue)({
+    const { maskedValue: endMaskedValue, onMaskedValueChange: onMaskedEndValueChange, onMaskedValueBlur: onMaskedEndValueBlur, onMaskedDateChange: onMaskedEndDateChange, } = (0, DatePicker_1.useMaskedValue)({
         currentValue: value?.end,
         mask,
         onChangeValue: handleChangeEndDate,
@@ -82,11 +83,32 @@ const useLogic = ({ value, minDate = DatePicker_1.DEFAULT_MIN_DATE, maxDate = Da
         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();
@@ -141,12 +163,14 @@ const useLogic = ({ value, minDate = DatePicker_1.DEFAULT_MIN_DATE, maxDate = Da
             ref: startInputRef,
             value: startMaskedValue,
             onAccept: handleAcceptStart,
+            onBlur: handleStartInputBlur,
             onClick: handleClickStartInput,
         },
         endDatePickerInputProps: {
             ref: endInputRef,
             value: endMaskedValue,
             onAccept: handleAcceptEnd,
+            onBlur: handleEndInputBlur,
             onClick: handleClickEndInput,
         },
         popoverHoveredContextProviderProps: {

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

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

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

@@ -15,4 +15,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./getBoundaryDate"), exports);
-__exportStar(require("./isMaskedDateSyntacticallyComplete"), exports);

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

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

package/node/components/utils/date/format/index.js

@@ -15,5 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./formatDate"), exports);
+__exportStar(require("./isMaskedDateSyntacticallyComplete"), exports);
 __exportStar(require("./maskDate"), exports);
 __exportStar(require("./parseDate"), exports);

package/{components/DateRangePicker/useLogic/utils → node/components/utils/date/format}/isMaskedDateSyntacticallyComplete/isMaskedDateSyntacticallyComplete.d.ts

@@ -1,4 +1,4 @@
-import { type DateMask } from '../../../../utils/date/format';
+import { type DateMask } from '../maskDate';
 /**
  * Все ли части строки по маске заполнены цифрами полностью (без промежуточных состояний IMask).
  */

package/node/components/utils/date/format/parseDate/parseDate.d.ts

@@ -1,5 +1,6 @@
 import { type DateMask } from '../maskDate';
 /**
  * утилита конвертации строковой даты созданной по маске обратно в Date
+ * Строгий разбор UTC через `dayjs` + `customParseFormat`; при невалидной строке — Invalid Date
  */
 export declare const parseDate: (date: string, mask: DateMask, separator?: string) => Date;

package/node/components/utils/date/format/parseDate/parseDate.js

@@ -1,25 +1,57 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseDate = void 0;
-const buildIsoDate_1 = require("../../buildIsoDate");
+const dayjs_1 = __importDefault(require("dayjs"));
+const customParseFormat_1 = __importDefault(require("dayjs/plugin/customParseFormat"));
+const utc_1 = __importDefault(require("dayjs/plugin/utc"));
 const maskDate_1 = require("../maskDate");
-const orderMap = {
-    [maskDate_1.DateMaskElements.Year]: 'year',
-    [maskDate_1.DateMaskElements.Month]: 'month',
-    [maskDate_1.DateMaskElements.Day]: 'day',
-    [maskDate_1.DateMaskElements.Hour]: 'hour',
-    [maskDate_1.DateMaskElements.Minute]: 'minute',
-    [maskDate_1.DateMaskElements.Second]: 'second',
+dayjs_1.default.extend(customParseFormat_1.default);
+dayjs_1.default.extend(utc_1.default);
+/**
+ * Токен маски UI → литерал формата `dayjs` (strict UTC).
+ * В маске час — `hh`, в дате используются сутки 0–23 как в `formatDate` (UTC), поэтому `HH`.
+ */
+const maskElementToDayjs = {
+    [maskDate_1.DateMaskElements.Day]: 'DD',
+    [maskDate_1.DateMaskElements.Month]: 'MM',
+    [maskDate_1.DateMaskElements.Year]: 'YYYY',
+    [maskDate_1.DateMaskElements.Hour]: 'HH',
+    [maskDate_1.DateMaskElements.Minute]: 'mm',
+    [maskDate_1.DateMaskElements.Second]: 'ss',
+};
+const buildDayjsFormat = (mask, separator) => {
+    const parts = mask.split(separator);
+    const tokens = [];
+    for (const part of parts) {
+        const t = maskElementToDayjs[part];
+        if (t == null) {
+            return null;
+        }
+        tokens.push(t);
+    }
+    return tokens.join(separator);
 };
 /**
  * утилита конвертации строковой даты созданной по маске обратно в Date
+ * Строгий разбор UTC через `dayjs` + `customParseFormat`; при невалидной строке — Invalid Date
  */
 const parseDate = (date, mask, separator = '.') => {
     const dateArr = date.split(separator);
-    const options = { year: 1900 };
-    mask.split('.').forEach((element, index) => {
-        options[orderMap[element]] = parseInt(dateArr[index]);
-    });
-    return (0, buildIsoDate_1.buildIsoDate)(options);
+    const maskSplit = mask.split(separator);
+    if (dateArr.length !== maskSplit.length) {
+        return new Date(Number.NaN);
+    }
+    const format = buildDayjsFormat(mask, separator);
+    if (format == null) {
+        return new Date(Number.NaN);
+    }
+    const parsed = dayjs_1.default.utc(date, format, true);
+    if (!parsed.isValid()) {
+        return new Date(Number.NaN);
+    }
+    return parsed.toDate();
 };
 exports.parseDate = parseDate;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astral/ui",
-  "version": "4.52.0",
+  "version": "4.53.0",
   "browser": "./index.js",
   "main": "./node/index.js",
   "dependencies": {