Skip to content

Commit 6fab2a0

Browse files
committed
Merge branch 'Janekk-configure-applying-default-styles'
2 parents bbd7290 + f360ce6 commit 6fab2a0

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

lib/components/Tabs.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ function isTabDisabled(node) {
1414
return node.getAttribute('aria-disabled') === 'true';
1515
}
1616

17+
let useDefaultStyles = true;
18+
1719
module.exports = React.createClass({
1820
displayName: 'Tabs',
1921

@@ -29,11 +31,17 @@ module.exports = React.createClass({
2931
forceRenderTabPanel: PropTypes.bool
3032
},
3133

34+
statics: {
35+
setUseDefaultStyles(use) {
36+
useDefaultStyles = use;
37+
}
38+
},
39+
3240
getDefaultProps() {
3341
return {
3442
selectedIndex: -1,
3543
focus: false,
36-
forceRenderTabPanel: false
44+
focusRenderTabPanel: false
3745
};
3846
},
3947

@@ -48,7 +56,9 @@ module.exports = React.createClass({
4856
},
4957

5058
componentWillMount() {
51-
jss(require('../helpers/styles.js'));
59+
if (useDefaultStyles) {
60+
jss(require('../helpers/styles.js'));
61+
}
5262
},
5363

5464
componentWillReceiveProps(newProps) {

0 commit comments

Comments
 (0)