From 9b2fc7680a365cd794cd3f1fe4f0a4943a53a42b Mon Sep 17 00:00:00 2001
From: tannerlinsley <tannerlinsley@gmail.com>
Date: Mon, 9 Sep 2019 07:50:39 -0600
Subject: [PATCH] Update utils.js

---
 src/utils.js | 38 ++++++++++++++------------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/src/utils.js b/src/utils.js
index 5c4f306..966f166 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -203,35 +203,25 @@ function isSortingDesc (d) {
   return !!(d.sort === 'desc' || d.desc === true || d.asc === false)
 }
 
-function normalizeComponent (Comp, params = {}, fallback = Comp) {
-  return typeof Comp === 'function' ? (
-    isReactComponent(Comp) ? (
-      <Comp {...params} />
-    ) : (
-      Comp(params)
-    )
-  ) : (
-    fallback
+function normalizeComponent(Comp, props, fallback = Comp) {
+  return isReactComponent(Comp) ? <Comp {...props} /> : typeof Comp === 'function' ? Comp(props) : fallback
+}
+
+function isClassComponent(component) {
+  return (
+    typeof component === 'function' &&
+    !!Object.getPrototypeOf(component).isReactComponent
   )
 }
 
-function isClassComponent (component) {
-  return !!((
+function isFunctionComponent(component) {
+  return (
     typeof component === 'function' &&
-      !!Object.getPrototypeOf(component).isReactComponent
-  ))
+    String(component).includes('.createElement')
+  )
 }
 
-function isFunctionComponent (component) {
-  return !!((
-    typeof component === 'function' &&
-      String(component).includes('return React.createElement')
-  ))
+function isReactComponent(component) {
+  return isClassComponent(component) || isFunctionComponent(component)
 }
 
-function isReactComponent (component) {
-  return !!((
-    isClassComponent(component) ||
-      isFunctionComponent(component)
-  ))
-}