@salutejs/plasma-new-hope 0.166.0-canary.1470.11345978173.0 → 0.166.0-canary.1475.11347015087.0

package/es/index.css

@@ -715,7 +715,7 @@
 
 
 
-.base_1911nyw_bxpb4df__5db6cb4b{width:var(--plasma-date-picker-width);}.base_1911nyw_bxpb4df__5db6cb4b .base_1911nyw_ss94ai0__5db6cb4b{margin:var(--plasma-date-picker__label-offset);font-family:var(--plasma-date-picker__label-font-family);font-size:var(--plasma-date-picker__label-font-size);font-style:var(--plasma-date-picker__label-font-style);font-weight:var(--plasma-date-picker__label-font-weight);-webkit-letter-spacing:var(--plasma-date-picker__label-letter-spacing);-moz-letter-spacing:var(--plasma-date-picker__label-letter-spacing);-ms-letter-spacing:var(--plasma-date-picker__label-letter-spacing);letter-spacing:var(--plasma-date-picker__label-letter-spacing);line-height:var(--plasma-date-picker__label-line-height);}.base_1911nyw_bxpb4df__5db6cb4b .base_1911nyw_l1b381ow__5db6cb4b{margin:var(--plasma-date-picker__left-helper-offset);font-family:var(--plasma-date-picker__left-helper-font-family);font-size:var(--plasma-date-picker__left-helper-font-size);font-style:var(--plasma-date-picker__left-helper-font-style);font-weight:var(--plasma-date-picker__left-helper-font-weight);-webkit-letter-spacing:var(--plasma-date-picker__left-helper-letter-spacing);-moz-letter-spacing:var(--plasma-date-picker__left-helper-letter-spacing);-ms-letter-spacing:var(--plasma-date-picker__left-helper-letter-spacing);letter-spacing:var(--plasma-date-picker__left-helper-letter-spacing);line-height:var(--plasma-date-picker__left-helper-line-height);}
+.base_1d0sbzw_bxpb4df__7076066f .base_1d0sbzw_ss94ai0__7076066f{margin:var(--plasma-date-picker__label-offset);font-family:var(--plasma-date-picker__label-font-family);font-size:var(--plasma-date-picker__label-font-size);font-style:var(--plasma-date-picker__label-font-style);font-weight:var(--plasma-date-picker__label-font-weight);-webkit-letter-spacing:var(--plasma-date-picker__label-letter-spacing);-moz-letter-spacing:var(--plasma-date-picker__label-letter-spacing);-ms-letter-spacing:var(--plasma-date-picker__label-letter-spacing);letter-spacing:var(--plasma-date-picker__label-letter-spacing);line-height:var(--plasma-date-picker__label-line-height);}.base_1d0sbzw_bxpb4df__7076066f .base_1d0sbzw_l1b381ow__7076066f{margin:var(--plasma-date-picker__left-helper-offset);font-family:var(--plasma-date-picker__left-helper-font-family);font-size:var(--plasma-date-picker__left-helper-font-size);font-style:var(--plasma-date-picker__left-helper-font-style);font-weight:var(--plasma-date-picker__left-helper-font-weight);-webkit-letter-spacing:var(--plasma-date-picker__left-helper-letter-spacing);-moz-letter-spacing:var(--plasma-date-picker__left-helper-letter-spacing);-ms-letter-spacing:var(--plasma-date-picker__left-helper-letter-spacing);letter-spacing:var(--plasma-date-picker__left-helper-letter-spacing);line-height:var(--plasma-date-picker__left-helper-line-height);}
 
 .base_11yn9y8_bcuyjma__ffe2947a .base_11yn9y8_ss94ai0__ffe2947a{display:block;color:var(--plasma-date-picker__label-color);}.base_11yn9y8_bcuyjma__ffe2947a .base_11yn9y8_l1b381ow__ffe2947a{color:var(--plasma-date-picker__left-helper-color);}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salutejs/plasma-new-hope",
-  "version": "0.166.0-canary.1470.11345978173.0",
+  "version": "0.166.0-canary.1475.11347015087.0",
   "description": "Salute Design System blueprint",
   "main": "cjs/index.js",
   "module": "es/index.js",
@@ -124,5 +124,5 @@
     "react-popper": "2.3.0",
     "storeon": "3.1.5"
   },
-  "gitHead": "d0ead47e92ca4c9a347678d66c1aafb8d0d31c0a"
+  "gitHead": "f291c9e0ef6cdeb122e62bf24492e2a061f85c3f"
 }

package/styled-components/cjs/components/Combobox/ComboboxNew/utils/filterItems.js

@@ -19,15 +19,15 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 // Не мутирует исходные данные.
 var filterItems = exports.filterItems = function filterItems(items, textValue, currentLabel, customFilter) {
   if (!textValue || textValue === currentLabel) return items;
-  var defaultFilter = function defaultFilter(item, value) {
-    return item.label.toLowerCase().includes(value.toLowerCase());
+  var defaultFilter = function defaultFilter(label, value) {
+    return label.toLowerCase().includes(value.toLowerCase());
   };
   var filter = customFilter || defaultFilter;
   var dfs = function dfs(items) {
     var newItems = [];
     items.forEach(function (item) {
       if (item.items) {
-        if (filter(item, textValue)) {
+        if (filter(item.label, textValue)) {
           newItems.push(item);
           return;
         }
@@ -37,11 +37,12 @@ var filterItems = exports.filterItems = function filterItems(items, textValue, c
             items: res
           }));
         }
-      } else if (filter(item, textValue)) {
+      } else if (filter(item.label, textValue)) {
         newItems.push(item);
       }
     });
     return newItems;
   };
