Skip to content
Merged
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,11 @@ function VirtualRows<TData>({

function VirtualLoaderRows({
columns,
rowHeight,
count
}: {
columns: ReturnType<
ReturnType<typeof useDataTable>['table']['getVisibleLeafColumns']
>;
rowHeight: number;
count: number;
}) {
return (
Expand All @@ -183,7 +181,6 @@ function VirtualLoaderRows({
role='row'
key={'loading-row-' + rowIndex}
className={cx(styles.virtualRow, styles['row'], styles.loaderRow)}
style={{ height: rowHeight }}
>
{columns.map((col, colIndex) => {
const columnDef = col.columnDef as DataTableColumnDef<
Expand Down Expand Up @@ -267,7 +264,7 @@ export function VirtualizedContent({
return list;
}, [rows, groupHeaderHeight, rowHeight]);

const showLoaderRows = isLoading && rows.length > 0;
const showLoaderRows = isLoading;

const virtualizer = useVirtualizer({
count: rows.length,
Expand Down Expand Up @@ -386,7 +383,6 @@ export function VirtualizedContent({
{showLoaderRows && (
<VirtualLoaderRows
columns={visibleColumns}
rowHeight={rowHeight}
count={loadingRowCount}
/>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,10 @@ function VirtualRows<TData, TValue>({
function VirtualLoaderRows<TData, TValue>({
renderedAccessors,
columnMap,
rowHeight,
count
}: {
renderedAccessors: string[];
columnMap: Map<string, DataViewTableColumn<TData, TValue>>;
rowHeight: number;
count: number;
}) {
return (
Expand All @@ -202,7 +200,6 @@ function VirtualLoaderRows<TData, TValue>({
role='row'
key={'loading-row-' + rowIndex}
className={cx(styles.virtualRow, styles['row'], styles.loaderRow)}
style={{ height: rowHeight }}
>
{renderedAccessors.map(accessor => {
const spec = columnMap.get(accessor);
Expand Down Expand Up @@ -302,7 +299,7 @@ export function VirtualizedContent<TData, TValue = unknown>({
return list;
}, [rows]);

const showLoaderRows = isLoading && rows.length > 0;
const showLoaderRows = isLoading;

const virtualizer = useVirtualizer({
count: rows.length,
Expand Down Expand Up @@ -421,7 +418,6 @@ export function VirtualizedContent<TData, TValue = unknown>({
<VirtualLoaderRows
renderedAccessors={renderedAccessors}
columnMap={columnMap}
rowHeight={rowHeight}
count={loadingRowCount}
/>
)}
Expand Down
Loading