[fix] don't replace 'className' value

This commit is contained in:
Nicolas Gallagher
2016-06-13 11:58:05 -07:00
parent 62cd335788
commit a16e542bd8
2 changed files with 16 additions and 2 deletions
@@ -48,4 +48,14 @@ suite('apis/StyleSheet', () => {
`.__style1{opacity:1;}`
)
})
test('resolve', () => {
assert.deepEqual(
StyleSheet.resolve({ className: 'test', style: styles.root }),
{
className: 'test',
style: { opacity: 1 }
}
)
})
})
+6 -2
View File
@@ -56,8 +56,12 @@ const renderToString = () => {
* Accepts React props and converts inline styles to single purpose classes
* where possible.
*/
const resolve = ({ style = {} }) => {
return StyleSheetRegistry.getStyleAsNativeProps(style, isRendered)
const resolve = ({ className, style = {} }) => {
const props = StyleSheetRegistry.getStyleAsNativeProps(style, isRendered);
return {
...props,
className: className ? `${props.className} ${className}`.trim() : props.className
}
}
module.exports = {