From 04c3531f607b8c6d6ed653ccfbd34f69e2031d41 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Mon, 4 Sep 2023 19:12:27 +0300
Subject: [PATCH] Fix tabindex

---
 rsconcept/frontend/src/components/Common/Checkbox.tsx         | 1 +
 rsconcept/frontend/src/components/Common/MiniButton.tsx       | 3 ++-
 rsconcept/frontend/src/components/Navigation/Navigation.tsx   | 2 ++
 .../frontend/src/components/Navigation/NavigationButton.tsx   | 1 +
 rsconcept/frontend/src/pages/RSFormPage/EditorItems.tsx       | 4 +++-
 rsconcept/frontend/src/pages/RSFormPage/EditorRSForm.tsx      | 2 +-
 rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx            | 2 +-
 rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx        | 3 +++
 8 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/rsconcept/frontend/src/components/Common/Checkbox.tsx b/rsconcept/frontend/src/components/Common/Checkbox.tsx
index 25a1e709..3a12cb07 100644
--- a/rsconcept/frontend/src/components/Common/Checkbox.tsx
+++ b/rsconcept/frontend/src/components/Common/Checkbox.tsx
@@ -38,6 +38,7 @@ function Checkbox({ id, required, disabled, tooltip, label, widthClass = 'w-full
         disabled={disabled}
         checked={value}
         onChange={onChange}
+        tabIndex={-1}
       />
       { label && 
       <Label
diff --git a/rsconcept/frontend/src/components/Common/MiniButton.tsx b/rsconcept/frontend/src/components/Common/MiniButton.tsx
index 1b93089f..fa3bb080 100644
--- a/rsconcept/frontend/src/components/Common/MiniButton.tsx
+++ b/rsconcept/frontend/src/components/Common/MiniButton.tsx
@@ -5,10 +5,11 @@ extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'className' | 'title
   noHover?: boolean
 }
 
-function MiniButton({ icon, tooltip, children, noHover, ...props }: MiniButtonProps) {
+function MiniButton({ icon, tooltip, children, noHover, tabIndex, ...props }: MiniButtonProps) {
   return (
     <button type='button'
       title={tooltip}
+      tabIndex={tabIndex ?? -1}
       className={`px-1 py-1 font-bold rounded-full cursor-pointer whitespace-nowrap disabled:cursor-not-allowed clr-btn-clear ${noHover ? 'outline-none' : 'clr-hover'}`}
       {...props}
     >
diff --git a/rsconcept/frontend/src/components/Navigation/Navigation.tsx b/rsconcept/frontend/src/components/Navigation/Navigation.tsx
index 5d78d8f5..b49e0618 100644
--- a/rsconcept/frontend/src/components/Navigation/Navigation.tsx
+++ b/rsconcept/frontend/src/components/Navigation/Navigation.tsx
@@ -21,6 +21,7 @@ function Navigation () {
         title='Скрыть навигацию'
         className='absolute top-0 right-0 z-[60] w-[1.2rem] h-[3rem] border-b-2 border-l-2 clr-btn-nav rounded-none'
         onClick={toggleNoNavigation}
+        tabIndex={-1}
       >
         <p>{'>'}</p><p>{'>'}</p>
       </button>}
@@ -29,6 +30,7 @@ function Navigation () {
         title='Показать навигацию'
         className='absolute top-0 right-0 z-[60] px-1 h-[1.6rem] border-b-2 border-l-2 clr-btn-nav rounded-none'
         onClick={toggleNoNavigation}
+        tabIndex={-1}
       >
         {'∨∨∨'}
       </button>}
diff --git a/rsconcept/frontend/src/components/Navigation/NavigationButton.tsx b/rsconcept/frontend/src/components/Navigation/NavigationButton.tsx
index 322b07b3..b02c51cb 100644
--- a/rsconcept/frontend/src/components/Navigation/NavigationButton.tsx
+++ b/rsconcept/frontend/src/components/Navigation/NavigationButton.tsx
@@ -12,6 +12,7 @@ function NavigationButton({ id, icon, description, onClick, text }: NavigationBu
       title={description}
       type='button'
       onClick={onClick}
+      tabIndex={-1}
       className={`flex items-center h-full gap-1 ${text ? 'px-2' : 'px-4'} mr-1 min-w-fit whitespace-nowrap clr-btn-nav`}
     >
       {icon && <span>{icon}</span>}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorItems.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorItems.tsx
index c267a353..bb4aa1b3 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorItems.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorItems.tsx
@@ -309,11 +309,12 @@ function EditorItems({ onOpenEdit, onCreateCst, onDeleteCst }: EditorItemsProps)
               const type = typeStr as CstType;
               return (
               <Button key={type}
-                text={`${getCstTypePrefix(type)}`}
+                text={getCstTypePrefix(type)}
                 tooltip={getCstTypeShortcut(type)}
                 dense
                 widthClass='w-[1.4rem]'
                 disabled={!isEditable}
+                tabIndex={-1}
                 onClick={() => handleCreateCst(type)}
               />);
           })}
@@ -343,6 +344,7 @@ function EditorItems({ onOpenEdit, onCreateCst, onDeleteCst }: EditorItemsProps)
         
         selectableRows
         selectableRowsHighlight
+        selectableRowsComponentProps={{tabIndex: -1}}
         onSelectedRowsChange={handleSelectionChange}
         onRowDoubleClicked={cst => onOpenEdit(cst.id)}
         onRowClicked={handleRowClicked}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm.tsx
index 2f35937c..7edeaac7 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm.tsx
@@ -132,9 +132,9 @@ function EditorRSForm({ onDestroy, onClaim, onShare, isModified, setIsModified,
         onChange={event => setComment(event.target.value)}
       />
       <div className='flex justify-between whitespace-nowrap'>
-        <div></div>
         <Checkbox id='common' label='Общедоступная схема'
           value={common}
+          widthClass='w-fit mt-3'
           disabled={!isEditable}
           onChange={event => setCommon(event.target.checked)}
         />
diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx b/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx
index 299b84c1..b6b3623e 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx
@@ -327,7 +327,7 @@ function RSTabs() {
           onShare={onShareSchema}
           onToggleSubscribe={handleToggleSubscribe}
           showCloneDialog={handleShowClone} 
-          showUploadDialog={() => setShowUpload(true)} 
+          showUploadDialog={() => setShowUpload(true)}
         />
         <ConceptTab className='border-r-2 min-w-[7.8rem]'>Паспорт схемы</ConceptTab>
         <ConceptTab className='border-r-2 min-w-[10rem] flex justify-between gap-2'>
diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx b/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx
index b51d8f5a..a3987ec3 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx
@@ -76,6 +76,7 @@ function RSTabsMenu({
           widthClass='h-full w-fit'
           dense
           onClick={schemaMenu.toggle}
+          tabIndex={-1}
         />
         { schemaMenu.isActive &&
         <Dropdown>
@@ -125,6 +126,7 @@ function RSTabsMenu({
           icon={<PenIcon size={5} color={isEditable ? 'text-success' : 'text-warning'}/>}
           dense
           onClick={editMenu.toggle}
+          tabIndex={-1}
         />
         { editMenu.isActive &&
         <Dropdown>
@@ -168,6 +170,7 @@ function RSTabsMenu({
           borderClass=''
           dense
           onClick={onToggleSubscribe}
+          tabIndex={-1}
           />
       </div>
     </div>