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
7 changes: 4 additions & 3 deletions src/inputs/Table/Table.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ const useStyles = makeStyles((theme) => ({
right: 'auto',
bottom: 'auto',
position: 'fixed',
height: '100%',
width: '100%',
// z-index for the fullscreen container must be higher than 1200 to hide the app bar and drawers, but lower than
// 1300 to still appear under modals & tooltips (see https://mui.com/material-ui/customization/z-index/ for details)
Expand Down Expand Up @@ -374,7 +375,7 @@ export const Table = (props) => {
id="table-container"
data-cy="table-input"
{...otherProps}
style={{ height }}
style={{ height, overflow: 'auto' }}
className={isDirty ? classes.dirtyInput : isDirty === false ? classes.notDirtyInput : ''}
>
<div data-cy="label">
Expand All @@ -391,7 +392,7 @@ export const Table = (props) => {
<div
data-cy="grid"
id="grid-container"
style={{ height: `calc(100% - ${TABLE_TOOLBAR_HEIGHT})` }}
style={{ height: height === '100%' ? '100%' : undefined }}
className={`${agTheme} ${isFullscreen && classes.fullscreenGridContainer}`}
>
<div
Expand All @@ -405,7 +406,7 @@ export const Table = (props) => {
>
{errorsPanelElement}
{tableToolbarElement}
<Box style={{ flex: '1 0 0', overflow: 'auto' }} sx={{ width: width ?? '100%' }}>
<Box style={{ flex: '1 0 0', overflow: 'auto', minHeight: '200px' }} sx={{ width: width ?? '100%' }}>
{isReady && !isLoading ? agGridElement : tablePlaceholder}
</Box>
</div>
Expand Down
Loading