@@ -144,6 +144,7 @@ const BackgroundWrapper = styled.div<{
144
144
$tableAutoHeight : boolean ;
145
145
$showHorizontalScrollbar : boolean ;
146
146
$showVerticalScrollbar : boolean ;
147
+ $fixedToolbar : boolean ;
147
148
} > `
148
149
display: flex;
149
150
flex-direction: column;
@@ -158,8 +159,15 @@ const BackgroundWrapper = styled.div<{
158
159
overflow: hidden;
159
160
160
161
> div.table-scrollbar-wrapper {
161
- height: auto;
162
162
overflow: auto;
163
+ ${ ( props ) => props . $fixedToolbar && `height: auto` } ;
164
+
165
+ ${ ( props ) => ( props . $showHorizontalScrollbar || props . $showVerticalScrollbar ) && `
166
+ .simplebar-content-wrapper {
167
+ overflow: auto !important;
168
+ }
169
+ ` }
170
+
163
171
${ ( props ) => ! props . $showHorizontalScrollbar && `
164
172
div.simplebar-horizontal {
165
173
visibility: hidden !important;
@@ -847,6 +855,7 @@ export function TableCompView(props: {
847
855
return < EmptyContent text = { trans ( "table.emptyColumns" ) } /> ;
848
856
}
849
857
858
+ const hideScrollbar = ! showHorizontalScrollbar && ! showVerticalScrollbar ;
850
859
return (
851
860
< BackgroundColorContext . Provider value = { style . background } >
852
861
< BackgroundWrapper
@@ -855,14 +864,15 @@ export function TableCompView(props: {
855
864
$tableAutoHeight = { tableAutoHeight }
856
865
$showHorizontalScrollbar = { showHorizontalScrollbar }
857
866
$showVerticalScrollbar = { showVerticalScrollbar }
867
+ $fixedToolbar = { toolbar . fixedToolbar }
858
868
>
859
- { toolbar . position === "above" && toolbar . fixedToolbar && toolbarView }
869
+ { toolbar . position === "above" && ( toolbar . fixedToolbar || ( tableAutoHeight && showHorizontalScrollbar ) ) && toolbarView }
860
870
< ScrollBar
861
871
className = "table-scrollbar-wrapper"
862
872
style = { { height : "100%" , margin : "0px" , padding : "0px" } }
863
- hideScrollbar = { ! showHorizontalScrollbar && ! showVerticalScrollbar }
864
- prefixNode = { toolbar . position === "above" && ! toolbar . fixedToolbar && toolbarView }
865
- suffixNode = { toolbar . position === "below" && ! toolbar . fixedToolbar && toolbarView }
873
+ hideScrollbar = { hideScrollbar }
874
+ prefixNode = { toolbar . position === "above" && ! toolbar . fixedToolbar && ! ( tableAutoHeight && showHorizontalScrollbar ) && toolbarView }
875
+ suffixNode = { toolbar . position === "below" && ! toolbar . fixedToolbar && ! ( tableAutoHeight && showHorizontalScrollbar ) && toolbarView }
866
876
>
867
877
< TableWrapper
868
878
$style = { style }
@@ -926,7 +936,7 @@ export function TableCompView(props: {
926
936
</ SlotConfigContext . Provider >
927
937
</ TableWrapper >
928
938
</ ScrollBar >
929
- { toolbar . position === "below" && toolbar . fixedToolbar && toolbarView }
939
+ { toolbar . position === "below" && ( toolbar . fixedToolbar || ( tableAutoHeight && showHorizontalScrollbar ) ) && toolbarView }
930
940
</ BackgroundWrapper >
931
941
932
942
</ BackgroundColorContext . Provider >
0 commit comments