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

fix: change tag td => th #1075

Merged
merged 4 commits into from
Feb 4, 2024
Merged

fix: change tag td => th #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6495f0
fix: change tag td => th
li-jia-nan Feb 1, 2024
1ef9957
fix: fix test case
li-jia-nan Feb 1, 2024
ecc35b9
lint: fix lint
li-jia-nan Feb 2, 2024
bdfb8bf
test: fix test case
li-jia-nan Feb 4, 2024
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
9 changes: 3 additions & 6 deletions src/Header/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,20 +90,19 @@ export interface HeaderProps<RecordType> {
onHeaderRow: GetComponentProps<readonly ColumnType<RecordType>[]>;
}

function Header<RecordType>(props: HeaderProps<RecordType>): React.ReactElement {
const Header = <RecordType extends any>(props: HeaderProps<RecordType>) => {
if (process.env.NODE_ENV !== 'production') {
devRenderTimes(props);
}

const { stickyOffsets, columns, flattenColumns, onHeaderRow } = props;

const { prefixCls, getComponent } = useContext(TableContext, ['prefixCls', 'getComponent']);
const rows: CellType<RecordType>[][] = React.useMemo(() => parseHeaderRows(columns), [columns]);
const rows = React.useMemo<CellType<RecordType>[][]>(() => parseHeaderRows(columns), [columns]);

const WrapperComponent = getComponent(['header', 'wrapper'], 'thead');
const trComponent = getComponent(['header', 'row'], 'tr');
const thComponent = getComponent(['header', 'cell'], 'th');
const tdComponent = getComponent(['header', 'cell'], 'td');

return (
<WrapperComponent className={`${prefixCls}-thead`}>
Expand All @@ -116,16 +115,14 @@ function Header<RecordType>(props: HeaderProps<RecordType>): React.ReactElement
stickyOffsets={stickyOffsets}
rowComponent={trComponent}
cellComponent={thComponent}
tdCellComponent={tdComponent}
onHeaderRow={onHeaderRow}
index={rowIndex}
/>
);

return rowNode;
})}
</WrapperComponent>
);
}
};

export default responseImmutable(Header);
25 changes: 12 additions & 13 deletions src/Header/HeaderRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,20 @@ export interface RowProps<RecordType> {
flattenColumns: readonly ColumnType<RecordType>[];
rowComponent: CustomizeComponent;
cellComponent: CustomizeComponent;
tdCellComponent: CustomizeComponent;
onHeaderRow: GetComponentProps<readonly ColumnType<RecordType>[]>;
index: number;
}

