fix: fix colspan prop to use column visibility

Fixes #1555
This commit is contained in:
tannerlinsley 2019-09-30 07:31:43 -06:00
parent e2e67ed181
commit 5f0e7cab8b
2 changed files with 17 additions and 4 deletions

View File

@ -246,7 +246,7 @@ export const useTable = (props, ...plugins) => {
mergeProps(
{
key: ['header', column.id].join('_'),
colSpan: column.totalHeaderCount,
colSpan: column.totalVisibleHeaderCount,
},
applyPropHooks(
instanceRef.current.hooks.getHeaderProps,

View File

@ -182,14 +182,27 @@ export function determineHeaderVisibility(instance) {
: !!column.show
: false
let totalVisibleHeaderCount = 0
if (column.headers && column.headers.length) {
column.headers.forEach(subColumn =>
handleColumn(subColumn, column.isVisible)
column.headers.forEach(
subColumn =>
(totalVisibleHeaderCount += handleColumn(subColumn, column.isVisible))
)
} else {
totalVisibleHeaderCount = column.isVisible ? 1 : 0
}
column.totalVisibleHeaderCount = totalVisibleHeaderCount
return totalVisibleHeaderCount
}
headers.forEach(subHeader => handleColumn(subHeader, true))
let totalVisibleHeaderCount = 0
headers.forEach(
subHeader => (totalVisibleHeaderCount += handleColumn(subHeader, true))
)
}
export function getBy(obj, path, def) {