From c138315deb42eb4d7486144fc0949d099c85641f Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Tue, 19 Dec 2023 11:18:28 +0300
Subject: [PATCH] Refactoring: remove redundant flex classnames

---
 rsconcept/frontend/README.md                         |  2 +-
 .../frontend/src/components/Common/Dropdown.tsx      |  2 +-
 .../frontend/src/components/Common/TextArea.tsx      |  2 +-
 .../frontend/src/components/Common/TextInput.tsx     |  2 +-
 .../src/components/Shared/InfoLibraryItem.tsx        |  8 ++++----
 .../dialogs/DlgConstituentaTemplate/TemplateTab.tsx  |  4 ++--
 .../dialogs/DlgEditWordForms/DlgEditWordForms.tsx    |  4 ++--
 .../frontend/src/pages/LibraryPage/SearchPanel.tsx   |  2 +-
 .../frontend/src/pages/ManualsPage/ManualsPage.tsx   |  2 +-
 .../EditorRSExpression/EditorRSExpression.tsx        | 12 +++++-------
 .../RSFormPage/EditorRSExpression/ParsingResult.tsx  |  2 +-
 .../ViewConstituents/ConstituentsSearch.tsx          |  2 +-
 12 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/rsconcept/frontend/README.md b/rsconcept/frontend/README.md
index 757dc560..7f16cde3 100644
--- a/rsconcept/frontend/README.md
+++ b/rsconcept/frontend/README.md
@@ -10,7 +10,7 @@ Styling conventions
   - layer: z-position
   - outer layout: fixed bottom-1/2 left-0 -translate-x-1/2
   - rectangle: mt-3 min-w-fit min-w-10 flex-grow shrink-0
-  - inner layout: px-3 py-2 flex flex-col gap-3 justify-start items-center
+  - inner layout: px-3 py-2 flex flex-col gap-3 justify-between items-center
   - overflow behavior: overflow-scroll
   - border: borer-2 outline-none shadow-md
   - colors: clr-controls
