@alfalab/core-components 24.1.0 → 25.0.0

package/calendar/useCalendar.js

@@ -1,12 +1,45 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
-var dateFns = require('date-fns');
+require('date-fns/startOfDay');
+var startOfMonth = require('date-fns/startOfMonth');
+var isSameDay = require('date-fns/isSameDay');
+require('date-fns/eachDayOfInterval');
+require('date-fns/eachMonthOfInterval');
+require('date-fns/eachYearOfInterval');
+require('date-fns/lastDayOfMonth');
+require('date-fns/startOfYear');
+require('date-fns/endOfYear');
+require('date-fns/isBefore');
+require('date-fns/isAfter');
+require('date-fns/min');
+require('date-fns/max');
+require('date-fns/addDays');
+var addMonths = require('date-fns/addMonths');
+require('date-fns/endOfWeek');
+require('date-fns/startOfWeek');
+require('date-fns/subDays');
+require('date-fns/subMonths');
+require('date-fns/format');
+require('date-fns/parse');
 var utils = require('./utils.js');
+var isSameMonth = require('date-fns/isSameMonth');
+var isSameYear = require('date-fns/isSameYear');
+var addYears = require('date-fns/addYears');
+var setYear = require('date-fns/setYear');
+var subYears = require('date-fns/subYears');
 var mergeRefs = require('react-merge-refs');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+var startOfMonth__default = /*#__PURE__*/_interopDefaultLegacy(startOfMonth);
+var isSameDay__default = /*#__PURE__*/_interopDefaultLegacy(isSameDay);
+var addMonths__default = /*#__PURE__*/_interopDefaultLegacy(addMonths);
+var isSameMonth__default = /*#__PURE__*/_interopDefaultLegacy(isSameMonth);
+var isSameYear__default = /*#__PURE__*/_interopDefaultLegacy(isSameYear);
+var addYears__default = /*#__PURE__*/_interopDefaultLegacy(addYears);
+var setYear__default = /*#__PURE__*/_interopDefaultLegacy(setYear);
+var subYears__default = /*#__PURE__*/_interopDefaultLegacy(subYears);
 var mergeRefs__default = /*#__PURE__*/_interopDefaultLegacy(mergeRefs);
 
 function useCalendar(_a) {
@@ -17,8 +50,8 @@ function useCalendar(_a) {
     var activeMonth = uncontrolled ? monthState : month;
     var dateRefs = React.useRef([]);
     var rootRef = React.useRef(null);
-    var minMonth = React.useMemo(function () { return minDate && dateFns.startOfMonth(minDate); }, [minDate]);
-    var maxMonth = React.useMemo(function () { return maxDate && dateFns.startOfMonth(maxDate); }, [maxDate]);
+    var minMonth = React.useMemo(function () { return minDate && startOfMonth__default['default'](minDate); }, [minDate]);
+    var maxMonth = React.useMemo(function () { return maxDate && startOfMonth__default['default'](maxDate); }, [maxDate]);
     var canSetPrevMonth = minMonth ? activeMonth > minMonth : true;
     var canSetNextMonth = maxMonth ? activeMonth < maxMonth : true;
     var eventsMap = React.useMemo(function () { return utils.dateArrayToHashTable(events || []); }, [events]);
@@ -30,7 +63,7 @@ function useCalendar(_a) {
         activeMonth,
     ]);
     var years = React.useMemo(function () {
-        return utils.generateYears(minDate || dateFns.subYears(new Date(), 100), maxDate || dateFns.addYears(new Date(), 1));
+        return utils.generateYears(minDate || subYears__default['default'](new Date(), 100), maxDate || addYears__default['default'](new Date(), 1));
     }, [minDate, maxDate]);
     var setMonth = React.useCallback(function (newMonth) {
         if (uncontrolled) {
@@ -41,7 +74,7 @@ function useCalendar(_a) {
         }
     }, [onMonthChange, uncontrolled]);
     var setMonthByStep = React.useCallback(function (step) {
-        setMonth(utils.limitDate(dateFns.addMonths(activeMonth, step), minMonth, maxMonth));
+        setMonth(utils.limitDate(addMonths__default['default'](activeMonth, step), minMonth, maxMonth));
     }, [setMonth, activeMonth, minMonth, maxMonth]);
     var setMonthByDate = React.useCallback(function (newMonth) {
         setMonth(utils.limitDate(newMonth, minMonth, maxMonth));
@@ -142,7 +175,7 @@ function useCalendar(_a) {
     var handleYearClick = React.useCallback(function (event) {
         var date = event.currentTarget.dataset.date;
         if (date) {
-            setMonthByDate(dateFns.setYear(activeMonth, new Date(+date).getFullYear()));
+            setMonthByDate(setYear__default['default'](activeMonth, new Date(+date).getFullYear()));
         }
         if (rootRef.current && rootRef.current.contains(document.activeElement)) {
             rootRef.current.focus();
@@ -200,10 +233,10 @@ function useCalendar(_a) {
     }, [controlsByView, view]);
     var focusableDayIsSet = false;
     var getDayProps = React.useCallback(function (day) {
-        var daySelected = selected && dateFns.isSameDay(selected, day.date);
+        var daySelected = selected && isSameDay__default['default'](selected, day.date);
         var canFocus = daySelected;
         // Если день не выбран — фокус должен начинаться с первого доступного дня месяца
-        if ((!selected || !dateFns.isSameMonth(selected, activeMonth)) &&
+        if ((!selected || !isSameMonth__default['default'](selected, activeMonth)) &&
             !focusableDayIsSet &&
             !day.disabled) {
             // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -232,7 +265,7 @@ function useCalendar(_a) {
     var getMonthProps = React.useCallback(
     // eslint-disable-next-line no-shadow
     function (month) {
-        var monthselected = dateFns.isSameMonth(activeMonth, month.date);
+        var monthselected = isSameMonth__default['default'](activeMonth, month.date);
         return {
             'data-date': month.date.getTime(),
             'aria-selected': monthselected,
@@ -245,7 +278,7 @@ function useCalendar(_a) {
         };
     }, [activeMonth, handleDateRef, handleMonthClick]);
     var getYearProps = React.useCallback(function (year) {
-        var yearSelected = dateFns.isSameYear(activeMonth, year);
+        var yearSelected = isSameYear__default['default'](activeMonth, year);
         return {
             'data-date': year.getTime(),
             'aria-selected': yearSelected,

package/calendar/usePeriod.js

@@ -1,8 +1,12 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
-var dateFns = require('date-fns');
 var hooks = require('@alfalab/hooks');
+var differenceInDays = require('date-fns/differenceInDays');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var differenceInDays__default = /*#__PURE__*/_interopDefaultLegacy(differenceInDays);
 
 function usePeriod(_a) {
     var _b = _a === void 0 ? {} : _a, onPeriodChange = _b.onPeriodChange, initialSelectedFrom = _b.initialSelectedFrom, initialSelectedTo = _b.initialSelectedTo;
@@ -58,8 +62,8 @@ function usePeriod(_a) {
             return;
         }
         // сдвигаем тот конец выделения, который ближе к выбранной дате
-        if (Math.abs(dateFns.differenceInDays(date, selectedTo)) >
-            Math.abs(dateFns.differenceInDays(date, selectedFrom))) {
+        if (Math.abs(differenceInDays__default['default'](date, selectedTo)) >
+            Math.abs(differenceInDays__default['default'](date, selectedFrom))) {
             setSelectedFrom(date);
         }
         else {

package/calendar/utils.js

@@ -1,6 +1,50 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var dateFns = require('date-fns');
+var startOfDay = require('date-fns/startOfDay');
+var startOfMonth = require('date-fns/startOfMonth');
+var isSameDay = require('date-fns/isSameDay');
+var eachDayOfInterval = require('date-fns/eachDayOfInterval');
+var eachMonthOfInterval = require('date-fns/eachMonthOfInterval');
+var eachYearOfInterval = require('date-fns/eachYearOfInterval');
+var lastDayOfMonth = require('date-fns/lastDayOfMonth');
+var startOfYear = require('date-fns/startOfYear');
+var endOfYear = require('date-fns/endOfYear');
+var isBefore = require('date-fns/isBefore');
+var isAfter = require('date-fns/isAfter');
+var min = require('date-fns/min');
+var max = require('date-fns/max');
+var addDays = require('date-fns/addDays');
+var addMonths = require('date-fns/addMonths');
+var endOfWeek = require('date-fns/endOfWeek');
+var startOfWeek = require('date-fns/startOfWeek');
+var subDays = require('date-fns/subDays');
+var subMonths = require('date-fns/subMonths');
+var format = require('date-fns/format');
+var parse = require('date-fns/parse');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var startOfDay__default = /*#__PURE__*/_interopDefaultLegacy(startOfDay);
+var startOfMonth__default = /*#__PURE__*/_interopDefaultLegacy(startOfMonth);
+var isSameDay__default = /*#__PURE__*/_interopDefaultLegacy(isSameDay);
+var eachDayOfInterval__default = /*#__PURE__*/_interopDefaultLegacy(eachDayOfInterval);
+var eachMonthOfInterval__default = /*#__PURE__*/_interopDefaultLegacy(eachMonthOfInterval);
+var eachYearOfInterval__default = /*#__PURE__*/_interopDefaultLegacy(eachYearOfInterval);
+var lastDayOfMonth__default = /*#__PURE__*/_interopDefaultLegacy(lastDayOfMonth);
+var startOfYear__default = /*#__PURE__*/_interopDefaultLegacy(startOfYear);
+var endOfYear__default = /*#__PURE__*/_interopDefaultLegacy(endOfYear);
+var isBefore__default = /*#__PURE__*/_interopDefaultLegacy(isBefore);
+var isAfter__default = /*#__PURE__*/_interopDefaultLegacy(isAfter);
+var min__default = /*#__PURE__*/_interopDefaultLegacy(min);
+var max__default = /*#__PURE__*/_interopDefaultLegacy(max);
+var addDays__default = /*#__PURE__*/_interopDefaultLegacy(addDays);
+var addMonths__default = /*#__PURE__*/_interopDefaultLegacy(addMonths);
+var endOfWeek__default = /*#__PURE__*/_interopDefaultLegacy(endOfWeek);
+var startOfWeek__default = /*#__PURE__*/_interopDefaultLegacy(startOfWeek);
+var subDays__default = /*#__PURE__*/_interopDefaultLegacy(subDays);
+var subMonths__default = /*#__PURE__*/_interopDefaultLegacy(subMonths);
+var format__default = /*#__PURE__*/_interopDefaultLegacy(format);
+var parse__default = /*#__PURE__*/_interopDefaultLegacy(parse);
 
 var DAYS_IN_WEEK = 7;
 var MONTHS_IN_YEAR = 12;
@@ -35,13 +79,13 @@ function russianWeekDay(date) {
  */
 function generateWeeks(month, options) {
     var newWeek = function () { return Array(DAYS_IN_WEEK).fill(null); };
-    var start = dateFns.startOfMonth(month);
-    var end = dateFns.lastDayOfMonth(start);
+    var start = startOfMonth__default['default'](month);
+    var end = lastDayOfMonth__default['default'](start);
     var week = newWeek();
-    return dateFns.eachDayOfInterval({ start: start, end: end }).reduce(function (weeks, day) {
+    return eachDayOfInterval__default['default']({ start: start, end: end }).reduce(function (weeks, day) {
         var weekDay = russianWeekDay(day);
         week[weekDay] = buildDay(day, options);
-        if (weekDay === SUNDAY_INDEX || dateFns.isSameDay(day, end)) {
+        if (weekDay === SUNDAY_INDEX || isSameDay__default['default'](day, end)) {
             weeks.push(week);
             week = newWeek();
         }
@@ -52,7 +96,7 @@ function generateWeeks(month, options) {
  * Возвращает массив с месяцами для переданного года
  */
 function generateMonths(year, options) {
-    return dateFns.eachMonthOfInterval({ start: dateFns.startOfYear(year), end: dateFns.endOfYear(year) }).map(function (month) {
+    return eachMonthOfInterval__default['default']({ start: startOfYear__default['default'](year), end: endOfYear__default['default'](year) }).map(function (month) {
         return buildMonth(month, options);
     });
 }
@@ -60,9 +104,9 @@ function generateMonths(year, options) {
  * Возвращает массив лет от minYear до maxYear
  */
 function generateYears(minYear, maxYear) {
-    return dateFns.eachYearOfInterval({
-        start: dateFns.min([dateFns.startOfYear(maxYear), dateFns.startOfYear(minYear)]),
-        end: dateFns.max([dateFns.startOfYear(maxYear), dateFns.startOfYear(minYear)]),
+    return eachYearOfInterval__default['default']({
+        start: min__default['default']([startOfYear__default['default'](maxYear), startOfYear__default['default'](minYear)]),
+        end: max__default['default']([startOfYear__default['default'](maxYear), startOfYear__default['default'](minYear)]),
     }).reverse();
 }
 /**
@@ -71,12 +115,12 @@ function generateYears(minYear, maxYear) {
 function buildDay(day, options) {
     var minDate = options.minDate, maxDate = options.maxDate, selected = options.selected, _a = options.eventsMap, eventsMap = _a === void 0 ? {} : _a, _b = options.offDaysMap, offDaysMap = _b === void 0 ? {} : _b;
     var off = offDaysMap[day.getTime()];
-    var disabled = (minDate && dateFns.isBefore(day, minDate)) || (maxDate && dateFns.isAfter(day, maxDate));
+    var disabled = (minDate && isBefore__default['default'](day, minDate)) || (maxDate && isAfter__default['default'](day, maxDate));
     return {
         date: day,
         disabled: disabled || off,
         event: eventsMap[day.getTime()],
-        selected: selected && dateFns.isSameDay(day, selected),
+        selected: selected && isSameDay__default['default'](day, selected),
     };
 }
 /**
@@ -86,7 +130,7 @@ function buildMonth(month, options) {
     var minMonth = options.minMonth, maxMonth = options.maxMonth;
     return {
         date: month,
-        disabled: (minMonth && dateFns.isBefore(month, minMonth)) || (maxMonth && dateFns.isAfter(month, maxMonth)),
+        disabled: (minMonth && isBefore__default['default'](month, minMonth)) || (maxMonth && isAfter__default['default'](month, maxMonth)),
     };
 }
 /**
@@ -95,9 +139,9 @@ function buildMonth(month, options) {
 function limitDate(date, minDate, maxDate) {
     var limitedDate = date;
     if (minDate)
-        limitedDate = dateFns.max([minDate, limitedDate]);
+        limitedDate = max__default['default']([minDate, limitedDate]);
     if (maxDate)
-        limitedDate = dateFns.min([maxDate, limitedDate]);
+        limitedDate = min__default['default']([maxDate, limitedDate]);
     return new Date(limitedDate);
 }
 /**
@@ -117,7 +161,7 @@ function monthName(month) {
  */
 function dateArrayToHashTable(arr) {
     return arr.reduce(function (acc, v) {
-        acc[dateFns.startOfDay(v).getTime()] = true;
+        acc[startOfDay__default['default'](v).getTime()] = true;
         return acc;
     }, {});
 }
@@ -131,8 +175,8 @@ function getSelectionRange(from, to, highlighted) {
     var start = from || highlighted;
     if (start && end && start !== end) {
         return {
-            start: dateFns.min([start, end]),
-            end: dateFns.max([start, end]),
+            start: min__default['default']([start, end]),
+            end: max__default['default']([start, end]),
         };
     }
     return null;
@@ -141,14 +185,14 @@ function getSelectionRange(from, to, highlighted) {
 function modifyDateByShift(shift, date, minDate, maxDate, offDaysMap) {
     if (offDaysMap === void 0) { offDaysMap = {}; }
     var modifiers = {
-        prev: function () { return dateFns.subDays(date, 1); },
-        prevWeek: function () { return dateFns.subDays(date, 7); },
-        prevMonth: function () { return dateFns.subMonths(date, 1); },
-        next: function () { return dateFns.addDays(date, 1); },
-        nextWeek: function () { return dateFns.addDays(date, 7); },
-        nextMonth: function () { return dateFns.addMonths(date, 1); },
-        startOfWeek: function () { return dateFns.startOfWeek(date, { weekStartsOn: 1 }); },
-        endOfWeek: function () { return dateFns.startOfDay(dateFns.endOfWeek(date, { weekStartsOn: 1 })); },
+        prev: function () { return subDays__default['default'](date, 1); },
+        prevWeek: function () { return subDays__default['default'](date, 7); },
+        prevMonth: function () { return subMonths__default['default'](date, 1); },
+        next: function () { return addDays__default['default'](date, 1); },
+        nextWeek: function () { return addDays__default['default'](date, 7); },
+        nextMonth: function () { return addMonths__default['default'](date, 1); },
+        startOfWeek: function () { return startOfWeek__default['default'](date, { weekStartsOn: 1 }); },
+        endOfWeek: function () { return startOfDay__default['default'](endOfWeek__default['default'](date, { weekStartsOn: 1 })); },
     };
     var newDate = modifiers[shift]();
     while (offDaysMap[newDate.getTime()]) {
@@ -158,7 +202,7 @@ function modifyDateByShift(shift, date, minDate, maxDate, offDaysMap) {
             amount = -1;
         if (shift === 'startOfWeek')
             amount = 1;
-        newDate = dateFns.addDays(newDate, amount);
+        newDate = addDays__default['default'](newDate, amount);
     }
     return limitDate(newDate, minDate, maxDate);
 }
@@ -177,11 +221,11 @@ function simulateTab(node) {
 }
 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());
 };
 
 exports.DATE_FORMAT = DATE_FORMAT;

package/calendar-input/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/calendar-input/Component.js

@@ -4,10 +4,12 @@ var React = require('react');
 var cn = require('classnames');
 var mergeRefs = require('react-merge-refs');
 var coreComponentsPopover = require('../popover');
+var CalendarMIcon = require('@alfalab/icons-glyph/CalendarMIcon');
 var coreComponentsDateInput = require('../date-input');
 var coreComponentsCalendar = require('../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 }; }
@@ -55,24 +57,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);
@@ -117,18 +123,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);
@@ -140,16 +142,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,
@@ -159,9 +168,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/calendar-input/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/calendar-input/cssm/Component.js

@@ -4,12 +4,14 @@ var React = require('react');
 var cn = require('classnames');
 var mergeRefs = require('react-merge-refs');
 var coreComponentsPopover = require('../../popover/cssm');
+var CalendarMIcon = require('@alfalab/icons-glyph/CalendarMIcon');
 var coreComponentsDateInput = require('../../date-input/cssm');
 var coreComponentsCalendar = require('../../calendar/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 }; }
 
@@ -59,19 +61,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);
@@ -116,18 +122,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);
@@ -139,16 +141,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,
@@ -158,9 +167,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()))));
 });