@salutejs/plasma-new-hope 0.163.0-canary.1466.11254522155.0 → 0.163.0-canary.1475.11258202491.0

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

@@ -26,6 +26,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 +47,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),
@@ -73,7 +78,8 @@ var RangeDatePopover = exports.RangeDatePopover = function RangeDatePopover(_ref
   }
   return /*#__PURE__*/_react["default"].createElement(_RangeDate.StyledPopover, {
     opened: innerIsOpen,
-    usePortal: false,
+    frame: frame,
+    usePortal: usePortal,
     onToggle: onToggle,
     offset: offset,
     placement: (0, _utils.getPlacements)(placement),

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,33 @@ 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) {
+        return onToggle(isCalendarOpen, event);
+      }
+      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 +207,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),

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
+  };
 };

package/styled-components/cjs/examples/plasma_b2c/components/Badge/Badge.config.js

@@ -24,8 +24,7 @@ var config = exports.config = {
     size: {
       l: /*#__PURE__*/(0, _styledComponents.css)(["", ":0.5rem;", ":1.75rem;", ":0.6875rem;", ":0.6875rem;", ":var(--plasma-typo-body-s-font-family);", ":var(--plasma-typo-body-s-font-size);", ":var(--plasma-typo-body-s-font-style);", ":var(--plasma-typo-body-s-font-weight);", ":var(--plasma-typo-body-s-letter-spacing);", ":var(--plasma-typo-body-s-line-height);", ":-0.0625rem;", ":0.25rem;", ":0.25rem;", ":-0.0625rem;"], _Badge.badgeTokens.borderRadius, _Badge.badgeTokens.height, _Badge.badgeTokens.paddingRight, _Badge.badgeTokens.paddingLeft, _Badge.badgeTokens.fontFamily, _Badge.badgeTokens.fontSize, _Badge.badgeTokens.fontStyle, _Badge.badgeTokens.fontWeight, _Badge.badgeTokens.letterSpacing, _Badge.badgeTokens.lineHeight, _Badge.badgeTokens.leftContentMarginLeft, _Badge.badgeTokens.leftContentMarginRight, _Badge.badgeTokens.rightContentMarginLeft, _Badge.badgeTokens.rightContentMarginRight),
       m: /*#__PURE__*/(0, _styledComponents.css)(["", ":0.375rem;", ":1.5rem;", ":0.5625rem;", ":0.5625rem;", ":var(--plasma-typo-body-xs-font-family);", ":var(--plasma-typo-body-xs-font-size);", ":var(--plasma-typo-body-xs-font-style);", ":var(--plasma-typo-body-xs-font-weight);", ":var(--plasma-typo-body-xs-letter-spacing);", ":var(--plasma-typo-body-xs-line-height);", ":-0.0625rem;", ":0.1875rem;", ":0.1875rem;", ":-0.0625rem;"], _Badge.badgeTokens.borderRadius, _Badge.badgeTokens.height, _Badge.badgeTokens.paddingRight, _Badge.badgeTokens.paddingLeft, _Badge.badgeTokens.fontFamily, _Badge.badgeTokens.fontSize, _Badge.badgeTokens.fontStyle, _Badge.badgeTokens.fontWeight, _Badge.badgeTokens.letterSpacing, _Badge.badgeTokens.lineHeight, _Badge.badgeTokens.leftContentMarginLeft, _Badge.badgeTokens.leftContentMarginRight, _Badge.badgeTokens.rightContentMarginLeft, _Badge.badgeTokens.rightContentMarginRight),
-      s: /*#__PURE__*/(0, _styledComponents.css)(["", ":0.375rem;", ":1.25rem;", ":0.4375rem;", ":0.4375rem;", ":var(--plasma-typo-body-xxs-font-family);", ":var(--plasma-typo-body-xxs-font-size);", ":var(--plasma-typo-body-xxs-font-style);", ":var(--plasma-typo-body-xxs-font-weight);", ":var(--plasma-typo-body-xxs-letter-spacing);", ":var(--plasma-typo-body-xxs-line-height);", ":-0.0625rem;", ":0.125rem;", ":0.125rem;", ":-0.0625rem;"], _Badge.badgeTokens.borderRadius, _Badge.badgeTokens.height, _Badge.badgeTokens.paddingRight, _Badge.badgeTokens.paddingLeft, _Badge.badgeTokens.fontFamily, _Badge.badgeTokens.fontSize, _Badge.badgeTokens.fontStyle, _Badge.badgeTokens.fontWeight, _Badge.badgeTokens.letterSpacing, _Badge.badgeTokens.lineHeight, _Badge.badgeTokens.leftContentMarginLeft, _Badge.badgeTokens.leftContentMarginRight, _Badge.badgeTokens.rightContentMarginLeft, _Badge.badgeTokens.rightContentMarginRight),
-      xs: /*#__PURE__*/(0, _styledComponents.css)(["", ":0.25rem;", ":1rem;", ":0.25rem;", ":0.25rem;", ":var(--plasma-typo-body-xxs-font-family);", ":var(--plasma-typo-body-xxs-font-size);", ":var(--plasma-typo-body-xxs-font-style);", ":var(--plasma-typo-body-xxs-font-weight);", ":var(--plasma-typo-body-xxs-letter-spacing);", ":var(--plasma-typo-body-xxs-line-height);", ":-0.0625rem;", ":0.125rem;", ":0.125rem;", ":-0.0625rem;"], _Badge.badgeTokens.borderRadius, _Badge.badgeTokens.height, _Badge.badgeTokens.paddingRight, _Badge.badgeTokens.paddingLeft, _Badge.badgeTokens.fontFamily, _Badge.badgeTokens.fontSize, _Badge.badgeTokens.fontStyle, _Badge.badgeTokens.fontWeight, _Badge.badgeTokens.letterSpacing, _Badge.badgeTokens.lineHeight, _Badge.badgeTokens.leftContentMarginLeft, _Badge.badgeTokens.leftContentMarginRight, _Badge.badgeTokens.rightContentMarginLeft, _Badge.badgeTokens.rightContentMarginRight)
+      s: /*#__PURE__*/(0, _styledComponents.css)(["", ":0.375rem;", ":1.25rem;", ":0.4375rem;", ":0.4375rem;", ":var(--plasma-typo-body-xxs-font-family);", ":var(--plasma-typo-body-xxs-font-size);", ":var(--plasma-typo-body-xxs-font-style);", ":var(--plasma-typo-body-xxs-font-weight);", ":var(--plasma-typo-body-xxs-letter-spacing);", ":var(--plasma-typo-body-xxs-line-height);", ":-0.0625rem;", ":0.125rem;", ":0.125rem;", ":-0.0625rem;"], _Badge.badgeTokens.borderRadius, _Badge.badgeTokens.height, _Badge.badgeTokens.paddingRight, _Badge.badgeTokens.paddingLeft, _Badge.badgeTokens.fontFamily, _Badge.badgeTokens.fontSize, _Badge.badgeTokens.fontStyle, _Badge.badgeTokens.fontWeight, _Badge.badgeTokens.letterSpacing, _Badge.badgeTokens.lineHeight, _Badge.badgeTokens.leftContentMarginLeft, _Badge.badgeTokens.leftContentMarginRight, _Badge.badgeTokens.rightContentMarginLeft, _Badge.badgeTokens.rightContentMarginRight)
     },
     pilled: {
       "true": /*#__PURE__*/(0, _styledComponents.css)(["", ":1.25rem;"], _Badge.badgeTokens.pilledBorderRadius)

package/styled-components/cjs/examples/plasma_b2c/components/Badge/Badge.stories.tsx

@@ -12,7 +12,7 @@ const meta: Meta<typeof Badge> = {
     decorators: [WithTheme],
     argTypes: {
         size: {
-            options: ['l', 'm', 's', 'xs'],
+            options: ['s', 'm', 'l'],
             control: {
                 type: 'select',
             },

package/styled-components/cjs/examples/plasma_b2c/components/DatePicker/DatePicker.stories.tsx

@@ -139,6 +139,7 @@ export const Default: StoryObj<StoryPropsDefault> = {
         valueSuccess: false,
         lang: 'ru',
         format: 'DD.MM.YYYY',
+        closeOnEsc: true,
     },
     render: (args) => <StoryDefault {...args} />,
 };
@@ -269,6 +270,7 @@ export const Range: StoryObj<StoryPropsRange> = {
         size: 'l',
         view: 'default',
         isDoubleCalendar: false,
+        closeOnEsc: true,
         dividerVariant: 'dash',
         min: new Date(2024, 1, 1),
         max: new Date(2024, 12, 29),

package/styled-components/cjs/examples/plasma_web/components/Badge/Badge.config.js

@@ -24,8 +24,7 @@ var config = exports.config = {
     size: {
       l: /*#__PURE__*/(0, _styledComponents.css)(["", ":0.5rem;", ":1.75rem;", ":0.6875rem;", ":0.6875rem;", ":var(--plasma-typo-body-s-font-family);", ":var(--plasma-typo-body-s-font-size);", ":var(--plasma-typo-body-s-font-style);", ":var(--plasma-typo-body-s-font-weight);", ":var(--plasma-typo-body-s-letter-spacing);", ":var(--plasma-typo-body-s-line-height);", ":-0.0625rem;", ":0.25rem;", ":0.25rem;", ":-0.0625rem;"], _Badge.badgeTokens.borderRadius, _Badge.badgeTokens.height, _Badge.badgeTokens.paddingRight, _Badge.badgeTokens.paddingLeft, _Badge.badgeTokens.fontFamily, _Badge.badgeTokens.fontSize, _Badge.badgeTokens.fontStyle, _Badge.badgeTokens.fontWeight, _Badge.badgeTokens.letterSpacing, _Badge.badgeTokens.lineHeight, _Badge.badgeTokens.leftContentMarginLeft, _Badge.badgeTokens.leftContentMarginRight, _Badge.badgeTokens.rightContentMarginLeft, _Badge.badgeTokens.rightContentMarginRight),
       m: /*#__PURE__*/(0, _styledComponents.css)(["", ":0.375rem;", ":1.5rem;", ":0.5625rem;", ":0.5625rem;", ":var(--plasma-typo-body-xs-font-family);", ":var(--plasma-typo-body-xs-font-size);", ":var(--plasma-typo-body-xs-font-style);", ":var(--plasma-typo-body-xs-font-weight);", ":var(--plasma-typo-body-xs-letter-spacing);", ":var(--plasma-typo-body-xs-line-height);", ":-0.0625rem;", ":0.1875rem;", ":0.1875rem;", ":-0.0625rem;"], _Badge.badgeTokens.borderRadius, _Badge.badgeTokens.height, _Badge.badgeTokens.paddingRight, _Badge.badgeTokens.paddingLeft, _Badge.badgeTokens.fontFamily, _Badge.badgeTokens.fontSize, _Badge.badgeTokens.fontStyle, _Badge.badgeTokens.fontWeight, _Badge.badgeTokens.letterSpacing, _Badge.badgeTokens.lineHeight, _Badge.badgeTokens.leftContentMarginLeft, _Badge.badgeTokens.leftContentMarginRight, _Badge.badgeTokens.rightContentMarginLeft, _Badge.badgeTokens.rightContentMarginRight),
-      s: /*#__PURE__*/(0, _styledComponents.css)(["", ":0.375rem;", ":1.25rem;", ":0.4375rem;", ":0.4375rem;", ":var(--plasma-typo-body-xxs-font-family);", ":var(--plasma-typo-body-xxs-font-size);", ":var(--plasma-typo-body-xxs-font-style);", ":var(--plasma-typo-body-xxs-font-weight);", ":var(--plasma-typo-body-xxs-letter-spacing);", ":var(--plasma-typo-body-xxs-line-height);", ":-0.0625rem;", ":0.125rem;", ":0.125rem;", ":-0.0625rem;"], _Badge.badgeTokens.borderRadius, _Badge.badgeTokens.height, _Badge.badgeTokens.paddingRight, _Badge.badgeTokens.paddingLeft, _Badge.badgeTokens.fontFamily, _Badge.badgeTokens.fontSize, _Badge.badgeTokens.fontStyle, _Badge.badgeTokens.fontWeight, _Badge.badgeTokens.letterSpacing, _Badge.badgeTokens.lineHeight, _Badge.badgeTokens.leftContentMarginLeft, _Badge.badgeTokens.leftContentMarginRight, _Badge.badgeTokens.rightContentMarginLeft, _Badge.badgeTokens.rightContentMarginRight),
-      xs: /*#__PURE__*/(0, _styledComponents.css)(["", ":0.25rem;", ":1rem;", ":0.25rem;", ":0.25rem;", ":var(--plasma-typo-body-xxs-font-family);", ":var(--plasma-typo-body-xxs-font-size);", ":var(--plasma-typo-body-xxs-font-style);", ":var(--plasma-typo-body-xxs-font-weight);", ":var(--plasma-typo-body-xxs-letter-spacing);", ":var(--plasma-typo-body-xxs-line-height);", ":-0.0625rem;", ":0.125rem;", ":0.125rem;", ":-0.0625rem;"], _Badge.badgeTokens.borderRadius, _Badge.badgeTokens.height, _Badge.badgeTokens.paddingRight, _Badge.badgeTokens.paddingLeft, _Badge.badgeTokens.fontFamily, _Badge.badgeTokens.fontSize, _Badge.badgeTokens.fontStyle, _Badge.badgeTokens.fontWeight, _Badge.badgeTokens.letterSpacing, _Badge.badgeTokens.lineHeight, _Badge.badgeTokens.leftContentMarginLeft, _Badge.badgeTokens.leftContentMarginRight, _Badge.badgeTokens.rightContentMarginLeft, _Badge.badgeTokens.rightContentMarginRight)
+      s: /*#__PURE__*/(0, _styledComponents.css)(["", ":0.375rem;", ":1.25rem;", ":0.4375rem;", ":0.4375rem;", ":var(--plasma-typo-body-xxs-font-family);", ":var(--plasma-typo-body-xxs-font-size);", ":var(--plasma-typo-body-xxs-font-style);", ":var(--plasma-typo-body-xxs-font-weight);", ":var(--plasma-typo-body-xxs-letter-spacing);", ":var(--plasma-typo-body-xxs-line-height);", ":-0.0625rem;", ":0.125rem;", ":0.125rem;", ":-0.0625rem;"], _Badge.badgeTokens.borderRadius, _Badge.badgeTokens.height, _Badge.badgeTokens.paddingRight, _Badge.badgeTokens.paddingLeft, _Badge.badgeTokens.fontFamily, _Badge.badgeTokens.fontSize, _Badge.badgeTokens.fontStyle, _Badge.badgeTokens.fontWeight, _Badge.badgeTokens.letterSpacing, _Badge.badgeTokens.lineHeight, _Badge.badgeTokens.leftContentMarginLeft, _Badge.badgeTokens.leftContentMarginRight, _Badge.badgeTokens.rightContentMarginLeft, _Badge.badgeTokens.rightContentMarginRight)
     },
     pilled: {
       "true": /*#__PURE__*/(0, _styledComponents.css)(["", ":1.25rem;"], _Badge.badgeTokens.pilledBorderRadius)

package/styled-components/cjs/examples/plasma_web/components/Badge/Badge.stories.tsx

@@ -12,7 +12,7 @@ const meta: Meta<typeof Badge> = {
     decorators: [WithTheme],
     argTypes: {
         size: {
-            options: ['l', 'm', 's', 'xs'],
+            options: ['s', 'm', 'l'],
             control: {
                 type: 'select',
             },

package/styled-components/es/components/Badge/Badge.template-doc.mdx

@@ -14,7 +14,7 @@ import { PropsTable, Description } from '@site/src/components';
 ### Размер badge
 Размер задается с помощью свойства `size`.
 
-Возможные значения свойства: `l`, `m`, `s`, `xs`.
+Возможные значения свойства: `"l"`, `"m"`, `"s"`.
 
 ```tsx live 
 import React from 'react';
@@ -26,7 +26,6 @@ export function App() {
             <Badge text="Бейдж" size="l" />
             <Badge text="Бейдж" size="m" />
             <Badge text="Бейдж" size="s" />
-            <Badge text="Бейдж" size="xs" />
         </div>
     );
 }
@@ -45,7 +44,6 @@ export function App() {
             <Badge text="Бейдж" size="l" pilled />
             <Badge text="Бейдж" size="m" pilled />
             <Badge text="Бейдж" size="s" pilled />
-            <Badge text="Бейдж" size="xs" pilled />
         </div>
     );
 }

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

@@ -1,4 +1,4 @@
-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 _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); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -10,11 +10,12 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React, { createRef, forwardRef, useCallback, useEffect, useRef, useState } from 'react';
 import { cx, noop } from '../../../utils';
-import { formatCalendarValue, formatInputValue, getDateFormatDelimiter } from '../utils/dateHelper';
+import { formatCalendarValue, formatInputValue, getDateFormatDelimiter, getDateFromFormat } from '../utils/dateHelper';
 import { useDatePicker } from '../hooks/useDatePicker';
 import { classes } from '../DatePicker.tokens';
-import { useKeyNavigation } from '../hooks/useKeyboardNavigation';
+import { keys, useKeyNavigation } from '../hooks/useKeyboardNavigation';
 import { InputHidden } from '../DatePickerBase.styles';
+import { getSortedValues } from '../../Calendar/utils';
 import { base as sizeCSS } from './variations/_size/base';
 import { base as viewCSS } from './variations/_view/base';
 import { base as disabledCSS } from './variations/_disabled/base';
@@ -80,6 +81,10 @@ export var datePickerRangeRoot = function datePickerRangeRoot(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,
@@ -95,8 +100,8 @@ export var datePickerRangeRoot = function datePickerRangeRoot(Root) {
       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__*/createRef();
     var rootRef = useRef(null);
@@ -167,7 +172,6 @@ export var datePickerRangeRoot = function datePickerRangeRoot(Root) {
         currentValue: inputFirstValue,
         setInputValue: setFirstInputValue,
         setCalendarValue: setCalendarFirstValue,
-        setIsInnerOpen: setIsInnerOpen,
         dateFormatDelimiter: dateFormatDelimiter,
         format: format,
         lang: lang,
@@ -176,7 +180,6 @@ export var datePickerRangeRoot = function datePickerRangeRoot(Root) {
         maskWithFormat: maskWithFormat,
         valueError: firstValueError,
         valueSuccess: firstValueSuccess,
-        inputRef: firstInputRef,
         name: name,
         onChangeValue: onChangeFirstValue,
         onCommitDate: onCommitFirstDate
@@ -187,7 +190,6 @@ export var datePickerRangeRoot = function datePickerRangeRoot(Root) {
         currentValue: inputSecondValue,
         setInputValue: setSecondInputValue,
         setCalendarValue: setCalendarSecondValue,
-        setIsInnerOpen: setIsInnerOpen,
         dateFormatDelimiter: dateFormatDelimiter,
         format: format,
         lang: lang,
@@ -196,7 +198,6 @@ export var datePickerRangeRoot = function datePickerRangeRoot(Root) {
         maskWithFormat: maskWithFormat,
         valueError: secondValueError,
         valueSuccess: secondValueSuccess,
-        inputRef: secondInputRef,
         onChangeValue: onChangeSecondValue,
         onCommitDate: onCommitSecondDate
       }),
@@ -207,15 +208,59 @@ export var datePickerRangeRoot = function datePickerRangeRoot(Root) {
       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 !== 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 = getDateFromFormat(inputFirstValue, format, lang),
+        firstDate = _getDateFromFormat.value,
+        firstIsSuccess = _getDateFromFormat.isSuccess;
+      var _getDateFromFormat2 = getDateFromFormat(inputSecondValue, format, lang),
+        secondDate = _getDateFromFormat2.value,
+        secondIsSuccess = _getDateFromFormat2.isSuccess;
+      if (!firstIsSuccess || !secondIsSuccess) {
+        outerHandler === null || outerHandler === void 0 || outerHandler(event);
+        return;
+      }
+      var _getSortedValues = getSortedValues([new Date(firstDate), new Date(secondDate)]),
+        _getSortedValues2 = _slicedToArray(_getSortedValues, 2),
+        startValue = _getSortedValues2[0],
+        endValue = _getSortedValues2[1];
+      setFirstInputValue(formatInputValue({
+        value: startValue,
+        format: format,
+        lang: lang
+      }));
+      setSecondInputValue(formatInputValue({
+        value: endValue,
+        format: format,
+        lang: lang
+      }));
+      setCalendarFirstValue(formatCalendarValue(startValue, format, lang));
+      setCalendarSecondValue(formatCalendarValue(endValue, format, lang));
+      outerHandler === null || outerHandler === void 0 || outerHandler(event);
+    };
     var _useKeyNavigation = useKeyNavigation({
         isCalendarOpen: isInnerOpen,
-        onToggle: handleToggle
+        onToggle: handleToggle,
+        closeOnEsc: closeOnEsc
       }),
       onKeyDown = _useKeyNavigation.onKeyDown;
     var RangeComponent = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(StyledRange, {
@@ -261,8 +306,12 @@ export var datePickerRangeRoot = function datePickerRangeRoot(Root) {
       },
       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
     }));
     useEffect(function () {
@@ -327,6 +376,8 @@ export var datePickerRangeRoot = function datePickerRangeRoot(Root) {
       disabledYearList: disabledYearList,
       min: min,
       max: max,
+      frame: frame,
+      usePortal: usePortal,
       placement: placement,
       closeOnOverlayClick: closeOnOverlayClick,
       closeOnEsc: closeOnEsc,

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

@@ -19,6 +19,10 @@ export var 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,
@@ -36,7 +40,8 @@ export var RangeDatePopover = function RangeDatePopover(_ref) {
   if (isDoubleCalendar) {
     return /*#__PURE__*/React.createElement(StyledPopover, {
       opened: innerIsOpen,
-      usePortal: false,
+      frame: frame,
+      usePortal: usePortal,
       onToggle: onToggle,
       offset: offset,
       placement: getPlacements(placement),
@@ -66,7 +71,8 @@ export var RangeDatePopover = function RangeDatePopover(_ref) {
   }
   return /*#__PURE__*/React.createElement(StyledPopover, {
     opened: innerIsOpen,
-    usePortal: false,
+    frame: frame,
+    usePortal: usePortal,
     onToggle: onToggle,
     offset: offset,
     placement: getPlacements(placement),