Comparing version 10.6.1 to 10.7.0
@@ -25,5 +25,12 @@ function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } } | ||
return arrayReduce(rules, function (style, rule) { | ||
return assignStyle(style, resolveRule(rule, props, renderer)); | ||
var resolvedRule = resolveRule(rule, props, renderer); | ||
// special combination of our special _className key | ||
if (style._className) { | ||
resolvedRule._className = style._className + (resolvedRule._className ? ' ' + resolvedRule._className : ''); | ||
} | ||
return assignStyle(style, resolvedRule); | ||
}, {}); | ||
}; | ||
} |
@@ -39,5 +39,12 @@ 'use strict'; | ||
return (0, _arrayReduce2.default)(rules, function (style, rule) { | ||
return (0, _assignStyle2.default)(style, resolveRule(rule, props, renderer)); | ||
var resolvedRule = resolveRule(rule, props, renderer); | ||
// special combination of our special _className key | ||
if (style._className) { | ||
resolvedRule._className = style._className + (resolvedRule._className ? ' ' + resolvedRule._className : ''); | ||
} | ||
return (0, _assignStyle2.default)(style, resolvedRule); | ||
}, {}); | ||
}; | ||
} |
{ | ||
"name": "fela", | ||
"version": "10.6.1", | ||
"version": "10.7.0", | ||
"description": "State-Driven Styling in JavaScript", | ||
@@ -38,6 +38,6 @@ "typings": "index.d.ts", | ||
"fast-loops": "^1.0.0", | ||
"fela-utils": "^10.6.1", | ||
"fela-utils": "^10.7.0", | ||
"isobject": "^3.0.1" | ||
}, | ||
"gitHead": "17ed6c0eff16effe089066ac84e1d817baacb13d" | ||
"gitHead": "1e832301926eefb4c0cf955ec3cb9e7298d9d06e" | ||
} |
@@ -81,3 +81,5 @@ <h1><img alt="Fela" src="docs/res/logo.png" width="203"/></h1> | ||
```javascript | ||
import { FelaComponent, Provider } from 'react-fela' | ||
import React from 'react' | ||
import { FelaProvider, useFela } from 'react-fela' | ||
import { createRenderer } from 'fela'; | ||
import { render } from 'react-dom' | ||
@@ -98,8 +100,12 @@ | ||
const Button = ({ fontSize = 14, children }) => ( | ||
<FelaComponent rule={rule} fontSize={fontSize}> | ||
const Button = ({ children, ...props }) => { | ||
const { css } = useFela(props) | ||
<button className={css(rule)}> | ||
{children} | ||
</FelaComponent> | ||
) | ||
</button> | ||
} | ||
const renderer = createRenderer() | ||
render( | ||
@@ -106,0 +112,0 @@ <Provider renderer={renderer}> |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
67079
1195
245
Updatedfela-utils@^10.7.0