From 6394396beeedb93002fa539a4c5722fac02b139d Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Thu, 3 Aug 2023 17:34:55 +0300
Subject: [PATCH] Fix scroll position

---
 rsconcept/frontend/src/App.tsx                             | 7 ++++++-
 .../frontend/src/components/Navigation/Navigation.tsx      | 2 +-
 rsconcept/frontend/src/pages/RSFormPage/EditorItems.tsx    | 2 +-
 .../frontend/src/pages/RSFormPage/EditorTermGraph.tsx      | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/rsconcept/frontend/src/App.tsx b/rsconcept/frontend/src/App.tsx
index ab78ed49..9c702e2c 100644
--- a/rsconcept/frontend/src/App.tsx
+++ b/rsconcept/frontend/src/App.tsx
@@ -3,6 +3,7 @@ import { Route, Routes } from 'react-router-dom';
 import Footer from './components/Footer';
 import Navigation from './components/Navigation/Navigation';
 import ToasterThemed from './components/ToasterThemed';
+import { useConceptTheme } from './context/ThemeContext';
 import CreateRSFormPage from './pages/CreateRSFormPage';
 import HomePage from './pages/HomePage';
 import LibraryPage from './pages/LibraryPage';
@@ -15,6 +16,8 @@ import RSFormPage from './pages/RSFormPage';
 import UserProfilePage from './pages/UserProfilePage';
 
 function App () {
+  const { noNavigation } = useConceptTheme();
+
   return (
     <div className='antialiased clr-app'>
       <Navigation />
@@ -24,7 +27,8 @@ function App () {
         draggable={false}
         pauseOnFocusLoss={false}
       />
-      <main className='min-h-[calc(100vh-7.5rem)] px-2 h-fit'>
+      <div className={`max-h-[calc(100vh-${noNavigation ? 0 : 4.5}rem)] overflow-auto`}>
+      <main className={`min-h-[calc(100vh-${noNavigation ? 8 : 12}rem)] px-2`}>
         <Routes>
           <Route path='/' element={ <HomePage/>} />
 
@@ -42,6 +46,7 @@ function App () {
         </Routes>
       </main>
       <Footer />
+      </div>
     </div>
   );
 }
diff --git a/rsconcept/frontend/src/components/Navigation/Navigation.tsx b/rsconcept/frontend/src/components/Navigation/Navigation.tsx
index a23d79f1..695157c8 100644
--- a/rsconcept/frontend/src/components/Navigation/Navigation.tsx
+++ b/rsconcept/frontend/src/components/Navigation/Navigation.tsx
@@ -18,7 +18,7 @@ function Navigation () {
   const navigateHelp = () => { navigate('/manuals') };
 
   return (
-    <nav className='sticky top-0 left-0 right-0 z-50'>
+    <nav className='sticky top-0 left-0 right-0 z-50 h-fit'>
       {!noNavigation &&
       <button
         title='Скрыть навигацию'
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorItems.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorItems.tsx
index 6f42065c..44425f9c 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorItems.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorItems.tsx
@@ -249,7 +249,7 @@ function EditorItems({ onOpenEdit, onCreateCst, onDeleteCst }: EditorItemsProps)
     <div className='w-full'>
       <div
         className={'flex justify-start w-full gap-1 px-2 py-1 border-y items-center h-[2.2rem] clr-app' +
-          (!noNavigation ? ' sticky z-10 top-[4rem]' : ' sticky z-10 top-[0rem]')}
+          (!noNavigation ? ' sticky z-10 top-[0rem]' : ' sticky z-10 top-[0rem]')}
       >
         <div className='mr-3 whitespace-nowrap'>
           Выбраны
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph.tsx
index 218c93f0..ab1d1bae 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph.tsx
@@ -127,7 +127,7 @@ function EditorTermGraph() {
     </div>
     </div>
     <div className='flex-wrap w-full h-full overflow-auto'>
-    <div className='relative w-[1240px] h-[800px] 2xl:w-[1880px] 2xl:h-[800px]'>
+    <div className='relative w-[1240px] h-[730px] 2xl:w-[1880px] 2xl:h-[750px]'>
       <GraphCanvas
         draggable
         ref={graphRef}