fix: better flexRender utility (supports JSX elements now)

Author: tannerlinsley

examples/kitchen-sink/src/App.js

@@ -304,8 +304,8 @@ function Table({ columns, data, updateMyData, disablePageResetOnDataChange }) {
  disablePageResetOnDataChange,
  },
  useFilters,
- useSortBy,
  useGroupBy,
+ useSortBy,
  useExpanded,
  usePagination,
  useRowSelect

src/utils.js

@@ -265,10 +265,22 @@ export function getElementDimensions(element) {
 }
 
 export function flexRender(Comp, props) {
- if (typeof Comp === 'function' || typeof Comp === 'object') {
- return <Comp {...props} />
- }
- return Comp
+ return isReactComponent(Comp) ? <Comp {...props} /> : Comp
+}
+
+function isClassComponent(component) {
+ return (
+ typeof component === 'function' &&
+ !!Object.getPrototypeOf(component).isReactComponent
+ )
+}
+
+function isFunctionComponent(component) {
+ return typeof component === 'function'
+}
+
+function isReactComponent(component) {
+ return isClassComponent(component) || isFunctionComponent(component)
 }
 
 export const mergeProps = (...groups) => {