Skip to content

fix: skip row virtualization for small data grids #10146

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

Open
VIBVEL47 wants to merge 1 commit into
base: master
Choose a base branch
from
+52 −19
Open

fix: skip row virtualization for small data grids #10146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
68 changes: 49 additions & 19 deletions web/pgadmin/static/js/SchemaView/DataGridView/grid.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,17 @@ export default function DataGridView({
)
).includes(true);

const VIRTUALISE_CELL_BUDGET = 700; // Number of cells to render
const DEFAULT_VIRTUALISE_THRESHOLD = 100; // Number of rows to render
const visibleColCount = table.getVisibleLeafColumns().length;
const virtualiseThreshold =
field.virtualiseThreshold ??
(visibleColCount > 0
? Math.min(400, Math.max(25,
Math.round(VIRTUALISE_CELL_BUDGET / visibleColCount)))
: DEFAULT_VIRTUALISE_THRESHOLD);
const virtualise = rows.length > virtualiseThreshold;

const virtualizer = useVirtualizer({
count: rows.length,
getScrollElement: () => tableEleRef.current,
Expand Down Expand Up @@ -152,32 +163,51 @@ export default function DataGridView({
ref={tableEleRef} table={table} data-test="data-grid-view"
tableClassName='DataGridView-table'>
<PgReactTableHeader table={table} />
<PgReactTableBody style={{
height: virtualizer.getTotalSize() + 'px'
}}>
{
virtualizer.getVirtualItems().map((virtualRow) => {
const row = rows[virtualRow.index];
return (
{virtualise ?
<PgReactTableBody style={{
height: virtualizer.getTotalSize() + 'px'
}}>
{
virtualizer.getVirtualItems().map((virtualRow) => {
const row = rows[virtualRow.index];
return (
<PgReactTableRow
key={row.id}
data-index={virtualRow.index}
ref={node => virtualizer.measureElement(node)}
style={{
// This should always be a `style` as it changes on
// scroll.
transform: `translateY(${virtualRow.start}px)`,
}}
>
<GridRow
rowId={virtualRow.index} isResizing={isResizing}
row={row}
/>
</PgReactTableRow>
);
})
}
</PgReactTableBody>
:
<PgReactTableBody>
{
rows.map((row, index) => (
<PgReactTableRow
key={row.id}
data-index={virtualRow.index}
ref={node => virtualizer.measureElement(node)}
style={{
// This should always be a `style` as it changes on
// scroll.
transform: `translateY(${virtualRow.start}px)`,
}}
data-index={index}
className='pgrt-row--static'
>
<GridRow
rowId={virtualRow.index} isResizing={isResizing}
rowId={index} isResizing={isResizing}
row={row}
/>
</PgReactTableRow>
);
})
}
</PgReactTableBody>
))
}
</PgReactTableBody>
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
</PgReactTable>
</DndProvider>
</Box>
Expand Down
3 changes: 3 additions & 0 deletions web/pgadmin/static/js/components/PgReactTableStyled.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ const StyledDiv = styled('div')(({theme})=>({
flexDirection: 'column',
position: 'absolute',
width: '100%',
'&.pgrt-row--static': {
position: 'relative',
},

'& .pgrt-row-content': {
display: 'flex',
Expand Down
Loading