diff --git a/rsconcept/frontend/src/components/Common/Dropdown.tsx b/rsconcept/frontend/src/components/Common/Dropdown.tsx
index a3ba3ca3..4d018fbb 100644
--- a/rsconcept/frontend/src/components/Common/Dropdown.tsx
+++ b/rsconcept/frontend/src/components/Common/Dropdown.tsx
@@ -20,7 +20,7 @@ function Dropdown({
     layer='z-modal-tooltip'
     position='mt-3'
     className={clsx(
-      'flex flex-col items-stretch',
+      'flex flex-col',
       'border rounded-md shadow-lg',
       'text-sm',
       'clr-input',
diff --git a/rsconcept/frontend/src/components/Common/TextArea.tsx b/rsconcept/frontend/src/components/Common/TextArea.tsx
index 0d48e147..a16b7202 100644
--- a/rsconcept/frontend/src/components/Common/TextArea.tsx
+++ b/rsconcept/frontend/src/components/Common/TextArea.tsx
@@ -19,7 +19,7 @@ function TextArea({
   <div className={clsx(
     {
       'flex flex-col gap-2': !dense,
-      'flex justify-stretch items-center gap-3': dense
+      'flex items-center gap-3': dense
     },
     dense && className,
   )}>
diff --git a/rsconcept/frontend/src/components/Common/TextInput.tsx b/rsconcept/frontend/src/components/Common/TextInput.tsx
index 96c374d5..55b3c7be 100644
--- a/rsconcept/frontend/src/components/Common/TextInput.tsx
+++ b/rsconcept/frontend/src/components/Common/TextInput.tsx
@@ -26,7 +26,7 @@ function TextInput({
   <div className={clsx(
     {
       'flex flex-col gap-2': !dense,
-      'flex justify-stretch items-center gap-3': dense,
+      'flex items-center gap-3': dense,
     },
     dense && className
   )}>
diff --git a/rsconcept/frontend/src/components/Shared/InfoLibraryItem.tsx b/rsconcept/frontend/src/components/Shared/InfoLibraryItem.tsx
index 9e5e0123..f515fe01 100644
--- a/rsconcept/frontend/src/components/Shared/InfoLibraryItem.tsx
+++ b/rsconcept/frontend/src/components/Shared/InfoLibraryItem.tsx
@@ -12,23 +12,23 @@ function InfoLibraryItem({ item }: InfoLibraryItemProps) {
   const intl = useIntl();
   return (
   <div className='flex flex-col gap-1'>
-    <div className='flex justify-start'>
+    <div className='flex'>
       <label className='font-semibold'>Владелец:</label>
       <span className='min-w-[200px] ml-2 overflow-ellipsis overflow-hidden whitespace-nowrap'>
         {getUserLabel(item?.owner ?? null)}
       </span>
     </div>
-    <div className='flex justify-start'>
+    <div className='flex'>
       <label className='font-semibold'>Отслеживают:</label>
       <span id='subscriber-count' className='ml-2'>
         { item?.subscribers.length ?? 0 }
       </span>
     </div>
-    <div className='flex justify-start'>
+    <div className='flex'>
       <label className='font-semibold'>Дата обновления:</label>
       <span className='ml-2'>{item && new Date(item?.time_update).toLocaleString(intl.locale)}</span>
     </div>
-    <div className='flex justify-start'>
+    <div className='flex'>
       <label className='font-semibold'>Дата создания:</label>
       <span className='ml-8'>{item && new Date(item?.time_create).toLocaleString(intl.locale)}</span>
     </div>
diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx
index 21aee635..2e74e06e 100644
--- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx
@@ -88,7 +88,7 @@ function TemplateTab({ state, partialUpdate }: TemplateTabProps) {
 
   return (
   <>
-    <div className='flex justify-stretch'>
+    <div className='flex'>
       <SelectSingle
         placeholder='Выберите категорию'
         className='flex-grow border-none'
@@ -102,7 +102,7 @@ function TemplateTab({ state, partialUpdate }: TemplateTabProps) {
       />
       <SelectSingle
         placeholder='Выберите источник'
-        className='min-w-[12rem]'
+        className='w-[12rem]'
         options={templateSelector}
         value={state.templateID ? { value: state.templateID, label: templates.find(item => item.id == state.templateID)!.title }: null}
         onChange={data => partialUpdate({templateID: (data ? data.value : undefined)})}
diff --git a/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx b/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx
index 410c6bf1..3c196514 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx
@@ -144,10 +144,10 @@ function DlgEditWordForms({ hideWindow, target, onSave }: DlgEditWordFormsProps)
       <Label text='Параметры словоформы' />
     </div>
 
-    <div className='flex justify-stretch'>
+    <div className='flex'>
       <TextArea
         placeholder='Введите текст'
-        className='min-w-[20rem] min-h-[5rem] flex-grow'
+        className='min-w-[20rem] min-h-[5rem]'
         rows={2}
         value={inputText}
         onChange={event => setInputText(event.target.value)}
diff --git a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
index a51e0fc9..7a3703e5 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
@@ -45,7 +45,7 @@ function SearchPanel({ total, filtered, query, setQuery, strategy, setFilter }:
   <div className={clsx(
     'sticky top-0',
     'w-full max-h-[2.3rem]',
-    'pr-40 flex items-stretch',
+    'pr-40 flex',
     'border-b',
     'clr-input'
   )}>
diff --git a/rsconcept/frontend/src/pages/ManualsPage/ManualsPage.tsx b/rsconcept/frontend/src/pages/ManualsPage/ManualsPage.tsx
index 6336329e..38fd193d 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/ManualsPage.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/ManualsPage.tsx
@@ -21,7 +21,7 @@ function ManualsPage() {
 
   return (
   <div
-    className='flex items-start justify-start w-full max-w-[90rem] gap-2'
+    className='flex items-start w-full max-w-[90rem] gap-2'
     style={{minHeight: mainHeight}}
   >
     <TopicsList 
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
index 1a8a9acc..edbfc05a 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
@@ -186,13 +186,11 @@ function EditorRSExpression({
     /> : null}
     
     {(parseData && parseData.errors.length > 0) ? 
-    <div className='flex-grow text-sm border overflow-y-auto max-h-[4.5rem] min-h-[4.5rem]'>
-      <ParsingResult
-        data={parseData}
-        disabled={disabled}
-        onShowError={onShowError}
-      />
-    </div> : null}
+    <ParsingResult
+      data={parseData}
+      disabled={disabled}
+      onShowError={onShowError}
+    />: null}
   </div>
   </>);
 }
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ParsingResult.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ParsingResult.tsx
index 6155c4f3..42e52420 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ParsingResult.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ParsingResult.tsx
@@ -15,7 +15,7 @@ function ParsingResult({ data, disabled, onShowError }: ParsingResultProps) {
   const warningsCount = data.errors.length - errorCount;
 
   return (
-  <div className='px-2 pt-1 text-sm'>
+  <div className='px-2 pt-1 text-sm border overflow-y-auto h-[4.5rem]'>
     <p>Ошибок: <b>{errorCount}</b> | Предупреждений: <b>{warningsCount}</b></p>
     {data.errors.map(
     (error, index) => {
diff --git a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx
index 6043114d..e6234709 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx
@@ -75,7 +75,7 @@ function ConstituentsSearch({ schema, activeID, activeExpression, setFiltered }:
   }, [sourceMenu, setFilterSource]);
   
   return (
-  <div className='flex items-stretch border-b clr-input'>
+  <div className='flex border-b clr-input'>
     <ConceptSearch noBorder
       className='min-w-[6rem] pr-2 flex-grow'
       value={filterText}