* Use PropTypes from prop-types package

jberglund · Sep 5, 2017 · 5f610d3 · 5f610d3
1 parent f58b50c
commit 5f610d3
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## Version 1.1.5
+* Use PropTypes from prop-types package
+
 ## Version 1.1.4
 * Removed peerDep on ffe-core
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ffe-system-message-react",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "SpareBank 1 System Message komponent",
   "main": "lib/index.js",
   "scripts": {
@@ -25,6 +25,9 @@
     "lint",
     "test"
   ],
+  "dependencies": {
+    "prop-types": "*"
+  },
   "peerDependencies": {
     "ffe-icons-react": "2.x",
     "ffe-system-message": "1.x || 2.x"

diff --git a/src/base.js b/src/base.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import { node, object, oneOf } from 'prop-types';
 import { findDOMNode } from 'react-dom';
 
 import KryssIkon from 'ffe-icons-react/kryss-ikon';
@@ -61,8 +62,8 @@ export default class Base extends Component {
 }
 
 Base.propTypes = {
-    children: PropTypes.node.isRequired,
-    icon: PropTypes.node.isRequired,
-    modifier: PropTypes.oneOf(['error', 'info', 'success', 'news']),
-    style: PropTypes.object,
+    children: node.isRequired,
+    icon: node.isRequired,
+    modifier: oneOf(['error', 'info', 'success', 'news']),
+    style: object,
 };
diff --git a/src/system-error-message.js b/src/system-error-message.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import { node, object } from 'prop-types';
 
 import InfoSirkelIkon from 'ffe-icons-react/info-sirkel-ikon';
 
@@ -16,6 +17,6 @@ export default function SystemErrorMessage({ style, children }) {
 }
 
 SystemErrorMessage.propTypes = {
-    children: PropTypes.node.isRequired,
-    style: PropTypes.object,
+    children: node.isRequired,
+    style: object,
 };
diff --git a/src/system-info-message.js b/src/system-info-message.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import { node, object } from 'prop-types';
 
 import InfoSirkelIkon from 'ffe-icons-react/info-sirkel-ikon';
 
@@ -13,6 +14,6 @@ export default function SystemInfoMessage({ style, children }) {
 }
 
 SystemInfoMessage.propTypes = {
-    children: PropTypes.node.isRequired,
-    style: PropTypes.object,
+    children: node.isRequired,
+    style: object,
 };
diff --git a/src/system-news-message.js b/src/system-news-message.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import { node, object } from 'prop-types';
 
 import InfoSirkelIkon from 'ffe-icons-react/info-sirkel-ikon';
 
@@ -13,6 +14,6 @@ export default function SystemNewsMessage({ style, children }) {
 }
 
 SystemNewsMessage.propTypes = {
-    children: PropTypes.node.isRequired,
-    style: PropTypes.object,
+    children: node.isRequired,
+    style: object,
 };
diff --git a/src/system-success-message.js b/src/system-success-message.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import { node, object } from 'prop-types';
 
 import HakeSirkelIkon from 'ffe-icons-react/hake-sirkel-ikon';
 
@@ -13,6 +14,6 @@ export default function SystemSuccessMessage({ style, children }) {
 }
 
 SystemSuccessMessage.propTypes = {
-    children: PropTypes.node.isRequired,
-    style: PropTypes.object,
+    children: node.isRequired,
+    style: object,
 };