@@ -27,7 +27,6 @@ function useColumnWidth(colWidths: readonly number[], columCount: number) {
27
27
export interface FixedHeaderProps < RecordType > extends HeaderProps < RecordType > {
28
28
className : string ;
29
29
noData : boolean ;
30
- maxContentScroll : boolean ;
31
30
colWidths : readonly number [ ] ;
32
31
columCount : number ;
33
32
direction : Direction ;
@@ -58,7 +57,6 @@ const FixedHolder = React.forwardRef<HTMLDivElement, FixedHeaderProps<any>>((pro
58
57
stickyBottomOffset,
59
58
stickyClassName,
60
59
onScroll,
61
- maxContentScroll,
62
60
children,
63
61
...restProps
64
62
} = props ;
@@ -98,12 +96,6 @@ const FixedHolder = React.forwardRef<HTMLDivElement, FixedHeaderProps<any>>((pro
98
96
} ;
99
97
} , [ ] ) ;
100
98
101
- // Check if all flattenColumns has width
102
- const allFlattenColumnsWithWidth = React . useMemo (
103
- ( ) => flattenColumns . every ( column => column . width ) ,
104
- [ flattenColumns ] ,
105
- ) ;
106
-
107
99
// Add scrollbar column
108
100
const lastColumn = flattenColumns [ flattenColumns . length - 1 ] ;
109
101
const ScrollBarColumn : ColumnType < unknown > & { scrollbar : true } = {
@@ -156,13 +148,11 @@ const FixedHolder = React.forwardRef<HTMLDivElement, FixedHeaderProps<any>>((pro
156
148
visibility : noData || mergedColumnWidth ? null : 'hidden' ,
157
149
} }
158
150
>
159
- { ( ! noData || ! maxContentScroll || allFlattenColumnsWithWidth ) && (
160
- < ColGroup
161
- colWidths = { mergedColumnWidth ? [ ...mergedColumnWidth , combinationScrollBarSize ] : [ ] }
162
- columCount = { columCount + 1 }
163
- columns = { flattenColumnsWithScrollbar }
164
- />
165
- ) }
151
+ < ColGroup
152
+ colWidths = { mergedColumnWidth ? [ ...mergedColumnWidth , combinationScrollBarSize ] : [ ] }
153
+ columCount = { columCount + 1 }
154
+ columns = { flattenColumnsWithScrollbar }
155
+ />
166
156
{ children ( {
167
157
...restProps ,
168
158
stickyOffsets : headerStickyOffsets ,
0 commit comments