@epam/uui 6.3.2 → 6.4.0

package/index.js

@@ -14,8 +14,8 @@ var updateLocale = require('dayjs/plugin/updateLocale.js');
 var objectSupport = require('dayjs/plugin/objectSupport');
 var customParseFormat = require('dayjs/plugin/customParseFormat.js');
 var isoWeek = require('dayjs/plugin/isoWeek.js');
-var overlayscrollbarsReact = require('overlayscrollbars-react');
 var isEqual = require('react-fast-compare');
+var overlayscrollbarsReact = require('overlayscrollbars-react');
 var FocusLock = require('react-focus-lock');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -190,7 +190,7 @@ var SvgEmptyTable = function SvgEmptyTable(props, ref) {
     xmlns: "http://www.w3.org/2000/svg",
     ref: ref
   }, props), /*#__PURE__*/React__namespace.createElement("g", {
-    clipPath: "url(#qrwlkiw0o9y1o95w_a)"
+    clipPath: "url(#790hffa01mx0vyggb_a)"
   }, _path$I || (_path$I = /*#__PURE__*/React__namespace.createElement("path", {
     d: "M150.585 1.535C49.483-11.495 27.481 61.805 45.725 97.481c10.581 20.69-39.64 70.792 17.744 81.468 27.538 5.123 36-13.341 62.433-10.655 35.4 3.6 148.167-4.73 88.349-78.915-31.713-39.335 1.026-79.506-63.666-87.844Z",
     fill: "#F5F6FA"
@@ -211,7 +211,7 @@ var SvgEmptyTable = function SvgEmptyTable(props, ref) {
     d: "M86.786 22.982c-2.55 0-4.965 2.07-4.965 4.552V120.6c0 2.484 2.4 4.572 4.965 4.572h88.101c2.582 0 4.986-2.089 4.986-4.572V27.534c0-2.464-2.418-4.552-4.986-4.552h-88.1Zm-5.793 4.552c0-3.022 2.874-5.38 5.793-5.38h88.101c2.935 0 5.814 2.374 5.814 5.38V120.6c0 3.021-2.86 5.4-5.814 5.4h-88.1c-2.94 0-5.794-2.381-5.794-5.4V27.534Z",
     fill: "#1D1E26"
   })), /*#__PURE__*/React__namespace.createElement("mask", {
-    id: "qrwlki95397hjp0xr_b",
+    id: "790hffb0gk95p6g05_b",
     style: {
       maskType: "alpha"
     },
@@ -224,7 +224,7 @@ var SvgEmptyTable = function SvgEmptyTable(props, ref) {
     d: "M174.887 125.586h-88.1c-2.752 0-5.38-2.234-5.38-4.986V27.534c0-2.752 2.644-4.966 5.38-4.966h88.1c2.752 0 5.4 2.23 5.4 4.966V120.6c0 2.752-2.632 4.986-5.4 4.986Z",
     fill: "#9BDEFF"
   }))), _g || (_g = /*#__PURE__*/React__namespace.createElement("g", {
-    mask: "url(#qrwlki95397hjp0xr_b)",
+    mask: "url(#790hffb0gk95p6g05_b)",
     fillRule: "evenodd",
     clipRule: "evenodd"
   }, /*#__PURE__*/React__namespace.createElement("path", {
@@ -310,7 +310,7 @@ var SvgEmptyTable = function SvgEmptyTable(props, ref) {
     d: "M24.73 96.184a.414.414 0 0 1 .581.06l48.646 59.751a.413.413 0 1 1-.642.523L24.67 96.766a.414.414 0 0 1 .06-.582Z",
     fill: "#fff"
   }))), _defs || (_defs = /*#__PURE__*/React__namespace.createElement("defs", null, /*#__PURE__*/React__namespace.createElement("clipPath", {
-    id: "qrwlkiw0o9y1o95w_a"
+    id: "790hffa01mx0vyggb_a"
   }, /*#__PURE__*/React__namespace.createElement("path", {
     fill: "#fff",
     transform: "translate(.552)",
@@ -961,14 +961,14 @@ var SvgSearchWithBackground = function SvgSearchWithBackground(props, ref) {
 };
 var ForwardRef$4 = /*#__PURE__*/React.forwardRef(SvgSearchWithBackground);
 
-var css$1w = {"root":"XsVVgE","uui-spinner":"J-KtPI","uuiSpinner":"J-KtPI"};
+var css$1w = {"root":"bEz5fb","uui-spinner":"Wl7p2-","uuiSpinner":"Wl7p2-"};
 
 function applySpinnerMods() {
     return [css$1w.root, 'uui-spinner'];
 }
 const Spinner = /* @__PURE__ */uuiCore.withMods(uuiComponents.Spinner, applySpinnerMods);
 
-var css$1v = {"root":"ZYuj6-","loading-word":"_1pIeDe","loadingWord":"_1pIeDe","animated-loading":"Y-kIe6","animatedLoading":"Y-kIe6","skeleton_loading":"z5d1jW","skeletonLoading":"z5d1jW"};
+var css$1v = {"root":"-uQdeS","loading-word":"rRUz6U","loadingWord":"rRUz6U","animated-loading":"LMeA8O","animatedLoading":"LMeA8O","skeleton_loading":"SydgTz","skeletonLoading":"SydgTz"};
 
 const TextPlaceholder = (props) => {
     const pattern = ' ';
@@ -985,7 +985,7 @@ const TextPlaceholder = (props) => {
         ]), dangerouslySetInnerHTML: { __html: it } })))));
 };
 
-var css$1u = {"root":"sQdH-t","line-height":"ZPDEKH","lineHeight":"ZPDEKH","font-size":"U15uax","fontSize":"U15uax"};
+var css$1u = {"root":"L47xZm","line-height":"O1zr-h","lineHeight":"O1zr-h","font-size":"_8psQnn","fontSize":"_8psQnn"};
 
 function applyTextMods(mods) {
     return [
@@ -1012,7 +1012,7 @@ const Text = /* @__PURE__ */uuiCore.withMods(uuiComponents__namespace.Text, appl
     };
 });
 
-var css$1t = {"root":"kqKJDi"};
+var css$1t = {"root":"viH-21"};
 
 const Blocker = /* @__PURE__ */uuiCore.withMods(uuiComponents.Blocker, () => [css$1t.root], () => ({ renderSpinner: settings.blocker.renderSpinner }));
 
@@ -1517,7 +1517,7 @@ const settings = {
     textInput: textInputSettings,
 };
 
-var css$1s = {"root":"_1jGPoQ"};
+var css$1s = {"root":"C3zmGr"};
 
 function applyButtonMods(mods) {
     return [
@@ -1535,7 +1535,7 @@ const Button = /* @__PURE__ */uuiCore.withMods(uuiComponents__namespace.Button,
     };
 });
 
-var css$1r = {"root":"HMtVaA"};
+var css$1r = {"root":"TMcx7u"};
 
 function applyIconButtonMods(props) {
     return ['uui-icon_button', `uui-color-${props.color || 'neutral'}`, css$1r.root];
@@ -1572,7 +1572,7 @@ function getIconClass(props) {
     return [classList['has-left-icon'] ? 'uui-has-left-icon' : 'uui-no-left-icon', classList['has-right-icon'] ? 'uui-has-right-icon' : 'uui-no-right-icon'];
 }
 
-var css$1q = {"root":"PKSXaj"};
+var css$1q = {"root":"ASLyUA"};
 
 const DEFAULT_COLOR = 'primary';
 const LinkButton = /* @__PURE__ */React__namespace.forwardRef((props, ref) => {
@@ -1602,7 +1602,7 @@ const LinkButton = /* @__PURE__ */React__namespace.forwardRef((props, ref) => {
         props.isDropdown && (React__namespace.createElement(uuiComponents.IconContainer, { icon: DropdownIcon, flipY: props.isOpen }))));
 });
 
-var css$1p = {"root":"LYO9YX"};
+var css$1p = {"root":"aKtP8i"};
 
 const CountIndicator = /* @__PURE__ */React.forwardRef((props, ref) => {
     return (React__namespace.default.createElement("div", { ref: ref, className: cx__default.default([
@@ -1614,7 +1614,7 @@ const CountIndicator = /* @__PURE__ */React.forwardRef((props, ref) => {
         ]) }, props.caption));
 });
 
-var css$1o = {"root":"ooiJr3","withNotify":"_0AIlVx"};
+var css$1o = {"root":"ykvezi","withNotify":"c8Tede"};
 
 const TabButton = /* @__PURE__ */React__namespace.default.forwardRef((props, refExternal) => {
     const refLocal = React__namespace.default.useRef(null);
@@ -1661,13 +1661,13 @@ const TabButton = /* @__PURE__ */React__namespace.default.forwardRef((props, ref
         props.onClear && !props.isDisabled && (React__namespace.default.createElement(uuiComponents.IconContainer, { cx: uuiCore.uuiMarkers.clickable, icon: ClearIcon, onClick: props.onClear }))));
 });
 
-var css$1n = {"root":"bZBWJi","noLeftPadding":"cl-DNj","foldingArea":"VYrbit","onlyFoldable":"ouc1II","captionWrapper":"q9ac-m","withNotify":"VtZ-OK"};
+var css$1n = {"root":"YOg-TX","noLeftPadding":"_3r1Et-","foldingArea":"_3p80ni","onlyFoldable":"bFtqXf","captionWrapper":"ejPkcT","withNotify":"p3cpn4"};
 
-var css$1m = {"root":"X5BhfP"};
+var css$1m = {"root":"V2PJ62"};
 
 const AvatarStack = /* @__PURE__ */uuiCore.withMods(uuiComponents.AvatarStack, () => [css$1m.root]);
 
-var css$1l = {"root":"Xtmono"};
+var css$1l = {"root":"mnNu-T"};
 
 const DEFAULT_FILL = 'solid';
 function applyBadgeMods(mods) {
@@ -1695,7 +1695,7 @@ const Badge = /* @__PURE__ */React__namespace.default.forwardRef((props, ref) =>
         props.isDropdown && (React__namespace.default.createElement(uuiComponents.IconContainer, { icon: DropdownIcon, flipY: props.isOpen }))));
 });
 
-var css$1k = {"root":"udiAKt"};
+var css$1k = {"root":"Mjetxg"};
 
 function applyTagMods(props) {
     return [
@@ -1710,44 +1710,58 @@ const Tag = /* @__PURE__ */React__namespace.default.forwardRef((props, ref) => {
     const styles = [applyTagMods(props), props.cx];
     const ClearIcon = props.clearIcon ? props.clearIcon : settings.tag.icons.clearIcon;
     const DropdownIcon = props.dropdownIcon ? props.dropdownIcon : settings.tag.icons.dropdownIcon;
+    const icon = (React__namespace.default.createElement(uuiComponents.ControlIcon, { icon: props.icon, onClick: props.onIconClick, isDisabled: props.isDisabled, rawProps: {
+            'aria-label': 'Icon in input',
+        } }));
     return (React__namespace.default.createElement(uuiComponents.Clickable, { ...props, rawProps: {
             'aria-haspopup': props.isDropdown,
             'aria-expanded': props.isOpen,
             ...props.rawProps,
         }, cx: styles, ref: ref },
-        props.icon && props.iconPosition !== 'right' && (React__namespace.default.createElement(uuiComponents.IconContainer, { icon: props.icon, onClick: !props.isDisabled ? props.onIconClick : undefined })),
+        props.iconPosition !== 'right' && icon,
         props.caption && (React__namespace.default.createElement("div", { className: uuiCore.uuiElement.caption }, props.caption)),
         props.count !== undefined && props.count !== null && (React__namespace.default.createElement(CountIndicator, { color: (!props.color || props.color === 'neutral') ? 'white' : props.color, size: settings.tag.sizes.countIndicatorMap[(props.size || settings.tag.sizes.default)], caption: props.count })),
-        props.icon && props.iconPosition === 'right' && (React__namespace.default.createElement(uuiComponents.IconContainer, { icon: props.icon, onClick: !props.isDisabled ? props.onIconClick : undefined })),
-        props.isDropdown && (React__namespace.default.createElement(uuiComponents.IconContainer, { icon: DropdownIcon, flipY: props.isOpen })),
-        props.onClear && !props.isDisabled && (React__namespace.default.createElement(uuiComponents.IconContainer, { cx: uuiCore.uuiMarkers.clickable, icon: ClearIcon, onClick: props.onClear }))));
+        props.iconPosition === 'right' && icon,
+        props.isDropdown && (React__namespace.default.createElement(uuiComponents.ControlIcon, { icon: DropdownIcon, flipY: props.isOpen })),
+        props.onClear && !props.isDisabled && (React__namespace.default.createElement(uuiComponents.ControlIcon, { cx: "uui-icon-cancel", icon: ClearIcon, onClick: props.onClear, rawProps: {
+                'aria-label': 'Remove tag',
+            } }))));
 });
 
-var css$1j = {"root":"QP57Rx","page":"HMzWC8","spacer":"_2w24-1","mode-ghost":"juUbpl","modeGhost":"juUbpl"};
+var css$1j = {"root":"-vpinZ","page":"o-w7Je","spacer":"Ygo3I4","mode-ghost":"HwVqRi","modeGhost":"HwVqRi"};
 
 function Paginator(props) {
-    const renderPaginator = (params) => (React__namespace.default.createElement("nav", { role: "navigation", className: cx__default.default(css$1j.root, 'uui-paginator', `uui-size-${props.size || settings.paginator.sizes.default}`), ...params.rawProps },
-        React__namespace.default.createElement(Button, { size: props.size || settings.paginator.sizes.default, icon: settings.paginator.icons.leftArrowIcon, onClick: params.goToPrev, isDisabled: params.isFirst || props.isDisabled, fill: "outline", color: "secondary" }),
-        params.pages.map((page, index) => {
-            if (page.type === 'spacer') {
-                return (React__namespace.default.createElement(Button, { cx: cx__default.default(css$1j.spacer, css$1j.page), size: props.size || settings.paginator.sizes.default, key: `${index}_spacer`, caption: "...", fill: "ghost", color: "secondary", tabIndex: -1, isDisabled: props.isDisabled }));
-            }
-            else {
-                return (React__namespace.default.createElement(Button, { cx: cx__default.default(css$1j[`mode-${!page.isActive && 'ghost'}`], css$1j.page), size: props.size || settings.paginator.sizes.default, key: page.pageNumber, caption: page.pageNumber, onClick: () => page.onClick?.(), rawProps: { 'aria-current': page.isActive }, fill: (page.isActive && 'outline') || 'ghost', color: "primary", isDisabled: props.isDisabled }));
-            }
-        }),
-        React__namespace.default.createElement(Button, { size: props.size || settings.paginator.sizes.default, icon: settings.paginator.icons.rightArrowIcon, onClick: params.goToNext, isDisabled: params.isLast || props.isDisabled, fill: "outline", color: "secondary" })));
+    const renderPaginator = (params) => (React__namespace.default.createElement("nav", { role: "navigation", className: cx__default.default('uui-paginator', `uui-size-${props.size || settings.paginator.sizes.default}`), ...params.rawProps },
+        React__namespace.default.createElement("ul", { className: css$1j.root },
+            React__namespace.default.createElement("li", null,
+                React__namespace.default.createElement(Button, { size: props.size || settings.paginator.sizes.default, icon: settings.paginator.icons.leftArrowIcon, onClick: params.goToPrev, isDisabled: params.isFirst || props.isDisabled, fill: "outline", color: "secondary", rawProps: {
+                        'aria-label': 'Previous page',
+                    } })),
+            params.pages.map((page, index) => {
+                if (page.type === 'spacer') {
+                    return (React__namespace.default.createElement("li", { key: `${index}_spacer` },
+                        React__namespace.default.createElement(Button, { cx: cx__default.default(css$1j.spacer, css$1j.page), size: props.size || settings.paginator.sizes.default, caption: "...", fill: "ghost", color: "secondary", tabIndex: -1, isDisabled: props.isDisabled })));
+                }
+                else {
+                    return (React__namespace.default.createElement("li", { key: page.pageNumber },
+                        React__namespace.default.createElement(Button, { cx: cx__default.default(css$1j[`mode-${!page.isActive && 'ghost'}`], css$1j.page), size: props.size || settings.paginator.sizes.default, caption: page.pageNumber, onClick: () => page.onClick?.(), rawProps: { 'aria-current': page.isActive }, fill: (page.isActive && 'outline') || 'ghost', color: "primary", isDisabled: props.isDisabled })));
+                }
+            }),
+            React__namespace.default.createElement("li", null,
+                React__namespace.default.createElement(Button, { size: props.size || settings.paginator.sizes.default, icon: settings.paginator.icons.rightArrowIcon, onClick: params.goToNext, isDisabled: params.isLast || props.isDisabled, fill: "outline", color: "secondary", rawProps: {
+                        'aria-label': 'Next page',
+                    } })))));
     return React__namespace.default.createElement(uuiComponents.Paginator, { ...props, render: renderPaginator });
 }
 
-var css$1i = {"root":"gfODfa","progress-bar":"V5kUJN","progressBar":"V5kUJN","progressBar-indeterminate":"fGrQ76","progressBarIndeterminate":"fGrQ76","size-12":"ZTCW31","size12":"ZTCW31","size-18":"c8Zqv8","size18":"c8Zqv8","size-24":"UiUmsy","size24":"UiUmsy"};
+var css$1i = {"root":"lpQGb8","progress-bar":"kHMnWm","progressBar":"kHMnWm","progressBar-indeterminate":"K5zhsI","progressBarIndeterminate":"K5zhsI","size-12":"DTvp79","size12":"DTvp79","size-18":"_4pjzqt","size18":"_4pjzqt","size-24":"jC7Acx","size24":"jC7Acx"};
 
 const IndeterminateBar = /* @__PURE__ */React__namespace.forwardRef((props, ref) => {
     return (React__namespace.createElement("div", { ref: ref, className: cx__default.default('uui-indeterminate_bar', props.cx, css$1i.root, css$1i[`size-${props.size || 12}`]) },
         React__namespace.createElement("div", { className: cx__default.default(css$1i.progressBar) })));
 });
 
-var css$1h = {"root":"l3g9UJ","striped":"-nsNol","animate-stripes":"xP0hY8","animateStripes":"xP0hY8","size-12":"_0UckyR","size12":"_0UckyR","size-18":"-MdCAM","size18":"-MdCAM","size-24":"fGW6MV","size24":"fGW6MV"};
+var css$1h = {"root":"_2iI23M","striped":"uV9JJi","animate-stripes":"hExMvK","animateStripes":"hExMvK","size-12":"_2hpJSw","size12":"_2hpJSw","size-18":"FGR7MH","size18":"FGR7MH","size-24":"l5FX4c","size24":"l5FX4c"};
 
 const DEFAULT_SIZE = '12';
 function applyProgressBarMods(mods) {
@@ -1762,14 +1776,14 @@ const ProgressBar = /* @__PURE__ */uuiCore.withMods(uuiComponents__namespace.Pro
     hideLabel: props.hideLabel || props.striped,
 }));
 