function HeaderRow<RecordType>({
cells,
stickyOffsets,
flattenColumns,
rowComponent: RowComponent,
cellComponent: CellComponent,
tdCellComponent,
onHeaderRow,
index,
}: RowProps<RecordType>) {
const HeaderRow = <RecordType extends any>(props: RowProps<RecordType>) => {
const {
cells,
stickyOffsets,
flattenColumns,
rowComponent: RowComponent,
cellComponent: CellComponent,
onHeaderRow,
index,
} = props;
const { prefixCls, direction } = useContext(TableContext, ['prefixCls', 'direction']);
let rowProps: React.HTMLAttributes<HTMLElement>;
if (onHeaderRow) {
Expand Down Expand Up @@ -68,7 +67,7 @@ function HeaderRow<RecordType>({
scope={column.title ? (cell.colSpan > 1 ? 'colgroup' : 'col') : null}
ellipsis={column.ellipsis}
align={column.align}
component={column.title ? CellComponent : tdCellComponent}
component={CellComponent}
prefixCls={prefixCls}
key={columnsKey[cellIndex]}
{...fixedInfo}
Expand All @@ -79,7 +78,7 @@ function HeaderRow<RecordType>({
})}
</RowComponent>
);
}
};

if (process.env.NODE_ENV !== 'production') {
HeaderRow.displayName = 'HeaderRow';
Expand Down
4 changes: 2 additions & 2 deletions tests/FixedColumn.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,10 +276,10 @@ describe('Table.FixedColumn', () => {
});

expect(container.querySelectorAll('tbody .rc-table-cell-fix-left')).toHaveLength(2);
expect(container.querySelectorAll('thead td')[1]).toHaveStyle({
expect(container.querySelectorAll('thead th')[1]).toHaveStyle({
left: '0px',
});
expect(container.querySelectorAll('thead td')[2]).toHaveStyle({
expect(container.querySelectorAll('thead th')[2]).toHaveStyle({
left: '1000px',
});
});
Expand Down
23 changes: 0 additions & 23 deletions tests/Table.spec.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,29 +300,6 @@ describe('Table.Basic', () => {
});
});

it('renders td instead of th if header title is empty', () => {
const wrapper = mount(
createTable({
columns: [
{
title: '',
dataIndex: 'firstName',
key: 'firstName',
},
{
title: 'Last Name',
dataIndex: 'lastName',
key: 'lastName',
},
],
data: [{ firstName: 'John', lastName: 'Doe', key: '1' }],
}),
);

expect(wrapper.find('thead td')).toHaveLength(1);
expect(wrapper.find('thead th')).toHaveLength(1);
});

it('renders column correctly', () => {
const columns = [
{
Expand Down
10 changes: 5 additions & 5 deletions tests/__snapshots__/ExpandRow.spec.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ LoadedCheerio {
class="rc-table-thead"
>
<tr>
<td
<th
class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
style="position: sticky; left: 0px;"
/>
Expand Down Expand Up @@ -344,7 +344,7 @@ LoadedCheerio {
class="rc-table-thead"
>
<tr>
<td
<th
class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
style="position: sticky; left: 0px;"
/>
Expand Down Expand Up @@ -646,7 +646,7 @@ LoadedCheerio {
class="rc-table-thead"
>
<tr>
<td
<th
class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left"
style="position: sticky; left: 0px;"
/>
Expand Down Expand Up @@ -1204,7 +1204,7 @@ LoadedCheerio {
class="rc-table-thead"
>
<tr>
<td
<th
class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
style="position: sticky; left: 0px;"
/>
Expand Down Expand Up @@ -1410,7 +1410,7 @@ LoadedCheerio {
>
Gender
</th>
<td
<th
class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-right rc-table-cell-fix-right-first"
style="position: sticky; right: 0px;"
/>
Expand Down
4 changes: 2 additions & 2 deletions tests/__snapshots__/FixedColumn.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2068,7 +2068,7 @@ LoadedCheerio {
>
title12
</th>
<td
<th
class="rc-table-cell rc-table-cell-fix-right rc-table-cell-scrollbar"
style="position: sticky; right: 0px;"
/>
Expand Down Expand Up @@ -2941,7 +2941,7 @@ LoadedCheerio {
>
title12
</th>
<td
<th
class="rc-table-cell rc-table-cell-fix-right rc-table-cell-scrollbar"
style="position: sticky; right: 0px;"
/>
Expand Down
10 changes: 5 additions & 5 deletions tests/__snapshots__/Table.spec.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,13 +394,13 @@ LoadedCheerio {
class="rc-table-thead"
>
<tr>
<td
<th
class="rc-table-cell"
/>
<td
<th
class="rc-table-cell"
/>
<td
<th
class="rc-table-cell rc-table-cell-scrollbar"
/>
</tr>
Expand Down Expand Up @@ -1021,7 +1021,7 @@ LoadedCheerio {
class="rc-table-thead"
>
<tr>
<td
<th
class="rc-table-cell"
/>
</tr>
Expand Down Expand Up @@ -1212,7 +1212,7 @@ LoadedCheerio {
>
Name
</th>
<td
<th
class="rc-table-cell rc-table-cell-scrollbar"
/>
</tr>
Expand Down
Loading