From 9085efdd1b98aae2e9cc059df456b163fb545cff Mon Sep 17 00:00:00 2001
From: AlekseyManetov <aliaksei_manetau@epam.com>
Date: Wed, 20 Mar 2024 17:04:23 +0100
Subject: [PATCH] Fixed layout issues in demo Form

---
 app/src/demo/form/DemoForm.module.scss |  5 ----
 app/src/demo/form/DemoForm.tsx         | 34 ++++++--------------------
 2 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/app/src/demo/form/DemoForm.module.scss b/app/src/demo/form/DemoForm.module.scss
index aed24a467a..43f8e8497e 100644
--- a/app/src/demo/form/DemoForm.module.scss
+++ b/app/src/demo/form/DemoForm.module.scss
@@ -28,11 +28,6 @@
             margin-top: 18px;
         }
 
-        .clear-button-wrapper {
-            margin-top: 6px;
-            margin-left: -3px;
-        }
-
         .attachment-container {
             display: grid;
             margin-top: 12px;
diff --git a/app/src/demo/form/DemoForm.tsx b/app/src/demo/form/DemoForm.tsx
index c08a8746a2..ee016f2130 100644
--- a/app/src/demo/form/DemoForm.tsx
+++ b/app/src/demo/form/DemoForm.tsx
@@ -4,31 +4,11 @@ import {
 } from '@epam/uui-core';
 import { demoData, Country } from '@epam/uui-docs';
 import type { TApi } from '../../data';
-import {
-    FlexCell,
-    FlexRow,
-    FlexSpacer,
-    LabeledInput,
-    Panel,
-    PickerInput,
-    RichTextView,
-    SuccessNotification,
-    ErrorNotification,
-    Text,
-    TextInput,
-    DatePicker,
-    Tooltip,
-    IconContainer,
-    Switch,
-    Button,
-    IconButton,
-    NumericInput,
-    RangeDatePicker,
-    MultiSwitch,
-    DropSpot,
-    FileCard,
-    useForm,
+import { FlexCell, FlexRow, FlexSpacer, LabeledInput, Panel, PickerInput, RichTextView, SuccessNotification,
+    ErrorNotification, Text, TextInput, DatePicker, Tooltip, IconContainer, Switch, Button, NumericInput,
+    RangeDatePicker, MultiSwitch, DropSpot, FileCard, useForm, IconButton,
 } from '@epam/uui';
+import { } from '@epam/loveship';
 import type {
     PersonDetails, Attachment, PersonLanguageInfo, PersonTravelVisa,
 } from './types';
@@ -185,7 +165,7 @@ function PrimaryInfo({ lens }: { lens: ILens<PersonDetails['primaryInfo']> }) {
                         </FlexCell>
                     </FlexRow>
                 </FlexCell>
-                <FlexCell minWidth={ 324 }>
+                <FlexCell minWidth={ 324 } alignSelf="flex-end">
                     <FlexRow size="48" columnGap="18" alignItems="bottom">
                         <Switch label="Time Reporting" { ...lens.prop('timeReporting').toProps() } isDisabled />
                         <Switch label="Remote" { ...lens.prop('remoteStatus').toProps() } isDisabled />
@@ -426,9 +406,9 @@ function Visas({ lens, countriesDS }: { lens: ILens<PersonDetails['travelVisas']
                                 <RangeDatePicker id="term" format="MMM D, YYYY" { ...visasLens.index(index).prop('term').toProps() } />
                             </LabeledInput>
                         </FlexCell>
-                        <FlexRow size="48" alignItems="bottom" cx={ css.clearButtonWrapper }>
+                        <FlexCell alignSelf="flex-end">
                             {isClearable && <IconButton icon={ ClearIcon } onClick={ () => removeLensItemHandler<PersonTravelVisa>(visasLens, index) } />}
-                        </FlexRow>
+                        </FlexCell>
                     </FlexRow>
                 );
             })}