Skip to content

Commit

Permalink
SSL-1056. Added ContextErrorMessage
Browse files Browse the repository at this point in the history
  • Loading branch information
eirikv committed Mar 15, 2017
1 parent a016111 commit 8cfefc6
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 4 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# CHANGELOG

## 2.2.0
* Added <ContextErrorMessage /> component

## 2.1.1/2.1.2
* Update designguide doc

Expand Down
12 changes: 12 additions & 0 deletions example/example.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
ContextInfoMessage,
ContextTipMessage,
ContextSuccessMessage,
ContextErrorMessage,
} from '../lib';

const example = (
Expand Down Expand Up @@ -58,6 +59,17 @@ const example = (
</ContextSuccessMessage>
</div>

<div className="example-container">
<h4 className="example-container__header">Error</h4>
<ContextErrorMessage
header='Error'
locale='nb'
showCloseButton={true}
>
Whoops! Noe gikk feil.
</ContextErrorMessage>
</div>

<div className="expanding-field">
<button className="expanding-field__toggle">Vis HTML</button>
<span className="expanding-field__icon"></span>
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ffe-context-message-react",
"version": "2.1.2",
"version": "2.2.0",
"description": "SpareBank 1 System Message komponent",
"main": "lib/index.js",
"scripts": {
Expand All @@ -25,7 +25,7 @@
"peerDependencies": {
"ffe-core": "^8.1.2",
"ffe-icons-react": "^2.3.0",
"ffe-context-message": "^1.1.0",
"ffe-context-message": "^1.2.0",
"react": "^15.1.0",
"react-dom": "^15.1.0"
},
Expand All @@ -46,7 +46,7 @@
"eslint-plugin-jsx-a11y": "^3.0.2",
"eslint-plugin-react": "^6.8.0",
"expect.js": "^0.3.1",
"ffe-context-message": "^1.0.3",
"ffe-context-message": "^1.2.0",
"ffe-core": "^8.1.2",
"ffe-icons-react": "^2.1.0",
"hjs-webpack": "^8.3.0",
Expand Down
2 changes: 1 addition & 1 deletion src/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export default class Base extends Component {

Base.propTypes = {
children: PropTypes.node.isRequired,
messageType: PropTypes.oneOf(['info', 'tip', 'success']).isRequired,
messageType: PropTypes.oneOf(['info', 'tip', 'success', 'error']).isRequired,
showCloseButton: PropTypes.bool.isRequired,
locale: PropTypes.oneOf(acceptedLocales),
icon: PropTypes.element,
Expand Down
17 changes: 17 additions & 0 deletions src/context-error-message.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React, { PropTypes } from 'react';
import Base from './base';

export default function ContextErrorMessage({children, ...rest}) {
return (
<Base
messageType="error"
{...rest}
>
{children}
</Base>
);
}

ContextErrorMessage.propTypes = {
children: PropTypes.node.isRequired,
};
2 changes: 2 additions & 0 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import ContextInfoMessage from './context-info-message';
import ContextTipMessage from './context-tip-message';
import ContextSuccessMessage from './context-success-message';
import ContextErrorMessage from './context-error-message';

export {
ContextInfoMessage,
ContextTipMessage,
ContextSuccessMessage,
ContextErrorMessage,
};
17 changes: 17 additions & 0 deletions src/test/context-message-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
ContextInfoMessage,
ContextTipMessage,
ContextSuccessMessage,
ContextErrorMessage,
} from '../';
import Base from '../base';
import InfoCircleIcon from 'ffe-icons-react/info-sirkel-ikon';
Expand Down Expand Up @@ -127,3 +128,19 @@ describe('Test ContextSuccessMessage', () => {
expect(component.hasClass('ffe-context-message--success')).to.be(true);
});
});

describe('Test ContextErrorMessage', () => {
const wrapper = mount(
<ContextErrorMessage
icon={<InfoCircleIcon />}
showCloseButton={true}
>
<p>content</p>
</ContextErrorMessage>
);

it('renders ContextErrorMessage', () => {
const component = wrapper.find('.ffe-context-message');
expect(component.hasClass('ffe-context-message--error')).to.be(true);
});
});

0 comments on commit 8cfefc6

Please sign in to comment.