fela-bindings
Advanced tools
Comparing version 11.0.2 to 11.1.0
@@ -7,4 +7,2 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; | ||
import deprecate from './_deprecate'; | ||
export default function FelaComponentFactory(createElement, RendererContext, FelaTheme) { | ||
@@ -16,14 +14,4 @@ function FelaComponent(_ref) { | ||
style = _ref.style, | ||
customClass = _ref.customClass, | ||
rule = _ref.rule, | ||
render = _ref.render, | ||
otherProps = _objectWithoutProperties(_ref, ['children', 'as', 'style', 'customClass', 'rule', 'render']); | ||
otherProps = _objectWithoutProperties(_ref, ['children', 'as', 'style']); | ||
// TODO: remove in 11.0.0 | ||
deprecate(customClass !== undefined, 'The `customClass` prop in FelaComponent is deprecated. It will be removed in react-fela@11.0.0.\nPlease resolve class names manually in your render function. See http://fela.js.org/docs/api/bindings/fela-component'); | ||
deprecate(rule !== undefined, 'The `rule` prop in FelaComponent is deprecated. It will be removed in react-fela@11.0.0.\nPlease always use `style` instead. See http://fela.js.org/docs/api/bindings/fela-component', function () { | ||
style = rule; | ||
}); | ||
deprecate(render !== undefined, 'The `render` prop in FelaComponent is deprecated. It will be removed in react-fela@11.0.0.\nPlease always use `children` instead. See http://fela.js.org/docs/api/bindings/fela-component'); | ||
var renderFn = function renderFn(renderer) { | ||
@@ -37,25 +25,10 @@ if (renderer.devMode && style == null) { | ||
// TODO: could optimize perf by not calling combineRules if not necessary | ||
var className = renderer.renderRule(combineRules(style), _extends({}, otherProps, { | ||
var renderedRule = renderer.renderRule(combineRules(style), _extends({}, otherProps, { | ||
theme: theme | ||
})); | ||
// TODO: remove in 11.0.0 | ||
var cls = customClass ? customClass + ' ' + className : className; | ||
if (render instanceof Function) { | ||
return render({ | ||
className: cls, | ||
children: children, | ||
theme: theme, | ||
as: as | ||
}); | ||
} | ||
if (typeof render === 'string') { | ||
return createElement(render, { className: cls }, children); | ||
} | ||
if (children instanceof Function) { | ||
return children({ | ||
className: cls, | ||
className: !renderer.isNativeRenderer && renderedRule, | ||
style: renderer.isNativeRenderer && renderedRule, | ||
theme: theme, | ||
@@ -66,3 +39,6 @@ as: as | ||
return createElement(as, { className: cls }, children); | ||
return createElement(as, { | ||
className: !renderer.isNativeRenderer && renderedRule, | ||
style: renderer.isNativeRenderer && renderedRule | ||
}, children); | ||
}); | ||
@@ -69,0 +45,0 @@ }; |
@@ -1,13 +0,7 @@ | ||
import deprecate from './_deprecate'; | ||
export default function FelaThemeFactory(createElement, ThemeContext) { | ||
function FelaTheme(_ref) { | ||
var children = _ref.children, | ||
render = _ref.render; | ||
var children = _ref.children; | ||
// TODO: remove with 11.0.0 | ||
deprecate(render !== undefined, 'The `render` prop in FelaTheme is deprecated. It will be removed in react-fela@11.0.0.\nPlease always use `children` instead. See http://fela.js.org/docs/api/bindings/fela-theme'); | ||
var renderFn = children; | ||
var renderFn = children || render; | ||
return createElement(ThemeContext.Consumer, undefined, renderFn); | ||
@@ -14,0 +8,0 @@ } |
@@ -13,8 +13,2 @@ 'use strict'; | ||
var _deprecate = require('./_deprecate'); | ||
var _deprecate2 = _interopRequireDefault(_deprecate); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } | ||
function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; } | ||
@@ -28,14 +22,4 @@ | ||
style = _ref.style, | ||
customClass = _ref.customClass, | ||
rule = _ref.rule, | ||
render = _ref.render, | ||
otherProps = _objectWithoutProperties(_ref, ['children', 'as', 'style', 'customClass', 'rule', 'render']); | ||
otherProps = _objectWithoutProperties(_ref, ['children', 'as', 'style']); | ||
// TODO: remove in 11.0.0 | ||
(0, _deprecate2.default)(customClass !== undefined, 'The `customClass` prop in FelaComponent is deprecated. It will be removed in react-fela@11.0.0.\nPlease resolve class names manually in your render function. See http://fela.js.org/docs/api/bindings/fela-component'); | ||
(0, _deprecate2.default)(rule !== undefined, 'The `rule` prop in FelaComponent is deprecated. It will be removed in react-fela@11.0.0.\nPlease always use `style` instead. See http://fela.js.org/docs/api/bindings/fela-component', function () { | ||
style = rule; | ||
}); | ||
(0, _deprecate2.default)(render !== undefined, 'The `render` prop in FelaComponent is deprecated. It will be removed in react-fela@11.0.0.\nPlease always use `children` instead. See http://fela.js.org/docs/api/bindings/fela-component'); | ||
var renderFn = function renderFn(renderer) { | ||
@@ -49,25 +33,10 @@ if (renderer.devMode && style == null) { | ||
// TODO: could optimize perf by not calling combineRules if not necessary | ||
var className = renderer.renderRule((0, _fela.combineRules)(style), _extends({}, otherProps, { | ||
var renderedRule = renderer.renderRule((0, _fela.combineRules)(style), _extends({}, otherProps, { | ||
theme: theme | ||
})); | ||
// TODO: remove in 11.0.0 | ||
var cls = customClass ? customClass + ' ' + className : className; | ||
if (render instanceof Function) { | ||
return render({ | ||
className: cls, | ||
children: children, | ||
theme: theme, | ||
as: as | ||
}); | ||
} | ||
if (typeof render === 'string') { | ||
return createElement(render, { className: cls }, children); | ||
} | ||
if (children instanceof Function) { | ||
return children({ | ||
className: cls, | ||
className: !renderer.isNativeRenderer && renderedRule, | ||
style: renderer.isNativeRenderer && renderedRule, | ||
theme: theme, | ||
@@ -78,3 +47,6 @@ as: as | ||
return createElement(as, { className: cls }, children); | ||
return createElement(as, { | ||
className: !renderer.isNativeRenderer && renderedRule, | ||
style: renderer.isNativeRenderer && renderedRule | ||
}, children); | ||
}); | ||
@@ -81,0 +53,0 @@ }; |
@@ -1,2 +0,2 @@ | ||
'use strict'; | ||
"use strict"; | ||
@@ -7,19 +7,8 @@ Object.defineProperty(exports, "__esModule", { | ||
exports.default = FelaThemeFactory; | ||
var _deprecate = require('./_deprecate'); | ||
var _deprecate2 = _interopRequireDefault(_deprecate); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } | ||
function FelaThemeFactory(createElement, ThemeContext) { | ||
function FelaTheme(_ref) { | ||
var children = _ref.children, | ||
render = _ref.render; | ||
var children = _ref.children; | ||
// TODO: remove with 11.0.0 | ||
(0, _deprecate2.default)(render !== undefined, 'The `render` prop in FelaTheme is deprecated. It will be removed in react-fela@11.0.0.\nPlease always use `children` instead. See http://fela.js.org/docs/api/bindings/fela-theme'); | ||
var renderFn = children; | ||
var renderFn = children || render; | ||
return createElement(ThemeContext.Consumer, undefined, renderFn); | ||
@@ -26,0 +15,0 @@ } |
{ | ||
"name": "fela-bindings", | ||
"version": "11.0.2", | ||
"version": "11.1.0", | ||
"description": "Abstract binding factories for Fela", | ||
@@ -30,8 +30,8 @@ "main": "lib/index.js", | ||
"fast-loops": "^1.0.0", | ||
"fela-dom": "^11.0.2", | ||
"fela-tools": "^11.0.2", | ||
"fela-dom": "^11.1.0", | ||
"fela-tools": "^11.1.0", | ||
"react-addons-shallow-compare": "^15.6.2", | ||
"shallow-equal": "^1.0.0" | ||
}, | ||
"gitHead": "e1a48f5d72623a0f95084dc07998dd85aa175bd1" | ||
"gitHead": "55ad9b7c6c3952d0c94f5815b87005e8552bec9e" | ||
} |
39
62345
1166
Updatedfela-dom@^11.1.0
Updatedfela-tools@^11.1.0