From 4c8ae806fc920ef2e66a7766735e94766809ea77 Mon Sep 17 00:00:00 2001
From: Melvin Valster <melvin.valster@gmail.com>
Date: Fri, 26 Jul 2019 22:39:27 +0200
Subject: [PATCH] Fix bug with className on Icon overriding

---
 src/components/Icon.tsx | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/components/Icon.tsx b/src/components/Icon.tsx
index 7fc2acf..19c4112 100644
--- a/src/components/Icon.tsx
+++ b/src/components/Icon.tsx
@@ -12,7 +12,14 @@ interface Props {
 const NOT_FOUND_ICON = 'inv_misc_questionmark'
 
 export const Icon = React.forwardRef<HTMLDivElement, Props>((props, ref) => {
-  const { name: defaultName, size = 'medium', golden = false, children, ...rest } = props
+  const { 
+    name: defaultName, 
+    size = 'medium', 
+    golden = false, 
+    children, 
+    className, 
+    ...rest 
+  } = props
   const [hasLoadedImage, setLoadedImage] = useState(false)
   const [fadeIn, setFadeIn] = useState(false)
   const [name, setName] = useState(defaultName)
@@ -36,14 +43,14 @@ export const Icon = React.forwardRef<HTMLDivElement, Props>((props, ref) => {
     img.src = url
   }, [url, start])
 
-  const className = classNames('icon', `icon--${size}`, props.className, {
+  const cn = classNames('icon', `icon--${size}`, className, {
     'icon--golden': golden,
     'icon--loaded': hasLoadedImage,
     'icon--fade-in': fadeIn,
   })
 
   return (
-    <div className={className} ref={ref} {...rest}>
+    <div className={cn} ref={ref} {...rest}>
       {url && 
         <div className="icon__bg" style={{ backgroundImage: `url(${url})` }} />
       }