@emotion/styled-base
Advanced tools
Comparing version 0.6.2 to 0.7.0
@@ -36,3 +36,3 @@ 'use strict'; | ||
}; | ||
var omitAssign = function omitAssign(testFn, target) { | ||
var pickAssign = function pickAssign(testFn, target) { | ||
var i = 2; | ||
@@ -64,5 +64,7 @@ var length = arguments.length; | ||
var identifierName; | ||
var shouldForwardProp; | ||
if (options !== undefined) { | ||
identifierName = options.label; | ||
shouldForwardProp = options.shouldForwardProp; | ||
} | ||
@@ -72,3 +74,7 @@ | ||
var baseTag = isReal && tag.__emotion_base || tag; | ||
var omitFn = typeof baseTag === 'string' && baseTag.charAt(0) === baseTag.charAt(0).toLowerCase() ? testOmitPropsOnStringTag : testOmitPropsOnComponent; | ||
if (typeof shouldForwardProp !== 'function') { | ||
shouldForwardProp = typeof baseTag === 'string' && baseTag.charAt(0) === baseTag.charAt(0).toLowerCase() ? testOmitPropsOnStringTag : testOmitPropsOnComponent; | ||
} | ||
return function () { | ||
@@ -97,3 +103,3 @@ var args = arguments; | ||
var classInterpolations = []; | ||
var mergedProps = omitAssign(testAlwaysTrue, {}, props, { | ||
var mergedProps = pickAssign(testAlwaysTrue, {}, props, { | ||
theme: props.theme || context.theme | ||
@@ -106,6 +112,7 @@ }); | ||
var serialized = serialize.serializeStyles.call(mergedProps, styles.concat(classInterpolations)); | ||
var serialized = serialize.serializeStyles.call(mergedProps, context.registered, styles.concat(classInterpolations)); | ||
var rules = utils.insertStyles(context, serialized); | ||
className += serialized.cls; | ||
var ele = React.createElement(baseTag, omitAssign(omitFn, {}, props, { | ||
className += "css-" + serialized.name; | ||
var ele = React.createElement(baseTag, // $FlowFixMe | ||
pickAssign(shouldForwardProp, {}, props, { | ||
className: className, | ||
@@ -112,0 +119,0 @@ ref: props.innerRef |
@@ -32,3 +32,3 @@ import isPropValid from '@emotion/is-prop-valid'; | ||
}; | ||
var omitAssign = function omitAssign(testFn, target) { | ||
var pickAssign = function pickAssign(testFn, target) { | ||
var i = 2; | ||
@@ -60,5 +60,7 @@ var length = arguments.length; | ||
var identifierName; | ||
var shouldForwardProp; | ||
if (options !== undefined) { | ||
identifierName = options.label; | ||
shouldForwardProp = options.shouldForwardProp; | ||
} | ||
@@ -68,3 +70,7 @@ | ||
var baseTag = isReal && tag.__emotion_base || tag; | ||
var omitFn = typeof baseTag === 'string' && baseTag.charAt(0) === baseTag.charAt(0).toLowerCase() ? testOmitPropsOnStringTag : testOmitPropsOnComponent; | ||
if (typeof shouldForwardProp !== 'function') { | ||
shouldForwardProp = typeof baseTag === 'string' && baseTag.charAt(0) === baseTag.charAt(0).toLowerCase() ? testOmitPropsOnStringTag : testOmitPropsOnComponent; | ||
} | ||
return function () { | ||
@@ -93,3 +99,3 @@ var args = arguments; | ||
var classInterpolations = []; | ||
var mergedProps = omitAssign(testAlwaysTrue, {}, props, { | ||
var mergedProps = pickAssign(testAlwaysTrue, {}, props, { | ||
theme: props.theme || context.theme | ||
@@ -102,6 +108,7 @@ }); | ||
var serialized = serializeStyles.call(mergedProps, styles.concat(classInterpolations)); | ||
var serialized = serializeStyles.call(mergedProps, context.registered, styles.concat(classInterpolations)); | ||
var rules = insertStyles(context, serialized); | ||
className += serialized.cls; | ||
var ele = createElement(baseTag, omitAssign(omitFn, {}, props, { | ||
className += "css-" + serialized.name; | ||
var ele = createElement(baseTag, // $FlowFixMe | ||
pickAssign(shouldForwardProp, {}, props, { | ||
className: className, | ||
@@ -108,0 +115,0 @@ ref: props.innerRef |
{ | ||
"name": "@emotion/styled-base", | ||
"version": "0.6.2", | ||
"version": "0.7.0", | ||
"description": "base styled API for emotion", | ||
@@ -10,6 +10,6 @@ "main": "dist/index.cjs.js", | ||
"dependencies": { | ||
"@emotion/is-prop-valid": "^0.6.1", | ||
"@emotion/serialize": "^0.6.2", | ||
"@emotion/types": "^0.6.0", | ||
"@emotion/utils": "^0.5.0" | ||
"@emotion/is-prop-valid": "^0.6.2", | ||
"@emotion/serialize": "^0.7.0", | ||
"@emotion/types": "^0.6.1", | ||
"@emotion/utils": "^0.6.0" | ||
}, | ||
@@ -26,3 +26,4 @@ "peerDependencies": { | ||
"dist" | ||
] | ||
], | ||
"umd:main": "./dist/index.min.js" | ||
} |
@@ -8,3 +8,3 @@ // @flow | ||
testOmitPropsOnStringTag, | ||
omitAssign, | ||
pickAssign, | ||
type StyledOptions, | ||
@@ -30,14 +30,17 @@ type CreateStyled | ||
let identifierName | ||
let shouldForwardProp | ||
if (options !== undefined) { | ||
identifierName = options.label | ||
shouldForwardProp = options.shouldForwardProp | ||
} | ||
const isReal = tag.__emotion_real === tag | ||
const baseTag = (isReal && tag.__emotion_base) || tag | ||
if (typeof shouldForwardProp !== 'function') { | ||
shouldForwardProp = | ||
typeof baseTag === 'string' && | ||
baseTag.charAt(0) === baseTag.charAt(0).toLowerCase() | ||
? testOmitPropsOnStringTag | ||
: testOmitPropsOnComponent | ||
} | ||
const omitFn = | ||
typeof baseTag === 'string' && | ||
baseTag.charAt(0) === baseTag.charAt(0).toLowerCase() | ||
? testOmitPropsOnStringTag | ||
: testOmitPropsOnComponent | ||
return function() { | ||
@@ -66,3 +69,3 @@ let args = arguments | ||
let classInterpolations = [] | ||
let mergedProps = omitAssign(testAlwaysTrue, {}, props, { | ||
let mergedProps = pickAssign(testAlwaysTrue, {}, props, { | ||
theme: props.theme || context.theme | ||
@@ -79,10 +82,12 @@ }) | ||
mergedProps, | ||
context.registered, | ||
styles.concat(classInterpolations) | ||
) | ||
const rules = insertStyles(context, serialized) | ||
className += serialized.cls | ||
className += `css-${serialized.name}` | ||
const ele = React.createElement( | ||
baseTag, | ||
omitAssign(omitFn, {}, props, { | ||
// $FlowFixMe | ||
pickAssign(shouldForwardProp, {}, props, { | ||
className, | ||
@@ -89,0 +94,0 @@ ref: props.innerRef |
@@ -11,3 +11,3 @@ // @flow | ||
export const omitAssign: ( | ||
export const pickAssign: ( | ||
testFn: (key: string) => boolean, | ||
@@ -31,3 +31,6 @@ target: {}, | ||
export type StyledOptions = { label: string } | ||
export type StyledOptions = { | ||
label?: string, | ||
shouldForwardProp?: string => boolean | ||
} | ||
@@ -34,0 +37,0 @@ type CreateStyledComponent = (...args: Interpolations) => * |
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
Minified code
QualityThis package contains minified code. This may be harmless in some cases where minified code is included in packaged libraries, however packages on npm should not minify code.
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
120908
11
450
3
+ Added@emotion/serialize@0.7.0(transitive)
+ Added@emotion/utils@0.6.1(transitive)
- Removed@emotion/serialize@0.6.2(transitive)
- Removed@emotion/utils@0.5.0(transitive)
Updated@emotion/serialize@^0.7.0
Updated@emotion/types@^0.6.1
Updated@emotion/utils@^0.6.0