From 972745a0914c3f4b3eb4b7498b6139baaa0b239e Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Mon, 15 Jun 2020 19:23:34 +0200
Subject: [PATCH] packages/core: refactor SidebarItem to avoid warnings

---
 packages/core/src/layout/Sidebar/Items.tsx | 32 +++++++++++++++-------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/packages/core/src/layout/Sidebar/Items.tsx b/packages/core/src/layout/Sidebar/Items.tsx
index 68f67c1445..a7f40f56ba 100644
--- a/packages/core/src/layout/Sidebar/Items.tsx
+++ b/packages/core/src/layout/Sidebar/Items.tsx
@@ -142,23 +142,25 @@ export const SidebarItem: FC<SidebarItemProps> = ({
     </Badge>
   );
 
-  const Component = to === undefined ? 'div' : NavLink;
   const childProps = {
-    activeClassName: classes.selected,
-    end: true,
-    to: to!,
-    onClick: onClick,
+    onClick,
+    className: clsx(classes.root, isOpen ? classes.open : classes.closed),
   };
 
   if (!isOpen) {
+    if (to === undefined) {
+      return <div {...childProps}>{itemIcon}</div>;
+    }
+
     return (
-      <Component className={clsx(classes.root, classes.closed)} {...childProps}>
+      <NavLink {...childProps} activeClassName={classes.selected} to={to} end>
         {itemIcon}
-      </Component>
+      </NavLink>
     );
   }
-  return (
-    <Component className={clsx(classes.root, classes.open)} {...childProps}>
+
+  const content = (
+    <>
       <div data-testid="login-button" className={classes.iconContainer}>
         {itemIcon}
       </div>
@@ -168,7 +170,17 @@ export const SidebarItem: FC<SidebarItemProps> = ({
         </Typography>
       )}
       <div className={classes.secondaryAction}>{children}</div>
-    </Component>
+    </>
+  );
+
+  if (to === undefined) {
+    return <div {...childProps}>{content}</div>;
+  }
+
+  return (
+    <NavLink {...childProps} activeClassName={classes.selected} to={to} end>
+      {content}
+    </NavLink>
   );
 };