From 3edee8450e9a00b439bbe689036338c2826ae4c4 Mon Sep 17 00:00:00 2001
From: Ivan <8611739+IRBorisov@users.noreply.github.com>
Date: Tue, 10 Sep 2024 17:40:58 +0300
Subject: [PATCH] M: Optimize dialogs height for small screen notebooks

---
 rsconcept/frontend/src/components/ui/Modal.tsx         | 10 +++-------
 .../DlgConstituentaTemplate.tsx                        |  4 ++--
 .../dialogs/DlgConstituentaTemplate/TabTemplate.tsx    |  2 +-
 .../dialogs/DlgCreateOperation/DlgCreateOperation.tsx  |  6 +++---
 .../src/dialogs/DlgEditOperation/DlgEditOperation.tsx  |  2 +-
 .../src/dialogs/DlgEditOperation/TabSynthesis.tsx      |  2 +-
 .../src/dialogs/DlgEditReference/DlgEditReference.tsx  |  2 +-
 .../dialogs/DlgEditReference/TabEntityReference.tsx    |  2 +-
 .../dialogs/DlgInlineSynthesis/DlgInlineSynthesis.tsx  |  2 +-
 .../src/dialogs/DlgInlineSynthesis/TabConstituents.tsx |  2 +-
 .../src/dialogs/DlgInlineSynthesis/TabSchema.tsx       |  2 +-
 11 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/rsconcept/frontend/src/components/ui/Modal.tsx b/rsconcept/frontend/src/components/ui/Modal.tsx
