Browse Source

fix: empty default component

pull/2682/head
tangjinzhou 4 years ago
parent
commit
515d90513c
  1. 2
      antdv-demo
  2. 4
      components/config-provider/renderEmpty.jsx
  3. 2
      components/empty/index.jsx
  4. 4
      components/list/__tests__/__snapshots__/empty.test.js.snap
  5. 2
      components/list/__tests__/index.test.js

2
antdv-demo

@ -1 +1 @@
Subproject commit c2bb61d21910b82f60b098d1468e24e6a9900344
Subproject commit 7edb9609894a10324fc71095b197f64bddb98795

4
components/config-provider/renderEmpty.jsx

@ -15,14 +15,14 @@ const RenderEmpty = {
switch (componentName) {
case 'Table':
case 'List':
return <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />;
return <Empty image={<Empty.PRESENTED_IMAGE_SIMPLE />} />;
case 'Select':
case 'TreeSelect':
case 'Cascader':
case 'Transfer':
case 'Mentions':
return <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} class={`${prefix}-small`} />;
return <Empty image={<Empty.PRESENTED_IMAGE_SIMPLE />} class={`${prefix}-small`} />;
default:
return <Empty />;

2
components/empty/index.jsx

@ -38,7 +38,7 @@ const Empty = {
let imageNode = null;
if (typeof image === 'string') {
imageNode = <img alt={alt} src={image} />;
} else if (typeof image === 'object' && image.PRESENTED_IMAGE_SIMPLE) {
} else if (typeof image === 'object' && image.type?.PRESENTED_IMAGE_SIMPLE) {
const Image = image;
imageNode = <Image />;
cls[`${prefixCls}-normal`] = true;

4
components/list/__tests__/__snapshots__/empty.test.js.snap

@ -10,9 +10,9 @@ exports[`List renders empty list 1`] = `
<div class="ant-list-empty-text">
<div class="ant-empty ant-empty-normal">
<div class="ant-empty-image"><svg width="64" height="41" viewBox="0 0 64 41" xmlns="http://www.w3.org/2000/svg">
<g transform="translate(0 1)" fill="none" fillRule="evenodd">
<g transform="translate(0 1)" fill="none" fill-rule="evenodd">
<ellipse fill="#F5F5F5" cx="32" cy="33" rx="32" ry="7"></ellipse>
<g fillRule="nonzero" stroke="#D9D9D9">
<g fill-rule="nonzero" stroke="#D9D9D9">
<path d="M55 12.76L44.854 1.258C44.367.474 43.656 0 42.907 0H21.093c-.749 0-1.46.474-1.947 1.257L9 12.761V22h46v-9.24z"></path>
<path d="M41.613 15.931c0-1.605.994-2.93 2.227-2.931H55v18.137C55 33.26 53.68 35 52.05 35h-40.1C10.32 35 9 33.259 9 31.137V13h11.16c1.233 0 2.227 1.323 2.227 2.928v.022c0 1.605 1.005 2.901 2.237 2.901h14.752c1.232 0 2.237-1.308 2.237-2.913v-.007z" fill="#FAFAFA"></path>
</g>

2
components/list/__tests__/index.test.js

@ -14,7 +14,7 @@ describe('List', () => {
return (
<List
dataSource={[]}
renderItem={item => <List.Item>{item}</List.Item>}
renderItem={({ item }) => <List.Item>{item}</List.Item>}
locale={locale}
/>
);

Loading…
Cancel
Save