@alfalab/core-components 23.12.0 → 25.0.0

package/calendar-input/index.css

@@ -1,6 +1,5 @@
-/* hash: 1v5y6 */
+/* hash: codnr */
 :root {
-    --color-light-border-primary: #dbdee1;
     --color-light-graphic-primary: #0b1f35;
 }
 :root {
@@ -16,7 +15,7 @@
     --gap-2xs: 4px;
 }
 :root {
-    --border-radius-m: 8px;
+    --border-radius-s: 4px;
 }
 :root {
 
@@ -40,40 +39,38 @@
 }
 :root {
     --calendar-input-icon-color: var(--color-light-graphic-primary);
-    --calendar-input-popover-border-color: var(--color-light-border-primary);
-    --calendar-input-popover-border-radius: var(--border-radius-m);
+    --calendar-input-popover-border-radius: 0 0 var(--border-radius-s) var(--border-radius-s);
 }
-.calendar-input__component_1s0er {
+.calendar-input__component_1ksty {
     display: inline-block;
     outline: none;
     position: relative;
 }
-.calendar-input__block_1s0er {
+.calendar-input__block_1ksty {
     width: 100%;
 }
-.calendar-input__calendarContainer_1s0er {
+.calendar-input__calendarContainer_1ksty {
     display: inline-block;
     box-sizing: border-box;
     box-shadow: var(--shadow-s);
-    border: 1px solid var(--calendar-input-popover-border-color);
     border-radius: var(--calendar-input-popover-border-radius)
 }
 @media (max-width: 374px) {
-.calendar-input__calendarContainer_1s0er {
+.calendar-input__calendarContainer_1ksty {
         width: 100%;
         min-width: 288px
 }
     }
-.calendar-input__calendarIcon_1s0er {
+.calendar-input__calendarIcon_1ksty {
     width: 24px;
     height: 24px;
     display: block;
     color: var(--calendar-input-icon-color)
 }
-.calendar-input__calendarIcon_1s0er:not(:only-child) {
+.calendar-input__calendarIcon_1ksty:not(:only-child) {
         margin-right: var(--gap-2xs);
     }
-.calendar-input__nativeInput_1s0er {
+.calendar-input__nativeInput_1ksty {
     opacity: 0;
     position: absolute;
     top: 0;
@@ -84,9 +81,9 @@
             appearance: none;
     z-index: 1
 }
-.calendar-input__nativeInput_1s0er::-webkit-calendar-picker-indicator {
+.calendar-input__nativeInput_1ksty::-webkit-calendar-picker-indicator {
         display: none;
     }
-.calendar-input__nativeInput_1s0er::-webkit-inner-spin-button {
+.calendar-input__nativeInput_1ksty::-webkit-inner-spin-button {
         display: none;
     }

package/calendar-input/index.js

@@ -5,10 +5,12 @@ require('react');
 require('classnames');
 require('react-merge-refs');
 require('../popover');
+require('@alfalab/icons-glyph/CalendarMIcon');
 require('../date-input');
 require('../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');
 
 
@@ -20,6 +22,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/calendar-input/modern/Component.d.ts

@@ -45,6 +45,10 @@ type CalendarInputProps = Omit<DateInputProps, 'onChange' | 'mobileMode'> & {
      * Максимальная дата, доступная для выбора (timestamp)
      */
     maxDate?: number;
+    /**
+     * Список событий
+     */
+    events?: Array<Date | number>;
     /**
      * Список выходных
      */
@@ -97,7 +101,7 @@ type CalendarInputProps = Omit<DateInputProps, 'onChange' | 'mobileMode'> & {
      */
     useAnchorWidth?: boolean;
 };
-declare const CalendarInput: React.ForwardRefExoticComponent<Pick<DateInputProps, "children" | "value" | "form" | "label" | "slot" | "style" | "title" | "pattern" | "dir" | "className" | "dataTestId" | "height" | "name" | "hidden" | "color" | "size" | "block" | "clear" | "multiple" | "disabled" | "leftAddons" | "rightAddons" | "colors" | "type" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "draggable" | "id" | "lang" | "placeholder" | "spellCheck" | "tabIndex" | "translate" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "list" | "step" | "autoFocus" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "fieldClassName" | "labelClassName" | "addonsClassName" | "error" | "hint" | "bottomAddons" | "accept" | "alt" | "autoComplete" | "capture" | "checked" | "crossOrigin" | "max" | "maxLength" | "min" | "minLength" | "readOnly" | "required" | "src" | "width" | "success" | "inputClassName" | "focusedClassName" | "filledClassName" | "onClear" | "wrapperRef" | "keepCharPositions" | "minYear" | "maxYear"> & {
+declare const CalendarInput: React.ForwardRefExoticComponent<Pick<DateInputProps, "children" | "value" | "form" | "label" | "slot" | "style" | "title" | "pattern" | "dir" | "className" | "dataTestId" | "height" | "name" | "width" | "hidden" | "color" | "size" | "block" | "clear" | "multiple" | "disabled" | "leftAddons" | "rightAddons" | "colors" | "type" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "draggable" | "id" | "lang" | "placeholder" | "spellCheck" | "tabIndex" | "translate" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "list" | "step" | "autoFocus" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "fieldClassName" | "labelClassName" | "addonsClassName" | "error" | "hint" | "bottomAddons" | "accept" | "alt" | "autoComplete" | "capture" | "checked" | "crossOrigin" | "max" | "maxLength" | "min" | "minLength" | "readOnly" | "required" | "src" | "success" | "inputClassName" | "focusedClassName" | "filledClassName" | "onClear" | "wrapperRef" | "onComplete"> & {
     /**
      * Дополнительный класс
      */
@@ -138,6 +142,10 @@ declare const CalendarInput: React.ForwardRefExoticComponent<Pick<DateInputProps
      * Максимальная дата, доступная для выбора (timestamp)
      */
     maxDate?: number | undefined;
+    /**
+     * Список событий
+     */
+    events?: (number | Date)[] | undefined;
     /**
      * Список выходных
      */

package/calendar-input/modern/Component.js

@@ -1,27 +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 { CalendarMIcon } from '@alfalab/icons-glyph/CalendarMIcon';
+import 'date-fns/parse';
+import 'date-fns/format';
+import 'date-fns/isSameDay';
 import { Popover } from '../../popover/modern';
-import { parseDateString, isCompleteDateInput, formatDate, DateInput, SUPPORTS_INPUT_TYPE_DATE } from '../../date-input/modern';
+import { parseDateString, isCompleteDateInput, formatDate, DateInput } from '../../date-input/modern';
 import { Calendar, dateInLimits } from '../../calendar/modern';
+import { SUPPORTS_INPUT_TYPE_DATE } from './utils.js';
 
-var styles = {"component":"calendar-input__component_1s0er","block":"calendar-input__block_1s0er","calendarContainer":"calendar-input__calendarContainer_1s0er","calendarIcon":"calendar-input__calendarIcon_1s0er","nativeInput":"calendar-input__nativeInput_1s0er"};
+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);
@@ -64,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);
@@ -87,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,
@@ -106,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/calendar-input/modern/index.css

@@ -1,6 +1,5 @@
-/* hash: 1v5y6 */
+/* hash: codnr */
 :root {
-    --color-light-border-primary: #dbdee1;
     --color-light-graphic-primary: #0b1f35;
 }
 :root {
@@ -16,7 +15,7 @@
     --gap-2xs: 4px;
 }
 :root {
-    --border-radius-m: 8px;
+    --border-radius-s: 4px;
 }
 :root {
 
@@ -40,40 +39,38 @@
 }
 :root {
     --calendar-input-icon-color: var(--color-light-graphic-primary);
-    --calendar-input-popover-border-color: var(--color-light-border-primary);
-    --calendar-input-popover-border-radius: var(--border-radius-m);
+    --calendar-input-popover-border-radius: 0 0 var(--border-radius-s) var(--border-radius-s);
 }
-.calendar-input__component_1s0er {
+.calendar-input__component_1ksty {
     display: inline-block;
     outline: none;
     position: relative;
 }
-.calendar-input__block_1s0er {
+.calendar-input__block_1ksty {
     width: 100%;
 }
-.calendar-input__calendarContainer_1s0er {
+.calendar-input__calendarContainer_1ksty {
     display: inline-block;
     box-sizing: border-box;
     box-shadow: var(--shadow-s);
-    border: 1px solid var(--calendar-input-popover-border-color);
     border-radius: var(--calendar-input-popover-border-radius)
 }
 @media (max-width: 374px) {
-.calendar-input__calendarContainer_1s0er {
+.calendar-input__calendarContainer_1ksty {
         width: 100%;
         min-width: 288px
 }
     }
-.calendar-input__calendarIcon_1s0er {
+.calendar-input__calendarIcon_1ksty {
     width: 24px;
     height: 24px;
     display: block;
     color: var(--calendar-input-icon-color)
 }
-.calendar-input__calendarIcon_1s0er:not(:only-child) {
+.calendar-input__calendarIcon_1ksty:not(:only-child) {
         margin-right: var(--gap-2xs);
     }
-.calendar-input__nativeInput_1s0er {
+.calendar-input__nativeInput_1ksty {
     opacity: 0;
     position: absolute;
     top: 0;
@@ -84,9 +81,9 @@
             appearance: none;
     z-index: 1
 }
-.calendar-input__nativeInput_1s0er::-webkit-calendar-picker-indicator {
+.calendar-input__nativeInput_1ksty::-webkit-calendar-picker-indicator {
         display: none;
     }
-.calendar-input__nativeInput_1s0er::-webkit-inner-spin-button {
+.calendar-input__nativeInput_1ksty::-webkit-inner-spin-button {
         display: none;
     }

package/calendar-input/modern/index.js

@@ -2,9 +2,11 @@ import 'react';
 import 'classnames';
 import 'react-merge-refs';
 import '@alfalab/icons-glyph/CalendarMIcon';
-import 'date-fns';
+import 'date-fns/parse';
+import 'date-fns/format';
+import 'date-fns/isSameDay';
 import '../../popover/modern';
 import '../../date-input/modern';
 import '../../calendar/modern';
+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';
-export { DATE_FORMAT, DATE_MASK, IS_BROWSER, NATIVE_DATE_FORMAT, SUPPORTS_INPUT_TYPE_DATE, formatDate, isCompleteDateInput, isInputDateSupported, parseDateString } from './utils.js';

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

@@ -1,11 +1,14 @@
-import { format, parse } from 'date-fns';
+import parse from 'date-fns/parse';
+import format from 'date-fns/format';
+import isSameDay from 'date-fns/isSameDay';
+import { isCompleteDateInput } from '../../date-input/modern';
+import { dateInLimits } from '../../calendar/modern';
 
 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/calendar-input/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/calendar-input/utils.js

@@ -1,20 +1,29 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var dateFns = require('date-fns');
+var coreComponentsDateInput = require('../date-input');
+var coreComponentsCalendar = require('../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"]`
@@ -26,6 +35,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;
@@ -33,6 +52,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/calendar-range/Component.d.ts

@@ -1,6 +1,5 @@
 import { FC } from 'react';
 import { CalendarInputProps } from "../calendar-input";
-import { ValueState } from "./utils";
 type CalendarRangeProps = {
     /**
      * Дополнительный класс
@@ -29,11 +28,34 @@ type CalendarRangeProps = {
     /**
      * Обработчик изменения даты от
      */
-    onDateFromChange?: (payload: ValueState) => void;
+    onDateFromChange?: (payload: {
+        date: number | null;
+        value: string;
+    }) => void;
     /**
      * Обработчик изменения даты до
      */
-    onDateToChange?: (payload: ValueState) => void;
+    onDateToChange?: (payload: {
+        date: number | null;
+        value: string;
+    }) => void;
+    /**
+     * Обработчик изменения
+     */
+    onChange?: (payload: {
+        dateFrom: number | null;
+        valueFrom: string;
+        dateTo: number | null;
+        valueTo: string;
+    }) => void;
+    /**
+     * Список событий
+     */
+    events?: Array<Date | number>;
+    /**
+     * Список выходных
+     */
+    offDays?: Array<Date | number>;
     /**
      * Пропсы для инпута даты от
      */