Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions src/FixedHolder/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,20 @@ const FixedHolder = React.forwardRef<HTMLDivElement, FixedHeaderProps<any>>((pro

const mergedColumnWidth = useColumnWidth(colWidths, columCount);

const colGroupNode = useMemo(() => {
// use original ColGroup if no data or no calculated column width, otherwise use calculated column width
if (noData || !mergedColumnWidth) {
return colGroup;
}
return (
<ColGroup
colWidths={[...mergedColumnWidth, combinationScrollBarSize]}
columCount={columCount + 1}
columns={flattenColumnsWithScrollbar}
/>
);
}, [noData, mergedColumnWidth, colGroup, combinationScrollBarSize, columCount, flattenColumnsWithScrollbar]);

return (
<div
style={{
Expand All @@ -155,16 +169,7 @@ const FixedHolder = React.forwardRef<HTMLDivElement, FixedHeaderProps<any>>((pro
...scrollTableStyle,
}}
>
{/* use original ColGroup if no data, otherwise use calculated column width */}
{noData ? (
colGroup
) : (
<ColGroup
colWidths={mergedColumnWidth ? [...mergedColumnWidth, combinationScrollBarSize] : []}
columCount={columCount + 1}
columns={flattenColumnsWithScrollbar}
/>
)}
{colGroupNode}
{children({
...restProps,
stickyOffsets: headerStickyOffsets,
Expand Down