@alfalab/core-components-date-range-input 2.2.1 → 2.2.2

package/cssm/responsive.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var Component_responsive = require('./Component.responsive.js');
-require('./Component-a4cfbf46.js');
+require('./Component-540e1474.js');
 require('react');
 require('react-merge-refs');
 require('classnames');
@@ -10,11 +10,11 @@ require('@alfalab/core-components-calendar/cssm');
 require('@alfalab/core-components-icon-button/cssm');
 require('@alfalab/core-components-input/cssm');
 require('@alfalab/core-components-popover/cssm');
+require('@alfalab/hooks');
 require('@alfalab/icons-glyph/CalendarMIcon');
 require('./utils/format.js');
 require('date-fns/parse');
 require('./components/date-range-input/index.module.css');
-require('@alfalab/hooks');
 require('./Component.desktop.js');
 require('./Component.mobile.js');
 

package/desktop.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var Component_desktop = require('./Component.desktop.js');
-require('./Component-070df1af.js');
+require('./Component-fd7fd8ef.js');
 require('react');
 require('react-merge-refs');
 require('classnames');
@@ -10,6 +10,7 @@ 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/parse');

package/esm/{Component-3d173527.js → Component-550f221e.js}

@@ -6,6 +6,7 @@ import { usePeriod, Calendar } from '@alfalab/core-components-calendar/esm';
 import { IconButton } from '@alfalab/core-components-icon-button/esm';
 import { Input } from '@alfalab/core-components-input/esm';
 import { Popover } from '@alfalab/core-components-popover/esm';
+import { useDidUpdateEffect } from '@alfalab/hooks';
 import { CalendarMIcon } from '@alfalab/icons-glyph/CalendarMIcon';
 import { parseTimestampToDate, DATE_FORMAT, DATE_MASK, format, parseDateString, isCompleteDateInput, isValid } from './utils/format.js';
 
@@ -48,7 +49,7 @@ function __rest(s, e) {
     return t;
 }
 
-var styles = {"component":"date-range-input__component_xgs6o","calendarContainer":"date-range-input__calendarContainer_xgs6o","calendarResponsive":"date-range-input__calendarResponsive_xgs6o","block":"date-range-input__block_xgs6o"};
+var styles = {"component":"date-range-input__component_a0llm","calendarContainer":"date-range-input__calendarContainer_a0llm","calendarResponsive":"date-range-input__calendarResponsive_a0llm","block":"date-range-input__block_a0llm"};
 require('./components/date-range-input/index.css')
 
 /* eslint-disable no-useless-escape, jsx-a11y/click-events-have-key-events */
