Fix #9859, #9858 (#10294)
Fix #9859, #9858 (#10294)

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

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

* [x] Make sure that you propose PR to right branch: bugfix for `master`, feature for latest active branch `feature-x.x`.
* [x] Make sure that you follow antd's [code convention](https://github.com/ant-design/ant-design/wiki/Code-convention-for-antd).
* [x] Run `npm run lint` and fix those errors before submitting in order to keep consistent code style.
* [x] Rebase before creating a PR to keep commit history clear.
* [x] Add some descriptions and refer relative issues for you PR.

Extra checklist:

**if** *isBugFix* **:**

  * [-] Make sure that you add at least one unit test for the bug which you had fixed.

elevensky/ant-design,elevensky/ant-design,icaife/ant-design,icaife/ant-design,ant-design/ant-design,ant-design/ant-design,icaife/ant-design,havefive/ant-design,ant-design/ant-design,havefive/ant-design,icaife/ant-design,havefive/ant-design,zheeeng/ant-design,havefive/ant-design,elevensky/ant-design,ant-design/ant-design,zheeeng/ant-design,zheeeng/ant-design,elevensky/ant-design,zheeeng/ant-design