fela-plugin-extend
Advanced tools
Comparing version 5.0.8 to 5.0.9
@@ -1,21 +0,17 @@ | ||
import assignStyle from 'css-in-js-utils/lib/assignStyle'; | ||
import { isObject, arrayEach, objectEach } from 'fela-utils'; | ||
import { isObject, arrayEach } from 'fela-utils'; | ||
function extendStyle(style, extension, extendPlugin) { | ||
function extendStyle(style, extension, extendPlugin, renderer) { | ||
// extend conditional style objects | ||
if (extension.hasOwnProperty('condition')) { | ||
if (extension.condition) { | ||
assignStyle(style, extendPlugin(extension.style)); | ||
renderer._mergeStyle(style, extendPlugin(extension.style)); | ||
} | ||
} else { | ||
// extend basic style objects | ||
assignStyle(style, extension); | ||
renderer._mergeStyle(style, extension); | ||
} | ||
} | ||
function extend(style) { | ||
for (var property in style) { | ||
var value = style[property]; | ||
function extend(style, type, renderer) { | ||
objectEach(style, function (value, property) { | ||
if (property === 'extend') { | ||
@@ -25,3 +21,3 @@ var extensions = [].concat(value); | ||
arrayEach(extensions, function (extension) { | ||
return extendStyle(style, extension, extend); | ||
return extendStyle(style, extension, extend, renderer); | ||
}); | ||
@@ -31,5 +27,5 @@ delete style[property]; | ||
// support nested extend as well | ||
style[property] = extend(value); | ||
style[property] = extend(value, type, renderer); | ||
} | ||
} | ||
}); | ||
@@ -36,0 +32,0 @@ return style; |
@@ -7,26 +7,19 @@ 'use strict'; | ||
var _assignStyle = require('css-in-js-utils/lib/assignStyle'); | ||
var _assignStyle2 = _interopRequireDefault(_assignStyle); | ||
var _felaUtils = require('fela-utils'); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } | ||
function extendStyle(style, extension, extendPlugin) { | ||
function extendStyle(style, extension, extendPlugin, renderer) { | ||
// extend conditional style objects | ||
if (extension.hasOwnProperty('condition')) { | ||
if (extension.condition) { | ||
(0, _assignStyle2.default)(style, extendPlugin(extension.style)); | ||
renderer._mergeStyle(style, extendPlugin(extension.style)); | ||
} | ||
} else { | ||
// extend basic style objects | ||
(0, _assignStyle2.default)(style, extension); | ||
renderer._mergeStyle(style, extension); | ||
} | ||
} | ||
function extend(style) { | ||
for (var property in style) { | ||
var value = style[property]; | ||
function extend(style, type, renderer) { | ||
(0, _felaUtils.objectEach)(style, function (value, property) { | ||
if (property === 'extend') { | ||
@@ -36,3 +29,3 @@ var extensions = [].concat(value); | ||
(0, _felaUtils.arrayEach)(extensions, function (extension) { | ||
return extendStyle(style, extension, extend); | ||
return extendStyle(style, extension, extend, renderer); | ||
}); | ||
@@ -42,5 +35,5 @@ delete style[property]; | ||
// support nested extend as well | ||
style[property] = extend(value); | ||
style[property] = extend(value, type, renderer); | ||
} | ||
} | ||
}); | ||
@@ -47,0 +40,0 @@ return style; |
{ | ||
"name": "fela-plugin-extend", | ||
"version": "5.0.8", | ||
"version": "5.0.9", | ||
"description": "Fela plugin to extend style objects", | ||
@@ -24,4 +24,4 @@ "main": "lib/index.js", | ||
"css-in-js-utils": "^2.0.0", | ||
"fela-utils": "^7.0.0" | ||
"fela-utils": "^7.0.1" | ||
} | ||
} |
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
5786
62
Updatedfela-utils@^7.0.1