@@ -65,6 +66,10 @@ var DateRangeInput = React.forwardRef(function (_a, ref) {
     useEffect(function () {
         setOpen(defaultOpen);
     }, [defaultOpen]);
+    useDidUpdateEffect(function () {
+        var newPropValue = propValue || '';
+        setValue(function (prevValue) { return (prevValue === newPropValue ? prevValue : newPropValue); });
+    }, [propValue]);
     var handlePeriodChange = function (selectedFrom, selectedTo) {
         if (selectedFrom && !selectedTo && value.length === DATE_MASK.length) {
             setValue(parseTimestampToDate(selectedFrom));
@@ -73,24 +78,30 @@ var DateRangeInput = React.forwardRef(function (_a, ref) {
             (selectedFrom === selectedTo && value.length === DATE_MASK.length)) {
             setValue('');
         }
-        if (onChange) {
-            onChange({
-                dateFrom: selectedFrom ? new Date(selectedFrom) : undefined,
-                dateTo: selectedTo ? new Date(selectedTo) : undefined,
-                value: value,
-            });
-        }
-        if (onComplete && selectedFrom && selectedTo) {
-            onComplete({
-                dateFrom: new Date(selectedFrom),
-                dateTo: new Date(selectedTo),
-                value: value,
+        var dateFrom = selectedFrom ? new Date(selectedFrom) : undefined;
+        var dateTo = selectedTo ? new Date(selectedTo) : undefined;
+        var newValue = [selectedFrom, selectedTo].filter(Boolean)
+            .map(function (timestamp) { return parseTimestampToDate(timestamp); })
+            .join(' - ');
+        onChange === null || onChange === void 0 ? void 0 : onChange({
+            dateFrom: dateFrom,
+            dateTo: dateTo,
+            value: newValue,
+        });
+        if (dateFrom && dateTo) {
+            onComplete === null || onComplete === void 0 ? void 0 : onComplete({
+                dateFrom: dateFrom,
+                dateTo: dateTo,
+                value: newValue,
             });
         }
     };
     var _s = usePeriod({ onPeriodChange: handlePeriodChange }), selectedFrom = _s.selectedFrom, selectedTo = _s.selectedTo, updatePeriod = _s.updatePeriod, resetPeriod = _s.resetPeriod, setStart = _s.setStart, setEnd = _s.setEnd;
     var handleInputWrapperFocus = function (event) {
         if (view === 'desktop') {
+            if (picker) {
+                setOpen(true);
+            }
             if (!open && event.target.tagName !== 'INPUT' && calendarRef.current) {
                 calendarRef.current.focus();
             }
@@ -110,7 +121,7 @@ var DateRangeInput = React.forwardRef(function (_a, ref) {
         if (newValue.length > DATE_MASK.length)
             return;
         // Позволяем вводить только цифры, точки, дефис и пробелы
-        if (/[^\d. \- \d.]/.test(newValue)) {
+        if (/[^\d. -]/.test(newValue)) {
             return;
         }
         var dots = newValue.match(/\./g);
@@ -121,33 +132,37 @@ var DateRangeInput = React.forwardRef(function (_a, ref) {
         }
         var formattedValue = format(newValue);
         var dateArr = formattedValue.split(' - ');
-        var dateFrom = parseDateString(dateArr[0]);
-        var dateTo = parseDateString(dateArr[1]);
-        if (selectedFrom && formattedValue.length < DATE_FORMAT.length) {
+        var dateFrom = dateArr[0] ? parseDateString(dateArr[0]) : undefined;
+        var dateTo = dateArr[1] ? parseDateString(dateArr[1]) : undefined;
+        if (!dateFrom && !dateTo) {
+            resetPeriod();
+        }
+        else if (selectedFrom && formattedValue.length < DATE_FORMAT.length) {
             setStart();
         }
         else if (selectedFrom && selectedTo) {
             setEnd();
         }
-        else if (dateFnsIsValid(dateFrom) &&
+        else if (dateFrom &&
+            dateFnsIsValid(dateFrom) &&
             ((_a = dateArr[0]) === null || _a === void 0 ? void 0 : _a.length) === DATE_FORMAT.length &&
             dateFrom.getTime() !== selectedFrom) {
             setStart(dateFrom.getTime());
         }
-        else if (dateFnsIsValid(dateTo) &&
+        else if (dateTo &&
+            dateFnsIsValid(dateTo) &&
             ((_b = dateArr[1]) === null || _b === void 0 ? void 0 : _b.length) === DATE_FORMAT.length &&
             dateTo.getTime() !== selectedTo) {
             setEnd(dateTo.getTime());
         }
         setValue(formattedValue);
-        if (onChange)
-            onChange({ dateFrom: dateFrom, dateTo: dateTo, value: formattedValue }, event);
+        onChange === null || onChange === void 0 ? void 0 : onChange({ dateFrom: dateFrom, dateTo: dateTo, value: formattedValue }, event);
         if (isCompleteDateInput(formattedValue)) {
             var valid = isValid(formattedValue, dateArr[0], dateArr[1]);
             if (!valid)
                 return;
-            if (onComplete) {
-                onComplete({ dateFrom: dateFrom, dateTo: dateTo, value: formattedValue }, event);
+            if (dateFrom && dateTo) {
+                onComplete === null || onComplete === void 0 ? void 0 : onComplete({ dateFrom: dateFrom, dateTo: dateTo, value: formattedValue }, event);
             }
         }
     };
@@ -175,14 +190,12 @@ var DateRangeInput = React.forwardRef(function (_a, ref) {
         // Не дает инпуту терять фокус при выборе даты
         event.preventDefault();
     };
-    var handleInputWrapperClick = function () {
-        if (view === 'desktop' && !open) {
-            setOpen(true);
-        }
-    };
     var handleIconButtonClick = function () {
         if (!open)
             setOpen(true);
+        if (view === 'desktop' && inputRef.current) {
+            inputRef.current.focus();
+        }
     };
     var renderCalendar = function () { return (
     // eslint-disable-next-line jsx-a11y/no-static-element-interactions
@@ -190,7 +203,7 @@ var DateRangeInput = React.forwardRef(function (_a, ref) {
         React.createElement(Calendar$1, __assign({}, calendarProps, { responsive: calendarResponsive, open: open, onClose: handleCalendarClose, ref: calendarRef, defaultMonth: defaultMonth, selectedFrom: selectedFrom, selectedTo: selectedTo, onChange: handleCalendarChange, minDate: minDate, maxDate: maxDate, offDays: offDays, events: events })))); };
     return (React.createElement("div", { className: cn(styles.component, className, (_b = {},
             _b[styles.block] = block,
-            _b)), onClick: inputDisabled ? undefined : handleInputWrapperClick, onFocus: inputDisabled ? undefined : handleInputWrapperFocus, onBlur: handleBlur },
+            _b)), onFocus: inputDisabled ? undefined : handleInputWrapperFocus, onBlur: handleBlur },
         React.createElement(Input, __assign({}, restProps, { block: block, ref: mergeRefs([ref, inputRef]), value: value, onChange: handleChange, disabled: disabled, readOnly: readOnly, className: inputClassName, onClear: handleClear, rightAddons: React.createElement(React.Fragment, null,
                 rightAddons,
                 picker && (React.createElement(IconButton, { onClick: inputDisabled ? undefined : handleIconButtonClick, icon: CalendarMIcon, size: 'xxs' }))) })),

package/esm/Component.desktop.d.ts

@@ -1,5 +1,5 @@
 import { FC } from 'react';
-import { DateRangeInputProps } from "./Component-3d173527";
+import { DateRangeInputProps } from "./Component-550f221e";
 type DateRangeInputDesktopProps = Omit<DateRangeInputProps, 'view'>;
 declare const DateRangeInputDesktop: FC<DateRangeInputDesktopProps>;
 export { DateRangeInputDesktopProps, DateRangeInputDesktop };

package/esm/Component.desktop.js

@@ -1,4 +1,4 @@
-import { D as DateRangeInput, _ as __assign } from './Component-3d173527.js';
+import { D as DateRangeInput, _ as __assign } from './Component-550f221e.js';
 import React from 'react';
 import 'react-merge-refs';
 import 'classnames';
@@ -7,6 +7,7 @@ import '@alfalab/core-components-calendar/esm';
 import '@alfalab/core-components-icon-button/esm';
 import '@alfalab/core-components-input/esm';
 import '@alfalab/core-components-popover/esm';
+import '@alfalab/hooks';
 import '@alfalab/icons-glyph/CalendarMIcon';
 import './utils/format.js';
 import 'date-fns/parse';

package/esm/Component.mobile.d.ts

@@ -1,5 +1,5 @@
 import { FC } from 'react';
-import { DateRangeInputProps } from "./Component-3d173527";
+import { DateRangeInputProps } from "./Component-550f221e";
 type DateRangeInputMobileProps = Omit<DateRangeInputProps, 'view'>;
 declare const DateRangeInputMobile: FC<DateRangeInputMobileProps>;
 export { DateRangeInputMobileProps, DateRangeInputMobile };

package/esm/Component.mobile.js

@@ -1,4 +1,4 @@
-import { D as DateRangeInput, _ as __assign } from './Component-3d173527.js';
+import { D as DateRangeInput, _ as __assign } from './Component-550f221e.js';
 import React from 'react';
 import { CalendarMobile } from '@alfalab/core-components-calendar/esm';
 import 'react-merge-refs';
@@ -7,6 +7,7 @@ import 'date-fns/isValid';
 import '@alfalab/core-components-icon-button/esm';
 import '@alfalab/core-components-input/esm';
 import '@alfalab/core-components-popover/esm';
+import '@alfalab/hooks';
 import '@alfalab/icons-glyph/CalendarMIcon';
 import './utils/format.js';
 import 'date-fns/parse';

package/esm/Component.responsive.d.ts

@@ -1,5 +1,5 @@
 import { FC } from 'react';
-import { DateRangeInputProps } from "./Component-3d173527";
+import { DateRangeInputProps } from "./Component-550f221e";
 type DateRangeInputResponsiveProps = Omit<DateRangeInputProps, 'view'> & {
     /**
      * Контрольная точка, с нее начинается desktop версия

package/esm/Component.responsive.js

@@ -1,4 +1,4 @@
-import { a as __rest, _ as __assign } from './Component-3d173527.js';
+import { a as __rest, _ as __assign } from './Component-550f221e.js';
 import React from 'react';
 import { useMedia } from '@alfalab/hooks';
 import { DateRangeInputDesktop } from './Component.desktop.js';

package/esm/components/date-range-input/Component.js

@@ -1,4 +1,4 @@
-export { D as DateRangeInput } from '../../Component-3d173527.js';
+export { D as DateRangeInput } from '../../Component-550f221e.js';
 import 'react';
 import 'react-merge-refs';
 import 'classnames';
@@ -7,6 +7,7 @@ import '@alfalab/core-components-calendar/esm';
 import '@alfalab/core-components-icon-button/esm';
 import '@alfalab/core-components-input/esm';
 import '@alfalab/core-components-popover/esm';
+import '@alfalab/hooks';
 import '@alfalab/icons-glyph/CalendarMIcon';
 import '../../utils/format.js';
 import 'date-fns/parse';

package/esm/components/date-range-input/index.css

@@ -1,4 +1,4 @@
-/* hash: rqkkz */
+/* hash: lj7cp */
 :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-range-input__component_xgs6o {
+.date-range-input__component_a0llm {
     display: inline-block;
     outline: none;
     position: relative;
 }
-.date-range-input__calendarContainer_xgs6o {
+.date-range-input__calendarContainer_a0llm {
     display: inline-block;
     box-sizing: border-box;
     border-radius: var(--calendar-popover-border-radius)
 }
 @media (max-width: 374px) {
-.date-range-input__calendarContainer_xgs6o {
+.date-range-input__calendarContainer_a0llm {
         width: 100%;
         min-width: 288px
 }
     }
-.date-range-input__calendarResponsive_xgs6o {
+.date-range-input__calendarResponsive_a0llm {
     width: var(--calendar-width);
     padding: 0 var(--gap-m);
 }
-.date-range-input__block_xgs6o {
+.date-range-input__block_a0llm {
     width: 100%;
 }

package/esm/components/date-range-input/index.d.ts

@@ -1 +1 @@
-export * from "../../Component-3d173527";
+export * from "../../Component-550f221e";

package/esm/components/date-range-input/index.js

@@ -1,4 +1,4 @@
-export { D as DateRangeInput } from '../../Component-3d173527.js';
+export { D as DateRangeInput } from '../../Component-550f221e.js';
 import 'react';
 import 'react-merge-refs';
 import 'classnames';
@@ -7,6 +7,7 @@ import '@alfalab/core-components-calendar/esm';
 import '@alfalab/core-components-icon-button/esm';
 import '@alfalab/core-components-input/esm';
 import '@alfalab/core-components-popover/esm';
+import '@alfalab/hooks';
 import '@alfalab/icons-glyph/CalendarMIcon';
 import '../../utils/format.js';
 import 'date-fns/parse';

package/esm/desktop.js

@@ -1,5 +1,5 @@
 export { DateRangeInputDesktop } from './Component.desktop.js';
-import './Component-3d173527.js';
+import './Component-550f221e.js';
 import 'react';
 import 'react-merge-refs';
 import 'classnames';
@@ -8,6 +8,7 @@ import '@alfalab/core-components-calendar/esm';
 import '@alfalab/core-components-icon-button/esm';
 import '@alfalab/core-components-input/esm';
 import '@alfalab/core-components-popover/esm';
+import '@alfalab/hooks';
 import '@alfalab/icons-glyph/CalendarMIcon';
 import './utils/format.js';
 import 'date-fns/parse';

package/esm/index.js

@@ -1,5 +1,5 @@
 export { DateRangeInputResponsive as DateRangeInput } from './Component.responsive.js';
-import './Component-3d173527.js';
+import './Component-550f221e.js';
 import 'react';
 import 'react-merge-refs';
 import 'classnames';
@@ -8,9 +8,9 @@ import '@alfalab/core-components-calendar/esm';
 import '@alfalab/core-components-icon-button/esm';
 import '@alfalab/core-components-input/esm';
 import '@alfalab/core-components-popover/esm';
+import '@alfalab/hooks';
 import '@alfalab/icons-glyph/CalendarMIcon';
 import './utils/format.js';
 import 'date-fns/parse';
-import '@alfalab/hooks';
 import './Component.desktop.js';
 import './Component.mobile.js';

package/esm/mobile.js

@@ -1,5 +1,5 @@
 export { DateRangeInputMobile } from './Component.mobile.js';
-import './Component-3d173527.js';
+import './Component-550f221e.js';
 import 'react';
 import 'react-merge-refs';
 import 'classnames';
@@ -8,6 +8,7 @@ import '@alfalab/core-components-calendar/esm';
 import '@alfalab/core-components-icon-button/esm';
 import '@alfalab/core-components-input/esm';
 import '@alfalab/core-components-popover/esm';
+import '@alfalab/hooks';
 import '@alfalab/icons-glyph/CalendarMIcon';
 import './utils/format.js';
 import 'date-fns/parse';

package/esm/responsive.js

@@ -1,5 +1,5 @@
 export { DateRangeInputResponsive } from './Component.responsive.js';
-import './Component-3d173527.js';
+import './Component-550f221e.js';
 import 'react';
 import 'react-merge-refs';
 import 'classnames';
@@ -8,9 +8,9 @@ import '@alfalab/core-components-calendar/esm';
 import '@alfalab/core-components-icon-button/esm';
 import '@alfalab/core-components-input/esm';
 import '@alfalab/core-components-popover/esm';
+import '@alfalab/hooks';
 import '@alfalab/icons-glyph/CalendarMIcon';
 import './utils/format.js';
 import 'date-fns/parse';
-import '@alfalab/hooks';
 import './Component.desktop.js';
 import './Component.mobile.js';

package/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var Component_responsive = require('./Component.responsive.js');
-require('./Component-070df1af.js');
+require('./Component-fd7fd8ef.js');
 require('react');
 require('react-merge-refs');
 require('classnames');
@@ -10,10 +10,10 @@ 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/parse');
-require('@alfalab/hooks');
 require('./Component.desktop.js');
 require('./Component.mobile.js');
 

package/mobile.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var Component_mobile = require('./Component.mobile.js');
-require('./Component-070df1af.js');
+require('./Component-fd7fd8ef.js');
 require('react');
 require('react-merge-refs');
 require('classnames');
@@ -10,6 +10,7 @@ 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/parse');

package/modern/Component.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/parse';

package/modern/Component.mobile.js

@@ -7,6 +7,7 @@ import 'date-fns/isValid';
 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/parse';

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

@@ -6,11 +6,12 @@ import { usePeriod, Calendar } 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 { parseTimestampToDate, DATE_FORMAT, DATE_MASK, format, parseDateString, isCompleteDateInput, isValid } from '../../utils/format.js';
 import 'date-fns/parse';
 
-const styles = {"component":"date-range-input__component_xgs6o","calendarContainer":"date-range-input__calendarContainer_xgs6o","calendarResponsive":"date-range-input__calendarResponsive_xgs6o","block":"date-range-input__block_xgs6o"};
+const styles = {"component":"date-range-input__component_a0llm","calendarContainer":"date-range-input__calendarContainer_a0llm","calendarResponsive":"date-range-input__calendarResponsive_a0llm","block":"date-range-input__block_a0llm"};
 require('./index.css')
 
 /* eslint-disable no-useless-escape, jsx-a11y/click-events-have-key-events */
@@ -24,6 +25,10 @@ const DateRangeInput = React.forwardRef(({ className, inputClassName, popoverCla
     useEffect(() => {
         setOpen(defaultOpen);
     }, [defaultOpen]);
+    useDidUpdateEffect(() => {
+        const newPropValue = propValue || '';
+        setValue((prevValue) => (prevValue === newPropValue ? prevValue : newPropValue));
+    }, [propValue]);
     const handlePeriodChange = (selectedFrom, selectedTo) => {
         if (selectedFrom && !selectedTo && value.length === DATE_MASK.length) {
             setValue(parseTimestampToDate(selectedFrom));
@@ -32,24 +37,30 @@ const DateRangeInput = React.forwardRef(({ className, inputClassName, popoverCla
             (selectedFrom === selectedTo && value.length === DATE_MASK.length)) {
             setValue('');
         }
-        if (onChange) {
-            onChange({
-                dateFrom: selectedFrom ? new Date(selectedFrom) : undefined,
-                dateTo: selectedTo ? new Date(selectedTo) : undefined,
-                value,
-            });
-        }
-        if (onComplete && selectedFrom && selectedTo) {
-            onComplete({
-                dateFrom: new Date(selectedFrom),
-                dateTo: new Date(selectedTo),
-                value,
+        const dateFrom = selectedFrom ? new Date(selectedFrom) : undefined;
+        const dateTo = selectedTo ? new Date(selectedTo) : undefined;
+        const newValue = [selectedFrom, selectedTo].filter(Boolean)
+            .map((timestamp) => parseTimestampToDate(timestamp))
+            .join(' - ');
+        onChange?.({
+            dateFrom,
+            dateTo,
+            value: newValue,
+        });
+        if (dateFrom && dateTo) {
+            onComplete?.({
+                dateFrom,
+                dateTo,
+                value: newValue,
             });
         }
     };
     const { selectedFrom, selectedTo, updatePeriod, resetPeriod, setStart, setEnd } = usePeriod({ onPeriodChange: handlePeriodChange });
     const handleInputWrapperFocus = (event) => {
         if (view === 'desktop') {
+            if (picker) {
+                setOpen(true);
+            }
             if (!open && event.target.tagName !== 'INPUT' && calendarRef.current) {
                 calendarRef.current.focus();
             }
@@ -68,7 +79,7 @@ const DateRangeInput = React.forwardRef(({ className, inputClassName, popoverCla
         if (newValue.length > DATE_MASK.length)
             return;
         // Позволяем вводить только цифры, точки, дефис и пробелы
-        if (/[^\d. \- \d.]/.test(newValue)) {
+        if (/[^\d. -]/.test(newValue)) {
             return;
         }
         const dots = newValue.match(/\./g);
@@ -79,33 +90,37 @@ const DateRangeInput = React.forwardRef(({ className, inputClassName, popoverCla
         }
         const formattedValue = format(newValue);
         const dateArr = formattedValue.split(' - ');
-        const dateFrom = parseDateString(dateArr[0]);
-        const dateTo = parseDateString(dateArr[1]);
-        if (selectedFrom && formattedValue.length < DATE_FORMAT.length) {
+        const dateFrom = dateArr[0] ? parseDateString(dateArr[0]) : undefined;
+        const dateTo = dateArr[1] ? parseDateString(dateArr[1]) : undefined;
+        if (!dateFrom && !dateTo) {
+            resetPeriod();
+        }
+        else if (selectedFrom && formattedValue.length < DATE_FORMAT.length) {
             setStart();
         }
         else if (selectedFrom && selectedTo) {
             setEnd();
         }
-        else if (dateFnsIsValid(dateFrom) &&
+        else if (dateFrom &&
+            dateFnsIsValid(dateFrom) &&
             dateArr[0]?.length === DATE_FORMAT.length &&
             dateFrom.getTime() !== selectedFrom) {
             setStart(dateFrom.getTime());
         }
-        else if (dateFnsIsValid(dateTo) &&
+        else if (dateTo &&
+            dateFnsIsValid(dateTo) &&
             dateArr[1]?.length === DATE_FORMAT.length &&
             dateTo.getTime() !== selectedTo) {
             setEnd(dateTo.getTime());
         }
         setValue(formattedValue);
-        if (onChange)
-            onChange({ dateFrom, dateTo, value: formattedValue }, event);
+        onChange?.({ dateFrom, dateTo, value: formattedValue }, event);
         if (isCompleteDateInput(formattedValue)) {
             const valid = isValid(formattedValue, dateArr[0], dateArr[1]);
             if (!valid)
                 return;
-            if (onComplete) {
-                onComplete({ dateFrom, dateTo, value: formattedValue }, event);
+            if (dateFrom && dateTo) {
+                onComplete?.({ dateFrom, dateTo, value: formattedValue }, event);
             }
         }
     };
@@ -133,14 +148,12 @@ const DateRangeInput = React.forwardRef(({ className, inputClassName, popoverCla
         // Не дает инпуту терять фокус при выборе даты
         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
@@ -148,7 +161,7 @@ const DateRangeInput = React.forwardRef(({ className, inputClassName, popoverCla
         React.createElement(Calendar$1, { ...calendarProps, responsive: calendarResponsive, open: open, onClose: handleCalendarClose, ref: calendarRef, defaultMonth: defaultMonth, selectedFrom: selectedFrom, selectedTo: selectedTo, 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, rightAddons: React.createElement(React.Fragment, null,
                 rightAddons,
                 picker && (React.createElement(IconButton, { onClick: inputDisabled ? undefined : handleIconButtonClick, icon: CalendarMIcon, size: 'xxs' }))) }),