+  dfs(items);
   return dfs(items);
 };

package/styled-components/cjs/components/DatePicker/RangeDate/RangeDate.js

@@ -12,13 +12,14 @@ var _useDatePicker3 = /*#__PURE__*/require("../hooks/useDatePicker");
 var _DatePicker = /*#__PURE__*/require("../DatePicker.tokens");
 var _useKeyboardNavigation = /*#__PURE__*/require("../hooks/useKeyboardNavigation");
 var _DatePickerBase = /*#__PURE__*/require("../DatePickerBase.styles");
+var _utils2 = /*#__PURE__*/require("../../Calendar/utils");
 var _base = /*#__PURE__*/require("./variations/_size/base");
 var _base2 = /*#__PURE__*/require("./variations/_view/base");
 var _base3 = /*#__PURE__*/require("./variations/_disabled/base");
 var _base4 = /*#__PURE__*/require("./variations/_readonly/base");
 var _RangeDate = /*#__PURE__*/require("./RangeDate.styles");
 var _RangeDatePopover = /*#__PURE__*/require("./RangeDatePopover/RangeDatePopover");
-var _excluded = ["className", "isDoubleCalendar", "opened", "label", "leftHelper", "contentLeft", "contentRight", "view", "size", "readOnly", "disabled", "name", "dividerVariant", "dividerIcon", "defaultFirstDate", "defaultSecondDate", "firstValueError", "secondValueError", "firstValueSuccess", "secondValueSuccess", "firstPlaceholder", "secondPlaceholder", "firstTextfieldContentLeft", "firstTextfieldContentRight", "secondTextfieldContentLeft", "secondTextfieldContentRight", "firstTextfieldTextBefore", "secondTextfieldTextBefore", "firstTextfieldTextAfter", "secondTextfieldTextAfter", "format", "lang", "maskWithFormat", "min", "max", "includeEdgeDates", "eventList", "disabledList", "eventMonthList", "disabledMonthList", "eventQuarterList", "disabledQuarterList", "eventYearList", "disabledYearList", "type", "placement", "closeOnOverlayClick", "closeOnEsc", "offset", "onToggle", "onChange", "onChangeFirstValue", "onChangeSecondValue", "onCommitFirstDate", "onCommitSecondDate", "onFocusFirstTextfield", "onFocusSecondTextfield", "onBlurFirstTextfield", "onBlurSecondTextfield"];
+var _excluded = ["className", "isDoubleCalendar", "opened", "label", "leftHelper", "contentLeft", "contentRight", "view", "size", "readOnly", "disabled", "name", "dividerVariant", "dividerIcon", "defaultFirstDate", "defaultSecondDate", "firstValueError", "secondValueError", "firstValueSuccess", "secondValueSuccess", "firstPlaceholder", "secondPlaceholder", "firstTextfieldContentLeft", "firstTextfieldContentRight", "secondTextfieldContentLeft", "secondTextfieldContentRight", "firstTextfieldTextBefore", "secondTextfieldTextBefore", "firstTextfieldTextAfter", "secondTextfieldTextAfter", "format", "lang", "maskWithFormat", "min", "max", "includeEdgeDates", "eventList", "disabledList", "eventMonthList", "disabledMonthList", "eventQuarterList", "disabledQuarterList", "eventYearList", "disabledYearList", "type", "frame", "usePortal", "placement", "closeOnOverlayClick", "closeOnEsc", "offset", "onToggle", "onChange", "onChangeFirstValue", "onChangeSecondValue", "onCommitFirstDate", "onCommitSecondDate", "onFocusFirstTextfield", "onFocusSecondTextfield", "onBlurFirstTextfield", "onBlurSecondTextfield"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -89,6 +90,10 @@ var datePickerRangeRoot = exports.datePickerRangeRoot = function datePickerRange
       disabledYearList = _ref.disabledYearList,
       _ref$type = _ref.type,
       type = _ref$type === void 0 ? 'Days' : _ref$type,
+      _ref$frame = _ref.frame,
+      frame = _ref$frame === void 0 ? 'document' : _ref$frame,
+      _ref$usePortal = _ref.usePortal,
+      usePortal = _ref$usePortal === void 0 ? false : _ref$usePortal,
       _ref$placement = _ref.placement,
       placement = _ref$placement === void 0 ? ['top', 'bottom'] : _ref$placement,
       _ref$closeOnOverlayCl = _ref.closeOnOverlayClick,
@@ -104,8 +109,8 @@ var datePickerRangeRoot = exports.datePickerRangeRoot = function datePickerRange
       onCommitSecondDate = _ref.onCommitSecondDate,
       onFocusFirstTextfield = _ref.onFocusFirstTextfield,
       onFocusSecondTextfield = _ref.onFocusSecondTextfield,
-      onBlurFirstTextfield = _ref.onBlurFirstTextfield,
-      onBlurSecondTextfield = _ref.onBlurSecondTextfield,
+      _onBlurFirstTextfield = _ref.onBlurFirstTextfield,
+      _onBlurSecondTextfield = _ref.onBlurSecondTextfield,
       rest = _objectWithoutProperties(_ref, _excluded);
     var rangeRef = ref && 'current' in ref ? ref : /*#__PURE__*/(0, _react.createRef)();
     var rootRef = (0, _react.useRef)(null);
@@ -176,7 +181,6 @@ var datePickerRangeRoot = exports.datePickerRangeRoot = function datePickerRange
         currentValue: inputFirstValue,
         setInputValue: setFirstInputValue,
         setCalendarValue: setCalendarFirstValue,
-        setIsInnerOpen: setIsInnerOpen,
         dateFormatDelimiter: dateFormatDelimiter,
         format: format,
         lang: lang,
@@ -185,7 +189,6 @@ var datePickerRangeRoot = exports.datePickerRangeRoot = function datePickerRange
         maskWithFormat: maskWithFormat,
         valueError: firstValueError,
         valueSuccess: firstValueSuccess,
-        inputRef: firstInputRef,
         name: name,
         onChangeValue: onChangeFirstValue,
         onCommitDate: onCommitFirstDate
@@ -196,7 +199,6 @@ var datePickerRangeRoot = exports.datePickerRangeRoot = function datePickerRange
         currentValue: inputSecondValue,
         setInputValue: setSecondInputValue,
         setCalendarValue: setCalendarSecondValue,
-        setIsInnerOpen: setIsInnerOpen,
         dateFormatDelimiter: dateFormatDelimiter,
         format: format,
         lang: lang,
@@ -205,7 +207,6 @@ var datePickerRangeRoot = exports.datePickerRangeRoot = function datePickerRange
         maskWithFormat: maskWithFormat,
         valueError: secondValueError,
         valueSuccess: secondValueSuccess,
-        inputRef: secondInputRef,
         onChangeValue: onChangeSecondValue,
         onCommitDate: onCommitSecondDate
       }),
