diff --git a/components/card/__tests__/__snapshots__/demo.test.js.snap b/components/card/__tests__/__snapshots__/demo.test.js.snap index da5b9f1b0d..8ce7e3107a 100644 --- a/components/card/__tests__/__snapshots__/demo.test.js.snap +++ b/components/card/__tests__/__snapshots__/demo.test.js.snap @@ -5,43 +5,41 @@ exports[`renders ./components/card/demo/basic.md correctly 1`] = ` class="ant-card ant-card-bordered" style="width:300px" > -
+
-
-
-

- Card content -

-

- Card content -

-

- Card content -

-
+
+
+
+

+ Card content +

+

+ Card content +

+

+ Card content +

@@ -55,34 +53,32 @@ exports[`renders ./components/card/demo/border-less.md correctly 1`] = ` class="ant-card" style="width:300px" > -
+
-
- Card title -
+ Card title
-
-
-

- Card content -

-

- Card content -

-

- Card content -

-
+
+
+
+

+ Card content +

+

+ Card content +

+

+ Card content +

@@ -94,38 +90,36 @@ exports[`renders ./components/card/demo/flexible-content.md correctly 1`] = ` class="ant-card ant-card-bordered ant-card-hoverable" style="width:240px" > -
-
- example -
-
-
+
+ example +
+
+
+
-
- Europe Street beat -
-
- www.instagram.com -
+ Europe Street beat +
+
+ www.instagram.com
@@ -139,66 +133,64 @@ exports[`renders ./components/card/demo/grid-card.md correctly 1`] = `
-
+
-
- Card Title -
+ Card Title
-
-
-
- Content -
-
- Content -
-
- Content -
-
- Content -
-
- Content -
-
- Content -
-
- Content -
+
+
+
+
+ Content +
+
+ Content +
+
+ Content +
+
+ Content +
+
+ Content +
+
+ Content +
+
+ Content
@@ -220,26 +212,24 @@ exports[`renders ./components/card/demo/in-column.md correctly 1`] = `
-
+
-
- Card title -
+ Card title
-
-
- Card content -
+
+
+
+ Card content
@@ -251,26 +241,24 @@ exports[`renders ./components/card/demo/in-column.md correctly 1`] = `
-
+
-
- Card title -
+ Card title
-
-
- Card content -
+
+
+
+ Card content
@@ -282,26 +270,24 @@ exports[`renders ./components/card/demo/in-column.md correctly 1`] = `
-
+
-
- Card title -
+ Card title
-
-
- Card content -
+
+
+
+ Card content
@@ -314,100 +300,94 @@ exports[`renders ./components/card/demo/inner.md correctly 1`] = `
-
+
-
- Card title -
+ Card title
-
-
-

- Group title -

+
+
+
+

+ Group title +

+
-
+
-
-
- Inner Card title -
- -
+ Inner Card title
-
- Inner Card content -
+ + More +
+ Inner Card content +
+
+
+
+
+
- -
-
- Inner Card content -
+ More +
+
+
+ Inner Card content +
+
@@ -419,75 +399,73 @@ exports[`renders ./components/card/demo/loading.md correctly 1`] = ` class="ant-card ant-card-loading ant-card-bordered" style="width:34%" > -
+
-
- Card title -
+ Card title
+
+
-
-

+

+ -

- - -

-

- - -

-

- - -

-

- - - -

-
+ +

+

+ + +

+

+ + +

+

+ + + +

@@ -498,49 +476,47 @@ exports[`renders ./components/card/demo/meta.md correctly 1`] = ` class="ant-card ant-card-bordered" style="width:300px" > -
-
- example -
-
-
+
+ example +
+
+
+
+ + + +
+
- - - + Card title
-
- Card title -
-
- This is the description -
+ This is the description
@@ -586,21 +562,19 @@ exports[`renders ./components/card/demo/simple.md correctly 1`] = ` class="ant-card ant-card-bordered" style="width:300px" > -
-
-
-

- Card content -

-

- Card content -

-

- Card content -

-
+
+
+

+ Card content +

+

+ Card content +

+

+ Card content +

@@ -612,113 +586,111 @@ exports[`renders ./components/card/demo/tabs.md correctly 1`] = ` class="ant-card ant-card-bordered ant-card-contain-tabs" style="width:100%" > -
+
-
- Card title -
- + Card title
+
+
+
-
- - + class="ant-tabs-tab-prev-icon" + /> + + - - + class="ant-tabs-tab-next-icon" + /> + +
+
+
+
-
- + aria-hidden="false" + class="ant-tabs-tabpane ant-tabs-tabpane-active" + role="tabpanel" + /> +
-
-
-

- content1 -

-
+
+
+
+

+ content1 +

@@ -728,111 +700,109 @@ exports[`renders ./components/card/demo/tabs.md correctly 1`] = ` class="ant-card ant-card-bordered ant-card-contain-tabs" style="width:100%" > -
+
+
-
-
- - + class="ant-tabs-tab-prev-icon" + /> + + - - + class="ant-tabs-tab-next-icon" + /> + +
+
+
+
-
- diff --git a/components/card/index.tsx b/components/card/index.tsx index 068dd22133..deb87bafed 100644 --- a/components/card/index.tsx +++ b/components/card/index.tsx @@ -183,13 +183,6 @@ export default class Card extends React.Component { {loading ? loadingBlock :
{children}
}
); - const mainContent = ( -
- {head} - {coverDom} - {children ? body : null} -
- ); const actionDom = actions && actions.length ?
    {this.getAction(actions)}
: null; const divProps = omit(others, [ @@ -197,7 +190,9 @@ export default class Card extends React.Component { ]); return (
- {mainContent} + {head} + {coverDom} + {children ? body : null} {actionDom}
);