From 5854bdd417a6fd23fc5f83e160ae8cffb0a82202 Mon Sep 17 00:00:00 2001
From: omerbakr <y.omerbakir@gmail.com>
Date: Sat, 7 Feb 2026 05:59:54 +0300
Subject: [PATCH 1/2] feat(ui-components): add collapsible sidebar (#8595)

Signed-off-by: omerbakr <y.omerbakir@gmail.com>
---
 .../src/Containers/Sidebar/index.module.css   | 69 +++++++++++++++----
 .../src/Containers/Sidebar/index.tsx          | 68 +++++++++++-------
 2 files changed, 98 insertions(+), 39 deletions(-)

diff --git a/packages/ui-components/src/Containers/Sidebar/index.module.css b/packages/ui-components/src/Containers/Sidebar/index.module.css
index f129b31b576de..6521d2fd8ad20 100644
--- a/packages/ui-components/src/Containers/Sidebar/index.module.css
+++ b/packages/ui-components/src/Containers/Sidebar/index.module.css
@@ -1,32 +1,71 @@
 @reference "../../styles/index.css";
 
 .wrapper {
-  @apply scrollbar-thin
-    ml:max-w-xs
-    ml:overflow-auto
+  @apply ml:max-w-xs
     ml:border-r
+    ml:overflow-visible!
+    relative
     z-0
     flex
     w-full
     flex-col
-    gap-8
     border-r-0
     border-neutral-200
     bg-white
-    px-4
-    py-6
-    2xl:px-6
+    transition-transform
+    duration-220
+    ease-out
     dark:border-neutral-900
     dark:bg-neutral-950;
 
-  .navigation {
-    @apply ml:flex
-      hidden;
-  }
+  &[data-collapsed='true'] {
+    transform: translateX(-100%);
 
-  .mobileSelect {
-    @apply ml:hidden
-      flex
-      w-full;
+    .content {
+      @apply invisible;
+    }
   }
 }
+
+.content {
+  @apply scrollbar-thin
+    flex
+    h-full
+    flex-col
+    gap-8
+    overflow-y-auto
+    px-4
+    py-6
+    2xl:px-6;
+}
+
+.navigation {
+  @apply ml:flex
+    hidden;
+}
+
+.mobileSelect {
+  @apply ml:hidden
+    flex
+    w-full;
+}
+
+.toggleButton {
+  @apply absolute
+    top-1/2
+    left-full
+    z-50
+    flex
+    h-12
+    w-6
+    -translate-y-1/2
+    cursor-pointer
+    items-center
+    justify-center
+    bg-green-600
+    text-white
+    outline-none
+    max-xl:hidden;
+
+  clip-path: polygon(0 0, 100% 25%, 100% 75%, 0 100%);
+}
diff --git a/packages/ui-components/src/Containers/Sidebar/index.tsx b/packages/ui-components/src/Containers/Sidebar/index.tsx
index b41c83e1630da..95770d5d283b5 100644
--- a/packages/ui-components/src/Containers/Sidebar/index.tsx
+++ b/packages/ui-components/src/Containers/Sidebar/index.tsx
@@ -1,4 +1,7 @@
-import { forwardRef } from 'react';
+'use client';
+
+import { ChevronLeftIcon, ChevronRightIcon } from '@heroicons/react/24/solid';
+import { forwardRef, useState } from 'react';
 
 import WithNoScriptSelect from '#ui/Common/Select/NoScriptSelect';
 import SidebarGroup from '#ui/Containers/Sidebar/SidebarGroup';
@@ -21,6 +24,8 @@ type SidebarProps = {
 
 const SideBar = forwardRef<HTMLElement, PropsWithChildren<SidebarProps>>(
   ({ groups, pathname, title, onSelect, as, children, placeholder }, ref) => {
+    const [isOpen, setIsOpen] = useState(true);
+
     const selectItems = groups.map(({ items, groupName }) => ({
       label: groupName,
       items: items.map(({ label, link }) => ({ value: link, label })),
@@ -31,31 +36,46 @@ const SideBar = forwardRef<HTMLElement, PropsWithChildren<SidebarProps>>(
       .find(item => pathname === item.value);
 
     return (
-      <aside ref={ref} className={styles.wrapper}>
-        {children}
+      <aside ref={ref} className={styles.wrapper} data-collapsed={!isOpen}>
+        <button
+          type="button"
+          className={styles.toggleButton}
+          onClick={() => setIsOpen(prev => !prev)}
+          aria-label={isOpen ? 'Collapse Sidebar' : 'Expand Sidebar'}
+        >
+          {isOpen ? (
+            <ChevronLeftIcon className="h-4 w-4" />
+          ) : (
+            <ChevronRightIcon className="h-4 w-4" />
+          )}
+        </button>
+
+        <div className={styles.content}>
+          {children}
 
-        {selectItems.length > 0 && (
-          <WithNoScriptSelect
-            label={title}
-            values={selectItems}
-            defaultValue={currentItem?.value}
-            placeholder={placeholder}
-            onChange={onSelect}
-            className={styles.mobileSelect}
-            as={as}
-          />
-        )}
+          {selectItems.length > 0 && (
+            <WithNoScriptSelect
+              label={title}
+              values={selectItems}
+              defaultValue={currentItem?.value}
+              placeholder={placeholder}
+              onChange={onSelect}
+              className={styles.mobileSelect}
+              as={as}
+            />
+          )}
 
-        {groups.map(({ groupName, items }) => (
-          <SidebarGroup
-            key={groupName.toString()}
-            groupName={groupName}
-            items={items}
-            pathname={pathname}
-            as={as}
-            className={styles.navigation}
-          />
-        ))}
+          {groups.map(({ groupName, items }) => (
+            <SidebarGroup
+              key={groupName.toString()}
+              groupName={groupName}
+              items={items}
+              pathname={pathname}
+              as={as}
+              className={styles.navigation}
+            />
+          ))}
+        </div>
       </aside>
     );
   }

From 8229b259b7d44ff77e1dab11938d793888255028 Mon Sep 17 00:00:00 2001
From: omerbakr <y.omerbakir@gmail.com>
Date: Sat, 7 Feb 2026 13:09:10 +0300
Subject: [PATCH 2/2] refactor(ui-components): adjust grid-template-columns for
 sidebar collapse

---
 .../src/Containers/Article/index.module.css            |  7 +++----
 .../src/Containers/Sidebar/index.module.css            | 10 ++++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/ui-components/src/Containers/Article/index.module.css b/packages/ui-components/src/Containers/Article/index.module.css
index c4d541d9fb19f..2bb807088f5e2 100644
--- a/packages/ui-components/src/Containers/Article/index.module.css
+++ b/packages/ui-components/src/Containers/Article/index.module.css
@@ -3,16 +3,15 @@
 .articleLayout {
   @apply max-w-10xl
     ml:grid
-    ml:grid-cols-[--spacing(52)_1fr]
+    ml:grid-cols-[auto_1fr]
     ml:grid-rows-[1fr]
     ml:overflow-visible
     ml:[grid-template-areas:'sidebar_main''sidebar_footer']
     mx-auto
     block
     w-full
-    xl:grid-cols-[--spacing(52)_1fr_--spacing(52)]
-    xl:[grid-template-areas:'sidebar_main_metabar''sidebar_footer_metabar']
-    2xl:grid-cols-[--spacing(80)_1fr_--spacing(80)];
+    xl:grid-cols-[auto_1fr_auto]
+    xl:[grid-template-areas:'sidebar_main_metabar''sidebar_footer_metabar'];
 
   > *:nth-child(1) {
     @apply [grid-area:sidebar]
diff --git a/packages/ui-components/src/Containers/Sidebar/index.module.css b/packages/ui-components/src/Containers/Sidebar/index.module.css
index 6521d2fd8ad20..11fc88111c3ad 100644
--- a/packages/ui-components/src/Containers/Sidebar/index.module.css
+++ b/packages/ui-components/src/Containers/Sidebar/index.module.css
@@ -1,9 +1,9 @@
 @reference "../../styles/index.css";
 
 .wrapper {
-  @apply ml:max-w-xs
-    ml:border-r
+  @apply ml:border-r
     ml:overflow-visible!
+    ml:max-w-[clamp(200px,20vw,320px)]
     relative
     z-0
     flex
@@ -12,14 +12,15 @@
     border-r-0
     border-neutral-200
     bg-white
-    transition-transform
+    transition-[transform,width]
     duration-220
     ease-out
     dark:border-neutral-900
     dark:bg-neutral-950;
 
   &[data-collapsed='true'] {
-    transform: translateX(-100%);
+    @apply ml:w-0
+      overflow-hidden;
 
     .content {
       @apply invisible;
@@ -36,6 +37,7 @@
     overflow-y-auto
     px-4
     py-6
+    2xl:min-w-80
     2xl:px-6;
 }