Skip to content
This repository was archived by the owner on Jun 3, 2020. It is now read-only.

Commit 2039500

Browse files
committed
Allowed internal component styles to be ignored, in the case that external styles are being used instead.
1 parent 12b2baa commit 2039500

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

dist-modules/sidebar.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,9 @@ var Sidebar = function (_Component) {
265265
}, {
266266
key: 'render',
267267
value: function render() {
268-
var sidebarStyle = _extends({}, defaultStyles.sidebar, this.props.styles.sidebar);
269-
var contentStyle = _extends({}, defaultStyles.content, this.props.styles.content);
270-
var overlayStyle = _extends({}, defaultStyles.overlay, this.props.styles.overlay);
268+
var sidebarStyle = _extends({}, this.props.externalStylesOnly ? {} : defaultStyles.sidebar, this.props.styles.sidebar);
269+
var contentStyle = _extends({}, this.props.externalStylesOnly ? {} : defaultStyles.content, this.props.styles.content);
270+
var overlayStyle = _extends({}, this.props.externalStylesOnly ? {} : defaultStyles.overlay, this.props.styles.overlay);
271271
var useTouch = this.state.dragSupported && this.props.touch;
272272
var isTouching = this.isTouching();
273273
var rootProps = {
@@ -379,7 +379,8 @@ var Sidebar = function (_Component) {
379379
}),
380380
_react2.default.createElement(
381381
'div',
382-
{ className: this.props.contentClassName, style: contentStyle },
382+
{ className: this.props.contentClassName,
383+
style: contentStyle },
383384
dragHandle,
384385
this.props.children
385386
)
@@ -403,6 +404,9 @@ Sidebar.propTypes = {
403404
dragHandle: _propTypes2.default.object
404405
}),
405406

407+
// Are styles loaded via an external source / stylesheet? If so, sets no styles on the component.
408+
externalStylesOnly: _propTypes2.default.bool,
409+
406410
// root component optional class
407411
rootClassName: _propTypes2.default.string,
408412

@@ -460,6 +464,7 @@ Sidebar.defaultProps = {
460464
dragToggleDistance: 30,
461465
onSetOpen: function onSetOpen() {},
462466
styles: {},
467+
externalStylesOnly: false,
463468
defaultSidebarWidth: 0
464469
};
465470

src/sidebar.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,9 @@ class Sidebar extends Component {
218218
}
219219

220220
render() {
221-
const sidebarStyle = {...defaultStyles.sidebar, ...this.props.styles.sidebar};
222-
const contentStyle = {...defaultStyles.content, ...this.props.styles.content};
223-
const overlayStyle = {...defaultStyles.overlay, ...this.props.styles.overlay};
221+
const sidebarStyle = {...this.props.externalStylesOnly ? {} : defaultStyles.sidebar, ...this.props.styles.sidebar};
222+
const contentStyle = {...this.props.externalStylesOnly ? {} : defaultStyles.content, ...this.props.styles.content};
223+
const overlayStyle = {...this.props.externalStylesOnly ? {} : defaultStyles.overlay, ...this.props.styles.overlay};
224224
const useTouch = this.state.dragSupported && this.props.touch;
225225
const isTouching = this.isTouching();
226226
const rootProps = {
@@ -328,7 +328,8 @@ class Sidebar extends Component {
328328
tabIndex="0"
329329
onClick={this.overlayClicked}
330330
/>
331-
<div className={this.props.contentClassName} style={contentStyle}>
331+
<div className={this.props.contentClassName}
332+
style={contentStyle}>
332333
{dragHandle}
333334
{this.props.children}
334335
</div>
@@ -350,6 +351,9 @@ Sidebar.propTypes = {
350351
dragHandle: PropTypes.object,
351352
}),
352353

354+
// Are styles loaded via an external source / stylesheet? If so, sets no styles on the component.
355+
externalStylesOnly: PropTypes.bool,
356+
353357
// root component optional class
354358
rootClassName: PropTypes.string,
355359

@@ -407,6 +411,7 @@ Sidebar.defaultProps = {
407411
dragToggleDistance: 30,
408412
onSetOpen: () => {},
409413
styles: {},
414+
externalStylesOnly: false,
410415
defaultSidebarWidth: 0,
411416
};
412417

0 commit comments

Comments
 (0)