Skip to content

Commit

Permalink
fix: Prop style is getting duplicated on Table (ant-design#18315) (an…
Browse files Browse the repository at this point in the history
  • Loading branch information
MrHeer authored and afc163 committed Aug 19, 2019
1 parent 62aeb5a commit af39b46
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
1 change: 0 additions & 1 deletion components/empty/__tests__/__snapshots__/demo.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,6 @@ exports[`renders ./components/empty/demo/config-provider.md correctly 1`] = `
</h3>
<div
class="ant-table-wrapper"
style="margin-top:8px"
>
<div
class="ant-spin-nested-loading"
Expand Down
3 changes: 1 addition & 2 deletions components/table/Table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1279,7 +1279,6 @@ export default class Table<T> extends React.Component<TableProps<T>, TableState<
const {
prefixCls: customizePrefixCls,
dropdownPrefixCls: customizeDropdownPrefixCls,
style,
className,
} = this.props;
const data = this.getCurrentPageData();
Expand Down Expand Up @@ -1315,7 +1314,7 @@ export default class Table<T> extends React.Component<TableProps<T>, TableState<
: `${prefixCls}-without-pagination`;

return (
<div className={classNames(`${prefixCls}-wrapper`, className)} style={style}>
<div className={classNames(`${prefixCls}-wrapper`, className)}>
<Spin
{...loading}
className={loading.spinning ? `${paginationPatchClass} ${prefixCls}-spin-holder` : ''}
Expand Down

0 comments on commit af39b46

Please sign in to comment.