From f73badebaaf64eafe042c59e7549d8ccc79cfacd Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Tue, 7 Nov 2023 18:03:37 +0300
Subject: [PATCH] Minor UI fixes

---
 rsconcept/frontend/src/components/RSInput/index.tsx         | 2 +-
 .../src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx    | 2 +-
 .../src/dialogs/DlgConstituentaTemplate/ConstituentaTab.tsx | 4 ++--
 .../src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx     | 2 +-
 rsconcept/frontend/src/dialogs/DlgCreateCst.tsx             | 4 ++--
 .../frontend/src/pages/RSFormPage/EditorConstituenta.tsx    | 6 ++----
 .../frontend/src/pages/RSFormPage/EditorRSExpression.tsx    | 2 +-
 .../src/pages/RSFormPage/elements/ViewSideConstituents.tsx  | 2 +-
 8 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/rsconcept/frontend/src/components/RSInput/index.tsx b/rsconcept/frontend/src/components/RSInput/index.tsx
index 57446ff3..d0770cc8 100644
--- a/rsconcept/frontend/src/components/RSInput/index.tsx
+++ b/rsconcept/frontend/src/components/RSInput/index.tsx
@@ -45,7 +45,7 @@ const editorSetup: BasicSetupOptions = {
 
 interface RSInputProps 
 extends Pick<ReactCodeMirrorProps, 
-  'id' | 'height' | 'value' | 'className' | 'onFocus' | 'onBlur' | 'placeholder'
+  'id' | 'height' | 'minHeight' | 'maxHeight' | 'value' | 'className' | 'onFocus' | 'onBlur' | 'placeholder'
 > {
   label?: string
   dimensions?: string
diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx
index b0fca732..3d2793ed 100644
--- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx
@@ -177,7 +177,7 @@ function ArgumentsTab({ state, schema, partialUpdate  }: ArgumentsTabProps) {
     <RSInput id='result'
       dimensions='w-full mt-[0.3rem]'
       placeholder='Итоговое определение'
-      height='4.8rem'
+      height='4.9rem'
       value={state.definition}
       disabled
     />
diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ConstituentaTab.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ConstituentaTab.tsx
index abf1ee07..8776021d 100644
--- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ConstituentaTab.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ConstituentaTab.tsx
@@ -40,7 +40,7 @@ function ConstituentaTab({state, partialUpdate}: ConstituentaTabProps) {
     />
     <RSInput id='expression' label='Формальное определение'
       placeholder='Родоструктурное выражение, задающее формальное определение'
-      height='4.8rem'
+      height='4.9rem'
       value={state.definition_formal}
       onChange={value => partialUpdate({definition_formal: value})}
     />
@@ -52,7 +52,7 @@ function ConstituentaTab({state, partialUpdate}: ConstituentaTabProps) {
       onChange={event => partialUpdate({ definition_raw: event.target.value })}
     />
     <TextArea id='convention' label='Конвенция / Комментарий'
-      placeholder='Договоренность об интерпретации неопределяемого понятия&#x000D;&#x000A;Комментарий к производному понятию'
+      placeholder='Договоренность об интерпретации или пояснение к схеме'
       rows={2}
       value={state.convention}
       spellCheck
diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx
index 071e646b..9ca1f1e1 100644
--- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx
@@ -121,7 +121,7 @@ function TemplateTab({ state, partialUpdate }: TemplateTabProps) {
       spellCheck
     />
     <RSInput id='expression'
-      height='4.8rem'
+      height='4.9rem'
       placeholder='Выберите шаблон из списка'
       disabled
       value={state.prototype?.definition_formal}
diff --git a/rsconcept/frontend/src/dialogs/DlgCreateCst.tsx b/rsconcept/frontend/src/dialogs/DlgCreateCst.tsx
index 181a71b3..78f45509 100644
--- a/rsconcept/frontend/src/dialogs/DlgCreateCst.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgCreateCst.tsx
@@ -79,7 +79,7 @@ function DlgCreateCst({ hideWindow, initial, schema, onCreate }: DlgCreateCstPro
       />
       <RSInput id='expression' label='Формальное определение'
         placeholder='Родоструктурное выражение, задающее формальное определение'
-        height='4.8rem'
+        height='4.9rem'
         value={cstData.definition_formal}
         onChange={value => updateCstData({definition_formal: value})}
       />
@@ -91,7 +91,7 @@ function DlgCreateCst({ hideWindow, initial, schema, onCreate }: DlgCreateCstPro
         onChange={event => updateCstData({ definition_raw: event.target.value })}
       />
       <TextArea id='convention' label='Конвенция / Комментарий'
-        placeholder='Договоренность об интерпретации неопределяемого понятия&#x000D;&#x000A;Комментарий к производному понятию'
+        placeholder='Договоренность об интерпретации или пояснение'
         rows={2}
         value={cstData.convention}
         spellCheck
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta.tsx
index 7b3e202f..3804ef52 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta.tsx
@@ -230,7 +230,6 @@ function EditorConstituenta({
       <div className='flex flex-col gap-3 mt-1'>
         <RefsInput id='term' label='Термин'
           placeholder='Обозначение, используемое в текстовых определениях данной схемы'
-          height='2.1rem'
           items={schema?.items}
           value={term}
           initialValue={activeCst?.term_raw ?? ''}
@@ -239,7 +238,7 @@ function EditorConstituenta({
           onChange={newValue => setTerm(newValue)}
         />
         <TextArea id='typification' label='Типизация'
-          dense
+          dense noBorder
           rows={1}
           value={typification}
           colors='clr-app'
@@ -257,7 +256,6 @@ function EditorConstituenta({
         />
         <RefsInput id='definition' label='Текстовое определение'
           placeholder='Лингвистическая интерпретация формального выражения'
-          height='4.8rem'
           items={schema?.items}
           value={textDefinition}
           initialValue={activeCst?.definition_raw ?? ''}
@@ -266,7 +264,7 @@ function EditorConstituenta({
           onChange={newValue => setTextDefinition(newValue)}
         />
         <TextArea id='convention' label='Конвенция / Комментарий'
-          placeholder='Договоренность об интерпретации неопределяемого понятия&#x000D;&#x000A;Комментарий к производному понятию'
+          placeholder='Договоренность об интерпретации или пояснение'
           rows={2}
           value={convention}
           disabled={!isEnabled}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression.tsx
index 1dc2d2e5..f84e1c76 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression.tsx
@@ -129,8 +129,8 @@ function EditorRSExpression({
       </div>
     </div>
     <RSInput innerref={rsInput}
-      height='4.8rem'
       value={value}
+      minHeight='3.5rem'
       disabled={disabled}
       onChange={handleChange}
       {...props}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/elements/ViewSideConstituents.tsx b/rsconcept/frontend/src/pages/RSFormPage/elements/ViewSideConstituents.tsx
index 20420949..aa599815 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/elements/ViewSideConstituents.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/elements/ViewSideConstituents.tsx
@@ -101,7 +101,7 @@ function ViewSideConstituents({ expression, baseHeight, activeID, onOpenEdit }:
       filtered = filtered.filter(cst => matchConstituenta(cst, filterText, filterMatch));
     }
     setFilteredData(filtered);
-  }, [filterText, setFilteredData, filterSource, expression, schema, filterMatch, activeID]);
+  }, [filterText, setFilteredData, filterSource, expression, schema?.items, schema, filterMatch, activeID]);
 
   const handleRowClicked = useCallback(
   (cst: IConstituenta, event: React.MouseEvent<Element, MouseEvent>) => {