From 0d3c3cb9a8898de4567fc09caa9ca0ea8a647185 Mon Sep 17 00:00:00 2001
From: Steven Straatemans <steven@straatemans.nl>
Date: Thu, 7 Nov 2024 17:53:17 +0100
Subject: [PATCH] fix the rightsidebar

---
 .../dev-wallet/src/App/Layout/SideBar.tsx     |  6 +--
 .../src/patterns/SideBarLayout/aside.css.ts   | 49 ++++++++++++++++++-
 .../SideBarLayout/components/SideBarAside.tsx | 10 +++-
 3 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/packages/apps/dev-wallet/src/App/Layout/SideBar.tsx b/packages/apps/dev-wallet/src/App/Layout/SideBar.tsx
index 190fb819ba..7ac626b9cc 100644
--- a/packages/apps/dev-wallet/src/App/Layout/SideBar.tsx
+++ b/packages/apps/dev-wallet/src/App/Layout/SideBar.tsx
@@ -123,10 +123,6 @@ export const SideBar: FC = () => {
                   </Button>
                 }
               >
-                <ContextMenuItem
-                  onClick={() => navigate('/profile')}
-                  label="Profile"
-                />
                 <ContextMenuItem
                   endVisual={<MonoLogout />}
                   label="Logout"
@@ -140,12 +136,12 @@ export const SideBar: FC = () => {
               label="Change theme"
             >
               <Button
+                isCompact
                 variant="transparent"
                 onPress={() => toggleTheme()}
                 startVisual={
                   theme === 'dark' ? <MonoDarkMode /> : <MonoLightMode />
                 }
-                isCompact={!isExpanded}
               />
             </SideBarItem>
           </SideBarItemsInline>
diff --git a/packages/libs/kode-ui/src/patterns/SideBarLayout/aside.css.ts b/packages/libs/kode-ui/src/patterns/SideBarLayout/aside.css.ts
index a5a72bc678..ea5c82cfa1 100644
--- a/packages/libs/kode-ui/src/patterns/SideBarLayout/aside.css.ts
+++ b/packages/libs/kode-ui/src/patterns/SideBarLayout/aside.css.ts
@@ -8,6 +8,50 @@ import {
 } from './../../styles';
 import { minHeaderHeight } from './styles.css';
 
+export const asideWrapperTempClass = recipe({
+  base: [
+    {
+      position: 'relative',
+      paddingBlockEnd: token('spacing.md'),
+      backgroundColor: token('color.background.base.default'),
+    },
+    responsiveStyle({
+      xs: {
+        display: 'none',
+      },
+
+      xxl: {
+        display: 'flex',
+        width: '370px',
+        minWidth: '370px',
+        transform: 'translateX(0%)',
+        marginInlineEnd: token('spacing.md'),
+        zIndex: 0,
+      },
+    }),
+  ],
+  variants: {
+    expanded: {
+      true: {
+        opacity: 1,
+        transform: 'translateX(0%)',
+        pointerEvents: 'auto',
+      },
+      false: [
+        {
+          opacity: 0,
+          pointerEvents: 'none',
+        },
+        responsiveStyle({
+          xxl: {
+            display: 'none',
+          },
+        }),
+      ],
+    },
+  },
+});
+
 export const asideWrapperClass = recipe({
   base: [
     {
@@ -15,6 +59,7 @@ export const asideWrapperClass = recipe({
       paddingBlockEnd: token('spacing.md'),
       backgroundColor: token('color.background.base.default'),
       gridRow: '2/5',
+      zIndex: 1,
     },
     responsiveStyle({
       xs: {
@@ -35,12 +80,14 @@ export const asideWrapperClass = recipe({
         maxWidth: '370px',
       },
       xxl: {
-        position: 'relative',
+        position: 'fixed',
+        top: minHeaderHeight,
         width: '370px',
         minWidth: '370px',
         transform: 'translateX(0%)',
         marginInlineEnd: token('spacing.md'),
         zIndex: 0,
+        height: `calc(100dvh - ${minHeaderHeight})`,
       },
     }),
   ],
diff --git a/packages/libs/kode-ui/src/patterns/SideBarLayout/components/SideBarAside.tsx b/packages/libs/kode-ui/src/patterns/SideBarLayout/components/SideBarAside.tsx
index 1aee57e11c..e8142a1df1 100644
--- a/packages/libs/kode-ui/src/patterns/SideBarLayout/components/SideBarAside.tsx
+++ b/packages/libs/kode-ui/src/patterns/SideBarLayout/components/SideBarAside.tsx
@@ -7,6 +7,7 @@ import {
   asideHeaderCloseButtonWrapperClass,
   asideHeadingClass,
   asideWrapperClass,
+  asideWrapperTempClass,
   menuBackdropClass,
 } from '../aside.css';
 import type { ISideBarLayoutLocation } from '../types';
@@ -35,8 +36,8 @@ export const SideBarAside: FC<{
   }, [ref.current]);
 
   useEffect(() => {
-    setIsRightAsideExpanded(!!location?.hash);
-  }, [location?.hash]);
+    setIsRightAsideExpanded(false);
+  }, [location.url]);
 
   return (
     <>
@@ -47,6 +48,11 @@ export const SideBarAside: FC<{
         })}
         onClick={handleExpand}
       />
+      <Stack
+        className={asideWrapperTempClass({
+          expanded: isRightAsideExpanded,
+        })}
+      ></Stack>
       <aside
         className={asideWrapperClass({
           expanded: isRightAsideExpanded,