Merge branch 'fix/tabs-props-passthrough' of https://github.com/kenny…

…w12/pivotal-ui into kennyw12-fix/tabs-props-passthrough
Pirolf · Dec 9, 2015 · c4705c9 · c4705c9
2 parents f96a2ae + 768329e
commit c4705c9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/library/spec/pivotal-ui-react/tabs/tabs_spec.js b/library/spec/pivotal-ui-react/tabs/tabs_spec.js
@@ -139,8 +139,7 @@ describe('Tabs', function() {
           );
 
         });
-
-        itPropagatesAttributes('#root > div', {className: 'test-class', id: 'test-id', style: {opacity: '0.5'}});
+        itPropagatesAttributes('#root .tab-simple > div', {className: 'test-class', id: 'test-id', style: {opacity: '0.5'}});
       });
     });
 

diff --git a/library/src/pivotal-ui-react/tabs/tabs.js b/library/src/pivotal-ui-react/tabs/tabs.js
@@ -93,27 +93,28 @@ const BaseTabs = React.createClass({
       tabs = (
         <Accordion className={smallScreenClasses}
                    activeKey={this.state.activeKey}
-                   onSelect={this.handleSelect}>
+                   onSelect={this.handleSelect}
+                  {...props}>
           {childrenAsPanels}
         </Accordion>
       );
     } else {
       tabs = (
         <div className={largeScreenClasses}>
-          <Tabs id={this.state.id || this.props.id}
-                position={position}
+          <Tabs position={position}
                 tabWidth={tabWidth}
                 paneWidth={paneWidth}
                 activeKey={this.state.activeKey}
-                onSelect={this.handleSelect}>
+                onSelect={this.handleSelect}
+                {...{id: this.state.id, ...props}}>
             {children}
           </Tabs>
         </div>
       );
     }
 
     return (
-      <div {...props}>
+      <div>
         {tabs}
       </div>
     );