Skip to content

Issue 162: rowClassName should accept strings too, not just functions #165

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

Merged
merged 1 commit into from
Sep 19, 2017
Merged

Issue 162: rowClassName should accept strings too, not just functions #165

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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ React.render(<Table columns={columns} data={data} />, mountNode);
</tr>
<tr>
<td>rowClassName</td>
<td>Function(record, index, indent):string</td>
<td>string or Function(record, index, indent):string</td>
<td></td>
<td>get row's className</td>
</tr>
Expand Down
6 changes: 4 additions & 2 deletions src/Table.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default class Table extends React.Component {
bodyStyle: PropTypes.object,
style: PropTypes.object,
rowKey: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
rowClassName: PropTypes.func,
rowClassName: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
expandedRowClassName: PropTypes.func,
childrenColumnName: PropTypes.string,
onExpand: PropTypes.func,
Expand Down Expand Up @@ -325,7 +325,9 @@ export default class Table extends React.Component {
if (expandedRowRender && isRowExpanded) {
expandedRowContent = expandedRowRender(record, i, indent);
}
const className = rowClassName(record, i, indent);
const className = typeof rowClassName === 'string'
? rowClassName
: rowClassName(record, i, indent);

const onHoverProps = {};
if (this.columnManager.isAnyColumnsFixed()) {
Expand Down
14 changes: 14 additions & 0 deletions tests/Table.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,4 +428,18 @@ describe('Table', () => {
wrapper.find('.rc-table-row').first().simulate('mouseLeave');
expect(handleRowMouseLeave).toBeCalledWith(data[0], 0, expect.anything());
});

it('renders correctly RowClassName as string', () => {
const wrapper = render(createTable({
rowClassName: 'test-row-class-name-asStr',
}));
expect(renderToJson(wrapper)).toMatchSnapshot();
});

it('renders correctly RowClassName as function', () => {
const wrapper = render(createTable({
rowClassName: () => 'test-row-class-name-asFn',
}));
expect(renderToJson(wrapper)).toMatchSnapshot();
});
});
100 changes: 100 additions & 0 deletions tests/__snapshots__/Table.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,106 @@ exports[`Table renders correctly 1`] = `
</div>
`;

exports[`Table renders correctly RowClassName as function 1`] = `
<div
class="rc-table rc-table-scroll-position-left">
<div
class="rc-table-content">
<div
class="rc-table-body">
<table
class="">
<colgroup>
<col />
</colgroup>
<thead
class="rc-table-thead">
<tr>
<th
class="">
Name
</th>
</tr>
</thead>
<tbody
class="rc-table-tbody">
<tr
class="rc-table-row test-row-class-name-asFn rc-table-row-level-0">
<td
class="">
<span
class="rc-table-row-indent indent-level-0"
style="padding-left:0px;" />
Lucy
</td>
</tr>
<tr
class="rc-table-row test-row-class-name-asFn rc-table-row-level-0">
<td
class="">
<span
class="rc-table-row-indent indent-level-0"
style="padding-left:0px;" />
Jack
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
`;

exports[`Table renders correctly RowClassName as string 1`] = `
<div
class="rc-table rc-table-scroll-position-left">
<div
class="rc-table-content">
<div
class="rc-table-body">
<table
class="">
<colgroup>
<col />
</colgroup>
<thead
class="rc-table-thead">
<tr>
<th
class="">
Name
</th>
</tr>
</thead>
<tbody
class="rc-table-tbody">
<tr
class="rc-table-row test-row-class-name-asStr rc-table-row-level-0">
<td
class="">
<span
class="rc-table-row-indent indent-level-0"
style="padding-left:0px;" />
Lucy
</td>
</tr>
<tr
class="rc-table-row test-row-class-name-asStr rc-table-row-level-0">
<td
class="">
<span
class="rc-table-row-indent indent-level-0"
style="padding-left:0px;" />
Jack
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
`;

exports[`Table renders custom cell correctly 1`] = `
<div
class="rc-table rc-table-scroll-position-left">
Expand Down