From d038682793b0db7d23217a5dcaeec9f53c8c0177 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Mon, 18 Dec 2023 20:45:33 +0300
Subject: [PATCH] UI improvements

---
 rsconcept/frontend/README.md                  |  4 +-
 .../src/components/Common/ConceptTab.tsx      |  2 +-
 .../src/components/Common/Divider.tsx         |  4 +-
 .../src/components/Common/PDFViewer.tsx       |  2 +-
 .../components/DataTable/PaginationTools.tsx  | 18 ++++-----
 .../src/components/Help/HelpButton.tsx        | 14 +++----
 .../src/components/Help/HelpLibrary.tsx       |  2 +-
 .../frontend/src/components/Help/HelpMain.tsx |  2 +-
 .../src/components/Help/HelpRSLang.tsx        |  4 +-
 .../src/components/Help/HelpRSTemplates.tsx   |  2 +-
 .../src/components/Navigation/UserMenu.tsx    |  2 -
 .../src/components/RefsInput/RefsInput.tsx    |  1 -
 .../components/Shared/ConstituentaBadge.tsx   | 32 +++++++--------
 .../src/components/Shared/InfoCstStatus.tsx   |  2 +-
 .../DlgConstituentaTemplate/ArgumentsTab.tsx  |  4 +-
 .../src/pages/ManualsPage/ManualsPage.tsx     |  2 +-
 .../src/pages/ManualsPage/TopicsList.tsx      |  2 +-
 .../RSFormPage/EditorRSList/RSListToolbar.tsx | 40 +++++++++----------
 .../RSFormPage/EditorTermGraph/ViewHidden.tsx |  2 +-
 .../src/pages/UserProfilePage/UserTabs.tsx    |  2 +-
 20 files changed, 66 insertions(+), 77 deletions(-)

diff --git a/rsconcept/frontend/README.md b/rsconcept/frontend/README.md
index 01cc86e4..0c887ddf 100644
--- a/rsconcept/frontend/README.md
+++ b/rsconcept/frontend/README.md
@@ -9,9 +9,9 @@ Styling conventions
   <pre>
   - layer: z-position
   - outer layout: fixed bottom-1/2 left-0 -translate-x-1/2
-  - rectangle: mt-3 w-full min-w-10 h-fit flex-grow
+  - rectangle: mt-3 min-w-fit min-w-10 flex-grow
   - inner layout: px-3 py-2 flex flex-col gap-3 justify-start items-center
-  - overflow behavior: overflow-auto
+  - overflow behavior: overflow-scroll
   - border: borer-2 outline-none shadow-md
   - colors: clr-controls
   - text: text-start text-sm font-semibold whitespace-nowrap
