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

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_1yhrr","calendarContainer":"date-range-input__calendarContainer_1yhrr","calendarResponsive":"date-range-input__calendarResponsive_1yhrr","block":"date-range-input__block_1yhrr"};
+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' }))) }),

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

@@ -1,4 +1,4 @@
-/* hash: 2v93k */
+/* 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_1yhrr {
+.date-range-input__component_a0llm {
     display: inline-block;
     outline: none;
     position: relative;
 }
-.date-range-input__calendarContainer_1yhrr {
+.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_1yhrr {
+.date-range-input__calendarContainer_a0llm {
         width: 100%;
         min-width: 288px
 }
     }
-.date-range-input__calendarResponsive_1yhrr {
+.date-range-input__calendarResponsive_a0llm {
     width: var(--calendar-width);
     padding: 0 var(--gap-m);
 }
-.date-range-input__block_1yhrr {
+.date-range-input__block_a0llm {
     width: 100%;
 }

package/modern/components/date-range-input/index.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/desktop.js

@@ -8,6 +8,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/index.d.ts

@@ -1 +1,2 @@
-export { DateRangeInputResponsive as DateRangeInput, DateRangeInputResponsiveProps as DateRangeInputProps } from "./responsive";
+export { DateRangeInputResponsive as DateRangeInput } from "./responsive";
+export type { DateRangeInputResponsiveProps as DateRangeInputProps } from "./responsive";

package/modern/mobile.js

@@ -8,6 +8,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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@alfalab/core-components-date-range-input",
-    "version": "2.2.0",
+    "version": "2.2.2",
     "description": "",
     "keywords": [],
     "license": "MIT",
@@ -15,10 +15,11 @@
         "react-dom": "^16.9.0 || ^17.0.1 || ^18.0.0"
     },
     "dependencies": {
-        "@alfalab/core-components-input": "^11.1.1",
+        "@alfalab/core-components-input": "^11.1.3",
         "@alfalab/core-components-icon-button": "^6.0.2",
-        "@alfalab/core-components-calendar": "^6.2.0",
+        "@alfalab/core-components-calendar": "^6.2.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-105ad648.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');