Clean codebase a bit

fkhadra · Mar 9, 2018 · 777a3e2 · 777a3e2
1 parent af7383f
commit 777a3e2
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 25 deletions.
diff --git a/dist/ReactToastify.min.js b/dist/ReactToastify.min.js
diff --git a/dist/ReactToastify.min.js.map b/dist/ReactToastify.min.js.map
diff --git a/src/ProgressBar.js b/src/ProgressBar.js
@@ -44,9 +44,10 @@ function ProgressBar({
 }) {
   return (
     <div
-      {...(typeof className !== 'string'
-        ? css(styles(type, isRunning, hide, delay, rtl), className)
-        : styles(type, isRunning, hide, delay, rtl))}
+      {...css(
+        styles(type, isRunning, hide, delay, rtl),
+        typeof className !== 'string' && className
+      )}
       {...typeof className === 'string' && { className }}
       onAnimationEnd={closeToast}
     />

diff --git a/src/Toast.js b/src/Toast.js
@@ -75,9 +75,9 @@ class Toast extends Component {
     hideProgressBar: false,
     onOpen: null,
     onClose: null,
-    className: '',
-    bodyClassName: '',
-    progressClassName: '',
+    className: null,
+    bodyClassName: null,
+    progressClassName: null,
     updateId: null,
     role: 'alert'
   };
@@ -156,16 +156,18 @@ class Toast extends Component {
         position={position}
       >
         <div
-          {...(typeof className !== 'string'
-            ? css(styles.container(type, rtl), className)
-            : styles.container(type, rtl))}
+          {...css(
+            styles.container(type, rtl),
+            typeof className !== 'string' && className
+          )}
           {...this.getToastProps()}
         >
           <div
             {...this.props.in && { role: role }}
-            {...(typeof bodyClassName !== 'string'
-              ? css(styles.body, bodyClassName)
-              : styles.body)}
+            {...css(
+              styles.body,
+              typeof bodyClassName !== 'string' && bodyClassName
+            )}
             {...typeof bodyClassName === 'string' && {
               className: bodyClassName
             }}

diff --git a/src/ToastContainer.js b/src/ToastContainer.js
@@ -144,9 +144,9 @@ class ToastContainer extends Component {
     newestOnTop: false,
     className: null,
     style: null,
-    toastClassName: '',
-    bodyClassName: '',
-    progressClassName: ''
+    toastClassName: null,
+    bodyClassName: null,
+    progressClassName: null
   };
 
   /**
@@ -348,9 +348,10 @@ class ToastContainer extends Component {
 
       return (
         <TransitionGroup
-          {...(typeof className !== 'string'
-            ? css(styles(disablePointer, position), className)
-            : styles(disablePointer, position))}
+          {...css(
+            styles(disablePointer, position),
+            typeof className !== 'string' && className
+          )}
           {...typeof className === 'string' && { className }}
           {...style !== null && { style }}
           key={`container-${position}`}

diff --git a/src/__tests__/__snapshots__/Toast.js.snap b/src/__tests__/__snapshots__/Toast.js.snap
@@ -111,12 +111,10 @@ exports[`Toast Should support Rtl display 1`] = `
   unmountOnExit={true}
 >
   <div
-    className=""
     data-css-1nz94ll=""
     onClick={[Function]}
   >
     <div
-      className=""
       data-css-w74h2a=""
       role="alert"
     >

diff --git a/src/__tests__/__snapshots__/ToastContainer.js.snap b/src/__tests__/__snapshots__/ToastContainer.js.snap
@@ -8,7 +8,7 @@ exports[`ToastContainer Should allow glamor rule as className 1`] = `
 
 <ToastContainer
   autoClose={5000}
-  bodyClassName=""
+  bodyClassName={null}
   className={
     Object {
       "data-glamor-0": "",
@@ -24,10 +24,10 @@ exports[`ToastContainer Should allow glamor rule as className 1`] = `
   newestOnTop={false}
   pauseOnHover={true}
   position="top-right"
-  progressClassName=""
+  progressClassName={null}
   rtl={false}
   style={null}
-  toastClassName=""
+  toastClassName={null}
   transition={[Function]}
 >
   <div />