From 51ad937b99d389181866f05c13b9a1b40893678b Mon Sep 17 00:00:00 2001
From: Ivan <8611739+IRBorisov@users.noreply.github.com>
Date: Wed, 28 Aug 2024 22:38:34 +0300
Subject: [PATCH] B: Small UI fixes

---
 rsconcept/frontend/src/components/ui/TextArea.tsx        | 3 +++
 rsconcept/frontend/src/dialogs/DlgChangeLocation.tsx     | 9 +--------
 rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx   | 1 -
 .../frontend/src/dialogs/DlgCreateCst/FormCreateCst.tsx  | 9 ++++++---
 .../RSFormPage/EditorConstituenta/FormConstituenta.tsx   | 5 +++--
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/rsconcept/frontend/src/components/ui/TextArea.tsx b/rsconcept/frontend/src/components/ui/TextArea.tsx
index 47e8f03d..506a684b 100644
--- a/rsconcept/frontend/src/components/ui/TextArea.tsx
+++ b/rsconcept/frontend/src/components/ui/TextArea.tsx
@@ -6,6 +6,7 @@ import Label from './Label';
 export interface TextAreaProps extends CProps.Editor, CProps.Colors, CProps.TextArea {
   dense?: boolean;
   noResize?: boolean;
+  fitContent?: boolean;
 }
 
 function TextArea({
@@ -18,6 +19,7 @@ function TextArea({
   noOutline,
   noResize,
   className,
+  fitContent,
   colors = 'clr-input',
   ...restProps
 }: TextAreaProps) {
@@ -40,6 +42,7 @@ function TextArea({
           'leading-tight',
           'overflow-x-hidden overflow-y-auto',
           {
+            'cc-fit-content': fitContent,
             'resize-none': noResize,
             'border': !noBorder,
             'flex-grow max-w-full': dense,
diff --git a/rsconcept/frontend/src/dialogs/DlgChangeLocation.tsx b/rsconcept/frontend/src/dialogs/DlgChangeLocation.tsx
index cd71d0a6..627c7211 100644
--- a/rsconcept/frontend/src/dialogs/DlgChangeLocation.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgChangeLocation.tsx
@@ -59,14 +59,7 @@ function DlgChangeLocation({ hideWindow, initial, onChangeLocation }: DlgChangeL
         onChange={handleSelectLocation}
         className='max-h-[9.2rem]'
       />
-      <TextArea
-        id='dlg_cst_body'
-        label='Путь'
-        className='w-[23rem]'
-        rows={3}
-        value={body}
-        onChange={event => setBody(event.target.value)}
-      />
+      <TextArea id='dlg_cst_body' label='Путь' rows={3} value={body} onChange={event => setBody(event.target.value)} />
     </Modal>
   );
 }
diff --git a/rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx b/rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx
index 302150d7..c5b008da 100644
--- a/rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx
@@ -128,7 +128,6 @@ function DlgCloneLibraryItem({ hideWindow, base, initialLocation, selected, tota
         <TextArea
           id='dlg_cst_body'
           label='Путь'
-          className='w-[18rem]'
           rows={3}
           value={body}
           onChange={event => setBody(event.target.value)}
diff --git a/rsconcept/frontend/src/dialogs/DlgCreateCst/FormCreateCst.tsx b/rsconcept/frontend/src/dialogs/DlgCreateCst/FormCreateCst.tsx
index 139d680b..173da906 100644
--- a/rsconcept/frontend/src/dialogs/DlgCreateCst/FormCreateCst.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgCreateCst/FormCreateCst.tsx
@@ -71,10 +71,11 @@ function FormCreateCst({ schema, state, partialUpdate, setValidated }: FormCreat
       <TextArea
         key='dlg_cst_term'
         id='dlg_cst_term'
+        fitContent
         spellCheck
         label='Термин'
         placeholder='Обозначение, используемое в текстовых определениях'
-        className='cc-fit-content max-h-[3.6rem]'
+        className='max-h-[3.6rem]'
         value={state.term_raw}
         onChange={event => partialUpdate({ term_raw: event.target.value })}
       />
@@ -102,9 +103,10 @@ function FormCreateCst({ schema, state, partialUpdate, setValidated }: FormCreat
         <TextArea
           id='dlg_cst_definition'
           spellCheck
+          fitContent
           label='Текстовое определение'
           placeholder='Текстовая интерпретация формального выражения'
-          className='cc-fit-content max-h-[3.6rem]'
+          className='max-h-[3.6rem]'
           value={state.definition_raw}
           onChange={event => partialUpdate({ definition_raw: event.target.value })}
         />
@@ -126,9 +128,10 @@ function FormCreateCst({ schema, state, partialUpdate, setValidated }: FormCreat
           key='dlg_cst_convention'
           id='dlg_cst_convention'
           spellCheck
+          fitContent
           label={isBasic ? 'Конвенция' : 'Комментарий'}
           placeholder={isBasic ? 'Договоренность об интерпретации' : 'Пояснение разработчика'}
-          className='cc-fit-content max-h-[5.4rem]'
+          className='max-h-[5.4rem]'
           value={state.convention}
           onChange={event => partialUpdate({ convention: event.target.value })}
         />
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
index 09da2b38..47a47394 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
@@ -161,7 +161,7 @@ function FormConstituenta({
         {state ? (
           <TextArea
             id='cst_typification'
-            className='cc-fit-content'
+            fitContent
             dense
             noResize
             noBorder
@@ -215,7 +215,8 @@ function FormConstituenta({
           <AnimateFade key='cst_convention_fade' hideContent={!showConvention || !state}>
             <TextArea
               id='cst_convention'
-              className='cc-fit-content max-h-[8rem]'
+              fitContent
+              className='max-h-[8rem]'
               spellCheck
               label={isBasic ? 'Конвенция' : 'Комментарий'}
               placeholder={isBasic ? 'Договоренность об интерпретации' : 'Пояснение разработчика'}