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
5 changes: 5 additions & 0 deletions .changeset/violet-years-rhyme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@heroui/table": patch
---

fix(table): Header sticky in virtualized table + topContent and bottom content placement fix in virtualized table (#5149)
114 changes: 59 additions & 55 deletions packages/components/table/src/virtualized-table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,71 +81,75 @@ const VirtualizedTable = forwardRef<"table", TableProps>((props, ref) => {
overscan: 5,
});

const tableProps = getTableProps();

return (
<div {...getBaseProps()}>
{/* We need to add p-1 to make the shadow-sm visible */}
{topContentPlacement === "outside" && topContent}
<Wrapper>
<>
{topContentPlacement === "outside" && topContent}
<div style={{height: `calc(${rowVirtualizer.getTotalSize() + headerHeight}px)`}}>
<>
{topContentPlacement === "inside" && topContent}
<Component {...getTableProps()}>
<TableRowGroup ref={headerRef} classNames={values.classNames} slots={values.slots}>
{collection.headerRows.map((headerRow) => (
<TableHeaderRow
key={headerRow?.key}
classNames={values.classNames}
node={headerRow}
slots={values.slots}
state={values.state}
>
{[...headerRow.childNodes].map((column) =>
column?.props?.isSelectionCell ? (
<TableSelectAllCheckbox
key={column?.key}
checkboxesProps={values.checkboxesProps}
classNames={values.classNames}
color={values.color}
disableAnimation={values.disableAnimation}
node={column}
selectionMode={values.selectionMode}
slots={values.slots}
state={values.state}
/>
) : (
<TableColumnHeader
key={column?.key}
classNames={values.classNames}
node={column}
slots={values.slots}
state={values.state}
/>
),
)}
</TableHeaderRow>
))}
<Spacer as="tr" tabIndex={-1} y={1} />
</TableRowGroup>
<VirtualizedTableBody
checkboxesProps={values.checkboxesProps}
{topContentPlacement === "inside" && topContent}
<Component
{...tableProps}
style={{
height: `calc(${rowVirtualizer.getTotalSize() + headerHeight}px)`,
...tableProps.style,
}}
>
<TableRowGroup ref={headerRef} classNames={values.classNames} slots={values.slots}>
{collection.headerRows.map((headerRow) => (
<TableHeaderRow
key={headerRow?.key}
classNames={values.classNames}
collection={values.collection}
color={values.color}
disableAnimation={values.disableAnimation}
isSelectable={values.isSelectable}
rowVirtualizer={rowVirtualizer}
selectionMode={values.selectionMode}
node={headerRow}
slots={values.slots}
state={values.state}
/>
</Component>
{bottomContentPlacement === "inside" && bottomContent}
</>
</div>
{bottomContentPlacement === "outside" && bottomContent}
>
{[...headerRow.childNodes].map((column) =>
column?.props?.isSelectionCell ? (
<TableSelectAllCheckbox
key={column?.key}
checkboxesProps={values.checkboxesProps}
classNames={values.classNames}
color={values.color}
disableAnimation={values.disableAnimation}
node={column}
selectionMode={values.selectionMode}
slots={values.slots}
state={values.state}
/>
) : (
<TableColumnHeader
key={column?.key}
classNames={values.classNames}
node={column}
slots={values.slots}
state={values.state}
/>
),
)}
</TableHeaderRow>
))}
<Spacer as="tr" tabIndex={-1} y={1} />
</TableRowGroup>
<VirtualizedTableBody
checkboxesProps={values.checkboxesProps}
classNames={values.classNames}
collection={values.collection}
color={values.color}
disableAnimation={values.disableAnimation}
isSelectable={values.isSelectable}
rowVirtualizer={rowVirtualizer}
selectionMode={values.selectionMode}
slots={values.slots}
state={values.state}
/>
</Component>
{bottomContentPlacement === "inside" && bottomContent}
</>
</Wrapper>
{bottomContentPlacement === "outside" && bottomContent}
</div>
);
});
Expand Down
8 changes: 8 additions & 0 deletions packages/components/table/stories/table.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1160,6 +1160,14 @@ export const Virtualized = {
},
};

export const VirtualizedWithHeaderSticky = {
...Virtualized,
args: {
...Virtualized.args,
isHeaderSticky: true,
},
};

export const TenThousandRows = {
render: VirtualizedTemplate,
args: {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/theme/src/components/table.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const table = tv({
],
table: "min-w-full h-auto",
thead: "[&>tr]:first:rounded-lg",
tbody: "",
tbody: "after:block",
tr: ["group/tr", "outline-none", ...dataFocusVisibleClasses],
th: [
"group/th",
Expand Down