@salutejs/plasma-new-hope 0.167.0-canary.1459.11350127444.0 → 0.167.0-canary.1475.11350736392.0

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

@@ -4,8 +4,7 @@ import { action } from '@storybook/addon-actions';
 import { IconPlaceholder } from '@salutejs/plasma-sb-utils';
 
 import { WithTheme } from '../../../_helpers';
-import { IconCross } from '../../../../components/_Icon';
-import type { PopoverPlacement } from '../Popover/Popover';
+import { IconChevronLeft } from '../../../../components/_Icon';
 
 import { TextField } from './TextField';
 
@@ -17,29 +16,7 @@ const onChipsChange = action('onChipsChange');
 
 const sizes = ['l', 'm', 's', 'xs'];
 const views = ['default', 'positive', 'warning', 'negative'];
-const hintViews = ['default', 'onDark', 'onLight'];
-const hintSizes = ['m', 's'];
-const hintTriggers = ['hover', 'click'];
 const labelPlacements = ['outer', 'inner'];
-const placements: Array<PopoverPlacement> = [
-    'top',
-    'top-start',
-    'top-end',
-
-    'bottom',
-    'bottom-start',
-    'bottom-end',
-
-    'left',
-    'left-start',
-    'left-end',
-
-    'right',
-    'right-start',
-    'right-end',
-
-    'auto',
-];
 
 const meta: Meta<typeof TextField> = {
     title: 'plasma_web/TextField',
@@ -93,43 +70,6 @@ const meta: Meta<typeof TextField> = {
                 type: 'inline-radio',
             },
         },
-        hintView: {
-            options: hintViews,
-            control: {
-                type: 'select',
-            },
-            if: { arg: 'hasHint', truthy: true },
-        },
-        hintSize: {
-            options: hintSizes,
-            control: {
-                type: 'select',
-            },
-            if: { arg: 'hasHint', truthy: true },
-        },
-        hintTrigger: {
-            options: hintTriggers,
-            control: {
-                type: 'inline-radio',
-            },
-            if: { arg: 'hasHint', truthy: true },
-        },
-        hintText: {
-            control: { type: 'text' },
-            if: { arg: 'hasHint', truthy: true },
-        },
-        hintPlacement: {
-            options: placements,
-            control: {
-                type: 'select',
-            },
-            if: { arg: 'hasHint', truthy: true },
-            mappers: placements,
-        },
-        hintHasArrow: {
-            control: { type: 'boolean' },
-            if: { arg: 'hasHint', truthy: true },
-        },
     },
 };
 
