@alfalab/core-components-calendar-input 5.3.0 → 6.0.0

package/CHANGELOG.md

@@ -3,6 +3,62 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [6.0.0](https://github.com/alfa-laboratory/core-components/compare/@alfalab/core-components-calendar-input@5.3.0...@alfalab/core-components-calendar-input@6.0.0) (2022-02-17)
+
+
+* refactor/calendar-range (#984) ([714f615](https://github.com/alfa-laboratory/core-components/commit/714f61590586bafe1060e652943e95c133ed002a)), closes [#984](https://github.com/alfa-laboratory/core-components/issues/984)
+
+
+### BREAKING CHANGES
+
+* Большое обновление CalendarRange
+
+* feat(date-input): add some improvements
+
+* feat(date-input): some updates
+
+* feat(date-input): validation
+
+* feat(calendar): change period selection logic
+
+* fix(calendar): range styles
+
+* fix(calendar): fix styles, add rangeComplete flag
+
+* refactor(calendar-range): temporary
+
+* fix(calendar-range): fix hook
+
+* fix(calendar-range): fix period
+
+* fix(calendar-range): fix tests, fix max date
+
+* fix: update exports
+
+* feat(calendar): allow empty values for PeriodSlider, update today
+
+* fix(calendar-range): hide error icon
+
+* chore(calendar-range): demo
+
+* feat(calendar): use IconButton
+
+* feat(calendar-range): add onChange, update demo
+
+* fix(calendar-range): update width
+
+* test(calendar-range): update snapshot
+
+* fix: import date-fns separately
+
+* fix(calendar-range): fix rest props
+
+Co-authored-by: dmitrsavk <dmitrsavk@yandex.ru>
+
+
+
+
+
 # [5.3.0](https://github.com/alfa-laboratory/core-components/compare/@alfalab/core-components-calendar-input@5.2.7...@alfalab/core-components-calendar-input@5.3.0) (2022-02-17)
 
 

package/dist/Component.d.ts

@@ -45,6 +45,10 @@ type CalendarInputProps = Omit<DateInputProps, 'onChange' | 'mobileMode'> & {
      * Максимальная дата, доступная для выбора (timestamp)
      */
     maxDate?: number;
+    /**
+     * Список событий
+     */
+    events?: Array<Date | number>;
     /**
      * Список выходных
      */
@@ -138,6 +142,10 @@ declare const CalendarInput: React.ForwardRefExoticComponent<Pick<DateInputProps
      * Максимальная дата, доступная для выбора (timestamp)
      */
     maxDate?: number | undefined;
+    /**
+     * Список событий
+     */
+    events?: (number | Date)[] | undefined;
     /**
      * Список выходных
      */

package/dist/Component.js

@@ -6,10 +6,12 @@ var React = require('react');
 var cn = require('classnames');
 var mergeRefs = require('react-merge-refs');
 var coreComponentsPopover = require('@alfalab/core-components-popover');
+var CalendarMIcon = require('@alfalab/icons-glyph/CalendarMIcon');
 var coreComponentsDateInput = require('@alfalab/core-components-date-input');
 var coreComponentsCalendar = require('@alfalab/core-components-calendar');
-var CalendarMIcon = require('@alfalab/icons-glyph/CalendarMIcon');
-require('date-fns');
+require('date-fns/parse');
+require('date-fns/format');
+require('date-fns/isSameDay');
 var utils = require('./utils.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -57,24 +59,28 @@ function __rest(s, e) {
     return t;
 }
 
-var styles = {"component":"calendar-input__component_1vge6","block":"calendar-input__block_1vge6","calendarContainer":"calendar-input__calendarContainer_1vge6","calendarIcon":"calendar-input__calendarIcon_1vge6","nativeInput":"calendar-input__nativeInput_1vge6"};
+var styles = {"component":"calendar-input__component_1ksty","block":"calendar-input__block_1ksty","calendarContainer":"calendar-input__calendarContainer_1ksty","calendarIcon":"calendar-input__calendarIcon_1ksty","nativeInput":"calendar-input__nativeInput_1ksty"};
 require('./index.css')
 
 var CalendarInput = React.forwardRef(function (_a, ref) {
     var _b;
-    var _c = _a.block, block = _c === void 0 ? false : _c, className = _a.className, inputClassName = _a.inputClassName, popoverClassName = _a.popoverClassName, _d = _a.defaultOpen, defaultOpen = _d === void 0 ? false : _d, defaultMonth = _a.defaultMonth, _e = _a.defaultValue, defaultValue = _e === void 0 ? '' : _e, _f = _a.calendarPosition, calendarPosition = _f === void 0 ? 'popover' : _f, value = _a.value, dataTestId = _a.dataTestId, _g = _a.calendarProps, calendarProps = _g === void 0 ? {} : _g, _h = _a.minDate, minDate = _h === void 0 ? calendarProps.minDate : _h, _j = _a.maxDate, maxDate = _j === void 0 ? calendarProps.maxDate : _j, _k = _a.offDays, offDays = _k === void 0 ? calendarProps.offDays || [] : _k, preventFlip = _a.preventFlip, _l = _a.mobileMode, mobileMode = _l === void 0 ? 'popover' : _l, _m = _a.wrapperRef, wrapperRef = _m === void 0 ? null : _m, disabled = _a.disabled, onChange = _a.onChange, onInputChange = _a.onInputChange, onCalendarChange = _a.onCalendarChange, onKeyDown = _a.onKeyDown, readOnly = _a.readOnly, _o = _a.Calendar, Calendar = _o === void 0 ? coreComponentsCalendar.Calendar : _o, _p = _a.popoverPosition, popoverPosition = _p === void 0 ? 'bottom-start' : _p, zIndexPopover = _a.zIndexPopover, useAnchorWidth = _a.useAnchorWidth, rightAddons = _a.rightAddons, restProps = __rest(_a, ["block", "className", "inputClassName", "popoverClassName", "defaultOpen", "defaultMonth", "defaultValue", "calendarPosition", "value", "dataTestId", "calendarProps", "minDate", "maxDate", "offDays", "preventFlip", "mobileMode", "wrapperRef", "disabled", "onChange", "onInputChange", "onCalendarChange", "onKeyDown", "readOnly", "Calendar", "popoverPosition", "zIndexPopover", "useAnchorWidth", "rightAddons"]);
-    var uncontrolled = value === undefined;
+    var _c = _a.block, block = _c === void 0 ? false : _c, className = _a.className, inputClassName = _a.inputClassName, popoverClassName = _a.popoverClassName, _d = _a.defaultOpen, defaultOpen = _d === void 0 ? false : _d, defaultMonth = _a.defaultMonth, _e = _a.defaultValue, defaultValue = _e === void 0 ? '' : _e, _f = _a.calendarPosition, calendarPosition = _f === void 0 ? 'popover' : _f, value = _a.value, dataTestId = _a.dataTestId, _g = _a.calendarProps, calendarProps = _g === void 0 ? {} : _g, _h = _a.minDate, minDate = _h === void 0 ? calendarProps.minDate : _h, _j = _a.maxDate, maxDate = _j === void 0 ? calendarProps.maxDate : _j, _k = _a.offDays, offDays = _k === void 0 ? calendarProps.offDays || [] : _k, _l = _a.events, events = _l === void 0 ? calendarProps.events || [] : _l, preventFlip = _a.preventFlip, _m = _a.mobileMode, mobileMode = _m === void 0 ? 'popover' : _m, _o = _a.wrapperRef, wrapperRef = _o === void 0 ? null : _o, disabled = _a.disabled, _p = _a.onChange, onChange = _p === void 0 ? function () { return null; } : _p, onInputChange = _a.onInputChange, onCalendarChange = _a.onCalendarChange, onKeyDown = _a.onKeyDown, readOnly = _a.readOnly, _q = _a.Calendar, Calendar = _q === void 0 ? coreComponentsCalendar.Calendar : _q, _r = _a.popoverPosition, popoverPosition = _r === void 0 ? 'bottom-start' : _r, zIndexPopover = _a.zIndexPopover, useAnchorWidth = _a.useAnchorWidth, rightAddons = _a.rightAddons, error = _a.error, restProps = __rest(_a, ["block", "className", "inputClassName", "popoverClassName", "defaultOpen", "defaultMonth", "defaultValue", "calendarPosition", "value", "dataTestId", "calendarProps", "minDate", "maxDate", "offDays", "events", "preventFlip", "mobileMode", "wrapperRef", "disabled", "onChange", "onInputChange", "onCalendarChange", "onKeyDown", "readOnly", "Calendar", "popoverPosition", "zIndexPopover", "useAnchorWidth", "rightAddons", "error"]);
     var shouldRenderNative = utils.SUPPORTS_INPUT_TYPE_DATE && mobileMode === 'native';
     var shouldRenderOnlyInput = mobileMode === 'input';
     var shouldRenderStatic = calendarPosition === 'static' && !shouldRenderOnlyInput;
     var shouldRenderPopover = calendarPosition === 'popover' && !shouldRenderNative && !shouldRenderOnlyInput;
-    var _q = React.useState(false), open = _q[0], setOpen = _q[1];
-    var _r = React.useState(defaultValue), stateValue = _r[0], setStateValue = _r[1];
-    var inputValue = uncontrolled ? stateValue : value;
+    var _s = React.useState(false), open = _s[0], setOpen = _s[1];
+    var _t = React.useState(value || defaultValue), inputValue = _t[0], setInputValue = _t[1];
     var calendarValue = inputValue ? coreComponentsDateInput.parseDateString(inputValue).getTime() : undefined;
-    var isCalendarValueValid = calendarValue &&
-        coreComponentsCalendar.dateInLimits(calendarValue, minDate, maxDate) &&
-        !offDays.includes(calendarValue);
+    var checkInputValueIsValid = React.useCallback(function (newInputValue) {
+        if (!newInputValue || error)
+            return false;
+        var dateValue = coreComponentsDateInput.parseDateString(newInputValue).getTime();
+        return (dateValue &&
+            coreComponentsDateInput.isCompleteDateInput(newInputValue) &&
+            coreComponentsCalendar.dateInLimits(dateValue, minDate, maxDate) &&
+            !offDays.includes(dateValue));
+    }, [error, maxDate, minDate, offDays]);
     var inputDisabled = disabled || readOnly;
     var inputWrapperRef = React.useRef(null);
     var calendarRef = React.useRef(null);
@@ -119,18 +125,14 @@ var CalendarInput = React.forwardRef(function (_a, ref) {
         if (initiator === 'calendar' && onCalendarChange) {
             onCalendarChange(newDate.getTime());
         }
+        setInputValue(newValue);
         if (shouldChange) {
-            if (uncontrolled) {
-                setStateValue(newValue);
-            }
-            if (onChange) {
-                onChange(event, { date: newDate, value: newValue });
-            }
+            onChange(event, { date: newDate, value: newValue });
         }
-    }, [onCalendarChange, onChange, onInputChange, uncontrolled]);
+    }, [onCalendarChange, onChange, onInputChange]);
     var handleInputChange = React.useCallback(function (event, payload) {
-        changeHandler(event, payload.value, payload.date, 'input', !payload.value || coreComponentsDateInput.isCompleteDateInput(payload.value));
-    }, [changeHandler]);
+        changeHandler(event, payload.value, payload.date, 'input', !payload.value || checkInputValueIsValid(payload.value));
+    }, [changeHandler, checkInputValueIsValid]);
     var handleCalendarChange = React.useCallback(function (date) {
         changeHandler(null, coreComponentsDateInput.formatDate(date), new Date(date), 'calendar');
         setOpen(false);
@@ -142,16 +144,23 @@ var CalendarInput = React.forwardRef(function (_a, ref) {
     React.useEffect(function () {
         setOpen(defaultOpen);
     }, [defaultOpen]);
+    React.useEffect(function () {
+        if (typeof value !== 'undefined') {
+            setInputValue(value);
+        }
+    }, [value]);
     var renderCalendar = React.useCallback(function () { return (
     // eslint-disable-next-line jsx-a11y/no-static-element-interactions
     React__default['default'].createElement("div", { onMouseDown: handleCalendarWrapperMouseDown },
-        React__default['default'].createElement(Calendar, __assign({}, calendarProps, { ref: calendarRef, defaultMonth: defaultMonth, value: isCalendarValueValid ? calendarValue : undefined, onChange: handleCalendarChange, minDate: minDate, maxDate: maxDate, offDays: offDays })))); }, [
+        React__default['default'].createElement(Calendar, __assign({}, calendarProps, { ref: calendarRef, defaultMonth: defaultMonth, value: checkInputValueIsValid(inputValue) ? calendarValue : undefined, onChange: handleCalendarChange, minDate: minDate, maxDate: maxDate, offDays: offDays, events: events })))); }, [
         calendarProps,
         calendarValue,
+        checkInputValueIsValid,
         defaultMonth,
+        events,
         handleCalendarChange,
         handleCalendarWrapperMouseDown,
-        isCalendarValueValid,
+        inputValue,
         maxDate,
         minDate,
         offDays,
@@ -161,9 +170,9 @@ var CalendarInput = React.forwardRef(function (_a, ref) {
     React__default['default'].createElement("div", { className: cn__default['default'](styles.component, className, (_b = {},
             _b[styles.block] = block,
             _b)), tabIndex: -1, onKeyDown: inputDisabled ? undefined : handleKeyDown, onClick: inputDisabled ? undefined : handleClick, onFocus: inputDisabled ? undefined : handleFocus, onBlur: handleBlur, "data-test-id": dataTestId },
-        React__default['default'].createElement(coreComponentsDateInput.DateInput, __assign({}, restProps, { ref: ref, wrapperRef: mergeRefs__default['default']([wrapperRef, inputWrapperRef]), value: inputValue, defaultValue: defaultValue, disabled: disabled, readOnly: readOnly, mobileMode: mobileMode === 'native' ? 'native' : 'input', rightAddons: React__default['default'].createElement(React__default['default'].Fragment, null,
+        React__default['default'].createElement(coreComponentsDateInput.DateInput, __assign({}, restProps, { ref: ref, wrapperRef: mergeRefs__default['default']([wrapperRef, inputWrapperRef]), value: inputValue, defaultValue: defaultValue, disabled: disabled, readOnly: readOnly, mobileMode: mobileMode === 'native' ? 'native' : 'input', error: error, rightAddons: React__default['default'].createElement(React__default['default'].Fragment, null,
                 rightAddons,
-                React__default['default'].createElement(CalendarMIcon.CalendarMIcon, { className: styles.calendarIcon })), onKeyDown: handleInputKeyDown, onChange: handleInputChange, block: true })),
+                shouldRenderPopover && (React__default['default'].createElement(CalendarMIcon.CalendarMIcon, { className: styles.calendarIcon }))), onKeyDown: handleInputKeyDown, onChange: handleInputChange, block: true })),
         shouldRenderStatic && renderCalendar(),
         shouldRenderPopover && (React__default['default'].createElement(coreComponentsPopover.Popover, { open: open, useAnchorWidth: useAnchorWidth, anchorElement: inputWrapperRef.current, popperClassName: styles.calendarContainer, className: popoverClassName, position: popoverPosition, offset: [0, 8], withTransition: false, preventFlip: preventFlip, zIndex: zIndexPopover }, renderCalendar()))));
 });

package/dist/cssm/Component.d.ts

@@ -45,6 +45,10 @@ type CalendarInputProps = Omit<DateInputProps, 'onChange' | 'mobileMode'> & {
      * Максимальная дата, доступная для выбора (timestamp)
      */
     maxDate?: number;
+    /**
+     * Список событий
+     */
+    events?: Array<Date | number>;
     /**
      * Список выходных
      */
@@ -138,6 +142,10 @@ declare const CalendarInput: React.ForwardRefExoticComponent<Pick<DateInputProps
      * Максимальная дата, доступная для выбора (timestamp)
      */
     maxDate?: number | undefined;
+    /**
+     * Список событий
+     */
+    events?: (number | Date)[] | undefined;
     /**
      * Список выходных
      */

package/dist/cssm/Component.js

@@ -6,12 +6,14 @@ var React = require('react');
 var cn = require('classnames');
 var mergeRefs = require('react-merge-refs');
 var coreComponentsPopover = require('@alfalab/core-components-popover/dist/cssm');
+var CalendarMIcon = require('@alfalab/icons-glyph/CalendarMIcon');
 var coreComponentsDateInput = require('@alfalab/core-components-date-input/dist/cssm');
 var coreComponentsCalendar = require('@alfalab/core-components-calendar/dist/cssm');
-var CalendarMIcon = require('@alfalab/icons-glyph/CalendarMIcon');
-var styles = require('./index.module.css');
-require('date-fns');
+require('date-fns/parse');
+require('date-fns/format');
+require('date-fns/isSameDay');
 var utils = require('./utils.js');
+var styles = require('./index.module.css');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -61,19 +63,23 @@ function __rest(s, e) {
 
 var CalendarInput = React.forwardRef(function (_a, ref) {
     var _b;
-    var _c = _a.block, block = _c === void 0 ? false : _c, className = _a.className, inputClassName = _a.inputClassName, popoverClassName = _a.popoverClassName, _d = _a.defaultOpen, defaultOpen = _d === void 0 ? false : _d, defaultMonth = _a.defaultMonth, _e = _a.defaultValue, defaultValue = _e === void 0 ? '' : _e, _f = _a.calendarPosition, calendarPosition = _f === void 0 ? 'popover' : _f, value = _a.value, dataTestId = _a.dataTestId, _g = _a.calendarProps, calendarProps = _g === void 0 ? {} : _g, _h = _a.minDate, minDate = _h === void 0 ? calendarProps.minDate : _h, _j = _a.maxDate, maxDate = _j === void 0 ? calendarProps.maxDate : _j, _k = _a.offDays, offDays = _k === void 0 ? calendarProps.offDays || [] : _k, preventFlip = _a.preventFlip, _l = _a.mobileMode, mobileMode = _l === void 0 ? 'popover' : _l, _m = _a.wrapperRef, wrapperRef = _m === void 0 ? null : _m, disabled = _a.disabled, onChange = _a.onChange, onInputChange = _a.onInputChange, onCalendarChange = _a.onCalendarChange, onKeyDown = _a.onKeyDown, readOnly = _a.readOnly, _o = _a.Calendar, Calendar = _o === void 0 ? coreComponentsCalendar.Calendar : _o, _p = _a.popoverPosition, popoverPosition = _p === void 0 ? 'bottom-start' : _p, zIndexPopover = _a.zIndexPopover, useAnchorWidth = _a.useAnchorWidth, rightAddons = _a.rightAddons, restProps = __rest(_a, ["block", "className", "inputClassName", "popoverClassName", "defaultOpen", "defaultMonth", "defaultValue", "calendarPosition", "value", "dataTestId", "calendarProps", "minDate", "maxDate", "offDays", "preventFlip", "mobileMode", "wrapperRef", "disabled", "onChange", "onInputChange", "onCalendarChange", "onKeyDown", "readOnly", "Calendar", "popoverPosition", "zIndexPopover", "useAnchorWidth", "rightAddons"]);
-    var uncontrolled = value === undefined;
+    var _c = _a.block, block = _c === void 0 ? false : _c, className = _a.className, inputClassName = _a.inputClassName, popoverClassName = _a.popoverClassName, _d = _a.defaultOpen, defaultOpen = _d === void 0 ? false : _d, defaultMonth = _a.defaultMonth, _e = _a.defaultValue, defaultValue = _e === void 0 ? '' : _e, _f = _a.calendarPosition, calendarPosition = _f === void 0 ? 'popover' : _f, value = _a.value, dataTestId = _a.dataTestId, _g = _a.calendarProps, calendarProps = _g === void 0 ? {} : _g, _h = _a.minDate, minDate = _h === void 0 ? calendarProps.minDate : _h, _j = _a.maxDate, maxDate = _j === void 0 ? calendarProps.maxDate : _j, _k = _a.offDays, offDays = _k === void 0 ? calendarProps.offDays || [] : _k, _l = _a.events, events = _l === void 0 ? calendarProps.events || [] : _l, preventFlip = _a.preventFlip, _m = _a.mobileMode, mobileMode = _m === void 0 ? 'popover' : _m, _o = _a.wrapperRef, wrapperRef = _o === void 0 ? null : _o, disabled = _a.disabled, _p = _a.onChange, onChange = _p === void 0 ? function () { return null; } : _p, onInputChange = _a.onInputChange, onCalendarChange = _a.onCalendarChange, onKeyDown = _a.onKeyDown, readOnly = _a.readOnly, _q = _a.Calendar, Calendar = _q === void 0 ? coreComponentsCalendar.Calendar : _q, _r = _a.popoverPosition, popoverPosition = _r === void 0 ? 'bottom-start' : _r, zIndexPopover = _a.zIndexPopover, useAnchorWidth = _a.useAnchorWidth, rightAddons = _a.rightAddons, error = _a.error, restProps = __rest(_a, ["block", "className", "inputClassName", "popoverClassName", "defaultOpen", "defaultMonth", "defaultValue", "calendarPosition", "value", "dataTestId", "calendarProps", "minDate", "maxDate", "offDays", "events", "preventFlip", "mobileMode", "wrapperRef", "disabled", "onChange", "onInputChange", "onCalendarChange", "onKeyDown", "readOnly", "Calendar", "popoverPosition", "zIndexPopover", "useAnchorWidth", "rightAddons", "error"]);
     var shouldRenderNative = utils.SUPPORTS_INPUT_TYPE_DATE && mobileMode === 'native';
     var shouldRenderOnlyInput = mobileMode === 'input';
     var shouldRenderStatic = calendarPosition === 'static' && !shouldRenderOnlyInput;
     var shouldRenderPopover = calendarPosition === 'popover' && !shouldRenderNative && !shouldRenderOnlyInput;
-    var _q = React.useState(false), open = _q[0], setOpen = _q[1];
-    var _r = React.useState(defaultValue), stateValue = _r[0], setStateValue = _r[1];
-    var inputValue = uncontrolled ? stateValue : value;
+    var _s = React.useState(false), open = _s[0], setOpen = _s[1];
+    var _t = React.useState(value || defaultValue), inputValue = _t[0], setInputValue = _t[1];
     var calendarValue = inputValue ? coreComponentsDateInput.parseDateString(inputValue).getTime() : undefined;
-    var isCalendarValueValid = calendarValue &&
-        coreComponentsCalendar.dateInLimits(calendarValue, minDate, maxDate) &&
-        !offDays.includes(calendarValue);
+    var checkInputValueIsValid = React.useCallback(function (newInputValue) {
+        if (!newInputValue || error)
+            return false;
+        var dateValue = coreComponentsDateInput.parseDateString(newInputValue).getTime();
+        return (dateValue &&
+            coreComponentsDateInput.isCompleteDateInput(newInputValue) &&
+            coreComponentsCalendar.dateInLimits(dateValue, minDate, maxDate) &&
+            !offDays.includes(dateValue));
+    }, [error, maxDate, minDate, offDays]);
     var inputDisabled = disabled || readOnly;
     var inputWrapperRef = React.useRef(null);
     var calendarRef = React.useRef(null);
@@ -118,18 +124,14 @@ var CalendarInput = React.forwardRef(function (_a, ref) {
         if (initiator === 'calendar' && onCalendarChange) {
             onCalendarChange(newDate.getTime());
         }
+        setInputValue(newValue);
         if (shouldChange) {
-            if (uncontrolled) {
-                setStateValue(newValue);
-            }
-            if (onChange) {
-                onChange(event, { date: newDate, value: newValue });
-            }
+            onChange(event, { date: newDate, value: newValue });
         }
-    }, [onCalendarChange, onChange, onInputChange, uncontrolled]);
+    }, [onCalendarChange, onChange, onInputChange]);
     var handleInputChange = React.useCallback(function (event, payload) {
-        changeHandler(event, payload.value, payload.date, 'input', !payload.value || coreComponentsDateInput.isCompleteDateInput(payload.value));
-    }, [changeHandler]);
+        changeHandler(event, payload.value, payload.date, 'input', !payload.value || checkInputValueIsValid(payload.value));
+    }, [changeHandler, checkInputValueIsValid]);
     var handleCalendarChange = React.useCallback(function (date) {
         changeHandler(null, coreComponentsDateInput.formatDate(date), new Date(date), 'calendar');
         setOpen(false);
@@ -141,16 +143,23 @@ var CalendarInput = React.forwardRef(function (_a, ref) {
     React.useEffect(function () {
         setOpen(defaultOpen);
     }, [defaultOpen]);
+    React.useEffect(function () {
+        if (typeof value !== 'undefined') {
+            setInputValue(value);
+        }
+    }, [value]);
     var renderCalendar = React.useCallback(function () { return (
     // eslint-disable-next-line jsx-a11y/no-static-element-interactions
     React__default['default'].createElement("div", { onMouseDown: handleCalendarWrapperMouseDown },
-        React__default['default'].createElement(Calendar, __assign({}, calendarProps, { ref: calendarRef, defaultMonth: defaultMonth, value: isCalendarValueValid ? calendarValue : undefined, onChange: handleCalendarChange, minDate: minDate, maxDate: maxDate, offDays: offDays })))); }, [
+        React__default['default'].createElement(Calendar, __assign({}, calendarProps, { ref: calendarRef, defaultMonth: defaultMonth, value: checkInputValueIsValid(inputValue) ? calendarValue : undefined, onChange: handleCalendarChange, minDate: minDate, maxDate: maxDate, offDays: offDays, events: events })))); }, [
         calendarProps,
         calendarValue,
+        checkInputValueIsValid,
         defaultMonth,
+        events,
         handleCalendarChange,
         handleCalendarWrapperMouseDown,
-        isCalendarValueValid,
+        inputValue,
         maxDate,
         minDate,
         offDays,
@@ -160,9 +169,9 @@ var CalendarInput = React.forwardRef(function (_a, ref) {
     React__default['default'].createElement("div", { className: cn__default['default'](styles__default['default'].component, className, (_b = {},
             _b[styles__default['default'].block] = block,
             _b)), tabIndex: -1, onKeyDown: inputDisabled ? undefined : handleKeyDown, onClick: inputDisabled ? undefined : handleClick, onFocus: inputDisabled ? undefined : handleFocus, onBlur: handleBlur, "data-test-id": dataTestId },
-        React__default['default'].createElement(coreComponentsDateInput.DateInput, __assign({}, restProps, { ref: ref, wrapperRef: mergeRefs__default['default']([wrapperRef, inputWrapperRef]), value: inputValue, defaultValue: defaultValue, disabled: disabled, readOnly: readOnly, mobileMode: mobileMode === 'native' ? 'native' : 'input', rightAddons: React__default['default'].createElement(React__default['default'].Fragment, null,
+        React__default['default'].createElement(coreComponentsDateInput.DateInput, __assign({}, restProps, { ref: ref, wrapperRef: mergeRefs__default['default']([wrapperRef, inputWrapperRef]), value: inputValue, defaultValue: defaultValue, disabled: disabled, readOnly: readOnly, mobileMode: mobileMode === 'native' ? 'native' : 'input', error: error, rightAddons: React__default['default'].createElement(React__default['default'].Fragment, null,
                 rightAddons,
-                React__default['default'].createElement(CalendarMIcon.CalendarMIcon, { className: styles__default['default'].calendarIcon })), onKeyDown: handleInputKeyDown, onChange: handleInputChange, block: true })),
+                shouldRenderPopover && (React__default['default'].createElement(CalendarMIcon.CalendarMIcon, { className: styles__default['default'].calendarIcon }))), onKeyDown: handleInputKeyDown, onChange: handleInputChange, block: true })),
         shouldRenderStatic && renderCalendar(),
         shouldRenderPopover && (React__default['default'].createElement(coreComponentsPopover.Popover, { open: open, useAnchorWidth: useAnchorWidth, anchorElement: inputWrapperRef.current, popperClassName: styles__default['default'].calendarContainer, className: popoverClassName, position: popoverPosition, offset: [0, 8], withTransition: false, preventFlip: preventFlip, zIndex: zIndexPopover }, renderCalendar()))));
 });

package/dist/cssm/index.js

@@ -7,12 +7,14 @@ require('react');
 require('classnames');
 require('react-merge-refs');
 require('@alfalab/core-components-popover/dist/cssm');
+require('@alfalab/icons-glyph/CalendarMIcon');
 require('@alfalab/core-components-date-input/dist/cssm');
 require('@alfalab/core-components-calendar/dist/cssm');
-require('@alfalab/icons-glyph/CalendarMIcon');
-require('./index.module.css');
-require('date-fns');
+require('date-fns/parse');
+require('date-fns/format');
+require('date-fns/isSameDay');
 var utils = require('./utils.js');
+require('./index.module.css');
 
 
 
@@ -23,6 +25,6 @@ exports.IS_BROWSER = utils.IS_BROWSER;
 exports.NATIVE_DATE_FORMAT = utils.NATIVE_DATE_FORMAT;
 exports.SUPPORTS_INPUT_TYPE_DATE = utils.SUPPORTS_INPUT_TYPE_DATE;
 exports.formatDate = utils.formatDate;
-exports.isCompleteDateInput = utils.isCompleteDateInput;
 exports.isInputDateSupported = utils.isInputDateSupported;
+exports.isValidInputValue = utils.isValidInputValue;
 exports.parseDateString = utils.parseDateString;

package/dist/cssm/utils.d.ts

@@ -3,11 +3,11 @@ declare const NATIVE_DATE_FORMAT = "yyyy-MM-dd";
 declare const DATE_MASK: (string | RegExp)[];
 declare const IS_BROWSER: boolean;
 declare const SUPPORTS_INPUT_TYPE_DATE: boolean;
-declare const isCompleteDateInput: (input: string) => boolean;
 declare const formatDate: (date: number | Date, dateFormat?: string) => string;
 declare const parseDateString: (value: string, dateFormat?: string) => Date;
 /**
  * Возвращает `true`, если поддерживается `input[type="date"]`
  */
 declare function isInputDateSupported(): boolean;
-export { DATE_FORMAT, NATIVE_DATE_FORMAT, DATE_MASK, IS_BROWSER, SUPPORTS_INPUT_TYPE_DATE, isCompleteDateInput, formatDate, parseDateString, isInputDateSupported };
+declare const isValidInputValue: (newInputValue: string | undefined, minDate: number | undefined, maxDate: number | undefined, offDays?: (number | Date)[]) => boolean;
+export { DATE_FORMAT, NATIVE_DATE_FORMAT, DATE_MASK, IS_BROWSER, SUPPORTS_INPUT_TYPE_DATE, formatDate, parseDateString, isInputDateSupported, isValidInputValue };

package/dist/cssm/utils.js

@@ -2,21 +2,30 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var dateFns = require('date-fns');
+var coreComponentsDateInput = require('@alfalab/core-components-date-input/dist/cssm');
+var coreComponentsCalendar = require('@alfalab/core-components-calendar/dist/cssm');
+var parse = require('date-fns/parse');
+var format = require('date-fns/format');
+var isSameDay = require('date-fns/isSameDay');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var parse__default = /*#__PURE__*/_interopDefaultLegacy(parse);
+var format__default = /*#__PURE__*/_interopDefaultLegacy(format);
+var isSameDay__default = /*#__PURE__*/_interopDefaultLegacy(isSameDay);
 
 var DATE_FORMAT = 'dd.MM.yyyy';
 var NATIVE_DATE_FORMAT = 'yyyy-MM-dd';
 var DATE_MASK = [/\d/, /\d/, '.', /\d/, /\d/, '.', /\d/, /\d/, /\d/, /\d/];
 var IS_BROWSER = typeof window !== 'undefined';
 var SUPPORTS_INPUT_TYPE_DATE = IS_BROWSER && isInputDateSupported();
-var isCompleteDateInput = function (input) { return input.length === DATE_MASK.length; };
 var formatDate = function (date, dateFormat) {
     if (dateFormat === void 0) { dateFormat = DATE_FORMAT; }
-    return dateFns.format(date, dateFormat);
+    return format__default['default'](date, dateFormat);
 };
 var parseDateString = function (value, dateFormat) {
     if (dateFormat === void 0) { dateFormat = DATE_FORMAT; }
-    return dateFns.parse(value, dateFormat, new Date());
+    return parse__default['default'](value, dateFormat, new Date());
 };
 /**
  * Возвращает `true`, если поддерживается `input[type="date"]`
@@ -28,6 +37,16 @@ function isInputDateSupported() {
     input.setAttribute('value', value);
     return input.value !== value;
 }
+var isValidInputValue = function (newInputValue, minDate, maxDate, offDays) {
+    if (offDays === void 0) { offDays = []; }
+    if (!newInputValue)
+        return false;
+    var dateValue = parseDateString(newInputValue).getTime();
+    return Boolean(dateValue &&
+        coreComponentsDateInput.isCompleteDateInput(newInputValue) &&
+        coreComponentsCalendar.dateInLimits(dateValue, minDate, maxDate) &&
+        !offDays.some(function (offDay) { return isSameDay__default['default'](offDay, dateValue); }));
+};
 
 exports.DATE_FORMAT = DATE_FORMAT;
 exports.DATE_MASK = DATE_MASK;
@@ -35,6 +54,6 @@ exports.IS_BROWSER = IS_BROWSER;
 exports.NATIVE_DATE_FORMAT = NATIVE_DATE_FORMAT;
 exports.SUPPORTS_INPUT_TYPE_DATE = SUPPORTS_INPUT_TYPE_DATE;
 exports.formatDate = formatDate;
-exports.isCompleteDateInput = isCompleteDateInput;
 exports.isInputDateSupported = isInputDateSupported;
+exports.isValidInputValue = isValidInputValue;
 exports.parseDateString = parseDateString;

package/dist/esm/Component.d.ts

@@ -45,6 +45,10 @@ type CalendarInputProps = Omit<DateInputProps, 'onChange' | 'mobileMode'> & {
      * Максимальная дата, доступная для выбора (timestamp)
      */
     maxDate?: number;
+    /**
+     * Список событий
+     */
+    events?: Array<Date | number>;
     /**
      * Список выходных
      */
@@ -138,6 +142,10 @@ declare const CalendarInput: React.ForwardRefExoticComponent<Pick<DateInputProps
      * Максимальная дата, доступная для выбора (timestamp)
      */
     maxDate?: number | undefined;
+    /**
+     * Список событий
+     */
+    events?: (number | Date)[] | undefined;
     /**
      * Список выходных
      */

package/dist/esm/Component.js

@@ -1,11 +1,13 @@
-import React, { forwardRef, useState, useRef, useCallback, useEffect } from 'react';
+import React, { forwardRef, useState, useCallback, useRef, useEffect } from 'react';
 import cn from 'classnames';
 import mergeRefs from 'react-merge-refs';
 import { Popover } from '@alfalab/core-components-popover/dist/esm';
+import { CalendarMIcon } from '@alfalab/icons-glyph/CalendarMIcon';
 import { parseDateString, isCompleteDateInput, formatDate, DateInput } from '@alfalab/core-components-date-input/dist/esm';
 import { dateInLimits, Calendar } from '@alfalab/core-components-calendar/dist/esm';
-import { CalendarMIcon } from '@alfalab/icons-glyph/CalendarMIcon';
-import 'date-fns';
+import 'date-fns/parse';
+import 'date-fns/format';
+import 'date-fns/isSameDay';
 import { SUPPORTS_INPUT_TYPE_DATE } from './utils.js';
 
 /*! *****************************************************************************
@@ -47,24 +49,28 @@ function __rest(s, e) {
     return t;
 }
 
-var styles = {"component":"calendar-input__component_1vge6","block":"calendar-input__block_1vge6","calendarContainer":"calendar-input__calendarContainer_1vge6","calendarIcon":"calendar-input__calendarIcon_1vge6","nativeInput":"calendar-input__nativeInput_1vge6"};
+var styles = {"component":"calendar-input__component_1ksty","block":"calendar-input__block_1ksty","calendarContainer":"calendar-input__calendarContainer_1ksty","calendarIcon":"calendar-input__calendarIcon_1ksty","nativeInput":"calendar-input__nativeInput_1ksty"};
 require('./index.css')
 
 var CalendarInput = forwardRef(function (_a, ref) {
     var _b;
-    var _c = _a.block, block = _c === void 0 ? false : _c, className = _a.className, inputClassName = _a.inputClassName, popoverClassName = _a.popoverClassName, _d = _a.defaultOpen, defaultOpen = _d === void 0 ? false : _d, defaultMonth = _a.defaultMonth, _e = _a.defaultValue, defaultValue = _e === void 0 ? '' : _e, _f = _a.calendarPosition, calendarPosition = _f === void 0 ? 'popover' : _f, value = _a.value, dataTestId = _a.dataTestId, _g = _a.calendarProps, calendarProps = _g === void 0 ? {} : _g, _h = _a.minDate, minDate = _h === void 0 ? calendarProps.minDate : _h, _j = _a.maxDate, maxDate = _j === void 0 ? calendarProps.maxDate : _j, _k = _a.offDays, offDays = _k === void 0 ? calendarProps.offDays || [] : _k, preventFlip = _a.preventFlip, _l = _a.mobileMode, mobileMode = _l === void 0 ? 'popover' : _l, _m = _a.wrapperRef, wrapperRef = _m === void 0 ? null : _m, disabled = _a.disabled, onChange = _a.onChange, onInputChange = _a.onInputChange, onCalendarChange = _a.onCalendarChange, onKeyDown = _a.onKeyDown, readOnly = _a.readOnly, _o = _a.Calendar, Calendar$1 = _o === void 0 ? Calendar : _o, _p = _a.popoverPosition, popoverPosition = _p === void 0 ? 'bottom-start' : _p, zIndexPopover = _a.zIndexPopover, useAnchorWidth = _a.useAnchorWidth, rightAddons = _a.rightAddons, restProps = __rest(_a, ["block", "className", "inputClassName", "popoverClassName", "defaultOpen", "defaultMonth", "defaultValue", "calendarPosition", "value", "dataTestId", "calendarProps", "minDate", "maxDate", "offDays", "preventFlip", "mobileMode", "wrapperRef", "disabled", "onChange", "onInputChange", "onCalendarChange", "onKeyDown", "readOnly", "Calendar", "popoverPosition", "zIndexPopover", "useAnchorWidth", "rightAddons"]);
-    var uncontrolled = value === undefined;
+    var _c = _a.block, block = _c === void 0 ? false : _c, className = _a.className, inputClassName = _a.inputClassName, popoverClassName = _a.popoverClassName, _d = _a.defaultOpen, defaultOpen = _d === void 0 ? false : _d, defaultMonth = _a.defaultMonth, _e = _a.defaultValue, defaultValue = _e === void 0 ? '' : _e, _f = _a.calendarPosition, calendarPosition = _f === void 0 ? 'popover' : _f, value = _a.value, dataTestId = _a.dataTestId, _g = _a.calendarProps, calendarProps = _g === void 0 ? {} : _g, _h = _a.minDate, minDate = _h === void 0 ? calendarProps.minDate : _h, _j = _a.maxDate, maxDate = _j === void 0 ? calendarProps.maxDate : _j, _k = _a.offDays, offDays = _k === void 0 ? calendarProps.offDays || [] : _k, _l = _a.events, events = _l === void 0 ? calendarProps.events || [] : _l, preventFlip = _a.preventFlip, _m = _a.mobileMode, mobileMode = _m === void 0 ? 'popover' : _m, _o = _a.wrapperRef, wrapperRef = _o === void 0 ? null : _o, disabled = _a.disabled, _p = _a.onChange, onChange = _p === void 0 ? function () { return null; } : _p, onInputChange = _a.onInputChange, onCalendarChange = _a.onCalendarChange, onKeyDown = _a.onKeyDown, readOnly = _a.readOnly, _q = _a.Calendar, Calendar$1 = _q === void 0 ? Calendar : _q, _r = _a.popoverPosition, popoverPosition = _r === void 0 ? 'bottom-start' : _r, zIndexPopover = _a.zIndexPopover, useAnchorWidth = _a.useAnchorWidth, rightAddons = _a.rightAddons, error = _a.error, restProps = __rest(_a, ["block", "className", "inputClassName", "popoverClassName", "defaultOpen", "defaultMonth", "defaultValue", "calendarPosition", "value", "dataTestId", "calendarProps", "minDate", "maxDate", "offDays", "events", "preventFlip", "mobileMode", "wrapperRef", "disabled", "onChange", "onInputChange", "onCalendarChange", "onKeyDown", "readOnly", "Calendar", "popoverPosition", "zIndexPopover", "useAnchorWidth", "rightAddons", "error"]);
     var shouldRenderNative = SUPPORTS_INPUT_TYPE_DATE && mobileMode === 'native';
     var shouldRenderOnlyInput = mobileMode === 'input';
     var shouldRenderStatic = calendarPosition === 'static' && !shouldRenderOnlyInput;
     var shouldRenderPopover = calendarPosition === 'popover' && !shouldRenderNative && !shouldRenderOnlyInput;
-    var _q = useState(false), open = _q[0], setOpen = _q[1];
-    var _r = useState(defaultValue), stateValue = _r[0], setStateValue = _r[1];
-    var inputValue = uncontrolled ? stateValue : value;
+    var _s = useState(false), open = _s[0], setOpen = _s[1];
+    var _t = useState(value || defaultValue), inputValue = _t[0], setInputValue = _t[1];
     var calendarValue = inputValue ? parseDateString(inputValue).getTime() : undefined;
-    var isCalendarValueValid = calendarValue &&
-        dateInLimits(calendarValue, minDate, maxDate) &&
-        !offDays.includes(calendarValue);
+    var checkInputValueIsValid = useCallback(function (newInputValue) {
+        if (!newInputValue || error)
+            return false;
+        var dateValue = parseDateString(newInputValue).getTime();
+        return (dateValue &&
+            isCompleteDateInput(newInputValue) &&
+            dateInLimits(dateValue, minDate, maxDate) &&
+            !offDays.includes(dateValue));
+    }, [error, maxDate, minDate, offDays]);
     var inputDisabled = disabled || readOnly;
     var inputWrapperRef = useRef(null);
     var calendarRef = useRef(null);
@@ -109,18 +115,14 @@ var CalendarInput = forwardRef(function (_a, ref) {
         if (initiator === 'calendar' && onCalendarChange) {
             onCalendarChange(newDate.getTime());
         }
+        setInputValue(newValue);
         if (shouldChange) {
-            if (uncontrolled) {
-                setStateValue(newValue);
-            }
-            if (onChange) {
-                onChange(event, { date: newDate, value: newValue });
-            }
+            onChange(event, { date: newDate, value: newValue });
         }
-    }, [onCalendarChange, onChange, onInputChange, uncontrolled]);
+    }, [onCalendarChange, onChange, onInputChange]);
     var handleInputChange = useCallback(function (event, payload) {
-        changeHandler(event, payload.value, payload.date, 'input', !payload.value || isCompleteDateInput(payload.value));
-    }, [changeHandler]);
+        changeHandler(event, payload.value, payload.date, 'input', !payload.value || checkInputValueIsValid(payload.value));
+    }, [changeHandler, checkInputValueIsValid]);
     var handleCalendarChange = useCallback(function (date) {
         changeHandler(null, formatDate(date), new Date(date), 'calendar');
         setOpen(false);
@@ -132,16 +134,23 @@ var CalendarInput = forwardRef(function (_a, ref) {
     useEffect(function () {
         setOpen(defaultOpen);
     }, [defaultOpen]);
+    useEffect(function () {
+        if (typeof value !== 'undefined') {
+            setInputValue(value);
+        }
+    }, [value]);
     var renderCalendar = useCallback(function () { return (
     // eslint-disable-next-line jsx-a11y/no-static-element-interactions
     React.createElement("div", { onMouseDown: handleCalendarWrapperMouseDown },
-        React.createElement(Calendar$1, __assign({}, calendarProps, { ref: calendarRef, defaultMonth: defaultMonth, value: isCalendarValueValid ? calendarValue : undefined, onChange: handleCalendarChange, minDate: minDate, maxDate: maxDate, offDays: offDays })))); }, [
+        React.createElement(Calendar$1, __assign({}, calendarProps, { ref: calendarRef, defaultMonth: defaultMonth, value: checkInputValueIsValid(inputValue) ? calendarValue : undefined, onChange: handleCalendarChange, minDate: minDate, maxDate: maxDate, offDays: offDays, events: events })))); }, [
         calendarProps,
         calendarValue,
+        checkInputValueIsValid,
         defaultMonth,
+        events,
         handleCalendarChange,
         handleCalendarWrapperMouseDown,
-        isCalendarValueValid,
+        inputValue,
         maxDate,
         minDate,
         offDays,
@@ -151,9 +160,9 @@ var CalendarInput = forwardRef(function (_a, ref) {
     React.createElement("div", { className: cn(styles.component, className, (_b = {},
             _b[styles.block] = block,
             _b)), tabIndex: -1, onKeyDown: inputDisabled ? undefined : handleKeyDown, onClick: inputDisabled ? undefined : handleClick, onFocus: inputDisabled ? undefined : handleFocus, onBlur: handleBlur, "data-test-id": dataTestId },
-        React.createElement(DateInput, __assign({}, restProps, { ref: ref, wrapperRef: mergeRefs([wrapperRef, inputWrapperRef]), value: inputValue, defaultValue: defaultValue, disabled: disabled, readOnly: readOnly, mobileMode: mobileMode === 'native' ? 'native' : 'input', rightAddons: React.createElement(React.Fragment, null,
+        React.createElement(DateInput, __assign({}, restProps, { ref: ref, wrapperRef: mergeRefs([wrapperRef, inputWrapperRef]), value: inputValue, defaultValue: defaultValue, disabled: disabled, readOnly: readOnly, mobileMode: mobileMode === 'native' ? 'native' : 'input', error: error, rightAddons: React.createElement(React.Fragment, null,
                 rightAddons,
-                React.createElement(CalendarMIcon, { className: styles.calendarIcon })), onKeyDown: handleInputKeyDown, onChange: handleInputChange, block: true })),
+                shouldRenderPopover && (React.createElement(CalendarMIcon, { className: styles.calendarIcon }))), onKeyDown: handleInputKeyDown, onChange: handleInputChange, block: true })),
         shouldRenderStatic && renderCalendar(),
         shouldRenderPopover && (React.createElement(Popover, { open: open, useAnchorWidth: useAnchorWidth, anchorElement: inputWrapperRef.current, popperClassName: styles.calendarContainer, className: popoverClassName, position: popoverPosition, offset: [0, 8], withTransition: false, preventFlip: preventFlip, zIndex: zIndexPopover }, renderCalendar()))));
 });

package/dist/esm/index.css

@@ -1,4 +1,4 @@
-/* hash: 1saz8 */
+/* hash: codnr */
 :root {
     --color-light-graphic-primary: #0b1f35;
 }
@@ -41,36 +41,36 @@
     --calendar-input-icon-color: var(--color-light-graphic-primary);
     --calendar-input-popover-border-radius: 0 0 var(--border-radius-s) var(--border-radius-s);
 }
-.calendar-input__component_1vge6 {
+.calendar-input__component_1ksty {
     display: inline-block;
     outline: none;
     position: relative;
 }
-.calendar-input__block_1vge6 {
+.calendar-input__block_1ksty {
     width: 100%;
 }
-.calendar-input__calendarContainer_1vge6 {
+.calendar-input__calendarContainer_1ksty {
     display: inline-block;
     box-sizing: border-box;
     box-shadow: var(--shadow-s);
     border-radius: var(--calendar-input-popover-border-radius)
 }
 @media (max-width: 374px) {
-.calendar-input__calendarContainer_1vge6 {
+.calendar-input__calendarContainer_1ksty {
         width: 100%;
         min-width: 288px
 }
     }
-.calendar-input__calendarIcon_1vge6 {
+.calendar-input__calendarIcon_1ksty {
     width: 24px;
     height: 24px;
     display: block;
     color: var(--calendar-input-icon-color)
 }
-.calendar-input__calendarIcon_1vge6:not(:only-child) {
+.calendar-input__calendarIcon_1ksty:not(:only-child) {
         margin-right: var(--gap-2xs);
     }
-.calendar-input__nativeInput_1vge6 {
+.calendar-input__nativeInput_1ksty {
     opacity: 0;
     position: absolute;
     top: 0;
@@ -81,9 +81,9 @@
             appearance: none;
     z-index: 1
 }
-.calendar-input__nativeInput_1vge6::-webkit-calendar-picker-indicator {
+.calendar-input__nativeInput_1ksty::-webkit-calendar-picker-indicator {
         display: none;
     }
-.calendar-input__nativeInput_1vge6::-webkit-inner-spin-button {
+.calendar-input__nativeInput_1ksty::-webkit-inner-spin-button {
         display: none;
     }

package/dist/esm/index.js

@@ -3,8 +3,10 @@ import 'react';
 import 'classnames';
 import 'react-merge-refs';
 import '@alfalab/core-components-popover/dist/esm';
+import '@alfalab/icons-glyph/CalendarMIcon';
 import '@alfalab/core-components-date-input/dist/esm';
 import '@alfalab/core-components-calendar/dist/esm';
-import '@alfalab/icons-glyph/CalendarMIcon';
-import 'date-fns';
-export { DATE_FORMAT, DATE_MASK, IS_BROWSER, NATIVE_DATE_FORMAT, SUPPORTS_INPUT_TYPE_DATE, formatDate, isCompleteDateInput, isInputDateSupported, parseDateString } from './utils.js';
+import 'date-fns/parse';
+import 'date-fns/format';
+import 'date-fns/isSameDay';
+export { DATE_FORMAT, DATE_MASK, IS_BROWSER, NATIVE_DATE_FORMAT, SUPPORTS_INPUT_TYPE_DATE, formatDate, isInputDateSupported, isValidInputValue, parseDateString } from './utils.js';

package/dist/esm/utils.d.ts

@@ -3,11 +3,11 @@ declare const NATIVE_DATE_FORMAT = "yyyy-MM-dd";
 declare const DATE_MASK: (string | RegExp)[];
 declare const IS_BROWSER: boolean;
 declare const SUPPORTS_INPUT_TYPE_DATE: boolean;
-declare const isCompleteDateInput: (input: string) => boolean;
 declare const formatDate: (date: number | Date, dateFormat?: string) => string;
 declare const parseDateString: (value: string, dateFormat?: string) => Date;
 /**
  * Возвращает `true`, если поддерживается `input[type="date"]`
  */
 declare function isInputDateSupported(): boolean;
-export { DATE_FORMAT, NATIVE_DATE_FORMAT, DATE_MASK, IS_BROWSER, SUPPORTS_INPUT_TYPE_DATE, isCompleteDateInput, formatDate, parseDateString, isInputDateSupported };
+declare const isValidInputValue: (newInputValue: string | undefined, minDate: number | undefined, maxDate: number | undefined, offDays?: (number | Date)[]) => boolean;
+export { DATE_FORMAT, NATIVE_DATE_FORMAT, DATE_MASK, IS_BROWSER, SUPPORTS_INPUT_TYPE_DATE, formatDate, parseDateString, isInputDateSupported, isValidInputValue };

package/dist/esm/utils.js

@@ -1,11 +1,14 @@
-import { format, parse } from 'date-fns';
+import { isCompleteDateInput } from '@alfalab/core-components-date-input/dist/esm';
+import { dateInLimits } from '@alfalab/core-components-calendar/dist/esm';
+import parse from 'date-fns/parse';
+import format from 'date-fns/format';
+import isSameDay from 'date-fns/isSameDay';
 
 var DATE_FORMAT = 'dd.MM.yyyy';
 var NATIVE_DATE_FORMAT = 'yyyy-MM-dd';
 var DATE_MASK = [/\d/, /\d/, '.', /\d/, /\d/, '.', /\d/, /\d/, /\d/, /\d/];
 var IS_BROWSER = typeof window !== 'undefined';
 var SUPPORTS_INPUT_TYPE_DATE = IS_BROWSER && isInputDateSupported();
-var isCompleteDateInput = function (input) { return input.length === DATE_MASK.length; };
 var formatDate = function (date, dateFormat) {
     if (dateFormat === void 0) { dateFormat = DATE_FORMAT; }
     return format(date, dateFormat);
@@ -24,5 +27,15 @@ function isInputDateSupported() {
     input.setAttribute('value', value);
     return input.value !== value;
 }
+var isValidInputValue = function (newInputValue, minDate, maxDate, offDays) {
+    if (offDays === void 0) { offDays = []; }
+    if (!newInputValue)
+        return false;
+    var dateValue = parseDateString(newInputValue).getTime();
+    return Boolean(dateValue &&
+        isCompleteDateInput(newInputValue) &&
+        dateInLimits(dateValue, minDate, maxDate) &&
+        !offDays.some(function (offDay) { return isSameDay(offDay, dateValue); }));
+};
 
-export { DATE_FORMAT, DATE_MASK, IS_BROWSER, NATIVE_DATE_FORMAT, SUPPORTS_INPUT_TYPE_DATE, formatDate, isCompleteDateInput, isInputDateSupported, parseDateString };
+export { DATE_FORMAT, DATE_MASK, IS_BROWSER, NATIVE_DATE_FORMAT, SUPPORTS_INPUT_TYPE_DATE, formatDate, isInputDateSupported, isValidInputValue, parseDateString };

package/dist/index.css

@@ -1,4 +1,4 @@
-/* hash: 1saz8 */
+/* hash: codnr */
 :root {
     --color-light-graphic-primary: #0b1f35;
 }
@@ -41,36 +41,36 @@
     --calendar-input-icon-color: var(--color-light-graphic-primary);
     --calendar-input-popover-border-radius: 0 0 var(--border-radius-s) var(--border-radius-s);
 }
-.calendar-input__component_1vge6 {
+.calendar-input__component_1ksty {
     display: inline-block;
     outline: none;
     position: relative;
 }
-.calendar-input__block_1vge6 {
+.calendar-input__block_1ksty {
     width: 100%;
 }
-.calendar-input__calendarContainer_1vge6 {
+.calendar-input__calendarContainer_1ksty {
     display: inline-block;
     box-sizing: border-box;
     box-shadow: var(--shadow-s);
     border-radius: var(--calendar-input-popover-border-radius)
 }
 @media (max-width: 374px) {
-.calendar-input__calendarContainer_1vge6 {
+.calendar-input__calendarContainer_1ksty {
         width: 100%;
         min-width: 288px
 }
     }
-.calendar-input__calendarIcon_1vge6 {
+.calendar-input__calendarIcon_1ksty {
     width: 24px;
     height: 24px;
     display: block;
     color: var(--calendar-input-icon-color)
 }
-.calendar-input__calendarIcon_1vge6:not(:only-child) {
+.calendar-input__calendarIcon_1ksty:not(:only-child) {
         margin-right: var(--gap-2xs);
     }
-.calendar-input__nativeInput_1vge6 {
+.calendar-input__nativeInput_1ksty {
     opacity: 0;
     position: absolute;
     top: 0;
@@ -81,9 +81,9 @@
             appearance: none;
     z-index: 1
 }
-.calendar-input__nativeInput_1vge6::-webkit-calendar-picker-indicator {
+.calendar-input__nativeInput_1ksty::-webkit-calendar-picker-indicator {
         display: none;
     }
-.calendar-input__nativeInput_1vge6::-webkit-inner-spin-button {
+.calendar-input__nativeInput_1ksty::-webkit-inner-spin-button {
         display: none;
     }

package/dist/index.js

@@ -7,10 +7,12 @@ require('react');
 require('classnames');
 require('react-merge-refs');
 require('@alfalab/core-components-popover');
+require('@alfalab/icons-glyph/CalendarMIcon');
 require('@alfalab/core-components-date-input');
 require('@alfalab/core-components-calendar');
-require('@alfalab/icons-glyph/CalendarMIcon');
-require('date-fns');
+require('date-fns/parse');
+require('date-fns/format');
+require('date-fns/isSameDay');
 var utils = require('./utils.js');
 
 
@@ -22,6 +24,6 @@ exports.IS_BROWSER = utils.IS_BROWSER;
 exports.NATIVE_DATE_FORMAT = utils.NATIVE_DATE_FORMAT;
 exports.SUPPORTS_INPUT_TYPE_DATE = utils.SUPPORTS_INPUT_TYPE_DATE;
 exports.formatDate = utils.formatDate;
-exports.isCompleteDateInput = utils.isCompleteDateInput;
 exports.isInputDateSupported = utils.isInputDateSupported;
+exports.isValidInputValue = utils.isValidInputValue;
 exports.parseDateString = utils.parseDateString;

package/dist/modern/Component.d.ts

@@ -45,6 +45,10 @@ type CalendarInputProps = Omit<DateInputProps, 'onChange' | 'mobileMode'> & {
      * Максимальная дата, доступная для выбора (timestamp)
      */
     maxDate?: number;
+    /**
+     * Список событий
+     */
+    events?: Array<Date | number>;
     /**
      * Список выходных
      */
@@ -138,6 +142,10 @@ declare const CalendarInput: React.ForwardRefExoticComponent<Pick<DateInputProps
      * Максимальная дата, доступная для выбора (timestamp)
      */
     maxDate?: number | undefined;
+    /**
+     * Список событий
+     */
+    events?: (number | Date)[] | undefined;
     /**
      * Список выходных
      */

package/dist/modern/Component.js

@@ -1,29 +1,35 @@
-import React, { forwardRef, useState, useRef, useCallback, useEffect } from 'react';
+import React, { forwardRef, useState, useCallback, useRef, useEffect } from 'react';
 import cn from 'classnames';
 import mergeRefs from 'react-merge-refs';
 import { Popover } from '@alfalab/core-components-popover/dist/modern';
+import { CalendarMIcon } from '@alfalab/icons-glyph/CalendarMIcon';
 import { parseDateString, isCompleteDateInput, formatDate, DateInput } from '@alfalab/core-components-date-input/dist/modern';
 import { Calendar, dateInLimits } from '@alfalab/core-components-calendar/dist/modern';
-import { CalendarMIcon } from '@alfalab/icons-glyph/CalendarMIcon';
-import 'date-fns';
+import 'date-fns/parse';
+import 'date-fns/format';
+import 'date-fns/isSameDay';
 import { SUPPORTS_INPUT_TYPE_DATE } from './utils.js';
 
-var styles = {"component":"calendar-input__component_1vge6","block":"calendar-input__block_1vge6","calendarContainer":"calendar-input__calendarContainer_1vge6","calendarIcon":"calendar-input__calendarIcon_1vge6","nativeInput":"calendar-input__nativeInput_1vge6"};
+var styles = {"component":"calendar-input__component_1ksty","block":"calendar-input__block_1ksty","calendarContainer":"calendar-input__calendarContainer_1ksty","calendarIcon":"calendar-input__calendarIcon_1ksty","nativeInput":"calendar-input__nativeInput_1ksty"};
 require('./index.css')
 
-const CalendarInput = forwardRef(({ block = false, className, inputClassName, popoverClassName, defaultOpen = false, defaultMonth, defaultValue = '', calendarPosition = 'popover', value, dataTestId, calendarProps = {}, minDate = calendarProps.minDate, maxDate = calendarProps.maxDate, offDays = calendarProps.offDays || [], preventFlip, mobileMode = 'popover', wrapperRef = null, disabled, onChange, onInputChange, onCalendarChange, onKeyDown, readOnly, Calendar: Calendar$1 = Calendar, popoverPosition = 'bottom-start', zIndexPopover, useAnchorWidth, rightAddons, ...restProps }, ref) => {
-    const uncontrolled = value === undefined;
+const CalendarInput = forwardRef(({ block = false, className, inputClassName, popoverClassName, defaultOpen = false, defaultMonth, defaultValue = '', calendarPosition = 'popover', value, dataTestId, calendarProps = {}, minDate = calendarProps.minDate, maxDate = calendarProps.maxDate, offDays = calendarProps.offDays || [], events = calendarProps.events || [], preventFlip, mobileMode = 'popover', wrapperRef = null, disabled, onChange = () => null, onInputChange, onCalendarChange, onKeyDown, readOnly, Calendar: Calendar$1 = Calendar, popoverPosition = 'bottom-start', zIndexPopover, useAnchorWidth, rightAddons, error, ...restProps }, ref) => {
     const shouldRenderNative = SUPPORTS_INPUT_TYPE_DATE && mobileMode === 'native';
     const shouldRenderOnlyInput = mobileMode === 'input';
     const shouldRenderStatic = calendarPosition === 'static' && !shouldRenderOnlyInput;
     const shouldRenderPopover = calendarPosition === 'popover' && !shouldRenderNative && !shouldRenderOnlyInput;
     const [open, setOpen] = useState(false);
-    const [stateValue, setStateValue] = useState(defaultValue);
-    const inputValue = uncontrolled ? stateValue : value;
+    const [inputValue, setInputValue] = useState(value || defaultValue);
     const calendarValue = inputValue ? parseDateString(inputValue).getTime() : undefined;
-    const isCalendarValueValid = calendarValue &&
-        dateInLimits(calendarValue, minDate, maxDate) &&
-        !offDays.includes(calendarValue);
+    const checkInputValueIsValid = useCallback((newInputValue) => {
+        if (!newInputValue || error)
+            return false;
+        const dateValue = parseDateString(newInputValue).getTime();
+        return (dateValue &&
+            isCompleteDateInput(newInputValue) &&
+            dateInLimits(dateValue, minDate, maxDate) &&
+            !offDays.includes(dateValue));
+    }, [error, maxDate, minDate, offDays]);
     const inputDisabled = disabled || readOnly;
     const inputWrapperRef = useRef(null);
     const calendarRef = useRef(null);
@@ -66,18 +72,14 @@ const CalendarInput = forwardRef(({ block = false, className, inputClassName, po
         if (initiator === 'calendar' && onCalendarChange) {
             onCalendarChange(newDate.getTime());
         }
+        setInputValue(newValue);
         if (shouldChange) {
-            if (uncontrolled) {
-                setStateValue(newValue);
-            }
-            if (onChange) {
-                onChange(event, { date: newDate, value: newValue });
-            }
+            onChange(event, { date: newDate, value: newValue });
         }
-    }, [onCalendarChange, onChange, onInputChange, uncontrolled]);
+    }, [onCalendarChange, onChange, onInputChange]);
     const handleInputChange = useCallback((event, payload) => {
-        changeHandler(event, payload.value, payload.date, 'input', !payload.value || isCompleteDateInput(payload.value));
-    }, [changeHandler]);
+        changeHandler(event, payload.value, payload.date, 'input', !payload.value || checkInputValueIsValid(payload.value));
+    }, [changeHandler, checkInputValueIsValid]);
     const handleCalendarChange = useCallback(date => {
         changeHandler(null, formatDate(date), new Date(date), 'calendar');
         setOpen(false);
@@ -89,16 +91,23 @@ const CalendarInput = forwardRef(({ block = false, className, inputClassName, po
     useEffect(() => {
         setOpen(defaultOpen);
     }, [defaultOpen]);
+    useEffect(() => {
+        if (typeof value !== 'undefined') {
+            setInputValue(value);
+        }
+    }, [value]);
     const renderCalendar = useCallback(() => (
     // eslint-disable-next-line jsx-a11y/no-static-element-interactions
     React.createElement("div", { onMouseDown: handleCalendarWrapperMouseDown },
-        React.createElement(Calendar$1, Object.assign({}, calendarProps, { ref: calendarRef, defaultMonth: defaultMonth, value: isCalendarValueValid ? calendarValue : undefined, onChange: handleCalendarChange, minDate: minDate, maxDate: maxDate, offDays: offDays })))), [
+        React.createElement(Calendar$1, Object.assign({}, calendarProps, { ref: calendarRef, defaultMonth: defaultMonth, value: checkInputValueIsValid(inputValue) ? calendarValue : undefined, onChange: handleCalendarChange, minDate: minDate, maxDate: maxDate, offDays: offDays, events: events })))), [
         calendarProps,
         calendarValue,
+        checkInputValueIsValid,
         defaultMonth,
+        events,
         handleCalendarChange,
         handleCalendarWrapperMouseDown,
-        isCalendarValueValid,
+        inputValue,
         maxDate,
         minDate,
         offDays,
@@ -108,9 +117,9 @@ const CalendarInput = forwardRef(({ block = false, className, inputClassName, po
     React.createElement("div", { className: cn(styles.component, className, {
             [styles.block]: block,
         }), tabIndex: -1, onKeyDown: inputDisabled ? undefined : handleKeyDown, onClick: inputDisabled ? undefined : handleClick, onFocus: inputDisabled ? undefined : handleFocus, onBlur: handleBlur, "data-test-id": dataTestId },
-        React.createElement(DateInput, Object.assign({}, restProps, { ref: ref, wrapperRef: mergeRefs([wrapperRef, inputWrapperRef]), value: inputValue, defaultValue: defaultValue, disabled: disabled, readOnly: readOnly, mobileMode: mobileMode === 'native' ? 'native' : 'input', rightAddons: React.createElement(React.Fragment, null,
+        React.createElement(DateInput, Object.assign({}, restProps, { ref: ref, wrapperRef: mergeRefs([wrapperRef, inputWrapperRef]), value: inputValue, defaultValue: defaultValue, disabled: disabled, readOnly: readOnly, mobileMode: mobileMode === 'native' ? 'native' : 'input', error: error, rightAddons: React.createElement(React.Fragment, null,
                 rightAddons,
-                React.createElement(CalendarMIcon, { className: styles.calendarIcon })), onKeyDown: handleInputKeyDown, onChange: handleInputChange, block: true })),
+                shouldRenderPopover && (React.createElement(CalendarMIcon, { className: styles.calendarIcon }))), onKeyDown: handleInputKeyDown, onChange: handleInputChange, block: true })),
         shouldRenderStatic && renderCalendar(),
         shouldRenderPopover && (React.createElement(Popover, { open: open, useAnchorWidth: useAnchorWidth, anchorElement: inputWrapperRef.current, popperClassName: styles.calendarContainer, className: popoverClassName, position: popoverPosition, offset: [0, 8], withTransition: false, preventFlip: preventFlip, zIndex: zIndexPopover }, renderCalendar()))));
 });

package/dist/modern/index.css

@@ -1,4 +1,4 @@
-/* hash: 1saz8 */
+/* hash: codnr */
 :root {
     --color-light-graphic-primary: #0b1f35;
 }
@@ -41,36 +41,36 @@
     --calendar-input-icon-color: var(--color-light-graphic-primary);
     --calendar-input-popover-border-radius: 0 0 var(--border-radius-s) var(--border-radius-s);
 }
-.calendar-input__component_1vge6 {
+.calendar-input__component_1ksty {
     display: inline-block;
     outline: none;
     position: relative;
 }
-.calendar-input__block_1vge6 {
+.calendar-input__block_1ksty {
     width: 100%;
 }
-.calendar-input__calendarContainer_1vge6 {
+.calendar-input__calendarContainer_1ksty {
     display: inline-block;
     box-sizing: border-box;
     box-shadow: var(--shadow-s);
     border-radius: var(--calendar-input-popover-border-radius)
 }
 @media (max-width: 374px) {
-.calendar-input__calendarContainer_1vge6 {
+.calendar-input__calendarContainer_1ksty {
         width: 100%;
         min-width: 288px
 }
     }
-.calendar-input__calendarIcon_1vge6 {
+.calendar-input__calendarIcon_1ksty {
     width: 24px;
     height: 24px;
     display: block;
     color: var(--calendar-input-icon-color)
 }
-.calendar-input__calendarIcon_1vge6:not(:only-child) {
+.calendar-input__calendarIcon_1ksty:not(:only-child) {
         margin-right: var(--gap-2xs);
     }
-.calendar-input__nativeInput_1vge6 {
+.calendar-input__nativeInput_1ksty {
     opacity: 0;
     position: absolute;
     top: 0;
@@ -81,9 +81,9 @@
             appearance: none;
     z-index: 1
 }
-.calendar-input__nativeInput_1vge6::-webkit-calendar-picker-indicator {
+.calendar-input__nativeInput_1ksty::-webkit-calendar-picker-indicator {
         display: none;
     }
-.calendar-input__nativeInput_1vge6::-webkit-inner-spin-button {
+.calendar-input__nativeInput_1ksty::-webkit-inner-spin-button {
         display: none;
     }

package/dist/modern/index.js

@@ -2,9 +2,11 @@ import 'react';
 import 'classnames';
 import 'react-merge-refs';
 import '@alfalab/core-components-popover/dist/modern';
+import '@alfalab/icons-glyph/CalendarMIcon';
 import '@alfalab/core-components-date-input/dist/modern';
 import '@alfalab/core-components-calendar/dist/modern';
-import '@alfalab/icons-glyph/CalendarMIcon';
+import 'date-fns/parse';
+import 'date-fns/format';
+import 'date-fns/isSameDay';
+export { DATE_FORMAT, DATE_MASK, IS_BROWSER, NATIVE_DATE_FORMAT, SUPPORTS_INPUT_TYPE_DATE, formatDate, isInputDateSupported, isValidInputValue, parseDateString } from './utils.js';
 export { CalendarInput } from './Component.js';
-import 'date-fns';
-export { DATE_FORMAT, DATE_MASK, IS_BROWSER, NATIVE_DATE_FORMAT, SUPPORTS_INPUT_TYPE_DATE, formatDate, isCompleteDateInput, isInputDateSupported, parseDateString } from './utils.js';

package/dist/modern/utils.d.ts

@@ -3,11 +3,11 @@ declare const NATIVE_DATE_FORMAT = "yyyy-MM-dd";
 declare const DATE_MASK: (string | RegExp)[];
 declare const IS_BROWSER: boolean;
 declare const SUPPORTS_INPUT_TYPE_DATE: boolean;
-declare const isCompleteDateInput: (input: string) => boolean;
 declare const formatDate: (date: number | Date, dateFormat?: string) => string;
 declare const parseDateString: (value: string, dateFormat?: string) => Date;
 /**
  * Возвращает `true`, если поддерживается `input[type="date"]`
  */
 declare function isInputDateSupported(): boolean;
-export { DATE_FORMAT, NATIVE_DATE_FORMAT, DATE_MASK, IS_BROWSER, SUPPORTS_INPUT_TYPE_DATE, isCompleteDateInput, formatDate, parseDateString, isInputDateSupported };
+declare const isValidInputValue: (newInputValue: string | undefined, minDate: number | undefined, maxDate: number | undefined, offDays?: (number | Date)[]) => boolean;
+export { DATE_FORMAT, NATIVE_DATE_FORMAT, DATE_MASK, IS_BROWSER, SUPPORTS_INPUT_TYPE_DATE, formatDate, parseDateString, isInputDateSupported, isValidInputValue };

package/dist/modern/utils.js

@@ -1,11 +1,14 @@
-import { format, parse } from 'date-fns';
+import { isCompleteDateInput } from '@alfalab/core-components-date-input/dist/modern';
+import { dateInLimits } from '@alfalab/core-components-calendar/dist/modern';
+import parse from 'date-fns/parse';
+import format from 'date-fns/format';
+import isSameDay from 'date-fns/isSameDay';
 
 const DATE_FORMAT = 'dd.MM.yyyy';
 const NATIVE_DATE_FORMAT = 'yyyy-MM-dd';
 const DATE_MASK = [/\d/, /\d/, '.', /\d/, /\d/, '.', /\d/, /\d/, /\d/, /\d/];
 const IS_BROWSER = typeof window !== 'undefined';
 const SUPPORTS_INPUT_TYPE_DATE = IS_BROWSER && isInputDateSupported();
-const isCompleteDateInput = (input) => input.length === DATE_MASK.length;
 const formatDate = (date, dateFormat = DATE_FORMAT) => format(date, dateFormat);
 const parseDateString = (value, dateFormat = DATE_FORMAT) => parse(value, dateFormat, new Date());
 /**
@@ -18,5 +21,14 @@ function isInputDateSupported() {
     input.setAttribute('value', value);
     return input.value !== value;
 }
+const isValidInputValue = (newInputValue, minDate, maxDate, offDays = []) => {
+    if (!newInputValue)
+        return false;
+    const dateValue = parseDateString(newInputValue).getTime();
+    return Boolean(dateValue &&
+        isCompleteDateInput(newInputValue) &&
+        dateInLimits(dateValue, minDate, maxDate) &&
+        !offDays.some(offDay => isSameDay(offDay, dateValue)));
+};
 
-export { DATE_FORMAT, DATE_MASK, IS_BROWSER, NATIVE_DATE_FORMAT, SUPPORTS_INPUT_TYPE_DATE, formatDate, isCompleteDateInput, isInputDateSupported, parseDateString };
+export { DATE_FORMAT, DATE_MASK, IS_BROWSER, NATIVE_DATE_FORMAT, SUPPORTS_INPUT_TYPE_DATE, formatDate, isInputDateSupported, isValidInputValue, parseDateString };

package/dist/utils.d.ts

@@ -3,11 +3,11 @@ declare const NATIVE_DATE_FORMAT = "yyyy-MM-dd";
 declare const DATE_MASK: (string | RegExp)[];
 declare const IS_BROWSER: boolean;
 declare const SUPPORTS_INPUT_TYPE_DATE: boolean;
-declare const isCompleteDateInput: (input: string) => boolean;
 declare const formatDate: (date: number | Date, dateFormat?: string) => string;
 declare const parseDateString: (value: string, dateFormat?: string) => Date;
 /**
  * Возвращает `true`, если поддерживается `input[type="date"]`
  */
 declare function isInputDateSupported(): boolean;
-export { DATE_FORMAT, NATIVE_DATE_FORMAT, DATE_MASK, IS_BROWSER, SUPPORTS_INPUT_TYPE_DATE, isCompleteDateInput, formatDate, parseDateString, isInputDateSupported };
+declare const isValidInputValue: (newInputValue: string | undefined, minDate: number | undefined, maxDate: number | undefined, offDays?: (number | Date)[]) => boolean;
+export { DATE_FORMAT, NATIVE_DATE_FORMAT, DATE_MASK, IS_BROWSER, SUPPORTS_INPUT_TYPE_DATE, formatDate, parseDateString, isInputDateSupported, isValidInputValue };

package/dist/utils.js

@@ -2,21 +2,30 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var dateFns = require('date-fns');
+var coreComponentsDateInput = require('@alfalab/core-components-date-input');
+var coreComponentsCalendar = require('@alfalab/core-components-calendar');
+var parse = require('date-fns/parse');
+var format = require('date-fns/format');
+var isSameDay = require('date-fns/isSameDay');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var parse__default = /*#__PURE__*/_interopDefaultLegacy(parse);
+var format__default = /*#__PURE__*/_interopDefaultLegacy(format);
+var isSameDay__default = /*#__PURE__*/_interopDefaultLegacy(isSameDay);
 
 var DATE_FORMAT = 'dd.MM.yyyy';
 var NATIVE_DATE_FORMAT = 'yyyy-MM-dd';
 var DATE_MASK = [/\d/, /\d/, '.', /\d/, /\d/, '.', /\d/, /\d/, /\d/, /\d/];
 var IS_BROWSER = typeof window !== 'undefined';
 var SUPPORTS_INPUT_TYPE_DATE = IS_BROWSER && isInputDateSupported();
-var isCompleteDateInput = function (input) { return input.length === DATE_MASK.length; };
 var formatDate = function (date, dateFormat) {
     if (dateFormat === void 0) { dateFormat = DATE_FORMAT; }
-    return dateFns.format(date, dateFormat);
+    return format__default['default'](date, dateFormat);
 };
 var parseDateString = function (value, dateFormat) {
     if (dateFormat === void 0) { dateFormat = DATE_FORMAT; }
-    return dateFns.parse(value, dateFormat, new Date());
+    return parse__default['default'](value, dateFormat, new Date());
 };
 /**
  * Возвращает `true`, если поддерживается `input[type="date"]`
@@ -28,6 +37,16 @@ function isInputDateSupported() {
     input.setAttribute('value', value);
     return input.value !== value;
 }
+var isValidInputValue = function (newInputValue, minDate, maxDate, offDays) {
+    if (offDays === void 0) { offDays = []; }
+    if (!newInputValue)
+        return false;
+    var dateValue = parseDateString(newInputValue).getTime();
+    return Boolean(dateValue &&
+        coreComponentsDateInput.isCompleteDateInput(newInputValue) &&
+        coreComponentsCalendar.dateInLimits(dateValue, minDate, maxDate) &&
+        !offDays.some(function (offDay) { return isSameDay__default['default'](offDay, dateValue); }));
+};
 
 exports.DATE_FORMAT = DATE_FORMAT;
 exports.DATE_MASK = DATE_MASK;
@@ -35,6 +54,6 @@ exports.IS_BROWSER = IS_BROWSER;
 exports.NATIVE_DATE_FORMAT = NATIVE_DATE_FORMAT;
 exports.SUPPORTS_INPUT_TYPE_DATE = SUPPORTS_INPUT_TYPE_DATE;
 exports.formatDate = formatDate;
-exports.isCompleteDateInput = isCompleteDateInput;
 exports.isInputDateSupported = isInputDateSupported;
+exports.isValidInputValue = isValidInputValue;
 exports.parseDateString = parseDateString;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@alfalab/core-components-calendar-input",
-    "version": "5.3.0",
+    "version": "6.0.0",
     "description": "Calendar input component",
     "keywords": [],
     "license": "MIT",
@@ -19,12 +19,12 @@
         "react-dom": "^16.9.0 || ^17.0.1"
     },
     "dependencies": {
-        "@alfalab/core-components-calendar": "^4.3.0",
-        "@alfalab/core-components-date-input": "^1.3.0",
+        "@alfalab/core-components-calendar": "^5.0.0",
+        "@alfalab/core-components-date-input": "^2.0.0",
         "@alfalab/core-components-popover": "^5.6.1",
         "classnames": "^2.2.6",
         "date-fns": "^2.16.1",
         "react-merge-refs": "^1.1.0"
     },
-    "gitHead": "45ff10d1efc81a4a1afb82c6b6eca1b428c7c459"
+    "gitHead": "c807c08f187316e93147175be6feffc3492989c8"
 }