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.

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

Fix(Table): Hide emptyType in `Table` when `loading` prop is true #9095

Merged
merged 3 commits into from Jan 26, 2018

Conversation

Projects
None yet
4 participants
@sallen450
Contributor

sallen450 commented Jan 23, 2018

First of all, thank you for your contribution! :-)

Please makes sure that these checkboxes are checked before submitting your PR, thank you!

  • Make sure that you propose PR to right branch: bugfix for master, feature for latest active branch feature-x.x.
  • Make sure that you follow antd's code convention.
  • Run npm run lint and fix those errors before submitting in order to keep consistent code style.
  • Rebase before creating a PR to keep commit history clear.
  • Add some descriptions and refer relative issues for you PR.

Extra checklist:

  • Make sure that you add at least one unit test for the bug which you had fixed.

fixed #9069

@sallen450 sallen450 force-pushed the sallen450:fix/table-loading-text branch from 2ef45e3 to e24a8d2 Jan 23, 2018

@codecov

This comment has been minimized.

codecov bot commented Jan 23, 2018

Codecov Report

Merging #9095 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #9095   +/-   ##
=======================================
  Coverage   85.25%   85.25%           
=======================================
  Files         195      195           
  Lines        4674     4674           
  Branches     1378     1379    +1     
=======================================
  Hits         3985     3985           
  Misses        689      689
Impacted Files Coverage Δ
components/table/Table.tsx 92.77% <ø> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 72a5b1f...9f7c6c2. Read the comment docs.

@@ -948,7 +949,7 @@ export default class Table<T> extends React.Component<TableProps<T>, TableState<
className={classString}
expandIconColumnIndex={expandIconColumnIndex}
expandIconAsCell={expandIconAsCell}
emptyText={locale.emptyText}
emptyText={emptyText}

This comment has been minimized.

@nikogu

nikogu Jan 24, 2018

Contributor
  1. const { ... loading ... } = this.props;
  2. emptyText={loading && locale.emptyText}

This comment has been minimized.

@sallen450

sallen450 Jan 24, 2018

Contributor

fixed

2 should be emptyText={!loading && locale.emptyText}

@yesmeck yesmeck merged commit a9562e7 into ant-design:master Jan 26, 2018

4 checks passed

codecov/patch Coverage not affected when comparing 72a5b1f...9f7c6c2
Details
codecov/project 85.25% remains the same compared to 72a5b1f
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
security/snyk No new issues
Details

@yesmeck yesmeck referenced this pull request Jan 26, 2018

Merged

3.1.5 changelog #9145

@anneyangyue

This comment has been minimized.

anneyangyue commented May 17, 2018

How to display images when the table content is empty?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment