pass style props to Affix (ant-design#4715)

+ close ant-design#4701
yry787 · Jan 26, 2017 · 340385d · 340385d
1 parent 5cd111d
commit 340385d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/components/affix/index.tsx b/components/affix/index.tsx
@@ -221,9 +221,9 @@ export default class Affix extends React.Component<AffixProps, any> {
     });
 
     const props = omit(this.props, ['prefixCls', 'offsetTop', 'offsetBottom', 'target']);
-
+    const placeholderStyle = { ...this.state.placeholderStyle, ...this.props.style };
     return (
-      <div {...props} style={this.state.placeholderStyle}>
+      <div {...props} style={placeholderStyle}>
         <div className={className} ref="fixedNode" style={this.state.affixStyle}>
           {this.props.children}
         </div>