4 files changed, 19 insertions, 15 deletions
diff --git a/src/generic-components/graph/ForceDirectedGraph.jsx b/src/generic-components/graph/ForceDirectedGraph.jsx
index 0ec2412..dfebfe3 100644
--- a/src/generic-components/graph/ForceDirectedGraph.jsx
+++ b/src/generic-components/graph/ForceDirectedGraph.jsx
@@ -22,7 +22,8 @@ import {drag} from 'd3-drag';
 import {forceSimulation, forceLink, forceManyBody, forceCenter} from 'd3-force';
 import {interpolateNumber} from 'd3-interpolate';
 import {select, event as currentEvent} from 'd3-selection';
-import React, {Component, PropTypes} from 'react';
+import React, {Component} from 'react';
+import { PropTypes } from 'prop-types';
 import {interval, now} from 'd3-timer';
 import {zoom, zoomIdentity} from 'd3-zoom';
 import NodeConstants from './NodeVisualElementConstants.js';
diff --git a/src/generic-components/graph/Link.jsx b/src/generic-components/graph/Link.jsx
index bebd4b6..aec33b8 100644
--- a/src/generic-components/graph/Link.jsx
+++ b/src/generic-components/graph/Link.jsx
@@ -19,17 +19,18 @@
  * ============LICENSE_END=========================================================
  */
 import React, {Component} from 'react';
+import { PropTypes } from 'prop-types';
 
 import TempCreateAttributes from './TempCreateAttributes.js';
 
 class Link extends Component {
 		
 		static propTypes = {
-				x1: React.PropTypes.number,
-				y1: React.PropTypes.number,
-				x2: React.PropTypes.number,
-				y2: React.PropTypes.number,
-				linkAttributes: React.PropTypes.object
+				x1: PropTypes.number,
+				y1: PropTypes.number,
+				x2: PropTypes.number,
+				y2: PropTypes.number,
+				linkAttributes: PropTypes.object
 		};
 		
 		static defaultProps = {
diff --git a/src/generic-components/graph/Node.jsx b/src/generic-components/graph/Node.jsx
index 0b96f2a..6de4715 100644
--- a/src/generic-components/graph/Node.jsx
+++ b/src/generic-components/graph/Node.jsx
@@ -19,15 +19,16 @@
  * ============LICENSE_END=========================================================
  */
 import React, {Component} from 'react';
+import { PropTypes } from 'prop-types';
 
 class Node extends Component {
 		
 		static propTypes = {
-				x: React.PropTypes.number,
-				y: React.PropTypes.number,
-				nodeClass: React.PropTypes.string,
-				visualElements: React.PropTypes.array,
-				meta: React.PropTypes.object
+				x: PropTypes.number,
+				y: PropTypes.number,
+				nodeClass: PropTypes.string,
+				visualElements: PropTypes.array,
+				meta: PropTypes.object
 		};
 		
 		static defaultProps = {
diff --git a/src/generic-components/graph/SVGShape.jsx b/src/generic-components/graph/SVGShape.jsx
index 0ee31fd..b06c46f 100644
--- a/src/generic-components/graph/SVGShape.jsx
+++ b/src/generic-components/graph/SVGShape.jsx
@@ -19,15 +19,16 @@
  * ============LICENSE_END=========================================================
  */
 import React, {Component} from 'react';
+import { PropTypes } from 'prop-types';
 import NodeVisualElementConstants from './NodeVisualElementConstants';
 
 class SVGShape extends Component {
 		
 		static propTypes = {
-				shapeType: React.PropTypes.string.isRequired,
-				shapeAttributes: React.PropTypes.object.isRequired,
-				shapeClass: React.PropTypes.object.isRequired,
-				textValue: React.PropTypes.string
+				shapeType: PropTypes.string.isRequired,
+				shapeAttributes: PropTypes.object.isRequired,
+				shapeClass: PropTypes.object.isRequired,
+				textValue: PropTypes.string
 		};
 		
 		static defaultProps = {