@@ -165,13 +105,13 @@ const StoryDemo = ({ enableContentLeft, enableContentRight, view, ...rest }: Sto
     const iconSize = rest.size === 'xs' ? 'xs' : 's';
 
     return (
-        <div style={{ display: 'flex', flexDirection: 'column', gap: '2rem', width: '70%', margin: '0 auto' }}>
+        <div style={{ display: 'flex', flexDirection: 'column', gap: '2rem' }}>
             <TextField
                 {...rest}
                 enumerationType="plain"
                 value={text}
-                contentLeft={enableContentLeft ? <IconCross color="inherit" size={iconSize} /> : undefined}
-                contentRight={enableContentRight ? <IconCross color="inherit" size={iconSize} /> : undefined}
+                contentLeft={enableContentLeft ? <IconPlaceholder size={iconSize} /> : undefined}
+                contentRight={enableContentRight ? <IconPlaceholder size={iconSize} /> : undefined}
                 view={view}
                 onChange={(e) => {
                     setText(e.target.value);
@@ -205,28 +145,17 @@ export const Default: StoryObj<StoryPropsDefault> = {
         view: 'default',
         label: 'Лейбл',
         labelPlacement: 'outer',
-        titleCaption: 'Подпись к полю',
-        textBefore: '',
-        textAfter: '',
         placeholder: 'Заполните поле',
         leftHelper: 'Подсказка к полю',
         disabled: false,
         readOnly: false,
+        required: false,
+        requiredPlacement: 'right',
+        optional: false,
         enableContentLeft: true,
         enableContentRight: true,
         clear: false,
         hasDivider: false,
-        optional: false,
-        required: false,
-        requiredPlacement: 'right',
-        hasHint: false,
-        hintTrigger: 'hover',
-        hintText: 'Текст подсказки',
-        hintView: 'default',
-        hintSize: 'm',
-        hintPlacement: 'auto',
-        hintWidth: '10rem',
-        hintHasArrow: true,
     },
     render: (args) => <StoryDemo {...args} />,
 };
@@ -247,6 +176,8 @@ type StoryPropsChips = Omit<
     | 'checked'
     | 'maxLength'
     | 'minLength'
+    | 'required'
+    | 'optional'
     | 'enumerationType'
 > & {
     enableContentLeft: boolean;
@@ -263,7 +194,7 @@ const StoryChips = ({ enableContentLeft, enableContentRight, view, ...rest }: St
             {...rest}
             enumerationType="chip"
             value={text}
-            contentLeft={enableContentLeft ? <IconPlaceholder size={iconSize} /> : undefined}
+            contentLeft={enableContentLeft ? <IconChevronLeft color="inherit" size={iconSize} /> : undefined}
             contentRight={enableContentRight ? <IconPlaceholder size={iconSize} /> : undefined}
             view={view}
             onChange={(e) => {
@@ -273,7 +204,6 @@ const StoryChips = ({ enableContentLeft, enableContentRight, view, ...rest }: St
             onFocus={onFocus}
             onBlur={onBlur}
             onChangeChips={onChipsChange}
-            style={{ width: '70%', margin: '0 auto' }}
         />
     );
 };

package/styled-components/es/components/Autocomplete/Autocomplete.js

@@ -1,4 +1,4 @@
-var _excluded = ["value", "onChange", "suggestions", "view", "size", "labelPlacement", "disabled", "readOnly", "label", "leftHelper", "contentLeft", "contentRight", "textBefore", "textAfter", "onScroll", "listMaxHeight", "listWidth", "portal", "filter", "onSuggestionSelect", "threshold", "renderList", "renderListEnd", "onSearch", "hasHint", "hintText"];
+var _excluded = ["value", "onChange", "suggestions", "view", "size", "labelPlacement", "disabled", "readOnly", "label", "leftHelper", "contentLeft", "contentRight", "textBefore", "textAfter", "onScroll", "listMaxHeight", "listWidth", "portal", "filter", "onSuggestionSelect", "threshold", "renderList", "renderListEnd", "onSearch"];
 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."); }
@@ -47,8 +47,6 @@ export var autocompleteRoot = function autocompleteRoot(Root) {
       renderList = _ref.renderList,
       renderListEnd = _ref.renderListEnd,
       onSearch = _ref.onSearch,
-      hasHint = _ref.hasHint,
-      hintText = _ref.hintText,
       rest = _objectWithoutProperties(_ref, _excluded);
     var _useReducer = useReducer(focusedReducer, null),
       _useReducer2 = _slicedToArray(_useReducer, 2),
@@ -146,9 +144,7 @@ export var autocompleteRoot = function autocompleteRoot(Root) {
         "aria-controls": listId,
         "aria-expanded": isOpen,
         "aria-activedescendant": "".concat(listId, "/").concat(focused),
-        "aria-describedby": helperTextId,
-        hasHint: Boolean(hasHint),
-        hintText: String(hintText || '')
+        "aria-describedby": helperTextId
       }, rest)),
       preventOverflow: false,
       ref: targetRef,

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 () {
@@ -305,6 +354,16 @@ export var datePickerRangeRoot = function datePickerRangeRoot(Root) {
         lang: lang
       }));
     }, [format, lang]);
+    var RootWrapper = useCallback(function (_ref2) {
+      var children = _ref2.children;
+      return /*#__PURE__*/React.createElement(Root, {
+        view: view,
+        size: size,
+        className: cx(classes.datePickerRoot, className),
+        disabled: disabled,
+        readOnly: !disabled && readOnly
+      }, children);
+    }, [view, size, disabled, readOnly]);
     return /*#__PURE__*/React.createElement(Root, _extends({
       ref: rootRef,
       view: view,
@@ -327,6 +386,8 @@ export var datePickerRangeRoot = function datePickerRangeRoot(Root) {
       disabledYearList: disabledYearList,
       min: min,
       max: max,
+      frame: frame,
+      usePortal: usePortal,
       placement: placement,
       closeOnOverlayClick: closeOnOverlayClick,
       closeOnEsc: closeOnEsc,
@@ -335,14 +396,15 @@ export var datePickerRangeRoot = function datePickerRangeRoot(Root) {
       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/es/components/DatePicker/RangeDate/RangeDatePopover/RangeDatePopover.js

@@ -3,7 +3,8 @@ import { getPlacements } from '../../../../utils';
 import { StyledPopover } from '../RangeDate.styles';
 import { StyledCalendar, StyledCalendarDouble } from './RangeDatePopover.styles';
 export var RangeDatePopover = function RangeDatePopover(_ref) {
-  var target = _ref.target,
+  var Root = _ref.rootWrapper,
+    target = _ref.target,
     isOpen = _ref.isOpen,
     opened = _ref.opened,
     isDoubleCalendar = _ref.isDoubleCalendar,
@@ -19,6 +20,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 +41,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),
@@ -45,7 +51,7 @@ export var RangeDatePopover = function RangeDatePopover(_ref) {
       isFocusTrapped: false,
       target: target,
       preventOverflow: false
-    }, /*#__PURE__*/React.createElement(StyledCalendarDouble, {
+    }, /*#__PURE__*/React.createElement(Root, null, /*#__PURE__*/React.createElement(StyledCalendarDouble, {
       size: size,
       value: calendarValue,
       eventList: eventList,
@@ -62,11 +68,12 @@ export var RangeDatePopover = function RangeDatePopover(_ref) {
       includeEdgeDates: includeEdgeDates,
       onChangeValue: onChangeValue,
       onChangeStartOfRange: onChangeStartOfRange
-    }));
+    })));
   }
   return /*#__PURE__*/React.createElement(StyledPopover, {
     opened: innerIsOpen,
-    usePortal: false,
+    frame: frame,
+    usePortal: usePortal,
     onToggle: onToggle,
     offset: offset,
     placement: getPlacements(placement),
@@ -76,7 +83,7 @@ export var RangeDatePopover = function RangeDatePopover(_ref) {
     target: target,
     preventOverflow: false,
     closeOnEsc: closeOnEsc
-  }, /*#__PURE__*/React.createElement(StyledCalendar, {
+  }, /*#__PURE__*/React.createElement(Root, null, /*#__PURE__*/React.createElement(StyledCalendar, {
     size: size,
     value: calendarValue,
     eventList: eventList,
@@ -94,5 +101,5 @@ export var RangeDatePopover = function RangeDatePopover(_ref) {
     includeEdgeDates: includeEdgeDates,
     onChangeValue: onChangeValue,
     onChangeStartOfRange: onChangeStartOfRange
-  }));
+  })));
 };

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

@@ -1,4 +1,4 @@
 import { css } from 'styled-components';
 import { tokens } from '../../../DatePicker.tokens';
 import { StyledLabel, LeftHelper } from '../../RangeDate.styles';
-export var base = /*#__PURE__*/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(", ");}"], tokens.width, StyledLabel, tokens.labelOffset, tokens.labelFontFamily, tokens.labelFontSize, tokens.labelFontStyle, tokens.labelFontWeight, tokens.labelLetterSpacing, tokens.labelLineHeight, LeftHelper, tokens.leftHelperOffset, tokens.leftHelperFontFamily, tokens.leftHelperFontSize, tokens.leftHelperFontStyle, tokens.leftHelperFontWeight, tokens.leftHelperLetterSpacing, tokens.leftHelperLineHeight);
+export var base = /*#__PURE__*/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(", ");}"], StyledLabel, tokens.labelOffset, tokens.labelFontFamily, tokens.labelFontSize, tokens.labelFontStyle, tokens.labelFontWeight, tokens.labelLetterSpacing, tokens.labelLineHeight, LeftHelper, tokens.leftHelperOffset, tokens.leftHelperFontFamily, tokens.leftHelperFontSize, tokens.leftHelperFontStyle, tokens.leftHelperFontWeight, tokens.leftHelperLetterSpacing, tokens.leftHelperLineHeight);

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

@@ -1,4 +1,4 @@
-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 _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."); }
@@ -14,7 +14,7 @@ import { formatCalendarValue, formatInputValue, getDateFormatDelimiter } from '.
 import { useDatePicker } from '../hooks/useDatePicker';
 import { classes } from '../DatePicker.tokens';
 import { InputHidden, StyledCalendar } from '../DatePickerBase.styles';
-import { useKeyNavigation } from '../hooks/useKeyboardNavigation';
+import { keys, useKeyNavigation } from '../hooks/useKeyboardNavigation';
 import { base as sizeCSS } from './variations/_size/base';
 import { base as viewCSS } from './variations/_view/base';
 import { base as disabledCSS } from './variations/_disabled/base';
@@ -64,10 +64,16 @@ export var 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,
@@ -102,7 +108,6 @@ export var datePickerRoot = function datePickerRoot(Root) {
         currentValue: inputValue,
         setInputValue: setInputValue,
         setCalendarValue: setCalendarValue,
-        setIsInnerOpen: setIsInnerOpen,
         dateFormatDelimiter: dateFormatDelimiter,
         format: format,
         lang: lang,
@@ -111,21 +116,34 @@ export var 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 !== 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 = useKeyNavigation({
         isCalendarOpen: isInnerOpen,
-        onToggle: handleToggle
+        onToggle: handleToggle,
+        closeOnEsc: closeOnEsc
       }),
       onKeyDown = _useKeyNavigation.onKeyDown;
     var DatePickerInput = /*#__PURE__*/React.createElement(StyledInput, _extends({
@@ -181,7 +199,8 @@ export var datePickerRoot = function datePickerRoot(Root) {
       ref: ref
     }, rest), !innerLabelPlacement && label && /*#__PURE__*/React.createElement(StyledLabel, null, label), /*#__PURE__*/React.createElement(StyledPopover, {
       opened: isInnerOpen,
-      usePortal: false,
+      usePortal: usePortal,
+      frame: frame,
       onToggle: handleToggle,
       offset: offset,
       placement: getPlacements(placement),
@@ -190,6 +209,12 @@ export var datePickerRoot = function datePickerRoot(Root) {
       isFocusTrapped: false,
       target: DatePickerInput,
       preventOverflow: false
+    }, /*#__PURE__*/React.createElement(Root, {
+      view: view,
+      size: size,
+      className: cx(classes.datePickerRoot, className),
+      disabled: disabled,
+      readOnly: !disabled && readOnly
     }, /*#__PURE__*/React.createElement(StyledCalendar, {
       size: size,
       value: calendarValue,
@@ -210,7 +235,7 @@ export var datePickerRoot = function datePickerRoot(Root) {
       onChangeValue: function onChangeValue(date, dateInfo) {
         return handleCommitDate(date, false, true, dateInfo);
       }
-    })), leftHelper && /*#__PURE__*/React.createElement(LeftHelper, null, leftHelper), /*#__PURE__*/React.createElement(InputHidden, _extends({
+    }))), leftHelper && /*#__PURE__*/React.createElement(LeftHelper, null, leftHelper), /*#__PURE__*/React.createElement(InputHidden, _extends({
       type: "hidden",
       datatype: "datepicker-single",
       name: name,