Skip to content

The "emptyText" prop can either be one React node or a function that returns one React node #130

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 3 commits into from
Mar 14, 2017
Merged

The "emptyText" prop can either be one React node or a function that returns one React node #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06a25cd
The "emptyText" prop can either be one React node or a function that …
cheton Mar 3, 2017
dd4152d
Rollback the emptyText prop to the original default value
cheton Mar 3, 2017
005c4d9
Add a test for PR #130
cheton Mar 14, 2017
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
4 changes: 2 additions & 2 deletions src/Table.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default class Table extends React.Component {
showHeader: PropTypes.bool,
title: PropTypes.func,
footer: PropTypes.func,
emptyText: PropTypes.func,
emptyText: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
scroll: PropTypes.object,
rowRef: PropTypes.func,
getBodyWrapper: PropTypes.func,
Expand Down Expand Up @@ -558,7 +558,7 @@ export default class Table extends React.Component {
const { emptyText, prefixCls, data } = this.props;
return !data.length ? (
<div className={`${prefixCls}-placeholder`} key="emptyText">
{emptyText()}
{(typeof emptyText === 'function') ? emptyText() : emptyText}
</div>
) : null;
}
Expand Down
7 changes: 7 additions & 0 deletions tests/Table.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ describe('Table', () => {
expect(renderToJson(wrapper)).toMatchSnapshot();
});

it('renders empty text correctly', () => {
const wrapper1 = render(createTable({ data: [], emptyText: 'No data' }));
const wrapper2 = render(createTable({ data: [], emptyText: () => 'No data' }));
expect(renderToJson(wrapper1)).toMatchSnapshot();
expect(renderToJson(wrapper2)).toMatchSnapshot();
});

it('renders without header', () => {
const wrapper = render(createTable({ showHeader: false }));
expect(renderToJson(wrapper)).toMatchSnapshot();
Expand Down
66 changes: 66 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 @@ -273,6 +273,72 @@ exports[`Table renders custom cell correctly 1`] = `
</div>
`;

exports[`Table renders empty text correctly 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" />
</table>
</div>
<div
class="rc-table-placeholder">
No data
</div>
</div>
</div>
`;

exports[`Table renders empty text correctly 2`] = `
<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" />
</table>
</div>
<div
class="rc-table-placeholder">
No data
</div>
</div>
</div>
`;

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