Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/mergeClasses.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
import _ from 'lodash'

export const mergeClasses = (classes, activeNames = []) => {

if(!classes.default && activeNames.length === 0){
classes = { default: classes }
}

const styles = (classes.default && _.cloneDeep(classes.default)) || {}

activeNames.map((name) => {
const toMerge = classes[name]
if (toMerge) {
Expand Down
38 changes: 38 additions & 0 deletions test/mergeClasses.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -129,3 +129,41 @@ describe('Combine', () => {
expect(mergeClasses(classes, [])).toEqual(after2)
})
})

describe('Combine with optional default ', () => {
it('should assume all properties are under the default property when "default" is omitted with no activeNames', () => {
const classes = {
header: {
margin: '0px',
},
logo: {
color: 'blue',
},
}
const after = {
header: {
margin: '0px',
},
logo: {
color: 'blue',
},
}
expect(mergeClasses(classes)).toEqual(after)
})

it('should not assume properties are nested under default when "default" is omitted but activeNames are present', () => {
const classes = {
header: {
margin: '0px',
},
logo: {
color: 'blue',
},
}
const after = {}

const names = ['active']

expect(mergeClasses(classes, names)).toEqual(after)
})
})