From 77131d886c4458092a529eab37c2c8117eb1061f Mon Sep 17 00:00:00 2001
From: Giancarlo Buomprisco <giancarlopsk@gmail.com>
Date: Mon, 3 Feb 2025 12:28:20 +0700
Subject: [PATCH] Refactor sidebar navigation to improve render action
 placement (#133)

- Moved `renderAction` from conditional rendering to a dedicated `SidebarMenuAction` component
- Simplified sidebar menu item rendering logic
- Ensured consistent placement of additional actions within sidebar menu items
---
 packages/ui/src/shadcn/sidebar.tsx | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/packages/ui/src/shadcn/sidebar.tsx b/packages/ui/src/shadcn/sidebar.tsx
index 97536dc9d..29c45e23d 100644
--- a/packages/ui/src/shadcn/sidebar.tsx
+++ b/packages/ui/src/shadcn/sidebar.tsx
@@ -873,14 +873,6 @@ export function SidebarNavigation({
                   <SidebarMenu>
                     <ContentContainer>
                       {item.children.map((child, childIndex) => {
-                        if (child.renderAction) {
-                          return (
-                            <SidebarMenuSubItem key={child.path}>
-                              {child.renderAction}
-                            </SidebarMenuSubItem>
-                          );
-                        }
-
                         const Container = (props: React.PropsWithChildren) => {
                           if ('collapsible' in child && child.collapsible) {
                             return (
@@ -1060,6 +1052,10 @@ export function SidebarNavigation({
                                   )}
                                 </If>
                               </ContentContainer>
+
+                              <SidebarMenuAction>
+                                {child.renderAction}
+                              </SidebarMenuAction>
                             </SidebarMenuItem>
                           </Container>
                         );