@alfalab/core-components-date-time-input 2.2.0 → 3.0.0

package/modern/Component.desktop.js

@@ -6,6 +6,7 @@ import '@alfalab/core-components-calendar/modern';
 import '@alfalab/core-components-icon-button/modern';
 import '@alfalab/core-components-input/modern';
 import '@alfalab/core-components-popover/modern';
+import '@alfalab/hooks';
 import '@alfalab/icons-glyph/CalendarMIcon';
 import './utils/format.js';
 import 'date-fns/isValid';

package/modern/Component.mobile.js

@@ -6,6 +6,7 @@ import 'classnames';
 import '@alfalab/core-components-icon-button/modern';
 import '@alfalab/core-components-input/modern';
 import '@alfalab/core-components-popover/modern';
+import '@alfalab/hooks';
 import '@alfalab/icons-glyph/CalendarMIcon';
 import './utils/format.js';
 import 'date-fns/isValid';

package/modern/components/date-time-input/Component.d.ts

@@ -24,14 +24,14 @@ type DateTimeInputProps = Omit<InputProps, 'onChange'> & {
     /**
      * Обработчик изменения значения
      */
-    onChange?: (event: ChangeEvent<HTMLInputElement>, payload: {
+    onChange?: (event: ChangeEvent<HTMLInputElement> | null, payload: {
         date: Date;
         value: string;
     }) => void;
     /**
      * Обработчик окончания ввода
      */
-    onComplete?: (event: ChangeEvent<HTMLInputElement>, payload: {
+    onComplete?: (event: ChangeEvent<HTMLInputElement> | null, payload: {
         date: Date;
         value: string;
     }) => void;
@@ -113,14 +113,14 @@ declare const DateTimeInput: React.ForwardRefExoticComponent<Omit<InputProps, "o
     /**
      * Обработчик изменения значения
      */
-    onChange?: ((event: ChangeEvent<HTMLInputElement>, payload: {
+    onChange?: ((event: ChangeEvent<HTMLInputElement> | null, payload: {
         date: Date;
         value: string;
     }) => void) | undefined;
     /**
      * Обработчик окончания ввода
      */
-    onComplete?: ((event: ChangeEvent<HTMLInputElement>, payload: {
+    onComplete?: ((event: ChangeEvent<HTMLInputElement> | null, payload: {
         date: Date;
         value: string;
     }) => void) | undefined;
@@ -133,9 +133,6 @@ declare const DateTimeInput: React.ForwardRefExoticComponent<Omit<InputProps, "o
      */
     calendarProps?: (CalendarProps & Record<string, unknown>) | (CalendarProps & {
         open: boolean;
-        /**
-         * Дополнительный класс для поповера
-         */
         title?: string | undefined;
         onClose?: (() => void) | undefined;
         yearsAmount?: number | undefined;

package/modern/components/date-time-input/Component.js

@@ -5,12 +5,13 @@ import { Calendar, dateInLimits } from '@alfalab/core-components-calendar/modern
 import { IconButton } from '@alfalab/core-components-icon-button/modern';
 import { Input } from '@alfalab/core-components-input/modern';
 import { Popover } from '@alfalab/core-components-popover/modern';
+import { useDidUpdateEffect } from '@alfalab/hooks';
 import { CalendarMIcon } from '@alfalab/icons-glyph/CalendarMIcon';
-import { getDateWithoutTime, setTimeToDate, DATE_MASK, format, getFullDateTime, isCompleteDateInput, isValid, parseTimestampToDate } from '../../utils/format.js';
+import { getDateWithoutTime, DATE_WITH_TIME_LENGTH, format, getFullDateTime, isCompleteDateInput, isValid, addTimeToDate, parseTimestampToDate } from '../../utils/format.js';
 import 'date-fns/isValid';
 import 'date-fns/parse';
 
-const styles = {"component":"date-time-input__component_1u4x2","calendarContainer":"date-time-input__calendarContainer_1u4x2","calendarResponsive":"date-time-input__calendarResponsive_1u4x2","block":"date-time-input__block_1u4x2"};
+const styles = {"component":"date-time-input__component_wum5f","calendarContainer":"date-time-input__calendarContainer_wum5f","calendarResponsive":"date-time-input__calendarResponsive_wum5f","block":"date-time-input__block_wum5f"};
 require('./index.css')
 
 /* eslint-disable no-useless-escape, jsx-a11y/click-events-have-key-events */
@@ -25,6 +26,10 @@ const DateTimeInput = React.forwardRef(({ className, inputClassName, popoverClas
     useEffect(() => {
         setOpen(defaultOpen);
     }, [defaultOpen]);
+    useDidUpdateEffect(() => {
+        const newPropValue = propValue || '';
+        setValue((prevValue) => (prevValue === propValue ? prevValue : newPropValue));
+    }, [propValue]);
     const checkInputValueIsValid = (newInputValue) => {
         if (!newInputValue || error)
             return false;
@@ -33,8 +38,23 @@ const DateTimeInput = React.forwardRef(({ className, inputClassName, popoverClas
             dateInLimits(dateValue, minDate, maxDate) &&
             !offDays.includes(dateValue));
     };
+    const setTimeToDate = () => {
+        setValue((prevValue) => {
+            const dateWithTime = addTimeToDate(prevValue);
+            if (dateWithTime !== prevValue && dateWithTime.length === DATE_WITH_TIME_LENGTH) {
+                onComplete?.(null, {
+                    date: getFullDateTime(dateWithTime),
+                    value: dateWithTime,
+                });
+            }
+            return dateWithTime;
+        });
+    };
     const handleInputWrapperFocus = (event) => {
         if (view === 'desktop') {
+            if (picker) {
+                setOpen(true);
+            }
             if (!open && event.target.tagName !== 'INPUT' && calendarRef.current) {
                 calendarRef.current.focus();
             }
@@ -45,21 +65,21 @@ const DateTimeInput = React.forwardRef(({ className, inputClassName, popoverClas
             const target = (event.relatedTarget || document.activeElement);
             if (calendarRef.current && calendarRef.current.contains(target) === false) {
                 setOpen(false);
-                setValue((prevValue) => setTimeToDate(prevValue));
+                setTimeToDate();
             }
         }
     };
     const handleChange = (event) => {
         const { value: newValue } = event.target;
-        if (newValue.length > DATE_MASK.length)
+        if (newValue.length > DATE_WITH_TIME_LENGTH)
             return;
         // Позволяем вводить только цифры, точки, запятую, двоеточие и пробел
-        if (/[^\d., :\d.]/.test(newValue)) {
+        if (/[^\d., :]/.test(newValue)) {
             return;
         }
         const dots = newValue.match(/\./g);
-        const colon = newValue.match(/\:/g);
-        const comma = newValue.match(/\,/g);
+        const colon = newValue.match(/:/g);
+        const comma = newValue.match(/,/g);
         // Не даем вводить больше, чем 2 точки, 1 двоеточие и 1 запятую
         if ((dots && dots.length > 2) ||
             (colon && colon.length > 1) ||
@@ -80,37 +100,38 @@ const DateTimeInput = React.forwardRef(({ className, inputClassName, popoverClas
             }
         }
     };
-    const handleCalendarClose = () => {
+    const handleMobileCalendarClose = () => {
         setOpen(false);
+        setTimeToDate();
     };
     const handleClear = () => {
         setValue('');
     };
     const handleCalendarChange = (date) => {
         if (date) {
-            setValue(parseTimestampToDate(date));
+            const newValue = parseTimestampToDate(date);
+            setValue(newValue);
+            onChange?.(null, { date: getFullDateTime(newValue), value: newValue });
         }
     };
     const handleCalendarWrapperMouseDown = (event) => {
         // Не дает инпуту терять фокус при выборе даты
         event.preventDefault();
     };
-    const handleInputWrapperClick = () => {
-        if (view === 'desktop' && !open) {
-            setOpen(true);
-        }
-    };
     const handleIconButtonClick = () => {
         if (!open)
             setOpen(true);
+        if (view === 'desktop' && inputRef.current) {
+            inputRef.current.focus();
+        }
     };
     const renderCalendar = () => (
     // eslint-disable-next-line jsx-a11y/no-static-element-interactions
     React.createElement("div", { onMouseDown: handleCalendarWrapperMouseDown },
-        React.createElement(Calendar$1, { ...calendarProps, responsive: calendarResponsive, open: open, onClose: handleCalendarClose, ref: calendarRef, defaultMonth: defaultMonth, value: checkInputValueIsValid(value) ? calendarValue : undefined, onChange: handleCalendarChange, minDate: minDate, maxDate: maxDate, offDays: offDays, events: events })));
+        React.createElement(Calendar$1, { ...calendarProps, responsive: calendarResponsive, open: open, onClose: handleMobileCalendarClose, ref: calendarRef, defaultMonth: defaultMonth, value: checkInputValueIsValid(value) ? calendarValue : undefined, onChange: handleCalendarChange, minDate: minDate, maxDate: maxDate, offDays: offDays, events: events })));
     return (React.createElement("div", { className: cn(styles.component, className, {
             [styles.block]: block,
-        }), onClick: inputDisabled ? undefined : handleInputWrapperClick, onFocus: inputDisabled ? undefined : handleInputWrapperFocus, onBlur: handleBlur },
+        }), onFocus: inputDisabled ? undefined : handleInputWrapperFocus, onBlur: handleBlur },
         React.createElement(Input, { ...restProps, block: block, ref: mergeRefs([ref, inputRef]), value: value, onChange: handleChange, disabled: disabled, readOnly: readOnly, className: inputClassName, onClear: handleClear, error: error, rightAddons: React.createElement(React.Fragment, null,
                 rightAddons,
                 picker && (React.createElement(IconButton, { onClick: inputDisabled ? undefined : handleIconButtonClick, icon: CalendarMIcon, size: 'xxs' }))) }),

package/modern/components/date-time-input/index.css

@@ -1,4 +1,4 @@
-/* hash: 1e3mm */
+/* hash: 9vegz */
 :root {
 
     /* Hard */
@@ -11,7 +11,7 @@
     --gap-m: 16px;
 }
 :root {
-    --border-radius-s: 4px;
+    --border-radius-m: 8px;
 }
 :root {
     --calendar-width: 344px;
@@ -37,28 +37,28 @@
     /* marker */
 }
 :root {
-    --calendar-popover-border-radius: 0 0 var(--border-radius-s) var(--border-radius-s);
+    --calendar-popover-border-radius: var(--border-radius-m);
 }
-.date-time-input__component_1u4x2 {
+.date-time-input__component_wum5f {
     display: inline-block;
     outline: none;
     position: relative;
 }
-.date-time-input__calendarContainer_1u4x2 {
+.date-time-input__calendarContainer_wum5f {
     display: inline-block;
     box-sizing: border-box;
     border-radius: var(--calendar-popover-border-radius)
 }
 @media (max-width: 374px) {
-.date-time-input__calendarContainer_1u4x2 {
+.date-time-input__calendarContainer_wum5f {
         width: 100%;
         min-width: 288px
 }
     }
-.date-time-input__calendarResponsive_1u4x2 {
+.date-time-input__calendarResponsive_wum5f {
     width: var(--calendar-width);
     padding: 0 var(--gap-m);
 }
-.date-time-input__block_1u4x2 {
+.date-time-input__block_wum5f {
     width: 100%;
 }

package/modern/components/date-time-input/index.js

@@ -6,6 +6,7 @@ import '@alfalab/core-components-calendar/modern';
 import '@alfalab/core-components-icon-button/modern';
 import '@alfalab/core-components-input/modern';
 import '@alfalab/core-components-popover/modern';
+import '@alfalab/hooks';
 import '@alfalab/icons-glyph/CalendarMIcon';
 import '../../utils/format.js';
 import 'date-fns/isValid';

package/modern/desktop.js

@@ -7,6 +7,7 @@ import '@alfalab/core-components-calendar/modern';
 import '@alfalab/core-components-icon-button/modern';
 import '@alfalab/core-components-input/modern';
 import '@alfalab/core-components-popover/modern';
+import '@alfalab/hooks';
 import '@alfalab/icons-glyph/CalendarMIcon';
 import './utils/format.js';
 import 'date-fns/isValid';

package/modern/index.d.ts

@@ -1 +1,2 @@
-export { DateTimeInputResponsive as DateTimeInput, DateTimeInputResponsiveProps as DateTimeInputProps } from "./responsive";
+export { DateTimeInputResponsive as DateTimeInput } from "./responsive";
+export type { DateTimeInputResponsiveProps as DateTimeInputProps } from "./responsive";

package/modern/mobile.js

@@ -7,6 +7,7 @@ import 'classnames';
 import '@alfalab/core-components-icon-button/modern';
 import '@alfalab/core-components-input/modern';
 import '@alfalab/core-components-popover/modern';
+import '@alfalab/hooks';
 import '@alfalab/icons-glyph/CalendarMIcon';
 import './utils/format.js';
 import 'date-fns/isValid';

package/modern/utils/format.d.ts

@@ -1,5 +1,6 @@
 declare const DATE_FORMAT = "dd.MM.yyyy";
 declare const DATE_MASK: (string | RegExp)[];
+declare const DATE_WITH_TIME_LENGTH: number;
 declare const isCompleteDateInput: (input: string) => boolean;
 declare const parseDateString: (value: string, dateFormat?: string) => Date;
 declare const isValidTimeFormat: (value: string) => boolean;
@@ -8,5 +9,5 @@ declare const format: (value: string) => string;
 declare const parseTimestampToDate: (timestamp: number) => string;
 declare const getDateWithoutTime: (value: string) => Date;
 declare const getFullDateTime: (value: string) => Date;
-declare const setTimeToDate: (value: string) => string;
-export { DATE_FORMAT, DATE_MASK, isCompleteDateInput, parseDateString, isValidTimeFormat, isValid, format, parseTimestampToDate, getDateWithoutTime, getFullDateTime, setTimeToDate };
+declare const addTimeToDate: (value: string) => string;
+export { DATE_FORMAT, DATE_MASK, DATE_WITH_TIME_LENGTH, isCompleteDateInput, parseDateString, isValidTimeFormat, isValid, format, parseTimestampToDate, getDateWithoutTime, getFullDateTime, addTimeToDate };

package/modern/utils/format.js

@@ -22,7 +22,8 @@ const DATE_MASK = [
     /\d/,
     /\d/,
 ];
-const isCompleteDateInput = (input) => input.length === DATE_MASK.length;
+const DATE_WITH_TIME_LENGTH = DATE_MASK.length;
+const isCompleteDateInput = (input) => input.length === DATE_WITH_TIME_LENGTH;
 const parseDateString = (value, dateFormat = DATE_FORMAT) => parse(value, dateFormat, new Date());
 const isValidTimeFormat = (value) => {
     const timeArr = value.split(':');
@@ -111,13 +112,15 @@ const getFullDateTime = (value) => {
     fullDate.setFullYear(Number(year), Number(month) - 1, Number(day));
     fullDate.setHours(Number(hours) || 0);
     fullDate.setMinutes(Number(mins) || 0);
+    fullDate.setSeconds(0);
+    fullDate.setMilliseconds(0);
     return fullDate;
 };
-const setTimeToDate = (value) => {
+const addTimeToDate = (value) => {
     if (value.length === 10 && dateFnsIsValid(parseDateString(value))) {
         return `${value}, 00:00`;
     }
     return value;
 };
 
-export { DATE_FORMAT, DATE_MASK, format, getDateWithoutTime, getFullDateTime, isCompleteDateInput, isValid, isValidTimeFormat, parseDateString, parseTimestampToDate, setTimeToDate };
+export { DATE_FORMAT, DATE_MASK, DATE_WITH_TIME_LENGTH, addTimeToDate, format, getDateWithoutTime, getFullDateTime, isCompleteDateInput, isValid, isValidTimeFormat, parseDateString, parseTimestampToDate };

package/modern/utils/index.js

@@ -1,3 +1,3 @@
-export { DATE_FORMAT, DATE_MASK, format, getDateWithoutTime, getFullDateTime, isCompleteDateInput, isValid, isValidTimeFormat, parseDateString, parseTimestampToDate, setTimeToDate } from './format.js';
+export { DATE_FORMAT, DATE_MASK, DATE_WITH_TIME_LENGTH, addTimeToDate, format, getDateWithoutTime, getFullDateTime, isCompleteDateInput, isValid, isValidTimeFormat, parseDateString, parseTimestampToDate } from './format.js';
 import 'date-fns/isValid';
 import 'date-fns/parse';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@alfalab/core-components-date-time-input",
-    "version": "2.2.0",
+    "version": "3.0.0",
     "description": "",
     "keywords": [],
     "license": "MIT",
@@ -15,10 +15,11 @@
         "react-dom": "^16.9.0 || ^17.0.1 || ^18.0.0"
     },
     "dependencies": {
-        "@alfalab/core-components-calendar": "^6.2.0",
-        "@alfalab/core-components-input": "^11.1.1",
+        "@alfalab/core-components-calendar": "^6.2.2",
+        "@alfalab/core-components-input": "^11.1.3",
         "@alfalab/core-components-icon-button": "^6.0.2",
         "@alfalab/core-components-popover": "^6.0.5",
+        "@alfalab/hooks": "^1.13.0",
         "classnames": "^2.3.1"
     }
 }

package/responsive.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var Component_responsive = require('./Component.responsive.js');
-require('./Component-27749cf7.js');
+require('./Component-1ff76732.js');
 require('react');
 require('react-merge-refs');
 require('classnames');
@@ -9,11 +9,11 @@ require('@alfalab/core-components-calendar');
 require('@alfalab/core-components-icon-button');
 require('@alfalab/core-components-input');
 require('@alfalab/core-components-popover');
+require('@alfalab/hooks');
 require('@alfalab/icons-glyph/CalendarMIcon');
 require('./utils/format.js');
 require('date-fns/isValid');
 require('date-fns/parse');
-require('@alfalab/hooks');
 require('./Component.desktop.js');
 require('./Component.mobile.js');
 

package/utils/format.d.ts

@@ -1,5 +1,6 @@
 declare const DATE_FORMAT = "dd.MM.yyyy";
 declare const DATE_MASK: (string | RegExp)[];
+declare const DATE_WITH_TIME_LENGTH: number;
 declare const isCompleteDateInput: (input: string) => boolean;
 declare const parseDateString: (value: string, dateFormat?: string) => Date;
 declare const isValidTimeFormat: (value: string) => boolean;
@@ -8,5 +9,5 @@ declare const format: (value: string) => string;
 declare const parseTimestampToDate: (timestamp: number) => string;
 declare const getDateWithoutTime: (value: string) => Date;
 declare const getFullDateTime: (value: string) => Date;
-declare const setTimeToDate: (value: string) => string;
-export { DATE_FORMAT, DATE_MASK, isCompleteDateInput, parseDateString, isValidTimeFormat, isValid, format, parseTimestampToDate, getDateWithoutTime, getFullDateTime, setTimeToDate };
+declare const addTimeToDate: (value: string) => string;
+export { DATE_FORMAT, DATE_MASK, DATE_WITH_TIME_LENGTH, isCompleteDateInput, parseDateString, isValidTimeFormat, isValid, format, parseTimestampToDate, getDateWithoutTime, getFullDateTime, addTimeToDate };

package/utils/format.js

@@ -29,7 +29,8 @@ var DATE_MASK = [
     /\d/,
     /\d/,
 ];
-var isCompleteDateInput = function (input) { return input.length === DATE_MASK.length; };
+var DATE_WITH_TIME_LENGTH = DATE_MASK.length;
+var isCompleteDateInput = function (input) { return input.length === DATE_WITH_TIME_LENGTH; };
 var parseDateString = function (value, dateFormat) {
     if (dateFormat === void 0) { dateFormat = DATE_FORMAT; }
     return parse__default.default(value, dateFormat, new Date());
@@ -123,9 +124,11 @@ var getFullDateTime = function (value) {
     fullDate.setFullYear(Number(year), Number(month) - 1, Number(day));
     fullDate.setHours(Number(hours) || 0);
     fullDate.setMinutes(Number(mins) || 0);
+    fullDate.setSeconds(0);
+    fullDate.setMilliseconds(0);
     return fullDate;
 };
-var setTimeToDate = function (value) {
+var addTimeToDate = function (value) {
     if (value.length === 10 && dateFnsIsValid__default.default(parseDateString(value))) {
         return "".concat(value, ", 00:00");
     }
@@ -134,6 +137,8 @@ var setTimeToDate = function (value) {
 
 exports.DATE_FORMAT = DATE_FORMAT;
 exports.DATE_MASK = DATE_MASK;
+exports.DATE_WITH_TIME_LENGTH = DATE_WITH_TIME_LENGTH;
+exports.addTimeToDate = addTimeToDate;
 exports.format = format;
 exports.getDateWithoutTime = getDateWithoutTime;
 exports.getFullDateTime = getFullDateTime;
@@ -142,4 +147,3 @@ exports.isValid = isValid;
 exports.isValidTimeFormat = isValidTimeFormat;
 exports.parseDateString = parseDateString;
 exports.parseTimestampToDate = parseTimestampToDate;
-exports.setTimeToDate = setTimeToDate;

package/utils/index.js

@@ -8,6 +8,8 @@ require('date-fns/parse');
 
 exports.DATE_FORMAT = utils_format.DATE_FORMAT;
 exports.DATE_MASK = utils_format.DATE_MASK;
+exports.DATE_WITH_TIME_LENGTH = utils_format.DATE_WITH_TIME_LENGTH;
+exports.addTimeToDate = utils_format.addTimeToDate;
 exports.format = utils_format.format;
 exports.getDateWithoutTime = utils_format.getDateWithoutTime;
 exports.getFullDateTime = utils_format.getFullDateTime;
@@ -16,4 +18,3 @@ exports.isValid = utils_format.isValid;
 exports.isValidTimeFormat = utils_format.isValidTimeFormat;
 exports.parseDateString = utils_format.parseDateString;
 exports.parseTimestampToDate = utils_format.parseTimestampToDate;
-exports.setTimeToDate = utils_format.setTimeToDate;