diff --git a/client/components/GenericTable/index.js b/client/components/GenericTable/index.js index 117ffa600f85..e606a43ae64d 100644 --- a/client/components/GenericTable/index.js +++ b/client/components/GenericTable/index.js @@ -61,7 +61,7 @@ const GenericTable = ( ) : ( <> - + {header && ( diff --git a/client/components/ScrollableContentWrapper.tsx b/client/components/ScrollableContentWrapper.tsx index 389d5cbf1576..79c19287390a 100644 --- a/client/components/ScrollableContentWrapper.tsx +++ b/client/components/ScrollableContentWrapper.tsx @@ -18,6 +18,7 @@ const styleDefault = { }; export type CustomScrollbarsProps = { + overflowX?: boolean; style?: CSSProperties; children?: ReactNode; onScroll?: (values: ScrollValues) => void; @@ -26,7 +27,7 @@ export type CustomScrollbarsProps = { }; const ScrollableContentWrapper = forwardRef( - function WrappedComponent({ children, style, onScroll, renderView }, ref) { + function WrappedComponent({ children, style, onScroll, overflowX, renderView }, ref) { const scrollbarsStyle = useMemo(() => ({ ...style, ...styleDefault }), [ style, ]) as CSSProperties; @@ -39,9 +40,13 @@ const ScrollableContentWrapper = forwardRef( style={scrollbarsStyle} onScrollFrame={onScroll} renderView={renderView} - renderTrackHorizontal={(props): ReactElement => ( -
- )} + renderTrackHorizontal={ + overflowX + ? undefined + : (props): ReactElement => ( +
+ ) + } renderThumbVertical={({ style, ...props }): JSX.Element => (