@emotion/styled-base
Advanced tools
Comparing version 0.4.0 to 0.4.1
@@ -111,3 +111,3 @@ 'use strict'; | ||
_this.mergedProps = omitAssign(testAlwaysTrue, {}, _this.props, { | ||
theme: context.theme || _this.props.theme || {} | ||
theme: _this.props.theme || context.theme | ||
}); | ||
@@ -120,3 +120,3 @@ | ||
var serialized = serialize.serializeStyles.call(_assertThisInitialized(_this), styles.concat(classInterpolations)); | ||
var rules = utils.insertStyles(context, serialized); | ||
var rules = utils.insertStyles(context, serialized, _this.serialized === undefined && _this.shouldHydrate); | ||
className += serialized.cls; | ||
@@ -123,0 +123,0 @@ |
@@ -109,3 +109,3 @@ import { memoize, STYLES_KEY } from 'emotion-utils'; | ||
_this.mergedProps = omitAssign(testAlwaysTrue, {}, _this.props, { | ||
theme: context.theme || _this.props.theme || {} | ||
theme: _this.props.theme || context.theme | ||
}); | ||
@@ -118,3 +118,3 @@ | ||
var serialized = serializeStyles.call(_assertThisInitialized(_this), styles.concat(classInterpolations)); | ||
var rules = insertStyles(context, serialized); | ||
var rules = insertStyles(context, serialized, _this.serialized === undefined && _this.shouldHydrate); | ||
className += serialized.cls; | ||
@@ -121,0 +121,0 @@ |
{ | ||
"name": "@emotion/styled-base", | ||
"version": "0.4.0", | ||
"version": "0.4.1", | ||
"description": "base styled API for emotion", | ||
@@ -10,5 +10,5 @@ "main": "dist/index.cjs.js", | ||
"dependencies": { | ||
"@emotion/serialize": "^0.2.1", | ||
"@emotion/serialize": "^0.4.1", | ||
"@emotion/types": "^0.2.3", | ||
"@emotion/utils": "^0.4.0", | ||
"@emotion/utils": "^0.4.1", | ||
"emotion-utils": "9.0.1" | ||
@@ -18,3 +18,3 @@ }, | ||
"@emotion/core": "0.x.x", | ||
"react": ">=16.3.0 || 16.3.0-alpha.0" | ||
"react": ">=16.3.0 || >=16.3.0-alpha.0" | ||
}, | ||
@@ -21,0 +21,0 @@ "publishConfig": { |
@@ -92,3 +92,3 @@ // @flow | ||
this.mergedProps = omitAssign(testAlwaysTrue, {}, this.props, { | ||
theme: context.theme || this.props.theme || {} | ||
theme: this.props.theme || context.theme | ||
}) | ||
@@ -106,3 +106,7 @@ if (typeof this.props.className === 'string') { | ||
) | ||
const rules = insertStyles(context, serialized) | ||
const rules = insertStyles( | ||
context, | ||
serialized, | ||
this.serialized === undefined && this.shouldHydrate | ||
) | ||
className += serialized.cls | ||
@@ -109,0 +113,0 @@ |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
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
92654
926
+ Added@emotion/serialize@0.4.1(transitive)
- Removed@emotion/serialize@0.2.1(transitive)
Updated@emotion/serialize@^0.4.1
Updated@emotion/utils@^0.4.1