Merge pull request #197 from habx/feature/app-3733-usecallbacks

APP-3733 Use React.useCallback instead of React.useMemofor callbacks
habx · Mar 4, 2019 · e615682 · e615682
2 parents 50f24a1 + 7974309
commit e615682
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/src/ExpansionPanelItem/ExpansionPanelItem.tsx b/src/ExpansionPanelItem/ExpansionPanelItem.tsx
@@ -22,8 +22,8 @@ const BaseExpansionPanelItem: React.StatelessComponent<ExpansionPanelItemProps>
     }
   })
 
-  const onToggle = React.useMemo(
-    () => () => setOpenedItem(openedItem === itemId ? null : itemId),
+  const onToggle = React.useCallback(
+    () => setOpenedItem(openedItem === itemId ? null : itemId),
     [openedItem, setOpenedItem, itemId]
   )
 

diff --git a/src/Menu/Menu.tsx b/src/Menu/Menu.tsx
@@ -17,14 +17,14 @@ const Menu: React.StatelessComponent<MenuProps> = ({
   const [open, setOpen] = React.useState(false)
   const isSmallScreen = useIsSmallScreen()
 
-  const handleClose = React.useMemo(
-    () => () => setOpen(false),
-    []
+  const handleClose = React.useCallback(
+    () => setOpen(false),
+    [setOpen]
   )
 
-  const handleToggle = React.useMemo(
-    () => () => setOpen(wasOpen => !wasOpen),
-    []
+  const handleToggle = React.useCallback(
+    () => setOpen(wasOpen => !wasOpen),
+    [setOpen]
   )
 
   useOnClickOutside(wrapperRef, handleClose)

diff --git a/src/withTriggerElement.tsx b/src/withTriggerElement.tsx
@@ -16,20 +16,20 @@ const withTriggerElement = <Props extends TriggerElementState> (WrappedComponent
 
     const [open, setOpen] = React.useState(false)
 
-    const handleToggle = React.useMemo(
-      () => () => setOpen(wasOpen => !wasOpen),
-      []
+    const handleToggle = React.useCallback(
+      () => setOpen(wasOpen => !wasOpen),
+      [setOpen]
     )
 
-    const handleClose = React.useMemo(
-      () => e => {
+    const handleClose = React.useCallback(
+      e => {
         if (isFunction(onClose)) {
           onClose(e)
         }
 
         setOpen(false)
       },
-      [onClose]
+      [setOpen, onClose]
     )
 
     return (