From 6dd3fd277906758f7a5267043c8e42131b50ab45 Mon Sep 17 00:00:00 2001
From: Siarhei_Dzeraviannik <siarhei_dzeraviannik@epam.com>
Date: Mon, 13 Jan 2025 14:56:35 +0300
Subject: [PATCH 1/3] [DropdownMenuItem]: fixed cropping of icons located to
 the right of the text, fixes issue #2708

---
 changelog.md                                     | 3 +++
 uui/components/overlays/DropdownMenu.module.scss | 1 +
 2 files changed, 4 insertions(+)

diff --git a/changelog.md b/changelog.md
index 835697c1b0..a85d4d1a9f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,9 @@
 **What's New**
 * [MainMenuAvatar]: added `RawProps` prop
 
+**What's Fixed**
+* [DropdownMenuButton]: fixed cropping of icons located to the right of the text
+
 
 # 5.12.1 - 17.12.2024
 **What's Fixed**
diff --git a/uui/components/overlays/DropdownMenu.module.scss b/uui/components/overlays/DropdownMenu.module.scss
index 367b0896c8..7b77fe302f 100644
--- a/uui/components/overlays/DropdownMenu.module.scss
+++ b/uui/components/overlays/DropdownMenu.module.scss
@@ -111,6 +111,7 @@
 
     .icon {
         justify-content: flex-start;
+        flex-shrink: 0;
         @include withActive;
 
         svg {

From 91f062f115b1cf528d61aa7d4d160f084d801940 Mon Sep 17 00:00:00 2001
From: Siarhei_Dzeraviannik <siarhei_dzeraviannik@epam.com>
Date: Wed, 15 Jan 2025 17:11:05 +0300
Subject: [PATCH 2/3] [DropdownMenuBody]: added 'maxHeight' prop,
 [PresetsPanel]: added scroll to 'More' dropdown

---
 changelog.md                                        | 2 ++
 uui/components/filters/PresetPanel/PresetsPanel.tsx | 6 +++---
 uui/components/overlays/DropdownMenu.tsx            | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/changelog.md b/changelog.md
index a85d4d1a9f..097bb12ba0 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,9 +1,11 @@
 # 5.12.2 - xx.xx.2024
 **What's New**
 * [MainMenuAvatar]: added `RawProps` prop
+* [DropdownMenuBody]: added `maxHeight` prop
 
 **What's Fixed**
 * [DropdownMenuButton]: fixed cropping of icons located to the right of the text
+* [PresetsPanel]: added scroll to `More` dropdown
 
 
 # 5.12.1 - 17.12.2024
diff --git a/uui/components/filters/PresetPanel/PresetsPanel.tsx b/uui/components/filters/PresetPanel/PresetsPanel.tsx
index a47b7a5dc9..4127a23572 100644
--- a/uui/components/filters/PresetPanel/PresetsPanel.tsx
+++ b/uui/components/filters/PresetPanel/PresetsPanel.tsx
@@ -3,10 +3,10 @@ import { i18n } from '../../../i18n';
 import {
     DataTableState, IHasRawProps, IPresetsApi, ITablePreset, orderBy,
 } from '@epam/uui-core';
-import { AdaptiveItemProps, AdaptivePanel, ScrollBars } from '@epam/uui-components';
+import { AdaptiveItemProps, AdaptivePanel } from '@epam/uui-components';
 import css from './PresetsPanel.module.scss';
 import { Button } from '../../buttons';
-import { FlexCell, FlexRow } from '../../layout';
+import { FlexCell, FlexRow, ScrollBars } from '../../layout';
 import { Dropdown, DropdownMenuBody, DropdownMenuButton } from '../../overlays';
 import { Preset } from './Preset';
 import { PresetInput } from './PresetInput';
@@ -65,7 +65,7 @@ export function PresetsPanel(props: PresetsPanelProps) {
                     </FlexRow>
                 ) }
                 renderBody={ (propsBody) => (
-                    <DropdownMenuBody minWidth={ 230 } { ...propsBody }>
+                    <DropdownMenuBody minWidth={ 230 } maxHeight={ 300 } { ...propsBody }>
                         <ScrollBars>
                             {hiddenItems.map((hiddenItem) => (
                                 <DropdownMenuButton
diff --git a/uui/components/overlays/DropdownMenu.tsx b/uui/components/overlays/DropdownMenu.tsx
index 8954cd669d..85a53980d8 100644
--- a/uui/components/overlays/DropdownMenu.tsx
+++ b/uui/components/overlays/DropdownMenu.tsx
@@ -17,7 +17,7 @@ export interface IDropdownMenuItemProps extends IDropdownTogglerProps, IHasCapti
     indent?: boolean;
 }
 
-export interface DropdownMenuContainerProps extends VPanelProps, IHasChildren, DropdownBodyProps, Pick<DropdownContainerProps, 'focusLock'> {
+export interface DropdownMenuContainerProps extends VPanelProps, IHasChildren, DropdownBodyProps, Pick<DropdownContainerProps, 'focusLock' | 'maxHeight'> {
     closeOnKey?: React.KeyboardEvent<HTMLElement>['key'];
     minWidth?: number;
 }

From 046855c1e5bb11eaab21ac6fe940c0bb04f24b7d Mon Sep 17 00:00:00 2001
From: Siarhei_Dzeraviannik <siarhei_dzeraviannik@epam.com>
Date: Wed, 15 Jan 2025 17:39:17 +0300
Subject: [PATCH 3/3] update changelog

---
 changelog.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/changelog.md b/changelog.md
index a5f4e57c39..70d5c440ac 100644
--- a/changelog.md
+++ b/changelog.md
@@ -9,6 +9,8 @@
 
 **What's Fixed**
 * [useForm]: reset serverValidationState by valid form save action
+* [DropdownMenuButton]: fixed cropping of icons located to the right of the text
+* [PresetsPanel]: added scroll to `More` dropdown
 
 
 # 5.12.1 - 17.12.2024