nav-frontend-alertstriper
Advanced tools
Comparing version 0.2.3 to 0.2.4
@@ -6,3 +6,3 @@ 'use strict'; | ||
}); | ||
exports.AlertStripeInfo = exports.AlertStripeInfoSolid = exports.AlertStripeSuksess = exports.AlertStripeSuksessSolid = exports.AlertStripeAdvarsel = exports.AlertStripeAdvarselSolid = undefined; | ||
exports.AlertStripeNavansatt = exports.AlertStripeInfo = exports.AlertStripeInfoSolid = exports.AlertStripeSuksess = exports.AlertStripeSuksessSolid = exports.AlertStripeAdvarsel = exports.AlertStripeAdvarselSolid = undefined; | ||
@@ -67,2 +67,11 @@ 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; }; | ||
var _navansattAlertstripe = require('./navansatt-alertstripe'); | ||
Object.defineProperty(exports, 'AlertStripeNavansatt', { | ||
enumerable: true, | ||
get: function get() { | ||
return _interopRequireDefault(_navansattAlertstripe).default; | ||
} | ||
}); | ||
var _propTypes = require('prop-types'); | ||
@@ -103,3 +112,3 @@ | ||
'alertstripe--solid': solid, | ||
'alertstripe--advarsel': type === 'advarsel', | ||
'alertstripe--advarsel': type === 'advarsel' || type === 'nav-ansatt', | ||
'alertstripe--info': type === 'info', | ||
@@ -116,3 +125,4 @@ 'alertstripe--suksess': type === 'suksess' | ||
'info-sirkel-fylt': type === 'info' && solid, | ||
'info-sirkel-orange': type === 'info' && !solid | ||
'info-sirkel-orange': type === 'info' && !solid, | ||
'nav-ansatt': type === 'nav-ansatt' && !solid | ||
}; | ||
@@ -144,5 +154,6 @@ | ||
solid = _props.solid, | ||
size = _props.size, | ||
className = _props.className, | ||
children = _props.children, | ||
props = _objectWithoutProperties(_props, ['type', 'solid', 'className', 'children']); | ||
props = _objectWithoutProperties(_props, ['type', 'solid', 'size', 'className', 'children']); | ||
@@ -155,7 +166,7 @@ return _react2.default.createElement( | ||
{ className: 'alertstripe__ikon' }, | ||
_react2.default.createElement(_navFrontendIkonerAssets2.default, { kind: ikonKind(type, solid), height: '1.5rem', width: '1.5rem' }) | ||
_react2.default.createElement(_navFrontendIkonerAssets2.default, { kind: ikonKind(type, solid), size: size }) | ||
), | ||
_react2.default.createElement( | ||
_navFrontendTypografi.Normaltekst, | ||
{ tag: 'span' }, | ||
{ className: 'alertstripe__tekst', tag: 'span' }, | ||
children | ||
@@ -172,4 +183,5 @@ ) | ||
children: _propTypes2.default.node.isRequired, | ||
type: _propTypes2.default.oneOf(['advarsel', 'suksess', 'info']).isRequired, | ||
type: _propTypes2.default.oneOf(['advarsel', 'suksess', 'info', 'nav-ansatt']).isRequired, | ||
solid: _propTypes2.default.bool, | ||
size: _propTypes2.default.string, | ||
className: _propTypes2.default.string | ||
@@ -180,5 +192,6 @@ }; | ||
className: undefined, | ||
solid: false | ||
solid: false, | ||
size: '1.5em' | ||
}; | ||
exports.default = AlertStripe; |
{ | ||
"name": "nav-frontend-alertstriper", | ||
"version": "0.2.3", | ||
"version": "0.2.4", | ||
"main": "lib/alertstripe.js", | ||
@@ -18,4 +18,4 @@ "jsnext:main": "src/alertstripe.js", | ||
"classnames": "^2.2.5", | ||
"nav-frontend-alertstriper-style": "^0.2.13", | ||
"nav-frontend-ikoner-assets": "^0.2.11", | ||
"nav-frontend-alertstriper-style": "^0.2.14", | ||
"nav-frontend-ikoner-assets": "^0.2.12", | ||
"nav-frontend-typografi": "^1.0.9", | ||
@@ -27,4 +27,4 @@ "prop-types": "^15.5.10", | ||
"@storybook/react": "3.2.0", | ||
"nav-frontend-alertstriper-style": "^0.2.13", | ||
"nav-frontend-ikoner-assets": "^0.2.11", | ||
"nav-frontend-alertstriper-style": "^0.2.14", | ||
"nav-frontend-ikoner-assets": "^0.2.12", | ||
"nav-frontend-typografi": "^1.0.9", | ||
@@ -31,0 +31,0 @@ "react": "^15.4.2 || ^16.0.0" |
@@ -10,3 +10,3 @@ import PT from 'prop-types'; | ||
'alertstripe--solid': solid, | ||
'alertstripe--advarsel': type === 'advarsel', | ||
'alertstripe--advarsel': type === 'advarsel' || type === 'nav-ansatt', | ||
'alertstripe--info': type === 'info', | ||
@@ -22,3 +22,4 @@ 'alertstripe--suksess': type === 'suksess' | ||
'info-sirkel-fylt': type === 'info' && solid, | ||
'info-sirkel-orange': type === 'info' && !solid | ||
'info-sirkel-orange': type === 'info' && !solid, | ||
'nav-ansatt': type === 'nav-ansatt' && !solid | ||
}; | ||
@@ -33,3 +34,3 @@ | ||
render() { | ||
const { type, solid, className, children, ...props } = this.props; | ||
const { type, solid, size, className, children, ...props } = this.props; | ||
@@ -39,5 +40,5 @@ return ( | ||
<span className="alertstripe__ikon"> | ||
<Ikon kind={ikonKind(type, solid)} height="1.5rem" width="1.5rem" /> | ||
<Ikon kind={ikonKind(type, solid)} size={size} /> | ||
</span> | ||
<Normaltekst tag="span">{children}</Normaltekst> | ||
<Normaltekst className="alertstripe__tekst" tag="span">{children}</Normaltekst> | ||
</div> | ||
@@ -50,4 +51,5 @@ ); | ||
children: PT.node.isRequired, | ||
type: PT.oneOf(['advarsel', 'suksess', 'info']).isRequired, | ||
type: PT.oneOf(['advarsel', 'suksess', 'info', 'nav-ansatt']).isRequired, | ||
solid: PT.bool, | ||
size: PT.string, | ||
className: PT.string | ||
@@ -58,3 +60,4 @@ }; | ||
className: undefined, | ||
solid: false | ||
solid: false, | ||
size: '1.5em' | ||
}; | ||
@@ -70,1 +73,2 @@ | ||
export { default as AlertStripeInfo } from './info-alertstripe'; | ||
export { default as AlertStripeNavansatt } from './navansatt-alertstripe'; |
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
20707
19
352