Skip to content

Commit 832fdec

Browse files
committed
dont overwrite existing className
1 parent 33c0978 commit 832fdec

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

api.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ let css = (rawCSS) => (parentClass, name, descriptor) => ({
2525

2626
/* Replace props and return realCSS™ */
2727
let realCSS = fillProps(rawCSS, originalProps);
28-
let className = insertRules(realCSS);
28+
29+
/* Merge classNames */
30+
const existingClassNames = rendered.props.className || ''
31+
let className = `${existingClassNames} ${insertRules(realCSS)}`;
2932

3033
/* Convert real CSS to javascripty CSS */
3134
//let style = parseCss(realCSS);

css-constructor.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/bundle.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ var _extends = Object.assign || function (target) {
1515
return function (b, c, d) {
1616
return _extends({}, d, { value: function value() {
1717
var e = void 0,
18-
g = d.value.apply(function f(l) {
19-
return e = l.props, l;
18+
g = d.value.apply(function f(m) {
19+
return e = m.props, m;
2020
}(this), arguments),
2121
h = fillProps(a, e),
22-
j = insertRules(h),
23-
k = _extends({}, e, { className: j });return _react2.default.cloneElement(g, k, g.props.children);
22+
j = g.props.className || '',
23+
k = j + ' ' + insertRules(h),
24+
l = _extends({}, e, { className: k });return _react2.default.cloneElement(g, l, g.props.children);
2425
} });
2526
};
2627
},
@@ -172,7 +173,7 @@ var Hello = (_dec = (0, _cssConstructor2.default)(_templateObject), (_class = fu
172173
value: function render() {
173174
return _react2.default.createElement(
174175
'div',
175-
null,
176+
{ className: 'existing' },
176177
_react2.default.createElement('img', { src: 'https://github.com/siddharthkp.png' }),
177178
_react2.default.createElement(
178179
'div',
@@ -1567,10 +1568,6 @@ process.off = noop;
15671568
process.removeListener = noop;
15681569
process.removeAllListeners = noop;
15691570
process.emit = noop;
1570-
process.prependListener = noop;
1571-
process.prependOnceListener = noop;
1572-
1573-
process.listeners = function (name) { return [] }
15741571

15751572
process.binding = function (name) {
15761573
throw new Error('process.binding is not supported');

example/css-constructor.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/hello.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export default class Hello extends React.Component {
3737
`
3838

3939
render () {
40-
return (<div>
40+
return (<div className="existing">
4141
<img src="https://github.com/siddharthkp.png"/>
4242
<div id="handle">@siddharthkp</div>
4343
</div>)

0 commit comments

Comments
 (0)