From 162191040c093fd78e16ffd223a0c83b0dd06951 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Tue, 15 Aug 2023 21:55:43 +0300
Subject: [PATCH] Hide footer when navigation is hidden

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

diff --git a/rsconcept/frontend/src/App.tsx b/rsconcept/frontend/src/App.tsx
index 6769c85d..a0abb79f 100644
--- a/rsconcept/frontend/src/App.tsx
+++ b/rsconcept/frontend/src/App.tsx
@@ -22,14 +22,14 @@ function App () {
   const scrollWindowSize = useMemo(
   () => {
     return !noNavigation ? 
-      'max-h-[calc(100vh-4.5rem)]'
-    : 'max-h-[100vh]'; 
+      'calc(100vh - 4.5rem)'
+    : '100vh'; 
   }, [noNavigation]);
   const mainSize = useMemo(
   () => {
     return !noNavigation ? 
-      'min-h-[calc(100vh-12rem)]'
-    : 'min-h-[calc(100vh-8rem)] '; 
+      'calc(100vh - 12rem)'
+    : '100vh'; 
   }, [noNavigation]);
   
   return (
@@ -42,8 +42,8 @@ function App () {
         pauseOnFocusLoss={false}
       />
       
-      <div className={`${scrollWindowSize} overflow-auto`}>
-      <main className={`${mainSize} px-2`}>
+      <div className='overflow-auto' style={{maxHeight: scrollWindowSize}}>
+      <main  className='px-2' style={{minHeight: mainSize}}>
         <Routes>
           <Route path='/' element={ <HomePage/>} />
 
@@ -60,7 +60,7 @@ function App () {
           <Route path='*' element={ <NotFoundPage/>} />
         </Routes>
       </main>
-      <Footer />
+      {!noNavigation && <Footer />}
       </div>
     </div>
   );
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph.tsx
index 97f5ce13..52e0bb91 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph.tsx
@@ -189,7 +189,7 @@ function EditorTermGraph({ onOpenEdit }: EditorTermGraphProps) {
   () => {
     return !noNavigation ? 
       'calc(100vh - 13rem)'
-    : 'calc(100vh - 8.5rem)';
+    : 'calc(100vh - 2rem)';
   }, [noNavigation]);
 
   const dismissedStyle = useCallback(
@@ -281,7 +281,7 @@ function EditorTermGraph({ onOpenEdit }: EditorTermGraphProps) {
     <div className='flex-wrap w-full h-full overflow-auto'>
     <div 
       className='relative border-t border-r'
-      style={{width: canvasWidth, height: canvasHeight}}
+      style={{width: canvasWidth, height: canvasHeight, borderBottomWidth: noNavigation ? '1px': ''}}
     >
       <div id='items-graph-help' className='relative top-0 right-0 z-10 m-2'>
         <HelpIcon color='text-primary' size={6} />