mirror of
https://github.com/zoriya/react-native-web.git
synced 2026-05-22 14:21:44 +00:00
[fix] don't replace 'className' value
This commit is contained in:
@@ -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 }
|
||||
}
|
||||
)
|
||||
})
|
||||
})
|
||||
|
||||
@@ -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 = {
|
||||
|
||||
Reference in New Issue
Block a user