Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve behavior of image columns #1637

Merged
merged 3 commits into from
Feb 8, 2023
Merged

Improve behavior of image columns #1637

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d8e951
Improve behavior of image columns
Janpot Feb 7, 2023
06c7928
fix sizing
Janpot Feb 8, 2023
53fb231
margins
Janpot Feb 8, 2023
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
61 changes: 52 additions & 9 deletions packages/toolpad-components/src/DataGrid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import {
styled,
Typography,
Tooltip,
Popover,
} from '@mui/material';
import { getObjectKey } from '@mui/toolpad-core/objectKey';
import { hasImageExtension } from '@mui/toolpad-core/path';
Expand Down Expand Up @@ -142,6 +143,56 @@ function inferColumnType(value: unknown): string {
}
}

function ImageCell({ field, id, value: src }: GridRenderCellParams<any, any, any>) {
const [anchorEl, setAnchorEl] = React.useState<HTMLElement | null>(null);

const handlePopoverOpen = (event: React.MouseEvent<HTMLElement>) => {
setAnchorEl(event.currentTarget);
};

const handlePopoverClose = () => {
setAnchorEl(null);
};

const open = Boolean(anchorEl);

const popoverId = React.useId();

const alt = `${field} ${id}`;

return (
<React.Fragment>
<Box
aria-owns={open ? popoverId : undefined}
aria-haspopup="true"
onMouseEnter={handlePopoverOpen}
onMouseLeave={handlePopoverClose}
component="img"
src={src}
alt={alt}
sx={{ maxWidth: '100%', maxHeight: '100%', objectFit: 'contain', py: 1 }}
/>
<Popover
id={popoverId}
sx={{
pointerEvents: 'none',
}}
open={open}
anchorEl={anchorEl}
onClose={handlePopoverClose}
disableRestoreFocus
>
<Box
component="img"
src={src}
alt={alt}
sx={{ maxWidth: '60vw', maxHeight: '60vh', objectFit: 'contain', m: 1 }}
/>
</Popover>
</React.Fragment>
);
}

function dateValueGetter({ value }: GridValueGetterParams<any, any>) {
return typeof value === 'number' ? new Date(value) : value;
}
Expand All @@ -166,9 +217,7 @@ export const CUSTOM_COLUMN_TYPES: GridColumnTypesRecord = {
),
},
image: {
renderCell: ({ field, id, value }) => (
<Box component="img" src={value} alt={`${field}${id}`} sx={{ maxWidth: '100%', p: 2 }} />
),
renderCell: ({ value, ...params }) => (value ? <ImageCell value={value} {...params} /> : ''),
},
};

Expand Down Expand Up @@ -459,11 +508,6 @@ const DataGridComponent = React.forwardRef(function DataGridComponent(
[getRowId, columns],
);

const getRowHeight = React.useMemo(() => {
const hasImageColumns = columns.some(({ type }) => type === 'image');
return hasImageColumns ? () => 'auto' : undefined;
}, [columns]);

return (
<div ref={ref} style={{ height: heightProp, minHeight: '100%', width: '100%' }}>
<DataGridPro
Expand All @@ -487,7 +531,6 @@ const DataGridComponent = React.forwardRef(function DataGridComponent(
message: typeof errorProp === 'string' ? errorProp : errorProp?.message,
},
}}
getRowHeight={getRowHeight}
{...props}
/>
</div>
Expand Down