index dcd01f2b..929f80b2 100644
--- a/rsconcept/frontend/src/components/ui/Modal.tsx
+++ b/rsconcept/frontend/src/components/ui/Modal.tsx
@@ -103,23 +103,19 @@ function Modal({
           {children}
         </div>
 
-        <div className={clsx('z-modalControls', 'px-6 py-3 flex gap-12 justify-center')}>
+        <div className='z-modalControls my-2 flex gap-12 justify-center text-sm'>
           {!readonly ? (
             <Button
               autoFocus
               text={submitText}
               title={!canSubmit ? submitInvalidTooltip : ''}
-              className='min-w-[8rem] min-h-[2.6rem]'
+              className='min-w-[7rem]'
               colors='clr-btn-primary'
               disabled={!canSubmit}
               onClick={handleSubmit}
             />
           ) : null}
-          <Button
-            text={readonly ? 'Закрыть' : 'Отмена'}
-            className='min-w-[8rem] min-h-[2.6rem]'
-            onClick={handleCancel}
-          />
+          <Button text={readonly ? 'Закрыть' : 'Отмена'} className='min-w-[7rem]' onClick={handleCancel} />
         </div>
       </motion.div>
     </div>
diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx
index e4841eac..29efa99c 100644
--- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx
@@ -160,13 +160,13 @@ function DlgConstituentaTemplate({ hideWindow, schema, onCreate, insertAfter }:
     <Modal
       header='Создание конституенты из шаблона'
       submitText='Создать'
-      className='w-[43rem] h-[36.5rem] px-6'
+      className='w-[43rem] h-[35rem] px-6'
       hideWindow={hideWindow}
       canSubmit={validated}
       beforeSubmit={handlePrompt}
       onSubmit={handleSubmit}
     >
-      <Overlay position='top-0 right-[6rem]'>
+      <Overlay position='top-0 right-[5.9rem]'>
         <BadgeHelp
           topic={HelpTopic.RSL_TEMPLATES}
           className={clsx(PARAMETER.TOOLTIP_WIDTH, 'sm:max-w-[40rem]')}
diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TabTemplate.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TabTemplate.tsx
index f9da183a..d15cd787 100644
--- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TabTemplate.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TabTemplate.tsx
@@ -118,7 +118,7 @@ function TabTemplate({ state, partialUpdate, templateSchema }: TabTemplateProps)
         data={filteredData}
         onSelectValue={cst => partialUpdate({ prototype: cst })}
         prefixID={prefixes.cst_template_ist}
-        rows={9}
+        rows={8}
       />
       <TextArea
         id='dlg_template_term'
diff --git a/rsconcept/frontend/src/dialogs/DlgCreateOperation/DlgCreateOperation.tsx b/rsconcept/frontend/src/dialogs/DlgCreateOperation/DlgCreateOperation.tsx
index db8224d3..a1988cfa 100644
--- a/rsconcept/frontend/src/dialogs/DlgCreateOperation/DlgCreateOperation.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgCreateOperation/DlgCreateOperation.tsx
@@ -147,7 +147,7 @@ function DlgCreateOperation({ hideWindow, oss, onCreate, initialInputs }: DlgCre
       hideWindow={hideWindow}
       canSubmit={isValid}
       onSubmit={handleSubmit}
-      className='w-[40rem] px-6 min-h-[35rem]'
+      className='w-[40rem] px-6 h-[32rem]'
     >
       <Overlay position='top-0 right-0'>
         <BadgeHelp topic={HelpTopic.CC_OSS} className={clsx(PARAMETER.TOOLTIP_WIDTH, 'sm:max-w-[40rem]')} offset={14} />
@@ -155,11 +155,11 @@ function DlgCreateOperation({ hideWindow, oss, onCreate, initialInputs }: DlgCre
 
       <Tabs
         selectedTabClassName='clr-selected'
-        className='flex flex-col'
+        className='flex flex-col pt-2'
         selectedIndex={activeTab}
         onSelect={handleSelectTab}
       >
-        <TabList className={clsx('mb-3 self-center', 'flex', 'border divide-x rounded-none')}>
+        <TabList className={clsx('self-center absolute top-[2.4rem]', 'flex', 'border divide-x rounded-none')}>
           <TabLabel
             title={describeOperationType(OperationType.INPUT)}
             label={labelOperationType(OperationType.INPUT)}
diff --git a/rsconcept/frontend/src/dialogs/DlgEditOperation/DlgEditOperation.tsx b/rsconcept/frontend/src/dialogs/DlgEditOperation/DlgEditOperation.tsx
index e20adc3f..72e49f67 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditOperation/DlgEditOperation.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgEditOperation/DlgEditOperation.tsx
@@ -169,7 +169,7 @@ function DlgEditOperation({ hideWindow, oss, target, onSubmit }: DlgEditOperatio
       hideWindow={hideWindow}
       canSubmit={canSubmit}
       onSubmit={handleSubmit}
-      className='w-[40rem] px-6 min-h-[35rem]'
+      className='w-[40rem] px-6 h-[32rem]'
     >
       <Overlay position='top-0 right-0'>
         <BadgeHelp topic={HelpTopic.CC_OSS} className={clsx(PARAMETER.TOOLTIP_WIDTH, 'sm:max-w-[40rem]')} offset={14} />
diff --git a/rsconcept/frontend/src/dialogs/DlgEditOperation/TabSynthesis.tsx b/rsconcept/frontend/src/dialogs/DlgEditOperation/TabSynthesis.tsx
index 0be98073..ab1fd81d 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditOperation/TabSynthesis.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgEditOperation/TabSynthesis.tsx
@@ -35,7 +35,7 @@ function TabSynthesis({
       <PickSubstitutions
         schemas={schemas}
         prefixID={prefixes.dlg_cst_substitutes_list}
-        rows={10}
+        rows={8}
         substitutions={substitutions}
         setSubstitutions={setSubstitutions}
         suggestions={suggestions}
diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx b/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx
index 7380be26..12df7f51 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx
@@ -70,7 +70,7 @@ function DlgEditReference({ hideWindow, schema, initial, onSave }: DlgEditRefere
       hideWindow={hideWindow}
       canSubmit={isValid}
       onSubmit={handleSubmit}
-      className='w-[40rem] px-6 min-h-[35rem]'
+      className='w-[40rem] px-6 h-[32rem]'
     >
       <Overlay position='top-0 right-0'>
         <BadgeHelp
diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/TabEntityReference.tsx b/rsconcept/frontend/src/dialogs/DlgEditReference/TabEntityReference.tsx
index fe9fa987..95b84a68 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditReference/TabEntityReference.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgEditReference/TabEntityReference.tsx
@@ -70,7 +70,7 @@ function TabEntityReference({ initial, schema, setIsValid, setReference }: TabEn
         describeFunc={cst => cst.term_resolved}
         matchFunc={(cst, filter) => matchConstituenta(cst, filter, CstMatchMode.TERM)}
         onBeginFilter={cst => cst.term_resolved !== ''}
-        rows={8}
+        rows={7}
       />
 
       <div className='flex gap-3'>
diff --git a/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/DlgInlineSynthesis.tsx b/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/DlgInlineSynthesis.tsx
index 1ff7d3d9..73fcd344 100644
--- a/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/DlgInlineSynthesis.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/DlgInlineSynthesis.tsx
@@ -96,7 +96,7 @@ function DlgInlineSynthesis({ hideWindow, receiver, onInlineSynthesis }: DlgInli
     <Modal
       header='Импорт концептуальной схем'
       submitText='Добавить конституенты'
-      className='w-[40rem] h-[36rem] px-6'
+      className='w-[40rem] h-[33rem] px-6'
       hideWindow={hideWindow}
       canSubmit={validated}
       onSubmit={handleSubmit}
diff --git a/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/TabConstituents.tsx b/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/TabConstituents.tsx
index b016d27e..57f57c28 100644
--- a/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/TabConstituents.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/TabConstituents.tsx
@@ -19,7 +19,7 @@ function TabConstituents({ schema, error, loading, selected, setSelected }: TabC
     <DataLoader id='dlg-constituents-tab' isLoading={loading} error={error} hasNoData={!schema}>
       <PickMultiConstituenta
         schema={schema}
-        rows={14}
+        rows={13}
         prefixID={prefixes.cst_inline_synth_list}
         selected={selected}
         setSelected={setSelected}
diff --git a/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/TabSchema.tsx b/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/TabSchema.tsx
index e1bbb10c..22e2295a 100644
--- a/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/TabSchema.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/TabSchema.tsx
@@ -35,7 +35,7 @@ function TabSchema({ selected, setSelected }: TabSchemaProps) {
         id='dlg_schema_picker' // prettier: split lines
         items={library.items}
         itemType={LibraryItemType.RSFORM}
-        rows={15}
+        rows={14}
         value={selected}
         onSelectValue={setSelected}
       />