Skip to content

Commit 5ad88aa

Browse files
committed
includeOriginal must be false when useModulName is true
1 parent 168e11a commit 5ad88aa

File tree

3 files changed

+21
-0
lines changed

3 files changed

+21
-0
lines changed

dist/linkClass.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ linkClass = function (element) {
3838

3939
if (options.useModuleName) {
4040
moduleName = element.props.moduleName;
41+
42+
options.includeOriginal = false;
4143
} else {
4244
moduleName = element.props.className;
4345
}

src/linkClass.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ linkClass = (element, styles = {}, options = {}) => {
2525

2626
if (options.useModuleName) {
2727
moduleName = element.props.moduleName;
28+
29+
options.includeOriginal = false;
2830
} else {
2931
moduleName = element.props.className;
3032
}

test/linkClass.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,23 @@ describe('linkClass', () => {
129129
});
130130
});
131131

132+
describe('when options.useModuleName is true', () => {
133+
it('does not lookup the className property', () => {
134+
let subject;
135+
136+
subject = linkClass(<div className='foo'></div>, {foo: 'foo-1'}, {useModuleName: true});
137+
138+
expect(subject.props.className).to.equal('foo');
139+
});
140+
it('appends CSS Modules using modulName', () => {
141+
let subject;
142+
143+
subject = linkClass(<div moduleName='foo'></div>, {foo: 'foo-1'}, {useModuleName: true});
144+
145+
expect(subject.props.className).to.equal('foo-1');
146+
});
147+
});
148+
132149
describe('when options.allowMultiple is false', () => {
133150
describe('when it finds multiple CSS class names in a className', () => {
134151
it('throws an error', () => {

0 commit comments

Comments
 (0)