diff --git a/rsconcept/frontend/src/components/Common/ConceptTab.tsx b/rsconcept/frontend/src/components/Common/ConceptTab.tsx
index 7290c0bf..a45a905b 100644
--- a/rsconcept/frontend/src/components/Common/ConceptTab.tsx
+++ b/rsconcept/frontend/src/components/Common/ConceptTab.tsx
@@ -11,7 +11,7 @@ function ConceptTab({ label, className, ...otherProps }: ConceptTabProps) {
   return (
   <Tab
     className={clsx(
-      'h-full min-w-[6rem]',
+      'min-w-[6rem]',
       'px-2 py-1 flex justify-center',
       'clr-tab',
       'text-sm whitespace-nowrap small-caps font-semibold',
diff --git a/rsconcept/frontend/src/components/Common/Divider.tsx b/rsconcept/frontend/src/components/Common/Divider.tsx
index 8b542f00..5dc05648 100644
--- a/rsconcept/frontend/src/components/Common/Divider.tsx
+++ b/rsconcept/frontend/src/components/Common/Divider.tsx
@@ -10,8 +10,8 @@ function Divider({ vertical, margins = 'mx-2' }: DividerProps) {
   <div className={clsx(
     margins, 
     {
-      'border-x h-full': vertical,
-      'border-y w-full': !vertical
+      'border-x': vertical,
+      'border-y': !vertical
     }
   )}/>);
 }
diff --git a/rsconcept/frontend/src/components/Common/PDFViewer.tsx b/rsconcept/frontend/src/components/Common/PDFViewer.tsx
index 6497f422..bf3c1e4d 100644
--- a/rsconcept/frontend/src/components/Common/PDFViewer.tsx
+++ b/rsconcept/frontend/src/components/Common/PDFViewer.tsx
@@ -36,7 +36,7 @@ function PDFViewer({ file }: PDFViewerProps) {
   <Document
     file={file}
     onLoadSuccess={onDocumentLoadSuccess}
-    className='px-3 w-fit'
+    className='px-3'
     loading='Загрузка PDF файла...'
     error='Не удалось загрузить файл.'
   >
diff --git a/rsconcept/frontend/src/components/DataTable/PaginationTools.tsx b/rsconcept/frontend/src/components/DataTable/PaginationTools.tsx
index 8490acb8..ff504b93 100644
--- a/rsconcept/frontend/src/components/DataTable/PaginationTools.tsx
+++ b/rsconcept/frontend/src/components/DataTable/PaginationTools.tsx
@@ -26,20 +26,18 @@ function PaginationTools<TData>({ table, paginationOptions, onChangePaginationOp
   return (
   <div className={clsx(
     'flex justify-end items-center',
-    'w-full my-2',
+    'my-2',
     'text-sm', 
     'clr-text-controls',
     'select-none'
   )}>
-    <div className='flex items-center gap-1 mr-3'>
-      <div className=''>
-        {table.getState().pagination.pageIndex * table.getState().pagination.pageSize + 1}
-        -
-        {Math.min(table.getFilteredRowModel().rows.length, (table.getState().pagination.pageIndex + 1) * table.getState().pagination.pageSize)}
-      </div>
-      <span>из</span>
-      <div className=''>{table.getFilteredRowModel().rows.length}</div>
-    </div>
+    <span className='mr-3'>
+      {`${table.getState().pagination.pageIndex * table.getState().pagination.pageSize + 1}
+      -
+      ${Math.min(table.getFilteredRowModel().rows.length, (table.getState().pagination.pageIndex + 1) * table.getState().pagination.pageSize)}
+      из
+      ${table.getFilteredRowModel().rows.length}`}
+    </span>
     <div className='flex'>
       <button type='button'
         className='clr-hover clr-text-controls'
diff --git a/rsconcept/frontend/src/components/Help/HelpButton.tsx b/rsconcept/frontend/src/components/Help/HelpButton.tsx
index 81280dd9..e5e410e1 100644
--- a/rsconcept/frontend/src/components/Help/HelpButton.tsx
+++ b/rsconcept/frontend/src/components/Help/HelpButton.tsx
@@ -15,13 +15,11 @@ extends CProps.Styling {
 
 function HelpButton({ topic, ...restProps }: HelpButtonProps) {
   return (
-  <>
-    <div
-      id={`help-${topic}`}
-      className='p-1'
-    >
-      <BiInfoCircle size='1.25rem' className='clr-text-primary' />
-    </div>
+  <div
+    id={`help-${topic}`}
+    className='p-1'
+  >
+    <BiInfoCircle size='1.25rem' className='clr-text-primary' />
     <ConceptTooltip clickable
       anchorSelect={`#help-${topic}`}
       layer='z-modal-tooltip'
@@ -34,7 +32,7 @@ function HelpButton({ topic, ...restProps }: HelpButtonProps) {
       </div>
       <InfoTopic topic={topic} />
     </ConceptTooltip>
-  </>);
+  </div>);
 }
 
 export default HelpButton;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Help/HelpLibrary.tsx b/rsconcept/frontend/src/components/Help/HelpLibrary.tsx
index b973c846..218502af 100644
--- a/rsconcept/frontend/src/components/Help/HelpLibrary.tsx
+++ b/rsconcept/frontend/src/components/Help/HelpLibrary.tsx
@@ -3,7 +3,7 @@ import { FiBell } from 'react-icons/fi';
 
 function HelpLibrary() {
   return (
-  <div className='w-full'>
+  <div>
     <h1>Библиотека концептуальных схем</h1>
     <p>В библиотеки собраны различные концептуальные схемы.</p>
     <p>Группировка и классификации схем на данный момент не проводится.</p>
diff --git a/rsconcept/frontend/src/components/Help/HelpMain.tsx b/rsconcept/frontend/src/components/Help/HelpMain.tsx
index 35dead1f..044707fa 100644
--- a/rsconcept/frontend/src/components/Help/HelpMain.tsx
+++ b/rsconcept/frontend/src/components/Help/HelpMain.tsx
@@ -3,7 +3,7 @@ import { urls } from '@/utils/constants';
 
 function HelpMain() {
   return (
-  <div className='flex flex-col w-full text-left'>
+  <div>
     <h1>Портал</h1>
     <p className=''>Портал позволяет анализировать предметные области, формально записывать системы определений (концептуальные схемы) и синтезировать их с помощью математического аппарата родов структур.</p>
     <p className='mt-4 mb-1 text-center'><b>Основные разделы</b></p>
diff --git a/rsconcept/frontend/src/components/Help/HelpRSLang.tsx b/rsconcept/frontend/src/components/Help/HelpRSLang.tsx
index 44705628..f0a327dc 100644
--- a/rsconcept/frontend/src/components/Help/HelpRSLang.tsx
+++ b/rsconcept/frontend/src/components/Help/HelpRSLang.tsx
@@ -17,7 +17,7 @@ function HelpRSLang() {
   }, [windowSize]);
 
   return (
-  <div className='flex flex-col w-full gap-4'>
+  <div className='flex flex-col gap-4'>
     <div>
       <h1>Родоструктурная экспликация концептуальных схем</h1>
       <p>Формальная запись (<i>экспликация</i>) концептуальных схем осуществляется с помощью языка родов структур.</p>
@@ -29,7 +29,7 @@ function HelpRSLang() {
         <li>3. <a className='underline' href={urls.full_course}>Видео: лекции для 4 курса (второй семестр 2022-23 год)</a></li>
       </ul>
     </div>
-    <div className='justify-center hidden w-full md:flex fleex-col'>
+    <div className='justify-center hidden w-full md:flex'>
     <EmbedYoutube
       videoID={youtube.intro}
       pxHeight={videoHeight}
diff --git a/rsconcept/frontend/src/components/Help/HelpRSTemplates.tsx b/rsconcept/frontend/src/components/Help/HelpRSTemplates.tsx
index 5679cad2..26c8e903 100644
--- a/rsconcept/frontend/src/components/Help/HelpRSTemplates.tsx
+++ b/rsconcept/frontend/src/components/Help/HelpRSTemplates.tsx
@@ -1,6 +1,6 @@
 function HelpRSTemplates() {
   return (
-  <div className='flex flex-col w-full gap-2 pb-2'>
+  <div className='flex flex-col gap-2 pb-2'>
     <h1>Банк выражений</h1>
     <p>Портал предоставляет быстрый доступ к часто используемым выражениям с помощью функции создания конституенты из шаблона.</p>
     <p>Источником шаблонов является <b>Банк выражений</b>, содержащий параметризованные понятия и утверждения, сгруппированные по разделам.</p>
diff --git a/rsconcept/frontend/src/components/Navigation/UserMenu.tsx b/rsconcept/frontend/src/components/Navigation/UserMenu.tsx
index 3794896d..75549d8d 100644
--- a/rsconcept/frontend/src/components/Navigation/UserMenu.tsx
+++ b/rsconcept/frontend/src/components/Navigation/UserMenu.tsx
@@ -16,7 +16,6 @@ function UserMenu() {
   const navigateLogin = () => router.push('/login');
   return (
   <div ref={menu.ref} className='h-full'>
-    <div className='flex items-center justify-end h-full w-fit'>
     {!user ?
     <NavigationButton
       description='Перейти на страницу логина'
@@ -29,7 +28,6 @@ function UserMenu() {
       icon={<FaCircleUser size='1.5rem' />}
       onClick={menu.toggle}
     /> : null}
-    </div>
     {(user && menu.isActive) ?
     <UserDropdown
       hideDropdown={() => menu.hide()}
diff --git a/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx b/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx
index f1c0baac..060baf87 100644
--- a/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx
+++ b/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx
@@ -178,7 +178,6 @@ function RefsInput({
     onSave={handleInputReference}
   /> : null}
   <div className={clsx(
-    'w-full',
     'flex flex-col gap-2',
     cursor
   )}>
diff --git a/rsconcept/frontend/src/components/Shared/ConstituentaBadge.tsx b/rsconcept/frontend/src/components/Shared/ConstituentaBadge.tsx
index 59c1da56..0a17c677 100644
--- a/rsconcept/frontend/src/components/Shared/ConstituentaBadge.tsx
+++ b/rsconcept/frontend/src/components/Shared/ConstituentaBadge.tsx
@@ -16,23 +16,21 @@ interface ConstituentaBadgeProps {
 
 function ConstituentaBadge({ value, prefixID, shortTooltip, theme }: ConstituentaBadgeProps) {
   return (
-  <div className='w-fit'>
-    <div
-      id={`${prefixID}${value.alias}`}
-      className={clsx(
-        'min-w-[3.1rem] max-w-[3.1rem]',
-        'px-1',
-        'border rounded-md',
-        'text-center font-semibold whitespace-nowrap'
-      )}
-      style={{
-        borderColor: colorfgCstStatus(value.status, theme),
-        color: colorfgCstStatus(value.status, theme),
-        backgroundColor: isMockCst(value) ? theme.bgWarning : theme.bgInput
-      }}
-    >
-      {value.alias}
-    </div>
+  <div
+    id={`${prefixID}${value.alias}`}
+    className={clsx(
+      'min-w-[3.1rem] max-w-[3.1rem]',
+      'px-1',
+      'border rounded-md',
+      'text-center font-semibold whitespace-nowrap'
+    )}
+    style={{
+      borderColor: colorfgCstStatus(value.status, theme),
+      color: colorfgCstStatus(value.status, theme),
+      backgroundColor: isMockCst(value) ? theme.bgWarning : theme.bgInput
+    }}
+  >
+    {value.alias}
     {!shortTooltip ?
     <ConstituentaTooltip
       anchor={`#${prefixID}${value.alias}`}
diff --git a/rsconcept/frontend/src/components/Shared/InfoCstStatus.tsx b/rsconcept/frontend/src/components/Shared/InfoCstStatus.tsx
index 966b6c3d..db50ecaa 100644
--- a/rsconcept/frontend/src/components/Shared/InfoCstStatus.tsx
+++ b/rsconcept/frontend/src/components/Shared/InfoCstStatus.tsx
@@ -14,7 +14,7 @@ function InfoCstStatus({ title }: InfoCstStatusProps) {
   const { colors } = useConceptTheme();
 
   return (
-  <div className='flex flex-col gap-1 mb-2 h-fit'>
+  <div className='flex flex-col gap-1 mb-2'>
     {title ? <h1>{title}</h1> : null}
     {Object.values(ExpressionStatus)
       .filter(status => status !== ExpressionStatus.UNDEFINED)
diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx
index e7bc24f4..85980cc1 100644
--- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx
@@ -97,7 +97,7 @@ function ArgumentsTab({ state, schema, partialUpdate  }: ArgumentsTabProps) {
       minSize: 40,
       maxSize: 40,
       cell: props => 
-        <div className='w-full text-center'>
+        <div className='text-center'>
           {props.getValue()}
         </div>
     }),
@@ -162,7 +162,7 @@ function ArgumentsTab({ state, schema, partialUpdate  }: ArgumentsTabProps) {
       conditionalRowStyles={conditionalRowStyles}
       noDataComponent={
         <p className={clsx(
-          'min-h-[3.6rem] w-full',
+          'min-h-[3.6rem]',
           'p-2',
           'text-center'
         )}>
diff --git a/rsconcept/frontend/src/pages/ManualsPage/ManualsPage.tsx b/rsconcept/frontend/src/pages/ManualsPage/ManualsPage.tsx
index a09d9caa..6336329e 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 gap-2'
+    className='flex items-start justify-start w-full max-w-[90rem] gap-2'
     style={{minHeight: mainHeight}}
   >
     <TopicsList 
diff --git a/rsconcept/frontend/src/pages/ManualsPage/TopicsList.tsx b/rsconcept/frontend/src/pages/ManualsPage/TopicsList.tsx
index 3353861e..d2e381d8 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/TopicsList.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/TopicsList.tsx
@@ -19,7 +19,7 @@ function TopicsList({ activeTopic, onChangeTopic }: TopicsListProps) {
     'small-caps',
     'select-none'
   )}>
-    <h1 className='mt-2 mb-1'>Справка</h1>
+    <h1 className='my-1'>Справка</h1>
     {Object.values(HelpTopic).map(
     (topic, index) => 
         <div key={`${prefixes.topic_list}${index}`}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSListToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSListToolbar.tsx
index a3f55431..4a5f3a09 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSListToolbar.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSListToolbar.tsx
@@ -38,7 +38,7 @@ function RSListToolbar({
   const nothingSelected = useMemo(() => selectedCount === 0, [selectedCount]);
   
   return (
-  <Overlay position='top-1 right-1/2 translate-x-1/2' className='flex'>
+  <Overlay position='top-1 right-1/2 translate-x-1/2' className='flex items-start'>
     <MiniButton
       title='Переместить вверх [Alt + вверх]'
       icon={<BiUpvote size='1.25rem' className={isMutable && !nothingSelected ? 'clr-text-primary': ''}/>}
@@ -63,27 +63,25 @@ function RSListToolbar({
       disabled={!isMutable}
       onClick={() => onCreate()}
     />
-    <div ref={insertMenu.ref} className='flex justify-center'>
-      <div>
-        <MiniButton
-          title='Добавить пустую конституенту'
-          icon={<BiDownArrowCircle size='1.25rem' className={isMutable ? 'clr-text-success': ''} />}
-          disabled={!isMutable}
-          onClick={insertMenu.toggle}
+    <div ref={insertMenu.ref}>
+      <MiniButton
+        title='Добавить пустую конституенту'
+        icon={<BiDownArrowCircle size='1.25rem' className={isMutable ? 'clr-text-success': ''} />}
+        disabled={!isMutable}
+        onClick={insertMenu.toggle}
+      />
+      {insertMenu.isActive ?
+      <Dropdown>
+      {(Object.values(CstType)).map(
+      (typeStr) => 
+        <DropdownButton
+          key={`${prefixes.csttype_list}${typeStr}`}
+          text={`${getCstTypePrefix(typeStr as CstType)}1 — ${labelCstType(typeStr as CstType)}`}
+          onClick={() => onCreate(typeStr as CstType)}
+          title={getCstTypeShortcut(typeStr as CstType)}
         />
-        {insertMenu.isActive ?
-        <Dropdown>
-        {(Object.values(CstType)).map(
-        (typeStr) => 
-          <DropdownButton
-            key={`${prefixes.csttype_list}${typeStr}`}
-            text={`${getCstTypePrefix(typeStr as CstType)}1 — ${labelCstType(typeStr as CstType)}`}
-            onClick={() => onCreate(typeStr as CstType)}
-            title={getCstTypeShortcut(typeStr as CstType)}
-          />
-        )}
-        </Dropdown> : null}
-      </div>
+      )}
+      </Dropdown> : null}
     </div>
     <MiniButton
       title='Удалить выбранные [Delete]'
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx
index 111724cf..d2586b68 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx
@@ -54,7 +54,7 @@ function ViewHidden({
       return (
       <div key={`wrap-${id}`}>
         <div key={id} id={id}
-          className='w-fit min-w-[3rem] rounded-md text-center cursor-pointer select-none'
+          className='min-w-[3rem] rounded-md text-center cursor-pointer select-none'
           style={{
             backgroundColor: colorbgGraphNode(cst, adjustedColoring, colors),
             ...dismissedStyle(cstID)
diff --git a/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx b/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx
index 9cc7327d..c95cd3dd 100644
--- a/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx
+++ b/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx
@@ -45,7 +45,7 @@ function UserTabs() {
           />
         </Overlay>
         <h1 className='mb-4'>Учетные данные пользователя</h1>
-        <div className='flex py-2 max-w-fit'>
+        <div className='flex py-2'>
           <EditorProfile />
           <EditorPassword />
         </div>