@@ -216,15 +217,59 @@ var datePickerRangeRoot = exports.datePickerRangeRoot = function datePickerRange
       if (disabled || readOnly) {
         return;
       }
-      var isCalendarOpen = firstInputRef !== null && firstInputRef !== void 0 && (_firstInputRef$curren = firstInputRef.current) !== null && _firstInputRef$curren !== void 0 && _firstInputRef$curren.contains(event.target || null) || secondInputRef !== null && secondInputRef !== void 0 && (_secondInputRef$curre = secondInputRef.current) !== null && _secondInputRef$curre !== void 0 && _secondInputRef$curre.contains(event.target || null) ? true : opened;
+      var isCalendarOpen = (firstInputRef !== null && firstInputRef !== void 0 && (_firstInputRef$curren = firstInputRef.current) !== null && _firstInputRef$curren !== void 0 && _firstInputRef$curren.contains(event.target || null) || secondInputRef !== null && secondInputRef !== void 0 && (_secondInputRef$curre = secondInputRef.current) !== null && _secondInputRef$curre !== void 0 && _secondInputRef$curre.contains(event.target || null)) && event.code !== _useKeyboardNavigation.keys.Escape ? true : opened;
+      if (!isCalendarOpen) {
+        if (calendarFirstValue && !calendarSecondValue) {
+          var _secondInputRef$curre2;
+          secondInputRef === null || secondInputRef === void 0 || (_secondInputRef$curre2 = secondInputRef.current) === null || _secondInputRef$curre2 === void 0 || _secondInputRef$curre2.focus();
+        }
+        if (calendarSecondValue || !calendarFirstValue) {
+          var _firstInputRef$curren2;
+          firstInputRef === null || firstInputRef === void 0 || (_firstInputRef$curren2 = firstInputRef.current) === null || _firstInputRef$curren2 === void 0 || _firstInputRef$curren2.focus();
+        }
+      }
       if (onToggle) {
         return onToggle(isCalendarOpen, event);
       }
       setIsInnerOpen(isCalendarOpen);
     };
+    var handleBlur = function handleBlur(event, outerHandler) {
+      if (!inputFirstValue || !inputSecondValue) {
+        outerHandler === null || outerHandler === void 0 || outerHandler(event);
+        return;
+      }
+      var _getDateFromFormat = (0, _dateHelper.getDateFromFormat)(inputFirstValue, format, lang),
+        firstDate = _getDateFromFormat.value,
+        firstIsSuccess = _getDateFromFormat.isSuccess;
+      var _getDateFromFormat2 = (0, _dateHelper.getDateFromFormat)(inputSecondValue, format, lang),
+        secondDate = _getDateFromFormat2.value,
+        secondIsSuccess = _getDateFromFormat2.isSuccess;
+      if (!firstIsSuccess || !secondIsSuccess) {
+        outerHandler === null || outerHandler === void 0 || outerHandler(event);
+        return;
+      }
+      var _getSortedValues = (0, _utils2.getSortedValues)([new Date(firstDate), new Date(secondDate)]),
+        _getSortedValues2 = _slicedToArray(_getSortedValues, 2),
+        startValue = _getSortedValues2[0],
+        endValue = _getSortedValues2[1];
+      setFirstInputValue((0, _dateHelper.formatInputValue)({
+        value: startValue,
+        format: format,
+        lang: lang
+      }));
+      setSecondInputValue((0, _dateHelper.formatInputValue)({
+        value: endValue,
+        format: format,
+        lang: lang
+      }));
+      setCalendarFirstValue((0, _dateHelper.formatCalendarValue)(startValue, format, lang));
+      setCalendarSecondValue((0, _dateHelper.formatCalendarValue)(endValue, format, lang));
+      outerHandler === null || outerHandler === void 0 || outerHandler(event);
+    };
     var _useKeyNavigation = (0, _useKeyboardNavigation.useKeyNavigation)({
         isCalendarOpen: isInnerOpen,
-        onToggle: handleToggle
+        onToggle: handleToggle,
+        closeOnEsc: closeOnEsc
       }),
       onKeyDown = _useKeyNavigation.onKeyDown;
     var RangeComponent = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_RangeDate.StyledRange, {
@@ -270,8 +315,12 @@ var datePickerRangeRoot = exports.datePickerRangeRoot = function datePickerRange
       },
       onFocusFirstTextfield: onFocusFirstTextfield,
       onFocusSecondTextfield: onFocusSecondTextfield,