-var css$1g = {"root":"wvRFkz"};
+var css$1g = {"root":"_6erezJ"};
 
 const IndicatorBar = /* @__PURE__ */React__namespace.forwardRef((props, ref) => {
     const { progress } = props;
     return progress || progress === 0 ? (React__namespace.createElement(ProgressBar, { ref: ref, progress: progress, cx: cx__default.default(css$1g.root, props.cx), hideLabel: true })) : (React__namespace.createElement(IndeterminateBar, { ref: ref, cx: cx__default.default(css$1g.root, props.cx) }));
 });
 
-var css$1f = {"root":"_8ClwZZ"};
+var css$1f = {"root":"Hb7eZm"};
 
 const StatusIndicator = /* @__PURE__ */React.forwardRef((props, ref) => {
     return (React__namespace.default.createElement("div", { ref: ref, className: cx__default.default([
@@ -1784,7 +1798,7 @@ const StatusIndicator = /* @__PURE__ */React.forwardRef((props, ref) => {
         React__namespace.default.createElement("p", { className: "uui-status_indicator-caption" }, props.caption)));
 });
 
-var css$1e = {"root":"adcmNx"};
+var css$1e = {"root":"_4KYo5h"};
 
 function applyCheckboxMods(mods) {
     return [
@@ -1802,7 +1816,7 @@ const applyUUICheckboxProps = (props) => {
 };
 const Checkbox = /* @__PURE__ */uuiCore.withMods(uuiComponents__namespace.Checkbox, applyCheckboxMods, applyUUICheckboxProps);
 
-var css$1d = {"root":"Wj8S-r"};
+var css$1d = {"root":"_-7C2gw"};
 
 function applyRadioInputMods(mods) {
     return [
@@ -1814,7 +1828,7 @@ function applyRadioInputMods(mods) {
 }
 const RadioInput = /* @__PURE__ */uuiCore.withMods(uuiComponents.RadioInput, applyRadioInputMods, (props) => ({ icon: props.icon ? props.icon : settings.radioInput.icons.dotIcon }));
 
-var css$1c = {"root":"HWBYqN"};
+var css$1c = {"root":"mDpAAT"};
 
 function applySwitchMods(mods) {
     return [
@@ -1838,7 +1852,7 @@ var EditMode;
     EditMode["INLINE"] = "inline";
 })(EditMode || (EditMode = {}));
 
-var textInputCss = {"root":"ZRMCmy"};
+var textInputCss = {"root":"t7Jexk"};
 
 const DEFAULT_MODE$3 = EditMode.FORM;
 function applyTextInputMods(mods) {
@@ -1863,7 +1877,7 @@ const SearchInput = /* @__PURE__ */React__namespace.default.forwardRef((props, r
         } }));
 });
 
-var css$1b = {"root":"ma4x7j"};
+var css$1b = {"root":"W4NDrH"};
 
 const ControlGroup = /* @__PURE__ */uuiCore.withMods(uuiComponents.ControlGroup, () => [css$1b.root, 'uui-control-group']);
 
@@ -1879,7 +1893,7 @@ function MultiSwitchComponent(props, ref) {
 }
 const MultiSwitch = /* @__PURE__ */React__namespace.forwardRef(MultiSwitchComponent);
 
-var css$1a = {"root":"Er4BEK"};
+var css$1a = {"root":"_4dqBf3"};
 
 const DEFAULT_MODE$2 = EditMode.FORM;
 function applyNumericInputMods(mods) {
@@ -1899,7 +1913,7 @@ const NumericInput = /* @__PURE__ */uuiCore.withMods(uuiComponents.NumericInput,
     };
 });
 
-var css$19 = {"root":"P073hJ"};
+var css$19 = {"root":"BNWkCm"};
 
 const DEFAULT_MODE$1 = EditMode.FORM;
 function applyTextAreaMods(mods) {
@@ -1940,7 +1954,7 @@ function TREE_SHAKEABLE_INIT$1() {
     };
 }
 
-var css$18 = {"root":"zEw5-y"};
+var css$18 = {"root":"JPwLks"};
 
 function applyDropdownContainerMods(mods) {
     return [
@@ -1951,7 +1965,7 @@ function applyDropdownContainerMods(mods) {
 }
 const DropdownContainer = /* @__PURE__ */uuiCore.withMods(uuiComponents__namespace.DropdownContainer, applyDropdownContainerMods);
 
-var css$17 = {"root":"HXcHjF","timepicker-input":"WBtwUc","timepickerInput":"WBtwUc","ltr-always":"_4wLiMO","ltrAlways":"_4wLiMO"};
+var css$17 = {"root":"v1laBj","timepicker-input":"_6RNYsC","timepickerInput":"_6RNYsC","ltr-always":"iNxk49","ltrAlways":"iNxk49"};
 
 const uuiTimePicker = {
     container: 'uui-timepicker-container',
@@ -2057,7 +2071,7 @@ const formatTime = (hours, minutes, meridian, format) => {
 
 const DEFAULT_MODE = EditMode.FORM;
 const valueToTimeString = (value, format) => {
-    if (value === null)
+    if (value === null || (value?.hours === null && value?.minutes === null))
         return null;
     return uuiDayjs.dayjs()
         .set(value)
@@ -2069,6 +2083,7 @@ function TimePickerComponent(props, ref) {
         value: valueToTimeString(props.value, props.format),
         inputValue: valueToTimeString(props.value, props.format),
     });
+    const targetRef = React__namespace.default.useRef(null);
     React.useEffect(() => {
         if (valueToTimeString(props.value, props.format) !== state.value) {
             const stringValue = valueToTimeString(props.value, props.format);
@@ -2090,13 +2105,17 @@ function TimePickerComponent(props, ref) {
     };
     const onClear = () => {
         props.onValueChange(null);
+        setState((prevState) => ({ ...prevState, value: null, inputValue: null }));
     };
     const onToggle = (value) => {
         setState((prevState) => ({ ...prevState, isOpen: value }));
     };
     const saveTime = (newTime) => {
         setState((prevState) => ({ ...prevState, inputValue: newTime }));
-        props.onValueChange(formatStringTimeToObject(newTime));
+        const newValue = formatStringTimeToObject(newTime);
+        if (!isEqual__default.default(props.value, newValue)) {
+            props.onValueChange(formatStringTimeToObject(newTime));
+        }
     };
     const getTimeFromInputValue = (newValue) => {
         const trimmedNewValue = newValue.trimStart();
@@ -2110,7 +2129,6 @@ function TimePickerComponent(props, ref) {
         saveTime(inputValue);
     };
     const handleFocus = (e) => {
-        onToggle(true);
         props.onFocus?.(e);
     };
     const handleInputChange = (newValue) => {
@@ -2123,29 +2141,46 @@ function TimePickerComponent(props, ref) {
         }
     };
     const handleBlur = (e) => {
-        if (uuiCore.isFocusReceiverInsideFocusLock(e))
-            return;
-        onToggle(false);
         props.onBlur?.(e);
         if (state.value === '' || state.inputValue === '') {
             props.onValueChange(null);
             setState((prevState) => ({ ...prevState, value: null, inputValue: null }));
         }
-        state.value && state.inputValue && saveTime(state.value);
+        else {
+            saveTime(state.value);
+        }
+    };
+    const onKeyDown = (e) => {
+        if (e.key === 'Enter') {
+            onToggle(true);
+        }
+        if (e.key === 'Escape' && state.isOpen) {
+            e.preventDefault();
+            e.stopPropagation();
+            onToggle(false);
+        }
     };
     const renderInput = (inputProps) => {
-        return (React__namespace.default.createElement(TextInput, { ...inputProps, onClick: null, size: props.size, isDisabled: props.isDisabled, isReadonly: props.isReadonly, isInvalid: props.isInvalid, cx: [css$17.root, css$17.timepickerInput, props.inputCx], value: state.inputValue, onValueChange: handleInputChange, onCancel: !props.disableClear && onClear, onFocus: handleFocus, onBlur: handleBlur, isDropdown: false, placeholder: props.placeholder ? props.placeholder : getFormat(), mode: props.mode || DEFAULT_MODE, rawProps: props.rawProps?.input }));
+        return (React__namespace.default.createElement(TextInput, { ...inputProps, size: props.size, isDisabled: props.isDisabled, isReadonly: props.isReadonly, isInvalid: props.isInvalid, cx: [css$17.root, css$17.timepickerInput, props.inputCx], value: state.inputValue, onValueChange: handleInputChange, onCancel: !props.disableClear && onClear, onKeyDown: onKeyDown, onFocus: handleFocus, onBlur: handleBlur, isDropdown: false, placeholder: props.placeholder ? props.placeholder : getFormat(), mode: props.mode || DEFAULT_MODE, rawProps: props.rawProps?.input, ref: (node) => {
+                targetRef.current = node;
+                if (typeof inputProps.ref === 'function') {
+                    inputProps.ref(node);
+                }
+                else if (inputProps.ref && 'current' in inputProps.ref) {
+                    inputProps.ref.current = node;
+                }
+            } }));
     };
     const renderBody = (bodyProps) => {
         const { forwardedRef, onValueChange, ...timePickerBodyProps } = props;
-        return (!props.isDisabled && !props.isReadonly && (React__namespace.default.createElement(DropdownContainer, { ...bodyProps, focusLock: false },
+        return (!props.isDisabled && !props.isReadonly && (React__namespace.default.createElement(DropdownContainer, { ...bodyProps, shards: [targetRef] },
             React__namespace.default.createElement(TimePickerBody, { ...timePickerBodyProps, onValueChange: handleBodyValueChange, value: formatStringTimeToObject(state.value), rawProps: props.rawProps?.body, cx: props.bodyCx }))));
     };
     return (React__namespace.default.createElement(uuiComponents.Dropdown, { renderTarget: (targetProps) => (props.renderTarget ? props.renderTarget(targetProps) : renderInput(targetProps)), renderBody: (bodyProps) => !props.isDisabled && !props.isReadonly && renderBody(bodyProps), onValueChange: !props.isDisabled && !props.isReadonly ? onToggle : null, value: state.isOpen, middleware: [react.offset(6)], ref: ref }));
 }
 const TimePicker = /* @__PURE__ */React__namespace.default.forwardRef(TimePickerComponent);
 
-var css$16 = {"root":"uALGx9"};
+var css$16 = {"root":"ltlZsj"};
 
 function applyInputAddonMods() {
     return [
@@ -2154,14 +2189,14 @@ function applyInputAddonMods() {
 }
 const InputAddon = /* @__PURE__ */uuiCore.withMods(uuiComponents.InputAddon, applyInputAddonMods);
 
-var css$15 = {"root":"TFYUhK"};
+var css$15 = {"root":"_3s-56r"};
 
 function applySliderMods() {
     return [css$15.root, 'uui-color-neutral'];
 }
 const Slider = /* @__PURE__ */uuiCore.withMods(uuiComponents.Slider, applySliderMods);
 
-var css$14 = {"root":"lJZGIN"};
+var css$14 = {"root":"MmOQTA"};
 
 function applyTooltipMods(mods) {
     return [
@@ -2171,7 +2206,7 @@ function applyTooltipMods(mods) {
 }
 const Tooltip = /* @__PURE__ */uuiCore.withMods(uuiComponents__namespace.Tooltip, applyTooltipMods);
 
-var css$13 = {"root":"J9DulM","tooltip":"_8G4jK8"};
+var css$13 = {"root":"o7Y-1v","tooltip":"RGs3tR"};
 
 function applyRatingMods(mods) {
     return [
@@ -2185,7 +2220,7 @@ const Rating = /* @__PURE__ */uuiCore.withMods(uuiComponents__namespace.Rating,
     Tooltip,
 }));
 
-var css$12 = {"drag-handle-wrapper":"fbqUWs","dragHandleWrapper":"fbqUWs","with-indent":"JKIv7U","withIndent":"JKIv7U","drag-handle":"_1e7n4o","dragHandle":"_1e7n4o","icon-container":"FEtudn","iconContainer":"FEtudn"};
+var css$12 = {"drag-handle-wrapper":"EAmIbS","dragHandleWrapper":"EAmIbS","with-indent":"_7uTf-f","withIndent":"_7uTf-f","drag-handle":"aznPbo","dragHandle":"aznPbo","icon-container":"KKKoce","iconContainer":"KKKoce"};
 
 function DataRowAddons(props) {
     const row = props.rowProps;
@@ -2202,15 +2237,20 @@ function DataRowAddons(props) {
         return (React__namespace.default.createElement("div", { key: "dh", className: cx__default.default(css$12.dragHandleWrapper, row.indent > 0 && css$12.withIndent), style: { width: row.indent > 0 ? (getIndent() + getWidth()) : 0 }, ...props.eventHandlers },
             React__namespace.default.createElement(uuiComponents.DragHandle, { cx: css$12.dragHandle })));
     };
+    const handleFold = (e) => {
+        if (e.key === 'Enter') {
+            row.onFold(row);
+        }
+    };
     return (React__namespace.default.createElement(React__namespace.default.Fragment, null,
         row.dnd?.srcData && renderDragHandle(),
         row?.checkbox?.isVisible && (React__namespace.default.createElement(Checkbox, { key: "cb", cx: "uui-dr_addons-checkbox", tabIndex: props.tabIndex, size: settings.dataTable.sizes.body.checkboxMap[props.size], value: row.isChecked, indeterminate: !row.isChecked && row.isChildrenChecked, onValueChange: () => row.onCheck?.(row), isDisabled: row.checkbox.isDisabled, isInvalid: row.checkbox.isInvalid })),
-        row.indent > 0 && (React__namespace.default.createElement("div", { key: "fold", className: cx__default.default('uui-dr_addons-indent', `uui-size-${props.size || settings.dataTable.sizes.body.row}`), style: { marginInlineStart: getIndent(), width: getWidth() } }, row.isFoldable && (React__namespace.default.createElement(uuiComponents.IconContainer, { rawProps: {
+        row.indent > 0 && (React__namespace.default.createElement("div", { key: "fold", className: cx__default.default('uui-dr_addons-indent', `uui-size-${props.size || settings.dataTable.sizes.body.row}`), style: { marginInlineStart: getIndent(), width: getWidth() } }, row.isFoldable && (React__namespace.default.createElement(uuiComponents.ControlIcon, { rawProps: {
                 'aria-label': row.isFolded ? 'Unfold' : 'Fold',
                 role: 'button',
             }, key: "icon", icon: settings.dataTable.icons.body.foldingIcon, cx: [
                 uuiCore.uuiElement.foldingArrow, uuiCore.uuiMarkers.clickable, css$12.iconContainer,
-            ], rotate: row.isFolded ? '90ccw' : '0', onClick: () => row.onFold(row), size: settings.dataTable.sizes.body.iconMap[props.size || settings.dataTable.sizes.body.row] }))))));
+            ], rotate: row.isFolded ? '90ccw' : '0', onClick: () => row.onFold(row), onKeyDown: handleFold, size: settings.dataTable.sizes.body.iconMap[props.size || settings.dataTable.sizes.body.row], tabIndex: props.tabIndex }))))));
 }
 
 function VerticalTabButtonComponent(props, ref) {
@@ -2262,7 +2302,7 @@ function VerticalTabButtonComponent(props, ref) {
 }
 const VerticalTabButton = /* @__PURE__ */React__namespace.default.forwardRef(VerticalTabButtonComponent);
 
-var css$11 = {"root":"DIRXdE","main-path":"oWZUre","mainPath":"oWZUre","content-wrapper":"_1O122O","contentWrapper":"_1O122O","content":"UKvjdn","action-wrapper":"mjtQi1","actionWrapper":"mjtQi1","icon-wrapper":"_-8NqNU","iconWrapper":"_-8NqNU","icon":"PaxoAA","close-icon":"SW9WCZ","closeIcon":"SW9WCZ"};
+var css$11 = {"root":"_1e7S0y","main-path":"obU9y3","mainPath":"obU9y3","content-wrapper":"OR8mMk","contentWrapper":"OR8mMk","content":"am2iMV","action-wrapper":"_9P96qq","actionWrapper":"_9P96qq","icon-wrapper":"RruO9-","iconWrapper":"RruO9-","icon":"ZriibA","close-icon":"lWhLRg","closeIcon":"lWhLRg"};
 
 const Alert = /* @__PURE__ */React__namespace.forwardRef((props, ref) => (React__namespace.createElement("div", { role: "alert", ref: ref, className: cx__default.default('uui-alert', css$11.root, props.color && `uui-color-${props.color}`, props.cx, `uui-size-${props.size || settings.alert.sizes.default}`), ...props.rawProps },
     React__namespace.createElement("div", { className: css$11.mainPath },
@@ -2280,7 +2320,7 @@ const ErrorAlert = /* @__PURE__ */React__namespace.forwardRef((props, ref) => Re
 
 const Dropdown = /* @__PURE__ */uuiCore.withMods(uuiComponents.Dropdown);
 
-var css$10 = {"submenu-root-item-rtl":"T-pVnA","submenuRootItemRtl":"T-pVnA","icon-after":"cNf3lu","iconAfter":"cNf3lu","submenu-root-item":"JfNkK5","submenuRootItem":"JfNkK5","icon-check":"x6izV4","iconCheck":"x6izV4","splitter-root":"XtLBiV","splitterRoot":"XtLBiV","splitter":"kTQg7S","header-root":"Qjj7zd","headerRoot":"Qjj7zd","item-root":"_2XzhWC","itemRoot":"_2XzhWC","icon":"KTdFGd","link":"CnpfxO","indent":"jd0ufG","selected-mark":"RdTkgN","selectedMark":"RdTkgN"};
+var css$10 = {"submenu-root-item-rtl":"D-rS7v","submenuRootItemRtl":"D-rS7v","icon-after":"J6i8k1","iconAfter":"J6i8k1","submenu-root-item":"XSsEXS","submenuRootItem":"XSsEXS","icon-check":"nlxDu7","iconCheck":"nlxDu7","splitter-root":"nffzud","splitterRoot":"nffzud","splitter":"qkFqLQ","header-root":"_1tylo3","headerRoot":"_1tylo3","item-root":"qbuty1","itemRoot":"qbuty1","icon":"BFBmLp","link":"_7YkkG0","indent":"XIoxMb","selected-mark":"Zv37Q-","selectedMark":"Zv37Q-"};
 
 exports.IDropdownControlKeys = void 0;
 (function (IDropdownControlKeys) {
@@ -2414,7 +2454,7 @@ function DropdownMenuSwitchButton(props) {
         React__namespace.default.createElement(Switch, { value: isSelected, tabIndex: -1, onValueChange: onHandleValueChange })));
 }
 
-var css$$ = {"root":"UndLoa","mode-block":"sfqLLw","modeBlock":"sfqLLw","mode-inline":"JTDTL9","modeInline":"JTDTL9","padding-0":"C7P0uP","padding0":"C7P0uP","padding-6":"ZtIMfd","padding6":"ZtIMfd","padding-12":"hbWno6","padding12":"hbWno6","padding-18":"UjMjqg","padding18":"UjMjqg"};
+var css$$ = {"root":"Hlwwhu","mode-block":"sMtMhE","modeBlock":"sMtMhE","mode-inline":"-k0QtU","modeInline":"-k0QtU","padding-0":"_3106Ez","padding0":"_3106Ez","padding-6":"Qm7Mya","padding6":"Qm7Mya","padding-12":"pxzoBb","padding12":"pxzoBb","padding-18":"S7cJFO","padding18":"S7cJFO"};
 
 function applyAccordionMods(mods) {
     return [
@@ -2427,7 +2467,7 @@ const Accordion = /* @__PURE__ */uuiCore.withMods(uuiComponents__namespace.Accor
     dropdownIcon: mods.dropdownIcon !== null && settings.accordion.icons.dropdownIcon,
 }));
 
-var css$_ = {"root":"aacNYu","align-items":"V--4kx","alignItems":"V--4kx","justify-content":"gJmQu-","justifyContent":"gJmQu-","border-top":"_1cnt2W","borderTop":"_1cnt2W","border-bottom":"e3-Xmq","borderBottom":"e3-Xmq","top-shadow":"HWYiX2","topShadow":"HWYiX2","padding":"Xd-R9k","margin":"OOkbO0","vPadding":"Xy7r--","column-gap":"hpqIs4","columnGap":"hpqIs4","row-gap":"yQLCjY","rowGap":"yQLCjY","spacing":"GLYk3c"};
+var css$_ = {"root":"gMB4J3","align-items":"eG-MqY","alignItems":"eG-MqY","justify-content":"hoX8Pl","justifyContent":"hoX8Pl","border-top":"-xdL8B","borderTop":"-xdL8B","border-bottom":"Dh0eg-","borderBottom":"Dh0eg-","top-shadow":"EwD-Cc","topShadow":"EwD-Cc","padding":"_9sVssD","margin":"Tp7KXK","vPadding":"OszXAG","column-gap":"XqIU3S","columnGap":"XqIU3S","row-gap":"d2PiG4","rowGap":"d2PiG4","spacing":"_1-6evf"};
 
 const FlexCell = /* @__PURE__ */uuiCore.withMods(uuiComponents.FlexCell, () => [css$_.flexCell]);
 
@@ -2479,7 +2519,7 @@ const FlexRow = /* @__PURE__ */React.forwardRef((props, ref) => {
         } }, props.children));
 });
 
-var css$Z = {"root":"LRHB9C","margin-24":"OWLwlu","margin24":"OWLwlu","padding-12":"aP80RR","padding12":"aP80RR","padding-24":"GStl-a","padding24":"GStl-a","shadow":"_5Ih5-Y","uui-surface-main":"koNeTq","uuiSurfaceMain":"koNeTq"};
+var css$Z = {"root":"Ns7CZ8","margin-24":"rzkSYM","margin24":"rzkSYM","padding-12":"U1H-72","padding12":"U1H-72","padding-24":"iRUoC2","padding24":"iRUoC2","shadow":"sxT-IZ","uui-surface-main":"_1MPPR7","uuiSurfaceMain":"_1MPPR7"};
 
 const Panel = /* @__PURE__ */uuiCore.withMods(uuiComponents.VPanel, (props) => [
     'uui-panel',
@@ -2489,7 +2529,7 @@ const Panel = /* @__PURE__ */uuiCore.withMods(uuiComponents.VPanel, (props) => [
     props.background && css$Z[`uui-${props.background}`],
 ]);
 
-var css$Y = {"root":"bqM0XN"};
+var css$Y = {"root":"hFjkXd"};
 
 function applyLabeledInputMods(mods) {
     return [
@@ -2498,15 +2538,20 @@ function applyLabeledInputMods(mods) {
         'uui-size-' + (mods.size || settings.labeledInput.sizes.default),
     ];
 }
+function getInfoIconForSize(size) {
+    return size <= '30'
+        ? settings.labeledInput.icons.fillInfoIcon
+        : settings.labeledInput.icons.infoIcon;
+}
 function applyLabeledInputProps(props) {
-    return ({
+    return {
         Tooltip: props.Tooltip || Tooltip,
-        infoIcon: props.infoIcon || props.size <= '30' ? settings.labeledInput.icons.fillInfoIcon : settings.labeledInput.icons.infoIcon,
-    });
+        infoIcon: props.infoIcon || getInfoIconForSize(props.size),
+    };
 }
 const LabeledInput = /* @__PURE__ */uuiCore.withMods(uuiComponents__namespace.LabeledInput, applyLabeledInputMods, applyLabeledInputProps);
 
-var css$X = {"root":"_1BZWhA"};
+var css$X = {"root":"QxyGE6"};
 
 function RadioGroup(props) {
     const direction = props.direction || 'vertical';
@@ -2521,7 +2566,7 @@ function RadioGroup(props) {
     })));
 }
 
-var css$W = {"root":"VJHvvd","viewport":"YKzA97"};
+var css$W = {"root":"r5VgqM","viewport":"f3Spqz"};
 
 var uuiScrollbars;
 (function (uuiScrollbars) {
@@ -2591,7 +2636,7 @@ const ScrollBars = /* @__PURE__ */React.forwardRef((props, ref) => {
 });
 ScrollBars.displayName = 'ScrollBars';
 
-var css$V = {"scroll-container":"r-Cdo7","scrollContainer":"r-Cdo7","list-container":"JFNVO8","listContainer":"JFNVO8"};
+var css$V = {"scroll-container":"_8NneMC","scrollContainer":"_8NneMC","list-container":"PfcsQz","listContainer":"PfcsQz"};
 
 const VirtualList = /* @__PURE__ */React__namespace.default.forwardRef((props, ref) => {
     const { listContainerRef, offsetY, handleScroll, estimatedHeight, scrollContainerRef, } = uuiCore.useVirtualList({
@@ -2644,7 +2689,7 @@ function Tree(props) {
     return (React__namespace.createElement(VirtualList, { value: value, onValueChange: onValueChange, rowsCount: rowsCount, rows: renderedRows, cx: uuiCore.cx(propsCx), role: "tree" }));
 }
 
-var css$U = {"root":"zeAdbv"};
+var css$U = {"root":"z-D1UO"};
 
 function CheckboxGroup(props) {
     const currentValue = props.value || [];
@@ -2746,7 +2791,7 @@ const Tabs = /* @__PURE__ */React.forwardRef((props, ref) => {
 });
 Tabs.displayName = 'Tabs';
 
-var css$T = {"root":"J2uUpX","modal-blocker":"c-N9SZ","modalBlocker":"c-N9SZ","animateModalBlocker":"yGfTR3","modal":"dyDwdX","modal-footer":"FPeQNP","modalFooter":"FPeQNP","border-top":"SrNWdt","borderTop":"SrNWdt","modal-header":"pImuN2","modalHeader":"pImuN2","border-bottom":"IGPQfw","borderBottom":"IGPQfw"};
+var css$T = {"root":"gdv-Rj","modal-blocker":"_7yBMt9","modalBlocker":"_7yBMt9","animateModalBlocker":"gpA9ko","modal":"zdbfaJ","modal-footer":"ic-5St","modalFooter":"ic-5St","border-top":"CemqT9","borderTop":"CemqT9","modal-header":"EY1EX5","modalHeader":"EY1EX5","border-bottom":"YBwmA6","borderBottom":"YBwmA6"};
 
 const ModalBlocker = /* @__PURE__ */uuiCore.withMods(uuiComponents.ModalBlocker, () => [css$T.modalBlocker]);
 const ModalWindow = /* @__PURE__ */uuiCore.withMods(uuiComponents.ModalWindow, () => [css$T.root, css$T.modal], (props) => {
@@ -2938,7 +2983,7 @@ const TREE_SHAKEABLE_INIT = () => ({
 });
 const i18n = /* @__PURE__ */TREE_SHAKEABLE_INIT();
 
-var css$S = {"root":"LcqNXz","icon-wrapper":"q9HQ0s","iconWrapper":"q9HQ0s","action-wrapper":"_9VCemv","actionWrapper":"_9VCemv","close-icon":"p7lITq","closeIcon":"p7lITq","main-path":"B9iF-E","mainPath":"B9iF-E","content":"-r30Ov","close-wrapper":"goJ343","closeWrapper":"goJ343","clear-notifications":"NHPJHy","clearNotifications":"NHPJHy"};
+var css$S = {"root":"pxbhml","icon-wrapper":"zCYla8","iconWrapper":"zCYla8","action-wrapper":"NJtMA8","actionWrapper":"NJtMA8","close-icon":"BwQhiB","closeIcon":"BwQhiB","main-path":"Qh--Cz","mainPath":"Qh--Cz","content":"JKfx5M","close-wrapper":"F1KSmJ","closeWrapper":"F1KSmJ","clear-notifications":"xXxll9","clearNotifications":"xXxll9"};
 
 const NotificationCard = /* @__PURE__ */React__namespace.default.forwardRef((props, ref) => {
     const notificationCardNode = React__namespace.default.useRef(null);
@@ -2971,7 +3016,7 @@ function ClearNotification() {
         React__namespace.default.createElement(LinkButton, { caption: i18n.notificationCard.closeAllNotificationsButton, onClick: () => uuiCtx.uuiNotifications.clearAll() })));
 }
 
-var css$R = {"footer":"STbolE"};
+var css$R = {"footer":"KGqcpf"};
 
 class ConfirmationModal extends React__namespace.Component {
     render() {
@@ -3013,7 +3058,7 @@ function useReliableForceUpdate() {
     return red[1];
 }
 
-var css$Q = {"root":"Heq9tT","container":"JgvNfs"};
+var css$Q = {"root":"OOHbQt","container":"_8NU6sF"};
 
 const defaultFormat = 'MMM D, YYYY';
 const valueFormat = 'YYYY-MM-DD';
@@ -3032,7 +3077,16 @@ const defaultRangeValue = {
     from: null,
     to: null,
 };
-const getDisplayedMonth = (selectedDate, focus) => {
+const getDisplayedMonth = (selectedDate, focus, initialViewMonth) => {
+    if (selectedDate.from || selectedDate.to) {
+        return getDisplayedMonthBySelection(selectedDate, focus);
+    }
+    else if (initialViewMonth) {
+        return getNewMonth(`${initialViewMonth}-01`);
+    }
+    return uuiDayjs.dayjs();
+};
+const getDisplayedMonthBySelection = (selectedDate, focus) => {
     if (selectedDate.from && selectedDate.to && focus) {
         return uuiDayjs.dayjs(selectedDate[focus]);
     }
@@ -3231,26 +3285,27 @@ function DatePickerHeader({ navIconLeft, navIconRight, value: { month, view }, o
             React__namespace.createElement(Button, { icon: navIconRight || settings.datePicker.icons.body.nextIcon, color: "secondary", fill: "ghost", cx: uuiHeader.navIconRight, onClick: !isDisabled && (() => onRightNavigationArrow()), isDisabled: disableNext }))));
 }
 
-var css$P = {"root":"JA2siv"};
+var css$P = {"root":"DPyH6V"};
 
 function applyDateSelectionMods() {
     return [css$P.root, `uui-size-${settings.datePicker.sizes.body}`];
 }
 const Calendar = /* @__PURE__ */uuiCore.withMods(uuiComponents.Calendar, applyDateSelectionMods);
 
-var css$O = {"root":"txi-vV"};
+var css$O = {"root":"qfSXJU"};
 
 const uuiDatePickerBody = {
     wrapper: 'uui-datepicker-body-wrapper',
 };
 const DatePickerBody = /* @__PURE__ */React.forwardRef(DatePickerBodyComp);
 function DatePickerBodyComp(props, ref) {
-    const { value, onValueChange } = props;
-    const [month, setMonth] = React.useState(getNewMonth(value));
+    const { value, onValueChange, initialViewMonth } = props;
+    const initialViewDate = value || (initialViewMonth ? `${initialViewMonth}-01` : '');
+    const [month, setMonth] = React.useState(getNewMonth(initialViewDate));
     const [view, setView] = React.useState('DAY_SELECTION');
     // sync updated props with internal state
     React.useEffect(() => {
-        setMonth(getNewMonth(value));
+        setMonth(getNewMonth(initialViewDate));
         setView('DAY_SELECTION');
     }, [value, setMonth]);
     return (React__namespace.default.createElement(StatelessDatePickerBody, { ref: ref, ...props, month: month, view: view, onValueChange: onValueChange, onMonthChange: (m) => setMonth(m), onViewChange: (v) => setView(v) }));
@@ -3348,7 +3403,7 @@ function DatePickerComponent(props, ref) {
     };
     const renderBody = React.useMemo(() => (renderProps) => {
         return (React__namespace.default.createElement(DropdownContainer, { ...renderProps },
-            React__namespace.default.createElement(DatePickerBody, { value: value, onValueChange: onBodyValueChange, cx: uuiCore.cx(props.bodyCx), filter: props.filter, isHoliday: props.isHoliday, renderDay: props.renderDay, rawProps: props.rawProps?.body }),
+            React__namespace.default.createElement(DatePickerBody, { value: value, onValueChange: onBodyValueChange, cx: uuiCore.cx(props.bodyCx), filter: props.filter, isHoliday: props.isHoliday, renderDay: props.renderDay, rawProps: props.rawProps?.body, initialViewMonth: props.initialViewMonth }),
             props.renderFooter?.()));
     }, [value, onBodyValueChange]);
     return (React__namespace.default.createElement(uuiComponents.Dropdown, { value: isBodyOpen, middleware: [react.offset(6)], placement: props.placement, ref: ref, onValueChange: (v) => {
@@ -3359,7 +3414,7 @@ function DatePickerComponent(props, ref) {
 }
 const DatePicker = /* @__PURE__ */React__namespace.default.forwardRef(DatePickerComponent);
 
-var css$N = {"date-input":"aiVas4","dateInput":"aiVas4","root":"pu2K1U","separator":"jdqiNL"};
+var css$N = {"date-input":"sF1znN","dateInput":"sF1znN","root":"BhbOtj","separator":"Hs-taf"};
 
 const RangeDatePickerInput = /* @__PURE__ */React.forwardRef(({ isDisabled, isInvalid, isReadonly, size, disableClear, rawProps, value, inFocus, format, onValueChange, onFocusInput, onBlurInput, onClick, getPlaceholder, filter, onKeyDown, preventEmptyFromDate, preventEmptyToDate, id, cx: classes, }, ref) => {
     const [inputValue, setInputValue] = React.useState(toCustomDateRangeFormat(value, format));
@@ -3421,16 +3476,18 @@ const RangeDatePickerInput = /* @__PURE__ */React.forwardRef(({ isDisabled, isIn
         };
         onValueChange(newValue);
     };
-    const clearAllowed = !disableClear && !(preventEmptyFromDate && preventEmptyToDate) && inputValue.from && inputValue.to;
+    const clearAllowed = !disableClear && !isReadonly && !isDisabled
+        && !(preventEmptyFromDate && preventEmptyToDate)
+        && ((value.from && !preventEmptyFromDate) || (value.to && !preventEmptyToDate));
     return (
     // eslint-disable-next-line jsx-a11y/no-static-element-interactions
     React__namespace.default.createElement("div", { ref: ref, className: uuiCore.cx(`uui-size-${size || settings.rangeDatePicker.sizes.default}`, 'uui-range-date-picker', classes, css$N.root, isDisabled && uuiCore.uuiMod.disabled, isReadonly && uuiCore.uuiMod.readonly, isInvalid && uuiCore.uuiMod.invalid, inFocus && uuiCore.uuiMod.focus), onKeyDown: onKeyDown },
         React__namespace.default.createElement(TextInput, { icon: settings.rangeDatePicker.icons.input.calendarIcon, cx: uuiCore.cx(css$N.dateInput, inFocus === 'from' && uuiCore.uuiMod.focus), size: size || settings.rangeDatePicker.sizes.default, placeholder: getPlaceholder ? getPlaceholder('from') : i18n.rangeDatePicker.pickerPlaceholderFrom, value: inputValue.from || undefined, onValueChange: (v) => onInputChange(v || '', 'from'), onFocus: (event) => handleFocus(event, 'from'), onBlur: (event) => handleBlur(event, 'from'), isInvalid: isInvalid, isDisabled: isDisabled, isReadonly: isReadonly, isDropdown: false, rawProps: rawProps?.from, onClick: onClick, onKeyDown: onInputKeyDown, id: id }),
         React__namespace.default.createElement("div", { className: css$N.separator }),
-        React__namespace.default.createElement(TextInput, { cx: uuiCore.cx(css$N.dateInput, inFocus === 'to' && uuiCore.uuiMod.focus), placeholder: getPlaceholder ? getPlaceholder('to') : i18n.rangeDatePicker.pickerPlaceholderTo, size: size || settings.rangeDatePicker.sizes.default, value: inputValue.to || undefined, onCancel: clearAllowed ? onClear : undefined, onValueChange: (v) => onInputChange(v || '', 'to'), onFocus: (e) => handleFocus(e, 'to'), onBlur: (e) => handleBlur(e, 'to'), isInvalid: isInvalid, isDisabled: isDisabled, isReadonly: isReadonly, isDropdown: false, rawProps: rawProps?.to, onClick: onClick, onKeyDown: onInputKeyDown })));
+        React__namespace.default.createElement(TextInput, { cx: uuiCore.cx(css$N.dateInput, inFocus === 'to' && uuiCore.uuiMod.focus), placeholder: getPlaceholder ? getPlaceholder('to') : i18n.rangeDatePicker.pickerPlaceholderTo, size: size || settings.rangeDatePicker.sizes.default, value: inputValue.to || undefined, icon: clearAllowed && ForwardRef$Q, iconPosition: "right", iconLabel: "Clear selected date range", onIconClick: onClear, onValueChange: (v) => onInputChange(v || '', 'to'), onFocus: (e) => handleFocus(e, 'to'), onBlur: (e) => handleBlur(e, 'to'), isInvalid: isInvalid, isDisabled: isDisabled, isReadonly: isReadonly, isDropdown: false, rawProps: rawProps?.to, onClick: onClick, onKeyDown: onInputKeyDown })));
 });
 
-var css$M = {"root":"RlOXAj"};
+var css$M = {"root":"Ynzf3x"};
 
 const uuiPresets = {
     container: 'uui-presets-container',
@@ -3450,7 +3507,7 @@ function CalendarPresets(props) {
         getPresets(props.presets).map((item) => (React__namespace.createElement(LinkButton, { key: item.key, caption: item.name, onClick: () => props.onPresetSet(item), size: settings.rangeDatePicker.sizes.preset })))));
 }
 
-var css$L = {"root":"qlibLW","container":"Heyztb","day-selection":"zdtrAD","daySelection":"zdtrAD","from-picker":"A-xvqM","fromPicker":"A-xvqM","to-picker":"J1oqEu","toPicker":"J1oqEu","bodes-wrapper":"ZDvurm","bodesWrapper":"ZDvurm","blocker":"yvYMHh"};
+var css$L = {"root":"JgvZ3k","container":"dI-bPp","day-selection":"X3ZTen","daySelection":"X3ZTen","from-picker":"InVzJi","fromPicker":"InVzJi","to-picker":"G5-vQS","toPicker":"G5-vQS","bodes-wrapper":"O7oqJp","bodesWrapper":"O7oqJp","blocker":"l4vmaZ"};
 
 const uuiRangeDatePickerBody = {
     inRange: 'uui-range-datepicker-in-range',
@@ -3526,13 +3583,13 @@ const rangeDatePickerPresets = {
 };
 const RangeDatePickerBody = /* @__PURE__ */React.forwardRef(RangeDatePickerBodyComp);
 function RangeDatePickerBodyComp(props, ref) {
-    const { value: _value, filter } = props;
+    const { value: _value, filter, initialViewMonth } = props;
     const { selectedDate: _selectedDate, inFocus, } = _value;
     const selectedDate = _selectedDate || defaultRangeValue; // also handles null in comparison to default value
     const [view, setView] = React.useState('DAY_SELECTION');
     const [disabledPanel, setDisabledPanel] = React.useState(null);
     const [month, setMonth] = React.useState(() => {
-        return getDisplayedMonth(selectedDate, inFocus);
+        return getDisplayedMonth(selectedDate, inFocus, initialViewMonth);
     });
     const getRange = (newValue) => {
         if (!filter || filter(uuiDayjs.dayjs(newValue))) {
@@ -3596,7 +3653,7 @@ function RangeDatePickerBodyComp(props, ref) {
                 }, presets: presets })));
     };
     uuiCore.useLayoutEffectSafeForSsr(() => {
-        const monthToSet = getDisplayedMonth(selectedDate, inFocus);
+        const monthToSet = getDisplayedMonth(selectedDate, inFocus, initialViewMonth);
         // To avoid re-rendering the body if the current month being displayed is equal to or greater than 1
         const shouldNotIgnoreUpdate = !(uuiDayjs.dayjs(month).isSame(monthToSet, 'month') || uuiDayjs.dayjs(month).add(1, 'month').isSame(monthToSet, 'month'));
         if (shouldNotIgnoreUpdate) {
@@ -3652,7 +3709,7 @@ const getDayState = (day, selectedDate) => {
     };
 };
 
-var css$K = {"dropdown-container":"_6UPpFS","dropdownContainer":"_6UPpFS"};
+var css$K = {"dropdown-container":"mfUZY-","dropdownContainer":"mfUZY-"};
 
 function RangeDatePickerComponent(props, ref) {
     const { value: _value, format = defaultFormat, size = settings.rangeDatePicker.sizes.default } = props;
@@ -3703,7 +3760,7 @@ function RangeDatePickerComponent(props, ref) {
                         inFocus,
                     }, onValueChange: onBodyValueChange, filter: props.filter, presets: props.presets, renderDay: props.renderDay, renderFooter: () => {
                         return props.renderFooter?.(value);
-                    }, isHoliday: props.isHoliday, rawProps: props.rawProps?.body, preventEmptyToDate: props.preventEmptyToDate, preventEmptyFromDate: props.preventEmptyFromDate }))));
+                    }, isHoliday: props.isHoliday, rawProps: props.rawProps?.body, preventEmptyToDate: props.preventEmptyToDate, preventEmptyFromDate: props.preventEmptyFromDate, initialViewMonth: props.initialViewMonth }))));
     };
     const handleEscape = (e) => {
         if (e.key === 'Escape' && isOpen) {
@@ -3720,7 +3777,7 @@ function RangeDatePickerComponent(props, ref) {
 }
 const RangeDatePicker = /* @__PURE__ */React__namespace.default.forwardRef(RangeDatePickerComponent);
 
-var css$J = {"root":"Q7kOop","blocker":"JuIPXc","marker":"BVzQbr","top":"yTjWEU","bottom":"_5X8uTc","left":"Xl7fLW","right":"_4-LzsS","inside":"vXwoIF"};
+var css$J = {"root":"wtdQD5","blocker":"tPzTL-","marker":"jvL75J","top":"y0nGTn","bottom":"cDVBde","left":"cEpiXD","right":"ufZtWU","inside":"zYAmbs"};
 
 function DropMarker(props) {
     return props.isDndInProgress
@@ -3735,9 +3792,9 @@ function DropMarker(props) {
         : null;
 }
 
-var css$I = {"search-wrapper":"gYDjn0","searchWrapper":"gYDjn0","no-data":"B6NEdN","noData":"B6NEdN"};
+var css$I = {"search-wrapper":"Sd0oxr","searchWrapper":"Sd0oxr","no-data":"F5kMAL","noData":"F5kMAL"};
 
-var css$H = {"picker-row":"N2pBgJ","pickerRow":"N2pBgJ","align-widgets-top":"jF94yB","alignWidgetsTop":"jF94yB","row-content":"_0smOOI","rowContent":"_0smOOI","align-widgets-center":"xB7453","alignWidgetsCenter":"xB7453","icon-container":"UNe5T7","iconContainer":"UNe5T7","content-wrapper":"KOmMqo","contentWrapper":"KOmMqo","icon-wrapper":"M395dw","iconWrapper":"M395dw","icon-default":"jsi8U-","iconDefault":"jsi8U-","selected-mark":"PMRHic","selectedMark":"PMRHic"};
+var css$H = {"picker-row":"AKWeJR","pickerRow":"AKWeJR","align-widgets-top":"KUz6Df","alignWidgetsTop":"KUz6Df","row-content":"VQHaUC","rowContent":"VQHaUC","align-widgets-center":"z4vbqx","alignWidgetsCenter":"z4vbqx","icon-container":"CGeuRM","iconContainer":"CGeuRM","content-wrapper":"QSgjAz","contentWrapper":"QSgjAz","icon-wrapper":"UMPUgE","iconWrapper":"UMPUgE","icon-default":"KpWvbe","iconDefault":"KpWvbe","selected-mark":"VFN14z","selectedMark":"VFN14z"};
 
 const mergeHighlightRanges = (ranges) => {
     const mergedRanges = [];
@@ -3804,7 +3861,7 @@ const getHighlightedSearchMatches = (str, search) => {
     return getDecoratedText(str, ranges);
 };
 
-var css$G = {"root":"Ssv0vp","column-gap":"rf-cHM","columnGap":"rf-cHM","title":"rWrs37","subtitle":"_15rOG6","disabled":"rjXXWk","multiline":"SW1ukQ"};
+var css$G = {"root":"UYc1Df","column-gap":"_4hF6vh","columnGap":"_4hF6vh","title":"SAYyTj","subtitle":"YH4D0u","disabled":"DKlbID","multiline":"pplegF"};
 
 function PickerItem(props) {
     const { highlightSearchMatches = true, size, avatarUrl, isLoading, isDisabled, icon, } = props;
@@ -3837,6 +3894,12 @@ function DataPickerRow(props) {
             rowNode.current?.removeEventListener('mouseenter', handleMouseEnter);
         };
     }, [props.onFocus, handleMouseEnter]);
+    const handleFocus = () => {
+        // If this row gets focus but is not the focused row, make it focused
+        if (!props.isFocused && props.onFocus) {
+            props.onFocus(props.index);
+        }
+    };
     const getSubtitle = ({ path }) => {
         if (!props.dataSourceState?.search)
             return;
@@ -3878,14 +3941,15 @@ function DataPickerRow(props) {
     const clickHandler = props.onClick || props.onSelect || props.onFold || props.onCheck;
     return (
     // eslint-disable-next-line jsx-a11y/click-events-have-key-events
-    React__namespace.createElement("div", { onClick: clickHandler && ((e) => !uuiCore.isEventTargetInsideClickable(e) && clickHandler(props)), role: "option", "aria-busy": props.isLoading, "aria-posinset": props.index + 1, "aria-checked": props.checkbox?.isVisible ? props.isChecked : null, "aria-selected": props.isSelectable ? props.isSelected : null, ref: rowNode, className: uuiCore.cx(css$H.pickerRow, 'uui-picker_input-row', `uui-size-${props.size || settings.pickerInput.sizes.body.row}`, css$H[`align-widgets-${props.alignActions || 'top'}`], clickHandler && props.isFocused && uuiCore.uuiMod.focus, clickHandler && uuiCore.uuiMarkers.clickable, props.cx), style: props.padding && {
+    React__namespace.createElement("div", { onClick: clickHandler && ((e) => !uuiCore.isEventTargetInsideClickable(e) && clickHandler(props)), onFocus: handleFocus, role: "option", "aria-busy": props.isLoading, "aria-posinset": props.index + 1, "aria-checked": props.checkbox?.isVisible ? props.isChecked : null, "aria-selected": props.isSelectable ? props.isSelected : null, tabIndex: -1, ref: rowNode, id: props.rowKey, className: uuiCore.cx(css$H.pickerRow, 'uui-picker_input-row', `uui-size-${props.size || settings.pickerInput.sizes.body.row}`, css$H[`align-widgets-${props.alignActions || 'top'}`], clickHandler && props.isFocused && uuiCore.uuiMod.focus, clickHandler && uuiCore.uuiMarkers.clickable, props.cx), style: props.padding && {
             '--uui-data_picker-horizontal-padding': `${props.padding}px`,
         }, ...props.rawProps }, renderContent()));
 }
 
-function DataPickerBody({ highlightSearchMatches = true, ...props }) {
+function DataPickerBody({ highlightSearchMatches = true, autoFocusSearch = true, ...props }) {
     const prevProps = uuiCore.usePrevious(props);
     const showSearch = props.showSearch === 'auto' ? props.totalCount > 10 : Boolean(props.showSearch);
+    const [isKeyboardNavigation, setIsKeyboardNavigation] = React__namespace.default.useState(false);
     React.useEffect(() => {
         if (props.rows.length !== prevProps?.rows.length || (!isEqual__default.default(prevProps?.value.checked, props.value.checked) && !props.fixedBodyPosition)) {
             props.scheduleUpdate?.();
@@ -3893,9 +3957,36 @@ function DataPickerBody({ highlightSearchMatches = true, ...props }) {
     }, [props.rows, prevProps, props.value.checked, props.fixedBodyPosition]);
     const searchKeyDown = (e) => {
         props.onKeyDown?.(e);
-        if (e.shiftKey && e.key === 'Tab')
-            e.preventDefault();
     };
+    const handleVirtualListFocus = (e) => {
+        // Only set keyboard navigation if focus came from keyboard (Tab key)
+        // Check if the focus event was triggered by keyboard navigation
+        const isKeyboardFocus = e.target === e.currentTarget;
+        if (isKeyboardFocus) {
+            setIsKeyboardNavigation(true);
+        }
+    };
+    const handleVirtualListBlur = (e) => {
+        // Check if focus is moving outside the virtual list
+        const relatedTarget = e.relatedTarget;
+        const currentTarget = e.currentTarget;
+        if (relatedTarget && !currentTarget.contains(relatedTarget)) {
+            // Focus is leaving the virtual list, hide visual focus but keep focusedIndex for navigation "by circle"
+            setIsKeyboardNavigation(false);
+        }
+    };
+    const { focusedIndex, topIndex, } = props.value;
+    const focusedRowId = React.useMemo(() => {
+        // No need to make unnecessary calculations.
+        if (!props.showSearch) {
+            return '';
+        }
+        const focusedRow = props.rows.at(focusedIndex - topIndex);
+        if (!focusedRow) {
+            return '';
+        }
+        return focusedRow.rowKey;
+    }, [props.showSearch, focusedIndex, topIndex]);
     const renderEmpty = () => {
         const search = props.value.search;
         if (props.renderEmpty) {
@@ -3930,25 +4021,36 @@ function DataPickerBody({ highlightSearchMatches = true, ...props }) {
         return props.size || settings.pickerInput.sizes.body.row;
     };
     const renderRow = (row, dsState) => {
-        const pickerRowProps = { ...row, getName: props.getName };
+        const pickerRowProps = {
+            ...row,
+            getName: props.getName,
+            cx: uuiCore.cx(row.cx, isKeyboardNavigation && row.isFocused && 'uui-focus', isKeyboardNavigation && row.isFocused && 'uui-keyboard-focus'),
+        };
         return props.renderRow ? (props.renderRow(pickerRowProps, dsState)) : (React__namespace.default.createElement(DataPickerRow, { ...pickerRowProps, key: row.rowKey, size: getRowSize(), flattenSearchResults: props.flattenSearchResults, highlightSearchMatches: highlightSearchMatches, dataSourceState: dsState, getName: props.getName }));
     };
+    const renderSearchInput = () => {
+        return (React__namespace.default.createElement(SearchInput, { placeholder: i18n.dataPickerBody.searchPlaceholder, value: props.value.search, onValueChange: (newVal) => props.onValueChange({ ...props.value, search: newVal }), onKeyDown: searchKeyDown, size: searchSize, debounceDelay: props.searchDebounceDelay, rawProps: {
+                dir: 'auto',
+                'aria-activedescendant': focusedRowId,
+            } }));
+    };
     const searchSize = uuiCore.isMobile()
         ? settings.pickerInput.sizes.body.mobileSearchInput
         : settings.pickerInput.sizes.body.getSearchSize({ pickerSize: props.searchSize });
-    const renderedDataRows = React.useMemo(() => props.rows.map((row) => renderRow(row, props.value)), [props.rows, props.value]);
+    const renderedDataRows = React.useMemo(() => props.rows.map((row) => renderRow(row, props.value)), [props.rows, props.value, isKeyboardNavigation]);
     return (React__namespace.default.createElement(React__namespace.default.Fragment, null,
         showSearch && (React__namespace.default.createElement("div", { key: "search", className: uuiCore.cx(css$I.searchWrapper, 'uui-picker_input-body-search') },
-            React__namespace.default.createElement(uuiComponents.FlexCell, { grow: 1 },
-                React__namespace.default.createElement(FocusLock.MoveFocusInside, null,
-                    React__namespace.default.createElement(SearchInput, { placeholder: i18n.dataPickerBody.searchPlaceholder, value: props.value.search, onValueChange: (newVal) => props.onValueChange({ ...props.value, search: newVal }), onKeyDown: searchKeyDown, size: searchSize, debounceDelay: props.searchDebounceDelay, rawProps: { dir: 'auto' } }))))),
+            React__namespace.default.createElement(uuiComponents.FlexCell, { grow: 1 }, autoFocusSearch ? React__namespace.default.createElement(FocusLock.MoveFocusInside, null, renderSearchInput()) : renderSearchInput()))),
         React__namespace.default.createElement(FlexRow, { key: "body", cx: uuiCore.cx('uui-picker_input-body'), rawProps: { style: { maxHeight: props.maxHeight, maxWidth: props.maxWidth }, tabIndex: -1 } }, props.rows.length === 0 && props.value.topIndex === 0
             // We need to also ensure that topIndex === 0, because we can have state were there is no rows but topIndex > 0, in case when we scrolled lover than we have rows
             // we fix this state on next render and shouldn't show empty state.
-            ? renderEmpty() : (React__namespace.default.createElement(VirtualList, { value: props.value, onValueChange: props.onValueChange, rows: renderedDataRows, rawProps: {
+            ? renderEmpty() : (React__namespace.default.createElement(VirtualList, { value: props.value, onValueChange: props.onValueChange, rows: renderedDataRows, role: "listbox", rawProps: {
                 'aria-multiselectable': props.selectionMode === 'multi' ? true : null,
                 'aria-orientation': 'vertical',
-                tabIndex: -1,
+                tabIndex: 0,
+                onKeyDown: props.onKeyDown,
+                onFocus: handleVirtualListFocus,
+                onBlur: handleVirtualListBlur,
                 ...props.rawProps,
             }, rowsCount: props.rowsCount, isLoading: props.isReloading, renderBlocker: settings.pickerInput.renderBlocker, overflowTopEffect: showSearch ? 'line' : 'none', overflowBottomEffect: "line" })))));
 }
@@ -3977,7 +4079,7 @@ function DataPickerFooterImpl(props) {
 }
 const DataPickerFooter = /* @__PURE__ */React__namespace.default.memo(DataPickerFooterImpl);
 
-var css$F = {"header":"Fn1mQ1","title":"-I-GQf","close":"e3w0P4"};
+var css$F = {"header":"xMqeKH","title":"_6LNCzC","close":"SvIMIt"};
 
 const DataPickerMobileHeaderImpl = (props) => {
     const title = props.title && typeof props.title === 'string' ? props.title.charAt(0).toUpperCase() + props.title.slice(1) : '';
@@ -3987,7 +4089,7 @@ const DataPickerMobileHeaderImpl = (props) => {
 };
 const DataPickerMobileHeader = /* @__PURE__ */React__namespace.default.memo(DataPickerMobileHeaderImpl);
 
-var css$E = {"done":"_0TEPrU","container":"E1JbF4"};
+var css$E = {"done":"VEuK4c","container":"_7-Ls91"};
 
 const PickerBodyMobileView = (props) => {
     const isMobileView = uuiCore.isMobile();
@@ -3999,7 +4101,7 @@ const PickerBodyMobileView = (props) => {
         isMobileView && (React__namespace.default.createElement(LinkButton, { caption: i18n.pickerInput.doneButton, onClick: () => props.onClose?.(), cx: css$E.done, size: settings.pickerInput.sizes.body.mobileFooterLinkButton }))));
 };
 
-var css$D = {"sub-header-wrapper":"BzVrjr","subHeaderWrapper":"BzVrjr","switch":"-Jxev8","no-found-modal-container":"zijgax","noFoundModalContainer":"zijgax","no-found-modal-container-icon":"GSmBps","noFoundModalContainerIcon":"GSmBps","no-found-modal-container-text":"dC0PPD","noFoundModalContainerText":"dC0PPD","body":"b6SNZD"};
+var css$D = {"sub-header-wrapper":"FqQxZy","subHeaderWrapper":"FqQxZy","switch":"PI0fZO","search":"Loa2gU","no-found-modal-container":"rPa16s","noFoundModalContainer":"rPa16s","no-found-modal-container-icon":"_55zy9M","noFoundModalContainerIcon":"_55zy9M","no-found-modal-container-text":"_7iIIK0","noFoundModalContainerText":"_7iIIK0","body":"Sukk2Z"};
 
 function PickerModal(props) {
     const { view, selection, dataSourceStateLens, dataSourceState, getName, clearSelection, getRows, getListProps, getFooterProps, isSingleSelect, handleDataSourceValueChange, } = uuiComponents.usePickerModal(props);
@@ -4027,25 +4129,40 @@ function PickerModal(props) {
             React__namespace.default.createElement(Text, { cx: css$D.noFoundModalContainerText, fontSize: "12", lineHeight: "18", color: "primary" }, i18n.dataPickerBody.noRecordsSubTitle)));
     };
     const dataRows = getRows();
+    const { focusedIndex, topIndex, } = dataSourceState;
+    const focusedRowId = React.useMemo(() => {
+        const focusedRow = dataRows.at(focusedIndex - topIndex);
+        if (!focusedRow) {
+            return '';
+        }
+        return focusedRow.rowKey;
+    }, [focusedIndex, topIndex]);
+    const onKeyDownHandler = (e) => {
+        uuiComponents.handleDataSourceKeyboard({
+            value: dataSourceState,
+            onValueChange: handleDataSourceValueChange,
+            listView: view,
+            rows: dataRows,
+            searchPosition: 'body',
+        }, e);
+    };
     return (React__namespace.default.createElement(ModalBlocker, { ...props },
         React__namespace.default.createElement(ModalWindow, { width: 600, height: 700, cx: css$D.body },
             React__namespace.default.createElement(ModalHeader, { title: props.caption || i18n.pickerModal.headerTitle, onClose: () => props.abort() }),
             React__namespace.default.createElement(FlexCell, { cx: css$D.subHeaderWrapper },
                 React__namespace.default.createElement(FlexRow, { vPadding: "24" },
-                    React__namespace.default.createElement(SearchInput, { ...dataSourceStateLens.prop('search').toProps(), onKeyDown: (e) => uuiComponents.handleDataSourceKeyboard({
-                            value: dataSourceState,
-                            onValueChange: handleDataSourceValueChange,
-                            listView: view,
-                            rows: dataRows,
-                            searchPosition: 'body',
-                        }, e), autoFocus: true, placeholder: i18n.pickerModal.searchPlaceholder, rawProps: { dir: 'auto' } })),
+                    React__namespace.default.createElement(FocusLock.MoveFocusInside, { className: css$D.search },
+                        React__namespace.default.createElement(SearchInput, { ...dataSourceStateLens.prop('search').toProps(), onKeyDown: onKeyDownHandler, placeholder: i18n.pickerModal.searchPlaceholder, rawProps: {
+                                dir: 'auto',
+                                'aria-activedescendant': focusedRowId,
+                            } }))),
                 !isSingleSelect() && (React__namespace.default.createElement(Switch, { cx: css$D.switch, size: settings.pickerInput.sizes.body.footerSwitchMap[settings.pickerInput.sizes.body.row], ...getFooterProps().showSelected, isDisabled: isSearching || view.getSelectedRowsCount() < 1, label: "Show only selected" })),
                 props.renderFilter && React__namespace.default.createElement(FlexCell, { grow: 2 }, props.renderFilter(dataSourceStateLens.prop('filter').toProps()))),
-            React__namespace.default.createElement(DataPickerBody, { ...getListProps(), value: dataSourceState, onValueChange: handleDataSourceValueChange, showSearch: false, getName: getName, rows: dataRows, renderRow: renderRow, renderEmpty: renderNotFound, size: settings.pickerInput.sizes.body.row }),
+            React__namespace.default.createElement(DataPickerBody, { ...getListProps(), value: dataSourceState, onValueChange: handleDataSourceValueChange, showSearch: false, getName: getName, rows: dataRows, renderRow: renderRow, renderEmpty: renderNotFound, size: settings.pickerInput.sizes.body.row, onKeyDown: onKeyDownHandler }),
             React__namespace.default.createElement(ModalFooter, null, props.renderFooter ? props.renderFooter(getFooterProps()) : renderFooter()))));
 }
 
-var css$C = {"tooltip":"mKceuf"};
+var css$C = {"tooltip":"_9oGJQc","noShrink":"vgbsQr"};
 
 const PickerTogglerTag = /* @__PURE__ */React__namespace.forwardRef((props, ref) => {
     const tagProps = {
@@ -4057,14 +4174,14 @@ const PickerTogglerTag = /* @__PURE__ */React__namespace.forwardRef((props, ref)
     if (props.isCollapsed) {
         const collapsedRows = props.collapsedRows.map((row) => props.getName(row.value)).join(', ');
         return (React__namespace.createElement(Tooltip, { key: "selected", content: collapsedRows, closeDelay: 150, closeOnMouseLeave: "boundary", cx: css$C.tooltip },
-            React__namespace.createElement(Tag, { ref: ref, rawProps: { role: 'option' }, ...tagProps })));
+            React__namespace.createElement(Tag, { ref: ref, rawProps: { role: 'option' }, ...tagProps, cx: css$C.noShrink })));
     }
     else {
         return React__namespace.createElement(Tag, { ref: ref, rawProps: { role: 'option' }, ...tagProps });
     }
 });
 
-var css$B = {"root":"sL0d3w"};
+var css$B = {"root":"rAzO0P"};
 
 const defaultMode = EditMode.FORM;
 function applyPickerTogglerMods(mods) {
@@ -4134,7 +4251,7 @@ function PickerInputComponent(props, ref) {
         const bodyHeight = uuiCore.isMobile() ? document.documentElement.clientHeight : props.dropdownHeight || settings.pickerInput.sizes.body.maxHeight;
         const minBodyWidth = props.minBodyWidth || settings.pickerInput.sizes.body.minWidth;
         const onKeyDown = (e) => handlePickerInputKeyboard(rows, e);
-        return (React__namespace.default.createElement(PickerBodyMobileView, { title: props.entityName, onClose: () => toggleBodyOpening(false), cx: [props.bodyCx, 'uui-picker_input-body-wrapper'], onKeyDown: onKeyDown, width: dropdownProps.togglerWidth > minBodyWidth ? dropdownProps.togglerWidth : minBodyWidth, focusLock: getSearchPosition() === 'body' },
+        return (React__namespace.default.createElement(PickerBodyMobileView, { title: props.entityName, onClose: () => toggleBodyOpening(false), cx: [props.bodyCx, 'uui-picker_input-body-wrapper'], width: dropdownProps.togglerWidth > minBodyWidth ? dropdownProps.togglerWidth : minBodyWidth, focusLock: true, shards: getSearchPosition() === 'input' ? [togglerRef] : undefined },
             React__namespace.default.createElement(DataPickerBody, { ...dropdownProps, ...getListProps(), showSearch: getSearchPosition() === 'body', getName: getName, value: dataSourceState, onValueChange: handleDataSourceValueChange, rows: rows, maxHeight: bodyHeight, searchSize: props.size, selectionMode: props.selectionMode, renderNotFound: props.renderNotFound, renderEmpty: props.renderEmpty, renderRow: props.renderRow, onKeyDown: onKeyDown, minCharsToSearch: props.minCharsToSearch, fixedBodyPosition: props.fixedBodyPosition, searchDebounceDelay: props.searchDebounceDelay, rawProps: props.rawProps?.body, highlightSearchMatches: props.highlightSearchMatches, flattenSearchResults: view.getConfig().flattenSearchResults }),
             renderFooter()));
     };
@@ -4142,11 +4259,11 @@ function PickerInputComponent(props, ref) {
     return (React__namespace.default.createElement(Dropdown, { renderTarget: (dropdownProps) => {
             const targetProps = getTogglerProps();
             return renderTarget({ ...dropdownProps, ...targetProps, renderItem });
-        }, renderBody: (bodyProps) => renderBody(bodyProps), value: shouldShowBody(), onValueChange: !props.isDisabled && toggleBodyOpening, placement: props.dropdownPlacement, middleware: middleware, closeBodyOnTogglerHidden: !uuiCore.isMobile(), portalTarget: props.portalTarget, ref: togglerRef }));
+        }, renderBody: (bodyProps) => renderBody(bodyProps), value: shouldShowBody(), onValueChange: !props.isDisabled && toggleBodyOpening, placement: props.dropdownPlacement, middleware: middleware, closeBodyOnTogglerHidden: uuiCore.isMobile() ? false : props.closeBodyOnTogglerHidden, portalTarget: props.portalTarget, ref: togglerRef }));
 }
 const PickerInput = /* @__PURE__ */React__namespace.default.forwardRef(PickerInputComponent);
 
-var css$A = {"row":"i3P9Dl"};
+var css$A = {"row":"IRYzzb"};
 
 function PickerListRow(props) {
     let label;
@@ -4166,7 +4283,7 @@ function PickerListRow(props) {
     return (React__namespace.default.createElement("div", { role: "option", "aria-selected": props.isSelectable ? props.isSelected : undefined, "aria-busy": props.isLoading, "aria-posinset": props.index + 1, ...(props.checkbox?.isVisible && { 'aria-checked': props.isChecked }), className: css$A.row }, component));
 }
 
-var css$z = {"root":"rZY763"};
+var css$z = {"root":"UM4vUK"};
 
 function PickerList(props) {
     const { context, view, onlySelectedView, getName, getEntityName, appendLastSelected, getSelectedIdsArray, buildRowsList, getMaxDefaultItems, getModalTogglerCaption, } = uuiComponents.usePickerList(props);
@@ -4201,7 +4318,7 @@ function PickerList(props) {
             }, selectedRows)));
 }
 
-var css$y = {"root":"e0L5jE","wrapper":"-zJGFZ","align-widgets-top":"DX2s8C","alignWidgetsTop":"DX2s8C","align-widgets-center":"J5JIJv","alignWidgetsCenter":"J5JIJv"};
+var css$y = {"root":"dP7eDn","wrapper":"NW9Om7","align-widgets-top":"dfrvv-","alignWidgetsTop":"dfrvv-","align-widgets-center":"ai9SyS","alignWidgetsCenter":"ai9SyS"};
 
 function DataTableCell(initialProps) {
     const props = { ...initialProps };
@@ -4251,7 +4368,7 @@ function DataTableCell(initialProps) {
     return React__namespace.createElement(uuiComponents.DataTableCell, { ...props });
 }
 
-var css$x = {"root":"qGJWgq"};
+var css$x = {"root":"XbIJkD"};
 
 // Here we define a single instance of the renderCell function to make DataTableRow#shouldComponentUpdate work.
 // As we need our mods to style the cell properly, we extract them from DataTableCellProps.rowProps, which is a hack, but it's reliable enough.
@@ -4267,7 +4384,7 @@ const DataTableRow = /* @__PURE__ */uuiCore.withMods(uuiComponents.DataTableRow,
     ];
 }, () => propsMods);
 
-var css$w = {"sorting-panel-container":"tdStZ4","sortingPanelContainer":"tdStZ4"};
+var css$w = {"sorting-panel-container":"_67mvhh","sortingPanelContainer":"_67mvhh"};
 
 const SortingPanelImpl = ({ sortDirection, onSort }) => {
     const sortAsc = React.useCallback(() => onSort(sortDirection === 'asc' ? undefined : 'asc'), [onSort]);
@@ -4287,7 +4404,7 @@ const ColumnHeaderDropdownImpl = (props) => {
 };
 const ColumnHeaderDropdown = /* @__PURE__ */React__namespace.default.memo(ColumnHeaderDropdownImpl);
 
-var css$v = {"root":"R-4-Pp","caption-wrapper":"_8YDZ5d","captionWrapper":"_8YDZ5d","sort-icon":"_61JLB-","sortIcon":"_61JLB-","dropdown-icon":"sdK66P","dropdownIcon":"sdK66P","infoIcon":"_2PSP-9","align-right":"X5Q30i","alignRight":"X5Q30i","align-center":"NcMr24","alignCenter":"NcMr24","caption":"uStB1R","truncate":"HS6w4A","upper-case":"hiW6DF","upperCase":"hiW6DF","checkbox":"_6llpid","icon":"gpCXK9","fold-all-icon":"Ij8KMu","foldAllIcon":"Ij8KMu","cell-tooltip":"C28-ul","cellTooltip":"C28-ul","resizing-marker":"i-3W8e","resizingMarker":"i-3W8e","pinned-right":"k-V3HX","pinnedRight":"k-V3HX","draggable":"j52Cok","ghost":"_5Sr9O1","is-dragged-out":"_23yTTr","isDraggedOut":"_23yTTr","dnd-marker-left":"_8-KkHW","dndMarkerLeft":"_8-KkHW","dnd-marker-right":"fvHDo2","dndMarkerRight":"fvHDo2","cell-tooltip-wrapper":"Dafgxy","cellTooltipWrapper":"Dafgxy","cell-tooltip-text":"B0Qu8z","cellTooltipText":"B0Qu8z","tooltip-caption":"f1kQit","tooltipCaption":"f1kQit","tooltip-info":"zyOd8Z","tooltipInfo":"zyOd8Z"};
+var css$v = {"root":"-jSBQe","caption-wrapper":"GWe86i","captionWrapper":"GWe86i","sort-icon":"P-3OKG","sortIcon":"P-3OKG","dropdown-icon":"xFkaX6","dropdownIcon":"xFkaX6","infoIcon":"DVOXmS","sortInActive":"dZf-ty","align-right":"QiKNM8","alignRight":"QiKNM8","align-center":"JCNoQ-","alignCenter":"JCNoQ-","caption":"yDy6h1","truncate":"EB-63z","upper-case":"jkDjHa","upperCase":"jkDjHa","checkbox":"FN2OBP","icon":"JDaLPL","fold-all-icon":"n-573A","foldAllIcon":"n-573A","cell-tooltip":"KMyw8k","cellTooltip":"KMyw8k","resizing-marker":"m-05GA","resizingMarker":"m-05GA","pinned-right":"Pyjecl","pinnedRight":"Pyjecl","draggable":"Li2F7g","ghost":"FRMvTF","is-dragged-out":"nTmRSy","isDraggedOut":"nTmRSy","dnd-marker-left":"_38h3Uu","dndMarkerLeft":"_38h3Uu","dnd-marker-right":"PyYdvz","dndMarkerRight":"PyYdvz","cell-tooltip-wrapper":"S4iNUD","cellTooltipWrapper":"S4iNUD","cell-tooltip-text":"qpaQ5D","cellTooltipText":"qpaQ5D","tooltip-caption":"okDXBx","tooltipCaption":"okDXBx","tooltip-info":"gl9OdB","tooltipInfo":"gl9OdB"};
 
 class DataTableHeaderCell extends React__namespace.Component {
     constructor() {
@@ -4298,7 +4415,7 @@ class DataTableHeaderCell extends React__namespace.Component {
         this.getTooltipContent = (column) => (React__namespace.createElement("div", { className: uuiCore.cx(css$v.cellTooltipWrapper, uuiCore.uuiDataTableHeaderCell.uuiTableHeaderCaptionTooltip) },
             React__namespace.createElement(Text, { cx: [css$v.cellTooltipText, css$v.tooltipCaption] }, column.caption),
             column.info && (React__namespace.createElement(Text, { cx: [css$v.cellTooltipText, css$v.tooltipInfo] }, column.info))));
-        this.getColumnCaption = () => {
+        this.getColumnCaption = (props, dropdownProps) => {
             const renderTooltip = this.props.column.renderTooltip || this.getTooltipContent;
             const captionCx = uuiCore.cx([
                 css$v.caption,
@@ -4307,12 +4424,24 @@ class DataTableHeaderCell extends React__namespace.Component {
                 'uui-typography-inline',
                 this.props.size >= '48' && css$v.truncate,
             ]);
+            const handleFilterOpen = (e) => {
+                if (e.key === 'Enter' || e.key === ' ') {
+                    dropdownProps.onClick(e);
+                    e.preventDefault();
+                }
+            };
+            const handleSort = (e) => {
+                if (e.key === 'Enter' || e.key === ' ') {
+                    props.toggleSort(e);
+                    e.preventDefault();
+                }
+            };
             return (React__namespace.createElement("div", { className: uuiCore.cx(css$v.captionWrapper, css$v['align-' + this.props.column.textAlign], uuiCore.uuiDataTableHeaderCell.uuiTableHeaderCaptionWrapper) },
-                React__namespace.createElement(Tooltip, { placement: "top", color: "inverted", content: renderTooltip(this.props.column), cx: [css$v.cellTooltip, 'uui-dt-header-tooltip'], openDelay: 600 },
+                React__namespace.createElement(Tooltip, { placement: "top", color: "inverted", content: renderTooltip(this.props.column), cx: [css$v.cellTooltip, 'uui-dt-header-tooltip'], openDelay: 600, closeOnMouseLeave: "boundary" },
                     React__namespace.createElement("div", { key: "text", className: captionCx }, this.props.column.caption)),
-                this.props.column.isSortable && (!this.props.column.renderFilter || this.props.sortDirection) && (React__namespace.createElement(IconButton, { key: "sort", cx: uuiCore.cx(css$v.icon, css$v.sortIcon, this.props.sortDirection && css$v.sortIconActive, uuiCore.uuiDataTableHeaderCell.uuiTableHeaderSortIcon), color: this.props.sortDirection ? 'neutral' : 'secondary', icon: settings.dataTable.icons.header[this.props.sortDirection === 'desc' ? 'descSortIcon' : this.props.sortDirection === 'asc' ? 'ascSortIcon' : 'defaultSortIcon'] })),
+                this.props.column.isSortable && (!this.props.column.renderFilter || this.props.sortDirection) && (React__namespace.createElement(uuiComponents.ControlIcon, { key: "sort", cx: uuiCore.cx(css$v.icon, css$v.sortIcon, !this.props.sortDirection && css$v.sortInActive, uuiCore.uuiDataTableHeaderCell.uuiTableHeaderSortIcon), icon: settings.dataTable.icons.header[this.props.sortDirection === 'desc' ? 'descSortIcon' : this.props.sortDirection === 'asc' ? 'ascSortIcon' : 'defaultSortIcon'], onKeyDown: !this.props.column.renderFilter ? handleSort : undefined })),
                 this.props.isFilterActive && (React__namespace.createElement(IconButton, { key: "filter", cx: uuiCore.cx(css$v.icon, !this.props.sortDirection && css$v.filterIcon, uuiCore.uuiDataTableHeaderCell.uuiTableHeaderFilterIcon), color: "neutral", icon: settings.dataTable.icons.header.filterIcon })),
-                this.props.column.renderFilter && (React__namespace.createElement(IconButton, { key: "dropdown", cx: uuiCore.cx(css$v.icon, css$v.dropdownIcon, uuiCore.uuiDataTableHeaderCell.uuiTableHeaderDropdownIcon), color: "secondary", icon: settings.dataTable.icons.header[this.state.isDropdownOpen ? 'openedDropdownIcon' : 'dropdownIcon'] }))));
+                this.props.column.renderFilter && (React__namespace.createElement(uuiComponents.ControlIcon, { key: "dropdown", cx: uuiCore.cx(css$v.icon, css$v.dropdownIcon, uuiCore.uuiDataTableHeaderCell.uuiTableHeaderDropdownIcon), icon: settings.dataTable.icons.header[this.state.isDropdownOpen ? 'openedDropdownIcon' : 'dropdownIcon'], onKeyDown: handleFilterOpen }))));
         };
         this.renderHeaderCheckbox = () => {
             if (this.props.selectAll && this.props.isFirstColumn) {
@@ -4324,7 +4453,7 @@ class DataTableHeaderCell extends React__namespace.Component {
                 return (React__namespace.createElement(Tooltip, { content: this.props.areAllFolded
                         ? i18n.tables.columnHeader.expandAllTooltip
                         : i18n.tables.columnHeader.collapseAllTooltip },
-                    React__namespace.createElement(IconButton, { color: "secondary", cx: uuiCore.cx(css$v.icon, css$v.foldAllIcon, uuiCore.uuiDataTableHeaderCell.uuiTableHeaderFoldAllIcon), icon: settings.dataTable.icons.header[this.props.areAllFolded ? 'unfoldIcon' : 'foldIcon'], onClick: this.props.onFoldAll, rawProps: {
+                    React__namespace.createElement(uuiComponents.ControlIcon, { cx: uuiCore.cx(css$v.icon, css$v.foldAllIcon, uuiCore.uuiDataTableHeaderCell.uuiTableHeaderFoldAllIcon), icon: settings.dataTable.icons.header[this.props.areAllFolded ? 'unfoldIcon' : 'foldIcon'], onClick: this.props.onFoldAll, rawProps: {
                             'aria-label': this.props.areAllFolded ? 'Expand All' : 'Collapse All',
                             'aria-expanded': !!this.props.areAllFolded,
                         } })));
@@ -4368,7 +4497,7 @@ class DataTableHeaderCell extends React__namespace.Component {
                 }, style: computeStyles },
                 this.renderHeaderCheckbox(),
                 this.renderFoldAllIcon(),
-                this.getColumnCaption(),
+                this.getColumnCaption(props, dropdownProps),
                 isResizable && this.renderResizingMarker(props)));
         };
         this.renderCellWithFilter = (props) => (React__namespace.createElement(ColumnHeaderDropdown, { isOpen: this.state.isDropdownOpen, isSortable: this.props.column.isSortable, renderTarget: (dropdownProps) => this.renderCellContent(props, dropdownProps), renderFilter: this.props.renderFilter, onSort: this.props.onSort, sortDirection: this.props.sortDirection, onOpenChange: (isDropdownOpen) => this.setState({ isDropdownOpen }), title: this.props.column.caption }));
@@ -4381,7 +4510,7 @@ class DataTableHeaderCell extends React__namespace.Component {
     }
 }
 
-var css$u = {"root":"nPJY6Z","caption-wrapper":"_2WUhrf","captionWrapper":"_2WUhrf","align-center":"e7gsA2","alignCenter":"e7gsA2","caption":"PcZb58","truncate":"Xdangv","upper-case":"XPjcE-","upperCase":"XPjcE-","group-cell-tooltip":"bu0R1a","groupCellTooltip":"bu0R1a","group-cell-tooltip-wrapper":"lx1iyr","groupCellTooltipWrapper":"lx1iyr","group-cell-tooltip-text":"_9AZj9w","groupCellTooltipText":"_9AZj9w","tooltip-caption":"T-gNIL","tooltipCaption":"T-gNIL","tooltip-info":"IQem18","tooltipInfo":"IQem18"};
+var css$u = {"root":"b8QkZF","caption-wrapper":"EeCWH9","captionWrapper":"EeCWH9","align-center":"tpVIVy","alignCenter":"tpVIVy","caption":"lYE5iK","truncate":"-YgWfh","upper-case":"RdSUl2","upperCase":"RdSUl2","group-cell-tooltip":"WfKpF3","groupCellTooltip":"WfKpF3","group-cell-tooltip-wrapper":"RRWwhc","groupCellTooltipWrapper":"RRWwhc","group-cell-tooltip-text":"fLrR4k","groupCellTooltipText":"fLrR4k","tooltip-caption":"W-Yk1r","tooltipCaption":"W-Yk1r","tooltip-info":"-na-FV","tooltipInfo":"-na-FV"};
 
 class DataTableHeaderGroupCell extends React__namespace.Component {
     constructor() {
@@ -4421,13 +4550,15 @@ class DataTableHeaderGroupCell extends React__namespace.Component {
     }
 }
 
-var css$t = {"root":"wsS90B"};
+var css$t = {"root":"C-qhBY"};
 
-const DataTableHeaderRow = /* @__PURE__ */uuiCore.withMods(uuiComponents.DataTableHeaderRow, () => [css$t.root, 'uui-dt-vars'], (mods) => ({
-    renderCell: (props) => (React__namespace.createElement(DataTableHeaderCell, { ...props, size: mods.size, textCase: mods.textCase || 'normal', key: props.column.key, columnsGap: mods.columnsGap })),
-    renderGroupCell: (props) => (React__namespace.createElement(DataTableHeaderGroupCell, { ...props, size: mods.size, textCase: mods.textCase || 'normal', key: props.key, columnsGap: mods.columnsGap })),
-    renderConfigButton: () => (React__namespace.createElement(IconButton, { key: "configuration", onClick: mods.onConfigButtonClick, cx: ['config-icon', `uui-size-${settings.dataTable.sizes.header.iconMap[mods.size || settings.dataTable.sizes.header.row]}`], color: "neutral", icon: settings.dataTable.icons.header.configIcon })),
-}));
+const DataTableHeaderRow = /* @__PURE__ */uuiCore.withMods(uuiComponents.DataTableHeaderRow, () => [css$t.root, 'uui-dt-vars'], (mods) => {
+    return ({
+        renderCell: (props) => (React__namespace.createElement(DataTableHeaderCell, { ...props, size: mods.size, textCase: mods.textCase || 'normal', key: props.column.key, columnsGap: mods.columnsGap })),
+        renderGroupCell: (props) => (React__namespace.createElement(DataTableHeaderGroupCell, { ...props, size: mods.size, textCase: mods.textCase || 'normal', key: props.key, columnsGap: mods.columnsGap })),
+        renderConfigButton: () => (React__namespace.createElement(uuiComponents.ControlIcon, { key: "configuration", onClick: mods.onConfigButtonClick, size: settings.dataTable.sizes.header.iconMap[mods.size || settings.dataTable.sizes.header.row], cx: ['config-icon'], icon: settings.dataTable.icons.header.configIcon })),
+    });
+});
 
 const normalizeFilterWithPredicates = (filter) => {
     if (!filter) {
@@ -4517,7 +4648,7 @@ const UUI_FILTERS_PANEL_ITEM_TOGGLER_SELECTION = 'uui-filters-panel-item-toggler
 const UUI_FILTERS_PANEL_ITEM_TOGGLER_POSTFIX = 'uui-filters-panel-item-toggler-postfix';
 const UUI_FILTERS_PANEL_BODY_FOOTER = 'uui-filters-panel-item-footer';
 
-var css$s = {"body":"rRkhDx","header":"HYLbGW","title":"ZjNaEX","removeButton":"YCDAQh","with-search":"iBbdNp","withSearch":"iBbdNp"};
+var css$s = {"body":"r5eb0W","header":"sc9W3A","title":"ytKWyK","removeButton":"_5iNUcu","with-search":"xRg-SM","withSearch":"xRg-SM"};
 
 function FilterColumnBody(props) {
     const [predicate, setPredicate] = React.useState(getDefaultPredicate(props.predicates, props.value));
@@ -4541,7 +4672,7 @@ function FilterColumnBody(props) {
         return props.predicates?.length > 0 && (React__namespace.default.createElement("div", { className: css$s.header },
             React__namespace.default.createElement(FilterPredicatePanel, { ...panelProps })));
     };
-    return (React__namespace.default.createElement(DropdownContainer, { style: { minWidth: '360px' }, cx: [css$s.body, UUI_FILTERS_PANEL_ITEM_BODY], ...props },
+    return (React__namespace.default.createElement(DropdownContainer, { style: { minWidth: '360px' }, cx: [css$s.body, UUI_FILTERS_PANEL_ITEM_BODY], ...props, focusLock: false },
         renderHeader(),
         React__namespace.default.createElement(FilterItemBody, { ...props, selectedPredicate: predicate, value: getValue(predicate, props.value), onValueChange: onValueChange })));
 }
@@ -4578,7 +4709,7 @@ const useColumnsWithFilters = (initialColumns, filters) => {
     return columns;
 };
 
-var css$r = {"unpin-icon":"uR9xNw","unpinIcon":"uR9xNw","pin-toggler-icon":"pYS5Jq","pinTogglerIcon":"pYS5Jq"};
+var css$r = {"unpin-icon":"fyTZB9","unpinIcon":"fyTZB9","pin-toggler-icon":"AgLLkb","pinTogglerIcon":"AgLLkb"};
 
 function PinIconButton(props) {
     const i18nLocal = i18n.tables.columnsConfigurationModal;
@@ -4629,7 +4760,7 @@ function getUnpinIcon(params) {
     }
 }
 
-var css$q = {"row-wrapper":"Y4AtPL","rowWrapper":"Y4AtPL","pin-icon-button":"_4vpP5B","pinIconButton":"_4vpP5B","not-pinned":"iH0fZA","notPinned":"iH0fZA","checkbox":"JHosgL","drag-handle":"elmWbQ","dragHandle":"elmWbQ","dnd-disabled":"UZfhNQ","dndDisabled":"UZfhNQ"};
+var css$q = {"row-wrapper":"n-77Cx","rowWrapper":"n-77Cx","pin-icon-button":"_7g3x2q","pinIconButton":"_7g3x2q","not-pinned":"qJ6hR7","notPinned":"qJ6hR7","checkbox":"K3PYjf","drag-handle":"wJt1Hm","dragHandle":"wJt1Hm","dnd-disabled":"rje-AG","dndDisabled":"rje-AG"};
 
 const ColumnRow = /* @__PURE__ */React__namespace.memo(function ColumnRow(props) {
     const { column } = props;
@@ -4663,7 +4794,7 @@ const ColumnRow = /* @__PURE__ */React__namespace.memo(function ColumnRow(props)
     return (React__namespace.createElement(uuiCore.DndActor, { key: column.key, srcData: isDndAllowed && data, dstData: data, canAcceptDrop: onCanAcceptDrop, onDrop: onDrop, render: renderContent }));
 });
 
-var css$p = {"root":"_1SC1L2","main-panel":"o8rOT6","mainPanel":"o8rOT6","group":"_2aZARG","group-title":"_77xmpb","groupTitle":"_77xmpb","group-items":"_3KDQOj","groupItems":"_3KDQOj","no-data":"S5CE9O","noData":"S5CE9O","no-data-title":"KMfyB6","noDataTitle":"KMfyB6","no-data-sub-title":"aDoaCE","noDataSubTitle":"aDoaCE","h-divider":"io-CI6","hDivider":"io-CI6","search-area":"_9olr-7","searchArea":"_9olr-7","subgroup-accordion":"E6GwhO","subgroupAccordion":"E6GwhO","subgroup":"KK3Z1-","subgroup-title":"sb4Ybr","subgroupTitle":"sb4Ybr"};
+var css$p = {"root":"_6j0vWm","main-panel":"N1g8-O","mainPanel":"N1g8-O","group":"_8aOzCN","group-title":"_0IaodE","groupTitle":"_0IaodE","group-items":"xY1dN2","groupItems":"xY1dN2","no-data":"CkAMjp","noData":"CkAMjp","no-data-title":"nhPdaX","noDataTitle":"nhPdaX","no-data-sub-title":"bHrLrS","noDataSubTitle":"bHrLrS","h-divider":"N1HPmd","hDivider":"N1HPmd","search-area":"fYJvzs","searchArea":"fYJvzs","subgroup-accordion":"lknJPY","subgroupAccordion":"lknJPY","subgroup":"G3uIgY","subgroup-title":"vnIJI7","subgroupTitle":"vnIJI7"};
 
 const renderGroupTitle = (title, amount) => (React__namespace.createElement(FlexRow, { cx: css$p.group },
     React__namespace.createElement(Text, { size: "none", cx: css$p.groupTitle }, title),
@@ -4766,7 +4897,7 @@ const getChildrenAndRest = (row, rows) => {
     return [children, rest];
 };
 
-var css$o = {"listContainer":"NNjdvd","header":"gmPHUB","group":"_9ei-A7","stickyHeader":"ybEmAY"};
+var css$o = {"listContainer":"yHYCYS","header":"bhxwj5","group":"cTKbZY","stickyHeader":"_52acyt"};
 
 function DataRowsGroup({ row, childRows, renderRow, top = 1, }) {
     const rowRef = React.useRef(undefined);
@@ -4806,7 +4937,7 @@ function DataRowsContainer({ estimatedHeight, listContainerRef, offsetY, rows, r
             React__namespace.default.createElement(DataRowsGroups, { rows: rows, renderRow: renderRow, top: headerRef?.current?.clientHeight }))));
 }
 
-var css$n = {"root":"_7uGqnJ","sticky-header":"_2cnnmA","stickyHeader":"_2cnnmA","no-results":"wafTyB","noResults":"wafTyB","icon":"_3qW-71","title":"q5yP59"};
+var css$n = {"root":"S37H5p","sticky-header":"XZWu-w","stickyHeader":"XZWu-w","no-results":"iLwqmc","noResults":"iLwqmc","icon":"-hkDaN","title":"NSqUzl"};
 
 function DataTable(props) {
     const { uuiModals } = uuiCore.useUuiContext();
@@ -4855,7 +4986,7 @@ function DataTable(props) {
             : (React__namespace.createElement(VirtualList, { value: props.value, onValueChange: props.onValueChange, onScroll: props.onScroll, rowsCount: props.rowsCount, renderRows: renderTableBody, cx: classes, isLoading: props.isReloading, rowsSelector: "[role=row]", rawProps: rawProps })))));
 }
 
-var css$m = {"root":"Cq9z7X","title-wrapper":"_97blHn","titleWrapper":"_97blHn","title":"-ElyDR","text-wrapper":"btyzly","textWrapper":"btyzly","selection":"mvBFFA","postfix":"iHjRdW","selected":"Z-katb"};
+var css$m = {"root":"dDgvaY","title-wrapper":"b-yyDG","titleWrapper":"b-yyDG","title":"pqoCsy","text-wrapper":"cTwSWr","textWrapper":"cTwSWr","selection":"Z48drn","postfix":"wcgkx6","selected":"rSK1oZ"};
 
 const FilterPanelItemToggler = /* @__PURE__ */React__namespace.forwardRef((props, ref) => {
     const togglerPickerOpened = (e) => {
@@ -4954,7 +5085,7 @@ function FilterPickerBody({ highlightSearchMatches = true, ...restProps }) {
             rows,
         }, e);
         return (React__namespace.createElement(React__namespace.Fragment, null,
-            React__namespace.createElement(DataPickerBody, { ...getListProps(), selectionMode: props.selectionMode, rows: rows, maxHeight: maxHeight, maxWidth: maxWidth, searchSize: settings.pickerInput.sizes.body.row, showSearch: props.showSearch ?? true, getName: getName, value: dataSourceState, onValueChange: handleDataSourceValueChange, renderRow: props.renderRow, onKeyDown: onKeyDown, minCharsToSearch: props.minCharsToSearch, searchDebounceDelay: props.searchDebounceDelay, rawProps: props.rawProps?.body, highlightSearchMatches: props.highlightSearchMatches, flattenSearchResults: view.getConfig().flattenSearchResults }),
+            React__namespace.createElement(DataPickerBody, { ...getListProps(), selectionMode: props.selectionMode, rows: rows, maxHeight: maxHeight, maxWidth: maxWidth, searchSize: settings.pickerInput.sizes.body.row, showSearch: props.showSearch ?? true, getName: getName, value: dataSourceState, onValueChange: handleDataSourceValueChange, renderRow: props.renderRow, onKeyDown: onKeyDown, minCharsToSearch: props.minCharsToSearch, searchDebounceDelay: props.searchDebounceDelay, rawProps: props.rawProps?.body, highlightSearchMatches: props.highlightSearchMatches, flattenSearchResults: view.getConfig().flattenSearchResults, autoFocusSearch: false }),
             renderFooter()));
     };
     return renderBody();
@@ -5080,7 +5211,7 @@ function FilterRangeDatePickerBody(props) {
         renderFooter()));
 }
 
-var css$l = {"container":"_-3lqXb"};
+var css$l = {"container":"ft2qC5"};
 
 function FilterNumericBody(props) {
     const isInRangePredicate = props?.selectedPredicate === 'inRange' || props?.selectedPredicate === 'notInRange';
@@ -5391,7 +5522,7 @@ function FiltersToolbarImpl(props) {
 }
 const FiltersPanel = /* @__PURE__ */React__namespace.default.memo(FiltersToolbarImpl);
 
-var css$k = {"delete-button":"Rp4TWy","deleteButton":"Rp4TWy","tab-button":"mGWsPn","tabButton":"mGWsPn","targetOpen":"Is--e5"};
+var css$k = {"delete-button":"_-5hPFw","deleteButton":"_-5hPFw","tab-button":"VLF6b0","tabButton":"VLF6b0","targetOpen":"lWjwow"};
 
 function PresetActionsDropdown(props) {
     const { uuiNotifications } = uuiCore.useUuiContext();
@@ -5467,7 +5598,7 @@ const UUI_PRESETS_PANEL_MORE_BUTTON = 'uui-presets-panel-more-button';
 const UUI_PRESETS_PANEL_INPUT = 'uui-presets-panel-input';
 const UUI_PRESETS_PANEL_PRESET = 'uui-presets-panel-preset';
 
-var css$j = {"preset-input-cell":"jNZyM9","presetInputCell":"jNZyM9","preset-input":"_1YDjAi","presetInput":"_1YDjAi"};
+var css$j = {"preset-input-cell":"QUGmr6","presetInputCell":"QUGmr6","preset-input":"SPgwC-","presetInput":"SPgwC-"};
 
 function PresetInput(props) {
     const [presetCaption, setPresetCaption] = React.useState(props.preset?.name || '');
@@ -5494,7 +5625,7 @@ function PresetInput(props) {
         React__namespace.default.createElement(TextInput, { cx: css$j.presetInput, onValueChange: setPresetCaption, value: presetCaption, onCancel: cancelActionHandler, onAccept: acceptActionHandler, onBlur: newPresetOnBlurHandler, autoFocus: true, maxLength: 50, isReadonly: readonly })));
 }
 
-var css$i = {"preset":"Srkj4-","activePreset":"fizI9Y"};
+var css$i = {"preset":"PZ-zOo","activePreset":"PDkkM9"};
 
 function Preset(props) {
     const [isRenamePreset, setIsRenamePreset] = React.useState(false);
@@ -5519,7 +5650,7 @@ function Preset(props) {
     return (React__namespace.default.createElement(FlexCell, { key: props.preset.id, alignSelf: "center", width: "auto" }, isRenamePreset ? (React__namespace.default.createElement(PresetInput, { onCancel: cancelRenamePreset, onSuccess: handlePresetRename, preset: props.preset })) : (React__namespace.default.createElement(TabButton, { caption: props.preset.name, onClick: !isPresetActive && choosePresetHandler, cx: [css$i.preset, isPresetActive && css$i.activePreset, UUI_PRESETS_PANEL_PRESET], size: settings.presetsPanel.sizes.tabButton, withNotify: isPresetActive && props.hasPresetChanged(props.preset), icon: PresetActionsDropdownComponent, iconPosition: "right", isActive: isPresetActive }))));
 }
 
-var css$h = {"divider":"S6oxKz","dropdownDeleteIcon":"Ubr9Ff","presetsWrapper":"LERS1r","addPresetContainer":"acNbx9","dropContainer":"JhCBD7"};
+var css$h = {"divider":"WOmaBb","dropdownDeleteIcon":"T4rp4W","presetsWrapper":"ZNQgBM","addPresetContainer":"QMqXqP","dropContainer":"_1bSjc9"};
 
 function PresetsPanel(props) {
     const [isAddingPreset, setIsAddingPreset] = React.useState(false);
@@ -5568,9 +5699,9 @@ function PresetsPanel(props) {
             React__namespace.default.createElement(uuiComponents.AdaptivePanel, { items: getPanelItems() }))));
 }
 
-var css$g = {"root":"qz8bvl"};
+var css$g = {"root":"t8-NPo"};
 
-var css$f = {"root":"PkyjrQ","burger-content":"_63KA-5","burgerContent":"_63KA-5"};
+var css$f = {"root":"ewXK6-","burger-content":"kdHv-a","burgerContent":"kdHv-a"};
 
 var _path$3;
 function _extends$3() { return _extends$3 = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$3.apply(null, arguments); }
@@ -5613,7 +5744,7 @@ var SvgNavigationArrowDownOutline = function SvgNavigationArrowDownOutline(props
 };
 var ForwardRef$2 = /*#__PURE__*/React.forwardRef(SvgNavigationArrowDownOutline);
 
-var css$e = {"root":"zN1Lal","button-primary":"IFkvin","buttonPrimary":"IFkvin","button-secondary":"hKYIRM","buttonSecondary":"hKYIRM","hasIcon":"TUalzB","dropdown":"_--haop"};
+var css$e = {"root":"_8Ilk6n","button-primary":"QPa-NJ","buttonPrimary":"QPa-NJ","button-secondary":"fRAmr2","buttonSecondary":"fRAmr2","hasIcon":"KFAERd","dropdown":"p3t6FG"};
 
 function applyBurgerButtonMods(props) {
     return [
@@ -5638,13 +5769,13 @@ const BurgerButton = /* @__PURE__ */React__namespace.default.forwardRef((props,
         }, dropdownIcon: ForwardRef$2 }));
 });
 
-var css$d = {"search-input":"HPE-e9","searchInput":"HPE-e9"};
+var css$d = {"search-input":"_1KAIub","searchInput":"_1KAIub"};
 
 function BurgerSearch(props) {
     return (React__namespace.createElement(uuiComponents.TextInput, { cx: cx__default.default(css$d.searchInput, 'uui-main_menu-burger-search'), iconPosition: "left", icon: ForwardRef$M, placeholder: props.placeholder, value: props.value, onValueChange: props.onValueChange, onCancel: props.onCancel, cancelIcon: props.value && ForwardRef$Q }));
 }
 
-var css$c = {"root":"HMjJnZ","group-header":"FN0W6i","groupHeader":"FN0W6i","group-name":"od3kC2","groupName":"od3kC2","line":"SlbjtD"};
+var css$c = {"root":"ROgiG4","group-header":"_6S946v","groupHeader":"_6S946v","group-name":"iLGH3Z","groupName":"iLGH3Z","line":"Mcdy7O"};
 
 function BurgerGroupHeader(props) {
     return (React__namespace.createElement("div", { className: cx__default.default(css$c.root, css$c.groupHeader, 'uui-burger-group-header') },
@@ -5652,7 +5783,7 @@ function BurgerGroupHeader(props) {
         React__namespace.createElement("span", { className: css$c.groupName }, props.caption)));
 }
 
-var css$b = {"root":"XK8gSP","type-primary":"_255flb","typePrimary":"_255flb","type-secondary":"e52EtM","typeSecondary":"e52EtM"};
+var css$b = {"root":"Sk6zpH","type-primary":"qIfIC6","typePrimary":"qIfIC6","type-secondary":"_1kinCy","typeSecondary":"_1kinCy"};
 
 const MainMenuButton = /* @__PURE__ */React__namespace.forwardRef((props, ref) => {
     const { type, ...clickableProps } = props;
@@ -5680,7 +5811,7 @@ const MainMenuButton = /* @__PURE__ */React__namespace.forwardRef((props, ref) =
         props.isDropdown && (React__namespace.createElement(uuiComponents.IconContainer, { icon: ForwardRef$P, flipY: props.isOpen }))));
 });
 
-var css$a = {"dropdown-body":"GaztpX","dropdownBody":"GaztpX"};
+var css$a = {"dropdown-body":"tUmYE9","dropdownBody":"tUmYE9"};
 
 function MainMenuDropdown(props) {
     const handleEscape = (e, onClose, isOpen) => {
@@ -5688,10 +5819,13 @@ function MainMenuDropdown(props) {
             onClose();
         }
     };
-    return (React__namespace.default.createElement(uuiComponents.Dropdown, { renderTarget: (dropdownProps) => (React__namespace.default.createElement(MainMenuButton, { caption: props.caption, ...dropdownProps, rawProps: props.rawProps, isActive: props.isActive, isDropdown: true })), renderBody: (dropdownBodyProps) => (React__namespace.default.createElement(FocusLock__default.default, { returnFocus: true, persistentFocus: true, lockProps: {
+    return (React__namespace.default.createElement(uuiComponents.Dropdown, { renderTarget: (dropdownProps) => (React__namespace.default.createElement(MainMenuButton, { caption: props.caption, ...dropdownProps, rawProps: {
+                'aria-haspopup': 'menu',
+                ...props.rawProps,
+            }, isActive: props.isActive, isDropdown: true })), renderBody: (dropdownBodyProps) => (React__namespace.default.createElement(FocusLock__default.default, { returnFocus: true, persistentFocus: true, lockProps: {
                 onKeyDown: (e) => handleEscape(e, dropdownBodyProps.onClose, dropdownBodyProps.isOpen),
             } },
-            React__namespace.default.createElement("div", { className: cx__default.default(css$a.dropdownBody, 'uui-main_menu-dropdown', props.cx) }, props.renderBody({ ...dropdownBodyProps })))), placement: "bottom-start" }));
+            React__namespace.default.createElement("div", { className: cx__default.default(css$a.dropdownBody, 'uui-main_menu-dropdown', props.cx), role: "menu" }, props.renderBody({ ...dropdownBodyProps })))), placement: "bottom-start" }));
 }
 
 function applyMainMenuMods() {
@@ -5723,12 +5857,12 @@ var SvgNavigationGlobalMenuOutlineOutline = function SvgNavigationGlobalMenuOutl
 };
 var ForwardRef$1 = /*#__PURE__*/React.forwardRef(SvgNavigationGlobalMenuOutlineOutline);
 
-var css$9 = {"global-menu-btn":"RcwLro","globalMenuBtn":"RcwLro","global-menu-icon":"UwDDvN","globalMenuIcon":"UwDDvN"};
+var css$9 = {"global-menu-btn":"iAWp8k","globalMenuBtn":"iAWp8k","global-menu-icon":"zh80jS","globalMenuIcon":"zh80jS"};
 
 const GlobalMenu = /* @__PURE__ */React__namespace.forwardRef((props, ref) => (React__namespace.createElement("button", { ref: ref, id: "global_menu_toggle", className: cx__default.default(css$9.globalMenuBtn, props.cx), ...props.rawProps },
     React__namespace.createElement(uuiComponents.IconContainer, { size: 36, icon: ForwardRef$1, cx: css$9.globalMenuIcon }))));
 
-var css$8 = {"container":"Ir64tv","open":"DwdySa","folding-arrow":"ERR2-m","foldingArrow":"ERR2-m"};
+var css$8 = {"container":"_0rzPa1","open":"NSis8h","folding-arrow":"JUNRfE","foldingArrow":"JUNRfE"};
 
 const MainMenuAvatar = /* @__PURE__ */React__namespace.forwardRef((props, ref) => (React__namespace.createElement("button", { ref: ref, className: cx__default.default(css$8.container, props.isDropdown && css$8.dropdown, props.isOpen && css$8.open, props.onClick && uuiCore.uuiMarkers.clickable, props.cx), onClick: props.onClick, ...props.rawProps },
     React__namespace.createElement(uuiComponents.Avatar, { size: "36", img: props.avatarUrl }),
@@ -5736,15 +5870,15 @@ const MainMenuAvatar = /* @__PURE__ */React__namespace.forwardRef((props, ref) =
     props.isDropdown && (React__namespace.createElement("div", null,
         React__namespace.createElement(uuiComponents.IconContainer, { size: 18, icon: ForwardRef$P, flipY: props.isOpen, cx: css$8.foldingArrow }))))));
 
-var css$7 = {"search-input":"mrJjw8","searchInput":"mrJjw8"};
+var css$7 = {"search-input":"grY23e","searchInput":"grY23e"};
 
 const MainMenuSearch = /* @__PURE__ */React__namespace.forwardRef((props, ref) => (React__namespace.createElement(uuiCore.IEditableDebouncer, { ...props, render: (iEditable) => (React__namespace.createElement(uuiComponents.TextInput, { iconPosition: "left", icon: ForwardRef$M, cancelIcon: props.value?.length > 0 && ForwardRef$Q, ...props, ...iEditable, ref: ref, cx: uuiCore.cx(css$7.searchInput, props.cx), ...props.rawProps })) })));
 
-var css$6 = {"container":"q29pMR"};
+var css$6 = {"container":"qZaHuG"};
 
 const MainMenuIcon = /* @__PURE__ */React__namespace.forwardRef((props, ref) => (React__namespace.createElement(IconButton, { ref: ref, icon: props.icon, cx: uuiCore.cx(props.cx, css$6.container), ...props })));
 
-var css$5 = {"root":"zXGmM-"};
+var css$5 = {"root":"_4kJk2f"};
 
 const Anchor = /* @__PURE__ */uuiCore.withMods(uuiComponents.Anchor, () => [css$5.root]);
 
@@ -5802,7 +5936,7 @@ var SvgFileCloudUploadFill = function SvgFileCloudUploadFill(props, ref) {
 };
 var ForwardRef = /*#__PURE__*/React.forwardRef(SvgFileCloudUploadFill);
 
-var css$4 = {"root":"Ku-x4n","drop-start":"_4aIP-V","dropStart":"_4aIP-V","drop-over":"e1G-zA","dropOver":"e1G-zA","link":"_2g36nB","drop-area":"_4NJ2Eg","dropArea":"_4NJ2Eg","drop-caption":"KMSmZa","dropCaption":"KMSmZa","icon-blue":"nABgY-","iconBlue":"nABgY-"};
+var css$4 = {"root":"P3LwFi","drop-start":"_43ADA7","dropStart":"_43ADA7","drop-over":"isUQjN","dropOver":"isUQjN","link":"xBHuf8","drop-area":"UklNoo","dropArea":"UklNoo","drop-caption":"hIC9Rp","dropCaption":"hIC9Rp","icon-blue":"GYk5m-","iconBlue":"GYk5m-"};
 
 function DropSpot(props) {
     const getInfoText = typeof props.infoText === 'string'
@@ -5820,7 +5954,7 @@ function DropSpot(props) {
     return React__namespace.createElement(uuiComponents.DropSpot, { render: renderAttachmentArea, onFilesDropped: props.onUploadFiles });
 }
 
-var css$3 = {"root":"_8J1Ojq"};
+var css$3 = {"root":"c9yGY-"};
 
 const SvgCircleProgress = /* @__PURE__ */React__namespace.forwardRef((props, ref) => {
     const outsetRadius = props.size / 2 - 1;
@@ -5831,7 +5965,7 @@ const SvgCircleProgress = /* @__PURE__ */React__namespace.forwardRef((props, ref
         React__namespace.createElement("circle", { strokeWidth: 1, fill: "transparent", r: outsetRadius, cx: props.size / 2, cy: props.size / 2 })));
 });
 
-var css$2 = {"root":"JBm0Ep","file-name":"ltQbj4","fileName":"ltQbj4","default-color":"-W-6MK","defaultColor":"-W-6MK","doc-color":"gHFwky","docColor":"gHFwky","xls-color":"wZF-XT","xlsColor":"wZF-XT","pdf-color":"_2E3XO1","pdfColor":"_2E3XO1","movie-color":"tRfggJ","movieColor":"tRfggJ","img-color":"sTrLuw","imgColor":"sTrLuw","mov-color":"iiFoco","movColor":"iiFoco","error-block":"ioop4n","errorBlock":"ioop4n","icons-block":"HZXZ5E","iconsBlock":"HZXZ5E"};
+var css$2 = {"root":"_1s2EcE","file-name":"PNcc3A","fileName":"PNcc3A","default-color":"I540bP","defaultColor":"I540bP","doc-color":"cnpKh5","docColor":"cnpKh5","xls-color":"Jh2HaV","xlsColor":"Jh2HaV","pdf-color":"eE2Hd8","pdfColor":"eE2Hd8","movie-color":"J9PtIz","movieColor":"J9PtIz","img-color":"LKF7o4","imgColor":"LKF7o4","mov-color":"kWdhb2","movColor":"kWdhb2","error-block":"_1CjXRG","errorBlock":"_1CjXRG","icons-block":"YYrn5R","iconsBlock":"YYrn5R"};
 
 const FileCard = /* @__PURE__ */React__namespace.forwardRef((props, ref) => {
     const [isLoadingShow, setIsLoadingShow] = React__namespace.useState(true);
@@ -5916,41 +6050,41 @@ const getRecoveryMessageConfig = () => ({
 });
 const getErrorPageConfig = () => ({
     notFound: {
-        imageUrl: 'https://static.cdn.epam.com/uploads/690afa39a93c88c4dd13758fe1d869d5/EPM-UUI/error-pages-illustrations/L_Error_404_Monochrome.svg',
-        mobileImageUrl: 'https://static.cdn.epam.com/uploads/690afa39a93c88c4dd13758fe1d869d5/EPM-UUI/error-pages-illustrations/L_Error_404_Monochrome.svg',
+        imageUrl: 'https://static.cdn.epam.com/uploads/690afa39a93c88c4dd13758fe1d869d5/EPM-UUI/error-pages-2025/404.svg',
+        mobileImageUrl: 'https://static.cdn.epam.com/uploads/690afa39a93c88c4dd13758fe1d869d5/EPM-UUI/error-pages-2025/404.svg',
         title: i18n.errorHandler.errorPageConfig.notFound.title,
         subtitle: i18n.errorHandler.errorPageConfig.notFound.subtitle,
     },
     permissionDenied: {
-        imageUrl: 'https://static.cdn.epam.com/uploads/690afa39a93c88c4dd13758fe1d869d5/EPM-UUI/error-pages-illustrations/L_Error_403_Monochrome.svg',
-        mobileImageUrl: 'https://static.cdn.epam.com/uploads/690afa39a93c88c4dd13758fe1d869d5/EPM-UUI/error-pages-illustrations/L_Error_403_Monochrome.svg',
+        imageUrl: 'https://static.cdn.epam.com/uploads/690afa39a93c88c4dd13758fe1d869d5/EPM-UUI/error-pages-2025/403.svg',
+        mobileImageUrl: 'https://static.cdn.epam.com/uploads/690afa39a93c88c4dd13758fe1d869d5/EPM-UUI/error-pages-2025/403.svg',
         title: i18n.errorHandler.errorPageConfig.permissionDenied.title,
         subtitle: i18n.errorHandler.errorPageConfig.permissionDenied.subtitle,
     },
     serverError: {
-        imageUrl: 'https://static.cdn.epam.com/uploads/690afa39a93c88c4dd13758fe1d869d5/EPM-UUI/error-pages-illustrations/L_Error_500_Monochrome.svg',
-        mobileImageUrl: 'https://static.cdn.epam.com/uploads/690afa39a93c88c4dd13758fe1d869d5/EPM-UUI/error-pages-illustrations/L_Error_500_Monochrome.svg',
+        imageUrl: 'https://static.cdn.epam.com/uploads/690afa39a93c88c4dd13758fe1d869d5/EPM-UUI/error-pages-2025/500.svg',
+        mobileImageUrl: 'https://static.cdn.epam.com/uploads/690afa39a93c88c4dd13758fe1d869d5/EPM-UUI/error-pages-2025/500.svg',
         title: i18n.errorHandler.errorPageConfig.serverError.title,
         subtitle: i18n.errorHandler.errorPageConfig.serverError.subtitle,
         supportLink: i18n.errorHandler.supportMessage,
     },
     serviceUnavailable: {
-        imageUrl: 'https://static.cdn.epam.com/uploads/690afa39a93c88c4dd13758fe1d869d5/EPM-UUI/error-pages-illustrations/L_Error_503_Monochrome.svg',
-        mobileImageUrl: 'https://static.cdn.epam.com/uploads/690afa39a93c88c4dd13758fe1d869d5/EPM-UUI/error-pages-illustrations/L_Error_503_Monochrome.svg',
+        imageUrl: 'https://static.cdn.epam.com/uploads/690afa39a93c88c4dd13758fe1d869d5/EPM-UUI/error-pages-2025/503.svg',
+        mobileImageUrl: 'https://static.cdn.epam.com/uploads/690afa39a93c88c4dd13758fe1d869d5/EPM-UUI/error-pages-2025/503.svg',
         title: i18n.errorHandler.errorPageConfig.serviceUnavailable.title,
         subtitle: i18n.errorHandler.errorPageConfig.serviceUnavailable.subtitle,
         supportLink: i18n.errorHandler.supportMessage,
     },
     default: {
-        imageUrl: 'https://static.cdn.epam.com/uploads/690afa39a93c88c4dd13758fe1d869d5/EPM-UUI/error-pages-illustrations/L_Empty_Monochrome.svg',
-        mobileImageUrl: 'https://static.cdn.epam.com/uploads/690afa39a93c88c4dd13758fe1d869d5/EPM-UUI/error-pages-illustrations/L_Empty_Monochrome.svg',
+        imageUrl: 'https://static.cdn.epam.com/uploads/690afa39a93c88c4dd13758fe1d869d5/EPM-UUI/error-pages-2025/Something went wrong.svg',
+        mobileImageUrl: 'https://static.cdn.epam.com/uploads/690afa39a93c88c4dd13758fe1d869d5/EPM-UUI/error-pages-2025/Something went wrong.svg',
         title: i18n.errorHandler.errorPageConfig.default.title,
         subtitle: i18n.errorHandler.errorPageConfig.default.subtitle,
         supportLink: i18n.errorHandler.supportMessage,
     },
 });
 
-var css$1 = {"container":"_0f4Gp6"};
+var css$1 = {"container":"H9pVTU"};
 
 const ErrorPage = (props) => {
     const isMobileScreen = uuiCore.isMobile();
@@ -5962,7 +6096,7 @@ const ErrorPage = (props) => {
             props?.supportLink && React__namespace.default.createElement("div", { className: "uui-error-support-link" }, props?.supportLink))));
 };
 
-var css = {"recovery-spinner":"_4hTXaP","recoverySpinner":"_4hTXaP","recovery-message":"_7iJKam","recoveryMessage":"_7iJKam","modal-blocker":"wwE-Kl","modalBlocker":"wwE-Kl","modalFadeIn":"HE4GpE"};
+var css = {"recovery-spinner":"VDllLm","recoverySpinner":"VDllLm","recovery-message":"yPHBDn","recoveryMessage":"yPHBDn","modal-blocker":"jNKgwb","modalBlocker":"jNKgwb","modalFadeIn":"gp5i0M"};
 
 function ErrorHandler(props) {
     const { uuiNotifications, uuiModals, uuiApi } = uuiCore.useUuiContext();