From fb1d360a46c98c46cbf16e42d50d3e156ea50007 Mon Sep 17 00:00:00 2001
From: Firman Ramdhani <33869609+firmanramdhani@users.noreply.github.com>
Date: Mon, 22 Jun 2026 18:18:21 +0700
Subject: [PATCH] feat: add conditional close button for sidebar-first variant
 in mobile navigation

---
 .../components/core-app-shell/core-app-shell.tsx  | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/ui/src/components/core-app-shell/core-app-shell.tsx b/packages/ui/src/components/core-app-shell/core-app-shell.tsx
index a4806cc..b144f44 100644
--- a/packages/ui/src/components/core-app-shell/core-app-shell.tsx
+++ b/packages/ui/src/components/core-app-shell/core-app-shell.tsx
@@ -26,6 +26,7 @@ function CoreAppShellInner({ slots, children }: CoreAppShellInnerProps) {
   const isDoubleSidebar = features?.withDoubleSidebar;
   const isTopNav = variant === 'top-nav';
   const isFooterOffset = variant === 'header-first';
+  const isSidebarFirst = variant === 'sidebar-first';
   
   // Calculate Navbar Width based on states
   const navbarWidth = useMemo(() => {
@@ -142,14 +143,18 @@ function CoreAppShellInner({ slots, children }: CoreAppShellInnerProps) {
         </Box>
         <Box hiddenFrom="sm" h="100%">
           <Flex direction="column" h="100%">
+            {
+              isSidebarFirst && (
+                <Box p="md" style={{ borderTop: '1px solid var(--mantine-color-default-border)' }}>
+                  <Button fullWidth variant="default" onClick={toggleMobile}>
+                    Close
+                  </Button>
+                </Box>
+              )
+            }
             <Box flex={1} style={{ overflowY: 'auto' }}>
               {slots.sidebarMobile || slots.sidebar}
             </Box>
-            <Box p="md" style={{ borderTop: '1px solid var(--mantine-color-default-border)' }}>
-              <Button fullWidth variant="default" onClick={toggleMobile}>
-                Close
-              </Button>
-            </Box>
           </Flex>
         </Box>
       </AppShell.Navbar>