From bf0df576d2ce94b75740499b357d32c13b66ba40 Mon Sep 17 00:00:00 2001
From: Phi <floyd_spiky@hotmail.com>
Date: Fri, 23 Aug 2019 14:04:38 -0400
Subject: [PATCH] Fixing up the sidebar context

---
 src/SidebarProvider.tsx  | 18 +++++++-----------
 src/hooks/useSidebar.tsx |  4 ++--
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/SidebarProvider.tsx b/src/SidebarProvider.tsx
index cc44827..239602b 100644
--- a/src/SidebarProvider.tsx
+++ b/src/SidebarProvider.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from "react"
+import React, { useState, useMemo } from "react"
 
 interface ISidebarProviderProps {
   children: React.ReactNode
@@ -15,20 +15,16 @@ export const SidebarContext = React.createContext<ISidebarContextInterface | nul
 
 export function SidebarProvider({
   children,
-}: ISidebarProviderProps): JSX.Element {
+}: ISidebarProviderProps) {
   const [current, setCurrent] = useState(0)
 
-  function selectFirstLevel(index: number) {
-    setCurrent(index)
-  }
+  const memoizedContextValue = useMemo(() => ({
+    current,
+    setCurrent,
+  }), [current, setCurrent])
 
   return (
-    <SidebarContext.Provider
-      value={{
-        current,
-        setCurrent: selectFirstLevel,
-      }}
-    >
+    <SidebarContext.Provider value={memoizedContextValue}>
       {children}
     </SidebarContext.Provider>
   )
diff --git a/src/hooks/useSidebar.tsx b/src/hooks/useSidebar.tsx
index ab3a4b4..4344d4a 100644
--- a/src/hooks/useSidebar.tsx
+++ b/src/hooks/useSidebar.tsx
@@ -1,7 +1,7 @@
 import { useContext } from "react"
-import { SidebarContext, SidebarContextInterface } from "../SidebarProvider"
+import { SidebarContext, ISidebarContextInterface } from "../SidebarProvider"
 
-export default function useSidebar(): SidebarContextInterface {
+export default function useSidebar(): ISidebarContextInterface {
   const sidebarContext = useContext(SidebarContext)
 
   if (!sidebarContext) {