-      onBlurFirstTextfield: onBlurFirstTextfield,
-      onBlurSecondTextfield: onBlurSecondTextfield,
+      onBlurFirstTextfield: function onBlurFirstTextfield(event) {
+        return handleBlur(event, _onBlurFirstTextfield);
+      },
+      onBlurSecondTextfield: function onBlurSecondTextfield(event) {
+        return handleBlur(event, _onBlurSecondTextfield);
+      },
       onKeyDown: onKeyDown
     }));
     (0, _react.useEffect)(function () {
@@ -314,6 +363,16 @@ var datePickerRangeRoot = exports.datePickerRangeRoot = function datePickerRange
         lang: lang
       }));
     }, [format, lang]);
+    var RootWrapper = (0, _react.useCallback)(function (_ref2) {
+      var children = _ref2.children;
+      return /*#__PURE__*/_react["default"].createElement(Root, {
+        view: view,
+        size: size,
+        className: (0, _utils.cx)(_DatePicker.classes.datePickerRoot, className),
+        disabled: disabled,
+        readOnly: !disabled && readOnly
+      }, children);
+    }, [view, size, disabled, readOnly]);
     return /*#__PURE__*/_react["default"].createElement(Root, _extends({
       ref: rootRef,
       view: view,
@@ -336,6 +395,8 @@ var datePickerRangeRoot = exports.datePickerRangeRoot = function datePickerRange
       disabledYearList: disabledYearList,
       min: min,
       max: max,
+      frame: frame,
+      usePortal: usePortal,
       placement: placement,
       closeOnOverlayClick: closeOnOverlayClick,
       closeOnEsc: closeOnEsc,
@@ -344,14 +405,15 @@ var datePickerRangeRoot = exports.datePickerRangeRoot = function datePickerRange
       onToggle: handleToggle,
       lang: lang,
       isDoubleCalendar: isDoubleCalendar,
+      rootWrapper: RootWrapper,
       onChangeStartOfRange: function onChangeStartOfRange(firstDate, dateInfo) {
         handleCommitFirstDate(firstDate, false, true, dateInfo);
         handleCommitSecondDate('');
       },
-      onChangeValue: function onChangeValue(_ref2, dateInfo) {
-        var _ref3 = _slicedToArray(_ref2, 2),
-          firstDate = _ref3[0],
-          secondDate = _ref3[1];
+      onChangeValue: function onChangeValue(_ref3, dateInfo) {
+        var _ref4 = _slicedToArray(_ref3, 2),
+          firstDate = _ref4[0],
+          secondDate = _ref4[1];
         firstDate && handleCommitFirstDate(firstDate, false, true, dateInfo);
         secondDate && handleCommitSecondDate(secondDate, false, true, dateInfo);
         if (firstDate && secondDate && !firstValueError && !secondValueError) {

package/styled-components/cjs/components/DatePicker/RangeDate/RangeDatePopover/RangeDatePopover.js

@@ -10,7 +10,8 @@ var _RangeDate = /*#__PURE__*/require("../RangeDate.styles");
 var _RangeDatePopover = /*#__PURE__*/require("./RangeDatePopover.styles");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 var RangeDatePopover = exports.RangeDatePopover = function RangeDatePopover(_ref) {
-  var target = _ref.target,
+  var Root = _ref.rootWrapper,
+    target = _ref.target,
     isOpen = _ref.isOpen,
     opened = _ref.opened,
     isDoubleCalendar = _ref.isDoubleCalendar,
@@ -26,6 +27,10 @@ var RangeDatePopover = exports.RangeDatePopover = function RangeDatePopover(_ref
     disabledQuarterList = _ref.disabledQuarterList,
     eventYearList = _ref.eventYearList,
     disabledYearList = _ref.disabledYearList,
+    _ref$frame = _ref.frame,
+    frame = _ref$frame === void 0 ? 'document' : _ref$frame,
+    _ref$usePortal = _ref.usePortal,
+    usePortal = _ref$usePortal === void 0 ? false : _ref$usePortal,
     _ref$placement = _ref.placement,
     placement = _ref$placement === void 0 ? ['top', 'bottom'] : _ref$placement,
     _ref$closeOnOverlayCl = _ref.closeOnOverlayClick,
@@ -43,7 +48,8 @@ var RangeDatePopover = exports.RangeDatePopover = function RangeDatePopover(_ref
   if (isDoubleCalendar) {
     return /*#__PURE__*/_react["default"].createElement(_RangeDate.StyledPopover, {
       opened: innerIsOpen,
-      usePortal: false,
+      frame: frame,
+      usePortal: usePortal,
       onToggle: onToggle,
       offset: offset,
       placement: (0, _utils.getPlacements)(placement),
@@ -52,7 +58,7 @@ var RangeDatePopover = exports.RangeDatePopover = function RangeDatePopover(_ref
       isFocusTrapped: false,
       target: target,
       preventOverflow: false
-    }, /*#__PURE__*/_react["default"].createElement(_RangeDatePopover.StyledCalendarDouble, {
+    }, /*#__PURE__*/_react["default"].createElement(Root, null, /*#__PURE__*/_react["default"].createElement(_RangeDatePopover.StyledCalendarDouble, {
       size: size,
       value: calendarValue,
       eventList: eventList,
@@ -69,11 +75,12 @@ var RangeDatePopover = exports.RangeDatePopover = function RangeDatePopover(_ref
       includeEdgeDates: includeEdgeDates,
       onChangeValue: onChangeValue,
       onChangeStartOfRange: onChangeStartOfRange
-    }));
+    })));
   }
   return /*#__PURE__*/_react["default"].createElement(_RangeDate.StyledPopover, {
     opened: innerIsOpen,
-    usePortal: false,
+    frame: frame,
+    usePortal: usePortal,
     onToggle: onToggle,
     offset: offset,
     placement: (0, _utils.getPlacements)(placement),
@@ -83,7 +90,7 @@ var RangeDatePopover = exports.RangeDatePopover = function RangeDatePopover(_ref
     target: target,
     preventOverflow: false,
     closeOnEsc: closeOnEsc
-  }, /*#__PURE__*/_react["default"].createElement(_RangeDatePopover.StyledCalendar, {
+  }, /*#__PURE__*/_react["default"].createElement(Root, null, /*#__PURE__*/_react["default"].createElement(_RangeDatePopover.StyledCalendar, {
     size: size,
     value: calendarValue,
     eventList: eventList,
@@ -101,5 +108,5 @@ var RangeDatePopover = exports.RangeDatePopover = function RangeDatePopover(_ref
     includeEdgeDates: includeEdgeDates,
     onChangeValue: onChangeValue,
     onChangeStartOfRange: onChangeStartOfRange
-  }));
+  })));
 };

package/styled-components/cjs/components/DatePicker/RangeDate/variations/_size/base.js

@@ -7,4 +7,4 @@ exports.base = void 0;
 var _styledComponents = /*#__PURE__*/require("styled-components");
 var _DatePicker = /*#__PURE__*/require("../../../DatePicker.tokens");
 var _RangeDate = /*#__PURE__*/require("../../RangeDate.styles");
-var base = exports.base = /*#__PURE__*/(0, _styledComponents.css)(["width:var(", ");", "{margin:var(", ");font-family:var(", ");font-size:var(", ");font-style:var(", ");font-weight:var(", ");letter-spacing:var(", ");line-height:var(", ");}", "{margin:var(", ");font-family:var(", ");font-size:var(", ");font-style:var(", ");font-weight:var(", ");letter-spacing:var(", ");line-height:var(", ");}"], _DatePicker.tokens.width, _RangeDate.StyledLabel, _DatePicker.tokens.labelOffset, _DatePicker.tokens.labelFontFamily, _DatePicker.tokens.labelFontSize, _DatePicker.tokens.labelFontStyle, _DatePicker.tokens.labelFontWeight, _DatePicker.tokens.labelLetterSpacing, _DatePicker.tokens.labelLineHeight, _RangeDate.LeftHelper, _DatePicker.tokens.leftHelperOffset, _DatePicker.tokens.leftHelperFontFamily, _DatePicker.tokens.leftHelperFontSize, _DatePicker.tokens.leftHelperFontStyle, _DatePicker.tokens.leftHelperFontWeight, _DatePicker.tokens.leftHelperLetterSpacing, _DatePicker.tokens.leftHelperLineHeight);
+var base = exports.base = /*#__PURE__*/(0, _styledComponents.css)(["", "{margin:var(", ");font-family:var(", ");font-size:var(", ");font-style:var(", ");font-weight:var(", ");letter-spacing:var(", ");line-height:var(", ");}", "{margin:var(", ");font-family:var(", ");font-size:var(", ");font-style:var(", ");font-weight:var(", ");letter-spacing:var(", ");line-height:var(", ");}"], _RangeDate.StyledLabel, _DatePicker.tokens.labelOffset, _DatePicker.tokens.labelFontFamily, _DatePicker.tokens.labelFontSize, _DatePicker.tokens.labelFontStyle, _DatePicker.tokens.labelFontWeight, _DatePicker.tokens.labelLetterSpacing, _DatePicker.tokens.labelLineHeight, _RangeDate.LeftHelper, _DatePicker.tokens.leftHelperOffset, _DatePicker.tokens.leftHelperFontFamily, _DatePicker.tokens.leftHelperFontSize, _DatePicker.tokens.leftHelperFontStyle, _DatePicker.tokens.leftHelperFontWeight, _DatePicker.tokens.leftHelperLetterSpacing, _DatePicker.tokens.leftHelperLineHeight);

package/styled-components/cjs/components/DatePicker/SingleDate/SingleDate.js

@@ -17,7 +17,7 @@ var _base2 = /*#__PURE__*/require("./variations/_view/base");
 var _base3 = /*#__PURE__*/require("./variations/_disabled/base");
 var _base4 = /*#__PURE__*/require("./variations/_readonly/base");
 var _SingleDate = /*#__PURE__*/require("./SingleDate.styles");
-var _excluded = ["className", "opened", "label", "labelPlacement", "placeholder", "leftHelper", "contentLeft", "contentRight", "textBefore", "textAfter", "view", "size", "readOnly", "disabled", "name", "defaultDate", "valueError", "valueSuccess", "format", "lang", "maskWithFormat", "min", "max", "includeEdgeDates", "eventList", "disabledList", "eventMonthList", "disabledMonthList", "eventQuarterList", "disabledQuarterList", "eventYearList", "disabledYearList", "type", "placement", "closeOnOverlayClick", "offset", "onChangeValue", "onCommitDate", "onToggle", "onFocus", "onBlur", "onChange"];
+var _excluded = ["className", "opened", "label", "labelPlacement", "placeholder", "leftHelper", "contentLeft", "contentRight", "textBefore", "textAfter", "view", "size", "readOnly", "disabled", "name", "defaultDate", "valueError", "valueSuccess", "format", "lang", "maskWithFormat", "min", "max", "includeEdgeDates", "eventList", "disabledList", "eventMonthList", "disabledMonthList", "eventQuarterList", "disabledQuarterList", "eventYearList", "disabledYearList", "type", "frame", "usePortal", "placement", "closeOnOverlayClick", "closeOnEsc", "offset", "onChangeValue", "onCommitDate", "onToggle", "onFocus", "onBlur", "onChange"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -73,10 +73,16 @@ var datePickerRoot = exports.datePickerRoot = function datePickerRoot(Root) {
       disabledYearList = _ref.disabledYearList,
       _ref$type = _ref.type,
       type = _ref$type === void 0 ? 'Days' : _ref$type,
+      _ref$frame = _ref.frame,
+      frame = _ref$frame === void 0 ? 'document' : _ref$frame,
+      _ref$usePortal = _ref.usePortal,
+      usePortal = _ref$usePortal === void 0 ? false : _ref$usePortal,
       _ref$placement = _ref.placement,
       placement = _ref$placement === void 0 ? ['top', 'bottom'] : _ref$placement,
       _ref$closeOnOverlayCl = _ref.closeOnOverlayClick,
       closeOnOverlayClick = _ref$closeOnOverlayCl === void 0 ? true : _ref$closeOnOverlayCl,
+      _ref$closeOnEsc = _ref.closeOnEsc,
+      closeOnEsc = _ref$closeOnEsc === void 0 ? true : _ref$closeOnEsc,
       offset = _ref.offset,
       onChangeValue = _ref.onChangeValue,
       onCommitDate = _ref.onCommitDate,
@@ -111,7 +117,6 @@ var datePickerRoot = exports.datePickerRoot = function datePickerRoot(Root) {
         currentValue: inputValue,
         setInputValue: setInputValue,
         setCalendarValue: setCalendarValue,
-        setIsInnerOpen: setIsInnerOpen,
         dateFormatDelimiter: dateFormatDelimiter,
         format: format,
         lang: lang,
@@ -120,21 +125,34 @@ var datePickerRoot = exports.datePickerRoot = function datePickerRoot(Root) {
         maskWithFormat: maskWithFormat,
         valueError: valueError,
         valueSuccess: valueSuccess,
-        inputRef: inputRef,
         name: name,
-        onToggle: onToggle,
         onChangeValue: onChangeValue,
         onCommitDate: onCommitDate,
         onChange: onChange
       }),
       datePickerErrorClass = _useDatePicker.datePickerErrorClass,
       datePickerSuccessClass = _useDatePicker.datePickerSuccessClass,
-      handleToggle = _useDatePicker.handleToggle,
       handleChangeValue = _useDatePicker.handleChangeValue,
       handleCommitDate = _useDatePicker.handleCommitDate;
+    var handleToggle = function handleToggle(opened, event) {
+      if (disabled || readOnly) {
+        return;
+      }
+      var isCalendarOpen = event.target === (inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) && event.code !== _useKeyboardNavigation.keys.Escape ? true : opened;
+      if (!isCalendarOpen && inputValue) {
+        var _inputRef$current;
+        inputRef === null || inputRef === void 0 || (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 || _inputRef$current.focus();
+      }
+      if (onToggle) {
+        onToggle(isCalendarOpen, event);
+        return;
+      }
+      setIsInnerOpen(isCalendarOpen);
+    };
     var _useKeyNavigation = (0, _useKeyboardNavigation.useKeyNavigation)({
         isCalendarOpen: isInnerOpen,
-        onToggle: handleToggle
+        onToggle: handleToggle,
+        closeOnEsc: closeOnEsc
       }),
       onKeyDown = _useKeyNavigation.onKeyDown;
     var DatePickerInput = /*#__PURE__*/_react["default"].createElement(_SingleDate.StyledInput, _extends({
@@ -190,7 +208,8 @@ var datePickerRoot = exports.datePickerRoot = function datePickerRoot(Root) {
       ref: ref
     }, rest), !innerLabelPlacement && label && /*#__PURE__*/_react["default"].createElement(_SingleDate.StyledLabel, null, label), /*#__PURE__*/_react["default"].createElement(_SingleDate.StyledPopover, {
       opened: isInnerOpen,
-      usePortal: false,
+      usePortal: usePortal,
+      frame: frame,
       onToggle: handleToggle,
       offset: offset,
       placement: (0, _utils.getPlacements)(placement),
@@ -199,6 +218,12 @@ var datePickerRoot = exports.datePickerRoot = function datePickerRoot(Root) {
       isFocusTrapped: false,
       target: DatePickerInput,
       preventOverflow: false
+    }, /*#__PURE__*/_react["default"].createElement(Root, {
+      view: view,
+      size: size,
+      className: (0, _utils.cx)(_DatePicker.classes.datePickerRoot, className),
+      disabled: disabled,
+      readOnly: !disabled && readOnly
     }, /*#__PURE__*/_react["default"].createElement(_DatePickerBase.StyledCalendar, {
       size: size,
       value: calendarValue,
@@ -219,7 +244,7 @@ var datePickerRoot = exports.datePickerRoot = function datePickerRoot(Root) {
       onChangeValue: function onChangeValue(date, dateInfo) {
         return handleCommitDate(date, false, true, dateInfo);
       }
-    })), leftHelper && /*#__PURE__*/_react["default"].createElement(_SingleDate.LeftHelper, null, leftHelper), /*#__PURE__*/_react["default"].createElement(_DatePickerBase.InputHidden, _extends({
+    }))), leftHelper && /*#__PURE__*/_react["default"].createElement(_SingleDate.LeftHelper, null, leftHelper), /*#__PURE__*/_react["default"].createElement(_DatePickerBase.InputHidden, _extends({
       type: "hidden",
       datatype: "datepicker-single",
       name: name,

package/styled-components/cjs/components/DatePicker/hooks/useDatePicker.js

@@ -6,12 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.useDatePicker = void 0;
 var _DatePicker = /*#__PURE__*/require("../DatePicker.tokens");
 var _dateHelper = /*#__PURE__*/require("../utils/dateHelper");
-var _datejs = /*#__PURE__*/require("../../../utils/datejs");
 var useDatePicker = exports.useDatePicker = function useDatePicker(_ref) {
   var currentValue = _ref.currentValue,
     setInputValue = _ref.setInputValue,
     setCalendarValue = _ref.setCalendarValue,
-    setIsInnerOpen = _ref.setIsInnerOpen,
     dateFormatDelimiter = _ref.dateFormatDelimiter,
     format = _ref.format,
     _ref$lang = _ref.lang,
@@ -21,24 +19,12 @@ var useDatePicker = exports.useDatePicker = function useDatePicker(_ref) {
     maskWithFormat = _ref.maskWithFormat,
     valueError = _ref.valueError,
     valueSuccess = _ref.valueSuccess,
-    inputRef = _ref.inputRef,
     name = _ref.name,
-    onToggle = _ref.onToggle,
     onChangeValue = _ref.onChangeValue,
     onCommitDate = _ref.onCommitDate,
     onChange = _ref.onChange;
   var datePickerErrorClass = valueError ? _DatePicker.classes.datePickerError : undefined;
   var datePickerSuccessClass = valueSuccess ? _DatePicker.classes.datePickerSuccess : undefined;
-  var handleToggle = function handleToggle(opened, event) {
-    if (disabled || readOnly) {
-      return;
-    }
-    var isCalendarOpen = event.target === (inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) ? true : opened;
-    if (onToggle) {
-      return onToggle(isCalendarOpen, event);
-    }
-    setIsInnerOpen(isCalendarOpen);
-  };
   var handleChangeValue = function handleChangeValue(event) {
     if (disabled || readOnly) {
       return;
@@ -61,24 +47,14 @@ var useDatePicker = exports.useDatePicker = function useDatePicker(_ref) {
       });
       return;
     }
-
-    /**
-     * NOTE: если в формате даты есть месяц в полном названии или сокращенном,
-     * нужно дополнительно проводить валидацию на полноту введенной даты.
-     * Иначе dayjs циклически будет пытаться отформатировать некорректную дату.
-     */
-    var hasMonthFullName = /M{3,4}/g.test(format);
-    var isValidMonth;
-    var isLengthEqual;
-    if (hasMonthFullName) {
-      _datejs.customDayjs.locale(lang);
-      var firstIndexOfMonth = format.indexOf('M');
-      var lastIndexOfMonth = newValue.indexOf(dateFormatDelimiter(), firstIndexOfMonth);
-      var fullMonthName = !lastIndexOfMonth ? newValue.slice(firstIndexOfMonth) : newValue.slice(firstIndexOfMonth, lastIndexOfMonth);
-      var monthFormatting = format.replace(/[^M]/g, '');
-      isValidMonth = (0, _datejs.customDayjs)("01 ".concat(fullMonthName, " 1970"), "DD ".concat(monthFormatting, " YYYY"), true).isValid();
-      isLengthEqual = format.length - monthFormatting.length === newValue.length - fullMonthName.length;
-    }
+    var _validateDateWithFull = (0, _dateHelper.validateDateWithFullMonth)({
+        currentValue: newValue,
+        format: format,
+        lang: lang
+      }),
+      hasMonthFullName = _validateDateWithFull.hasMonthFullName,
+      isValidMonth = _validateDateWithFull.isValidMonth,
+      isLengthEqual = _validateDateWithFull.isLengthEqual;
     if (!hasMonthFullName && (newValue === null || newValue === void 0 ? void 0 : newValue.length) === (format === null || format === void 0 ? void 0 : format.length) || isValidMonth && isLengthEqual) {
       setCalendarValue((0, _dateHelper.formatCalendarValue)(newValue, format, lang));
     }
@@ -108,20 +84,18 @@ var useDatePicker = exports.useDatePicker = function useDatePicker(_ref) {
       return onCommitDate === null || onCommitDate === void 0 ? void 0 : onCommitDate('', false, true);
     }
     if (isCalendarValue) {
-      setCalendarValue((0, _dateHelper.formatCalendarValue)(date, format, lang));
-      setInputValue((0, _dateHelper.formatInputValue)({
+      var _formattedInputValue = (0, _dateHelper.formatInputValue)({
         value: date,
         format: format,
         lang: lang
-      }));
+      });
+      setCalendarValue((0, _dateHelper.formatCalendarValue)(date, format, lang));
+      setInputValue(_formattedInputValue);
       onCommitDate === null || onCommitDate === void 0 || onCommitDate(date, false, true, dateInfo);
+      onChangeValue === null || onChangeValue === void 0 || onChangeValue(null, _formattedInputValue);
       onChange === null || onChange === void 0 || onChange({
         target: {
-          value: (0, _dateHelper.formatInputValue)({
-            value: date,
-            format: format,
-            lang: lang
-          }),
+          value: _formattedInputValue,
           name: name
         }
       });
@@ -132,19 +106,18 @@ var useDatePicker = exports.useDatePicker = function useDatePicker(_ref) {
       newDate = _getDateFromFormat.value,
       isError = _getDateFromFormat.isError,
       isSuccess = _getDateFromFormat.isSuccess;
-    setCalendarValue((0, _dateHelper.formatCalendarValue)(newDate, format, lang));
-    setInputValue((0, _dateHelper.formatInputValue)({
+    var formattedInputValue = (0, _dateHelper.formatInputValue)({
       value: newDate,
       format: format,
       lang: lang
-    }));
+    });
+    setCalendarValue((0, _dateHelper.formatCalendarValue)(newDate, format, lang));
+    setInputValue(formattedInputValue);
     onCommitDate === null || onCommitDate === void 0 || onCommitDate(newDate, isError, isSuccess);
+    onChangeValue === null || onChangeValue === void 0 || onChangeValue(null, formattedInputValue);
     onChange === null || onChange === void 0 || onChange({
       target: {
-        value: (0, _dateHelper.formatInputValue)({
-          value: date,
-          format: format
-        }),
+        value: formattedInputValue,
         name: name
       }
     });
@@ -152,7 +125,6 @@ var useDatePicker = exports.useDatePicker = function useDatePicker(_ref) {
   return {
     datePickerErrorClass: datePickerErrorClass,
     datePickerSuccessClass: datePickerSuccessClass,
-    handleToggle: handleToggle,
     handleChangeValue: handleChangeValue,
     handleCommitDate: handleCommitDate
   };

package/styled-components/cjs/components/DatePicker/hooks/useKeyboardNavigation.js

@@ -5,10 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useKeyNavigation = exports.keys = void 0;
 var keys = exports.keys = {
-  Space: 'Space'
+  Space: 'Space',
+  Escape: 'Escape'
 };
 var useKeyNavigation = exports.useKeyNavigation = function useKeyNavigation(_ref) {
   var isCalendarOpen = _ref.isCalendarOpen,
+    closeOnEsc = _ref.closeOnEsc,
     onToggle = _ref.onToggle;
   var onKeyDown = function onKeyDown(event) {
     switch (event.code) {
@@ -20,6 +22,14 @@ var useKeyNavigation = exports.useKeyNavigation = function useKeyNavigation(_ref
           }
           break;
         }
+      case keys.Escape:
+        {
+          if (isCalendarOpen && closeOnEsc) {
+            event.preventDefault();
+            onToggle(false, event);
+          }
+          break;
+        }
       default:
         {
           break;

package/styled-components/cjs/components/DatePicker/utils/dateHelper.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getMaskedDateOnInput = exports.getDateFromFormat = exports.getDateFormatDelimiter = exports.formatInputValue = exports.formatCalendarValue = void 0;
+exports.validateDateWithFullMonth = exports.getMaskedDateOnInput = exports.getDateFromFormat = exports.getDateFormatDelimiter = exports.formatInputValue = exports.formatCalendarValue = void 0;
 var _datejs = /*#__PURE__*/require("../../../utils/datejs");
 var formatInputValue = exports.formatInputValue = function formatInputValue(_ref) {
   var value = _ref.value,
@@ -84,4 +84,34 @@ var getMaskedDateOnInput = exports.getMaskedDateOnInput = function getMaskedDate
     return value + delimiter;
   }
   return value;
+};
+var validateDateWithFullMonth = exports.validateDateWithFullMonth = function validateDateWithFullMonth(_ref2) {
+  var currentValue = _ref2.currentValue,
+    format = _ref2.format,
+    lang = _ref2.lang;
+  /**
+   * NOTE: если в формате даты есть месяц в полном названии или сокращенном,
+   * нужно дополнительно проводить валидацию на полноту введенной даты.
+   * Иначе dayjs циклически будет пытаться отформатировать некорректную дату.
+   */
+  var hasMonthFullName = /M{3,4}/g.test(format);
+  if (!hasMonthFullName) {
+    return {
+      hasMonthFullName: hasMonthFullName,
+      isValidMonth: false,
+      isLengthEqual: false
+    };
+  }
+  _datejs.customDayjs.locale(lang);
+  var firstIndexOfMonth = format.indexOf('M');
+  var lastIndexOfMonth = currentValue.indexOf(getDateFormatDelimiter(format), firstIndexOfMonth);
+  var fullMonthName = !lastIndexOfMonth ? currentValue.slice(firstIndexOfMonth) : currentValue.slice(firstIndexOfMonth, lastIndexOfMonth);
+  var monthFormatting = format.replace(/[^M]/g, '');
+  var isValidMonth = (0, _datejs.customDayjs)("01 ".concat(fullMonthName, " 1970"), "DD ".concat(monthFormatting, " YYYY"), true).isValid();
+  var isLengthEqual = format.length - monthFormatting.length === currentValue.length - fullMonthName.length;
+  return {
+    hasMonthFullName: hasMonthFullName,
+    isValidMonth: isValidMonth,
+    isLengthEqual: isLengthEqual
+  };
 };