emotion-theming
Advanced tools
Comparing version 10.0.0-beta.7 to 10.0.0-beta.8
@@ -7,2 +7,3 @@ 'use strict'; | ||
var _objectAssign = _interopDefault(require('object-assign')); | ||
var React = require('react'); | ||
@@ -13,20 +14,2 @@ var core = require('@emotion/core'); | ||
function _extends() { | ||
_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; | ||
}; | ||
return _extends.apply(this, arguments); | ||
} | ||
var getTheme = function getTheme(outerTheme, theme) { | ||
@@ -47,3 +30,3 @@ if (typeof theme === 'function') { | ||
return _extends({}, outerTheme, theme); | ||
return _objectAssign({}, outerTheme, theme); | ||
}; | ||
@@ -69,2 +52,20 @@ | ||
function _extends() { | ||
_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; | ||
}; | ||
return _extends.apply(this, arguments); | ||
} | ||
// should we change this to be forwardRef/withCSSContext style so it doesn't merge with props? | ||
@@ -71,0 +72,0 @@ var withTheme = function withTheme(Component) { |
@@ -0,1 +1,2 @@ | ||
import _objectAssign from 'object-assign'; | ||
import { createElement, forwardRef } from 'react'; | ||
@@ -6,20 +7,2 @@ import { ThemeContext } from '@emotion/core'; | ||
function _extends() { | ||
_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; | ||
}; | ||
return _extends.apply(this, arguments); | ||
} | ||
var getTheme = function getTheme(outerTheme, theme) { | ||
@@ -40,3 +23,3 @@ if (typeof theme === 'function') { | ||
return _extends({}, outerTheme, theme); | ||
return _objectAssign({}, outerTheme, theme); | ||
}; | ||
@@ -62,2 +45,20 @@ | ||
function _extends() { | ||
_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; | ||
}; | ||
return _extends.apply(this, arguments); | ||
} | ||
// should we change this to be forwardRef/withCSSContext style so it doesn't merge with props? | ||
@@ -64,0 +65,0 @@ var withTheme = function withTheme(Component) { |
@@ -7,2 +7,3 @@ 'use strict'; | ||
var _objectAssign = _interopDefault(require('object-assign')); | ||
var React = require('react'); | ||
@@ -13,20 +14,2 @@ var core = require('@emotion/core'); | ||
function _extends() { | ||
_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; | ||
}; | ||
return _extends.apply(this, arguments); | ||
} | ||
var getTheme = function getTheme(outerTheme, theme) { | ||
@@ -47,3 +30,3 @@ if (typeof theme === 'function') { | ||
return _extends({}, outerTheme, theme); | ||
return _objectAssign({}, outerTheme, theme); | ||
}; | ||
@@ -69,2 +52,20 @@ | ||
function _extends() { | ||
_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; | ||
}; | ||
return _extends.apply(this, arguments); | ||
} | ||
// should we change this to be forwardRef/withCSSContext style so it doesn't merge with props? | ||
@@ -71,0 +72,0 @@ var withTheme = function withTheme(Component) { |
@@ -6,23 +6,11 @@ "use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: !0 }); | ||
var React = require("react"), | ||
var _objectAssign = _interopDefault(require("object-assign")), | ||
React = require("react"), | ||
core = require("@emotion/core"), | ||
weakMemoize = _interopDefault(require("@emotion/weak-memoize")), | ||
hoistNonReactStatics = _interopDefault(require("hoist-non-react-statics")); | ||
function _extends() { | ||
return (_extends = | ||
Object.assign || | ||
function(target) { | ||
for (var i = 1; i < arguments.length; i++) { | ||
var source = arguments[i]; | ||
for (var key in source) | ||
Object.prototype.hasOwnProperty.call(source, key) && | ||
(target[key] = source[key]); | ||
} | ||
return target; | ||
}).apply(this, arguments); | ||
} | ||
var getTheme = function(outerTheme, theme) { | ||
hoistNonReactStatics = _interopDefault(require("hoist-non-react-statics")), | ||
getTheme = function(outerTheme, theme) { | ||
return "function" == typeof theme | ||
? theme(outerTheme) | ||
: _extends({}, outerTheme, theme); | ||
: _objectAssign({}, outerTheme, theme); | ||
}, | ||
@@ -48,20 +36,33 @@ createCacheWithTheme = weakMemoize(function(outerTheme) { | ||
}); | ||
}, | ||
withTheme = function(Component) { | ||
var componentName = Component.displayName || Component.name || "Component", | ||
WithTheme = React.forwardRef(function(props, ref) { | ||
return React.createElement(core.ThemeContext.Consumer, null, function( | ||
theme | ||
) { | ||
return React.createElement( | ||
Component, | ||
_extends({ theme: theme, ref: ref }, props) | ||
); | ||
}); | ||
}; | ||
function _extends() { | ||
return (_extends = | ||
Object.assign || | ||
function(target) { | ||
for (var i = 1; i < arguments.length; i++) { | ||
var source = arguments[i]; | ||
for (var key in source) | ||
Object.prototype.hasOwnProperty.call(source, key) && | ||
(target[key] = source[key]); | ||
} | ||
return target; | ||
}).apply(this, arguments); | ||
} | ||
var withTheme = function(Component) { | ||
var componentName = Component.displayName || Component.name || "Component", | ||
WithTheme = React.forwardRef(function(props, ref) { | ||
return React.createElement(core.ThemeContext.Consumer, null, function( | ||
theme | ||
) { | ||
return React.createElement( | ||
Component, | ||
_extends({ theme: theme, ref: ref }, props) | ||
); | ||
}); | ||
return ( | ||
(WithTheme.displayName = "WithTheme(" + componentName + ")"), | ||
hoistNonReactStatics(WithTheme, Component) | ||
); | ||
}; | ||
}); | ||
return ( | ||
(WithTheme.displayName = "WithTheme(" + componentName + ")"), | ||
hoistNonReactStatics(WithTheme, Component) | ||
); | ||
}; | ||
(exports.ThemeProvider = ThemeProvider), (exports.withTheme = withTheme); |
@@ -0,1 +1,2 @@ | ||
import _objectAssign from 'object-assign'; | ||
import { createElement, forwardRef } from 'react'; | ||
@@ -6,20 +7,2 @@ import { ThemeContext } from '@emotion/core'; | ||
function _extends() { | ||
_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; | ||
}; | ||
return _extends.apply(this, arguments); | ||
} | ||
var getTheme = function getTheme(outerTheme, theme) { | ||
@@ -40,3 +23,3 @@ if (typeof theme === 'function') { | ||
return _extends({}, outerTheme, theme); | ||
return _objectAssign({}, outerTheme, theme); | ||
}; | ||
@@ -62,2 +45,20 @@ | ||
function _extends() { | ||
_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; | ||
}; | ||
return _extends.apply(this, arguments); | ||
} | ||
// should we change this to be forwardRef/withCSSContext style so it doesn't merge with props? | ||
@@ -64,0 +65,0 @@ var withTheme = function withTheme(Component) { |
{ | ||
"name": "emotion-theming", | ||
"version": "10.0.0-beta.7", | ||
"version": "10.0.0-beta.8", | ||
"description": "A CSS-in-JS theming solution, inspired by styled-components", | ||
@@ -35,4 +35,4 @@ "main": "dist/index.cjs.js", | ||
"devDependencies": { | ||
"@emotion/core": "^10.0.0-beta.7", | ||
"@emotion/styled": "^10.0.0-beta.7", | ||
"@emotion/core": "^10.0.0-beta.8", | ||
"@emotion/styled": "^10.0.0-beta.8", | ||
"@types/react": "16.3.18", | ||
@@ -43,3 +43,4 @@ "dtslint": "^0.3.0" | ||
"@emotion/weak-memoize": "^0.2.0", | ||
"hoist-non-react-statics": "^2.3.1" | ||
"hoist-non-react-statics": "^2.3.1", | ||
"object-assign": "^4.1.1" | ||
}, | ||
@@ -46,0 +47,0 @@ "peerDependencies": { |
34317
541
4
+ Addedobject-assign@^4.1.1
+ Addedobject-assign@4.1.1(transitive)