Skip to content

Commit 5a1b6e2

Browse files
committed
Separation.
1 parent cc9ee16 commit 5a1b6e2

File tree

4 files changed

+48
-42
lines changed

4 files changed

+48
-42
lines changed

src/extendReactClass.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ extendReactClass = (Component, defaultStyles, options) => {
2121
let renderResult,
2222
styles;
2323

24-
if (this.props.styles) {
24+
/*if (this.props.styles) {
2525
styles = this.props.styles;
2626
} else if (_.isObject(defaultStyles)) {
2727
this.props = _.assign({}, this.props, {
@@ -33,6 +33,10 @@ extendReactClass = (Component, defaultStyles, options) => {
3333
styles = {};
3434
}
3535
36+
console.log('styles', styles); */
37+
38+
styles = defaultStyles;
39+
3640
renderResult = super.render();
3741

3842
if (renderResult) {

src/generateAppendClassName.js

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import _ from 'lodash';
2+
3+
export default (styles, styleNames: Array<string>, errorWhenNotFound: boolean): string => {
4+
let appendClassName;
5+
6+
appendClassName = '';
7+
8+
appendClassName = _.map(styleNames, (styleName) => {
9+
if (styles[styleName]) {
10+
return styles[styleName];
11+
} else {
12+
if (errorWhenNotFound === true) {
13+
throw new Error('"' + styleName + '" CSS module is undefined.');
14+
}
15+
16+
return '';
17+
}
18+
});
19+
20+
appendClassName = _.filter(appendClassName, 'length');
21+
22+
appendClassName = appendClassName.join(' ');
23+
24+
return appendClassName;
25+
};

src/linkClass.js

Lines changed: 4 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,11 @@
1+
import _ from 'lodash';
12
import React from 'react';
23
import makeConfiguration from './makeConfiguration';
34
import isIterable from './isIterable';
4-
import _ from 'lodash';
5-
6-
let generateAppendClassName,
7-
linkClass,
8-
parseStyleName;
9-
10-
parseStyleName = (styleNamePropertyValue: string, allowMultiple: boolean): Array<string> => {
11-
let styleNames;
12-
13-
styleNames = styleNamePropertyValue.split(' ');
14-
styleNames = _.filter(styleNames);
15-
16-
if (allowMultiple === false && styleNames.length > 1) {
17-
throw new Error('ReactElement styleName property defines multiple module names ("' + styleNamePropertyValue + '").');
18-
}
19-
20-
return styleNames;
21-
};
5+
import parseStyleName from './parseStyleName';
6+
import generateAppendClassName from './generateAppendClassName';
227

23-
generateAppendClassName = (styles, styleNames: Array<string>, errorWhenNotFound: boolean): string => {
24-
let appendClassName;
25-
26-
appendClassName = '';
27-
28-
appendClassName = _.map(styleNames, (styleName) => {
29-
if (styles[styleName]) {
30-
return styles[styleName];
31-
} else {
32-
if (errorWhenNotFound === true) {
33-
throw new Error('"' + styleName + '" CSS module is undefined.');
34-
}
35-
36-
return '';
37-
}
38-
});
39-
40-
appendClassName = _.filter(appendClassName, 'length');
41-
42-
appendClassName = appendClassName.join(' ');
43-
44-
return appendClassName;
45-
};
8+
let linkClass;
469

4710
/**
4811
* @param {ReactElement} element

src/parseStyleName.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import _ from 'lodash';
2+
3+
export default (styleNamePropertyValue: string, allowMultiple: boolean): Array<string> => {
4+
let styleNames;
5+
6+
styleNames = styleNamePropertyValue.split(' ');
7+
styleNames = _.filter(styleNames);
8+
9+
if (allowMultiple === false && styleNames.length > 1) {
10+
throw new Error('ReactElement styleName property defines multiple module names ("' + styleNamePropertyValue + '").');
11+
}
12+
13+
return styleNames;
14+
};

0 commit comments

Comments
 (0)