Skip to content

Commit d7413dd

Browse files
authored
fix: table emptynode fixed display (#730)
1 parent b814ded commit d7413dd

File tree

5 files changed

+12
-3
lines changed

5 files changed

+12
-3
lines changed

src/Body/BodyRow.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ function BodyRow<RecordType extends { children?: readonly RecordType[] }>(
196196
component={RowComponent}
197197
cellComponent={cellComponent}
198198
colSpan={flattenColumns.length}
199+
isEmpty={false}
199200
>
200201
{expandContent}
201202
</ExpandedRow>

src/Body/ExpandedRow.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export interface ExpandedRowProps {
1212
expanded: boolean;
1313
children: React.ReactNode;
1414
colSpan: number;
15+
isEmpty: boolean;
1516
}
1617

1718
function ExpandedRow({
@@ -22,15 +23,17 @@ function ExpandedRow({
2223
className,
2324
expanded,
2425
colSpan,
26+
isEmpty,
2527
}: ExpandedRowProps) {
2628
const { scrollbarSize } = React.useContext(TableContext);
27-
const { fixHeader, fixColumn, componentWidth } = React.useContext(ExpandedRowContext);
29+
const { fixHeader, fixColumn, componentWidth, horizonScroll } =
30+
React.useContext(ExpandedRowContext);
2831

2932
// Cache render node
3033
return React.useMemo(() => {
3134
let contentNode = children;
3235

33-
if (fixColumn) {
36+
if (isEmpty ? horizonScroll : fixColumn) {
3437
contentNode = (
3538
<div
3639
style={{
@@ -64,10 +67,12 @@ function ExpandedRow({
6467
className,
6568
expanded,
6669
colSpan,
70+
isEmpty,
6771
scrollbarSize,
6872
componentWidth,
6973
fixColumn,
7074
fixHeader,
75+
horizonScroll,
7176
]);
7277
}
7378

src/Body/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ function Body<RecordType>({
9292
component={trComponent}
9393
cellComponent={tdComponent}
9494
colSpan={flattenColumns.length}
95+
isEmpty
9596
>
9697
{emptyNode}
9798
</ExpandedRow>

src/Table.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -844,8 +844,9 @@ function Table<RecordType extends DefaultRecordType>(props: TableProps<RecordTyp
844844
componentWidth,
845845
fixHeader,
846846
fixColumn,
847+
horizonScroll
847848
}),
848-
[componentWidth, fixHeader, fixColumn],
849+
[componentWidth, fixHeader, fixColumn, horizonScroll],
849850
);
850851

851852
const ResizeContextValue = React.useMemo(() => ({ onColumnResize }), [onColumnResize]);

src/context/ExpandedRowContext.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ export interface ExpandedRowProps {
44
componentWidth: number;
55
fixHeader: boolean;
66
fixColumn: boolean;
7+
horizonScroll: boolean;
78
}
89

910
const ExpandedRowContext = React.createContext<ExpandedRowProps>(null);

0 commit comments

Comments
 (0)