Merge pull request #961 from habx/fix/6.7/footer-render

APP-20868: Fix footer render
habx · May 7, 2021 · 0e3258d · 0e3258d
2 parents e8678ff + 9052c94
commit 0e3258d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/Table/TableFooter.tsx b/src/Table/TableFooter.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { HeaderGroup } from 'react-table'
+import { HeaderGroup, emptyRenderer } from 'react-table'
 
 import { TableCell, TableFooterRow, TableFooterContainer } from './Table.style'
 
@@ -10,11 +10,10 @@ export const TableFooter = <D extends {}>({
     <TableFooterContainer>
       {footerGroups.map((group) => {
         if (
-          group.headers.every(
-            (column) =>
-              ((column as unknown) as { Footer: Function }).Footer?.name ===
-              'emptyRenderer'
-          )
+          group.headers.every((column) => {
+            const Footer = ((column as unknown) as { Footer: Function }).Footer
+            return !Footer || Footer === emptyRenderer
+          })
         ) {
           return null
         }

diff --git a/src/global.d.ts b/src/global.d.ts
@@ -0,0 +1,5 @@
+import 'react-table'
+
+declare module 'react-table' {
+  export const emptyRenderer: Function
+}