Merge branch 'master' into develop

Author: bkrem

README.md

@@ -1,6 +1,7 @@
 # React D3 Tree
 [![Build Status](https://travis-ci.org/bkrem/react-d3-tree.svg?branch=master)](https://travis-ci.org/bkrem/react-d3-tree)
 [![Coverage Status](https://coveralls.io/repos/github/bkrem/react-d3-tree/badge.svg?branch=master)](https://coveralls.io/github/bkrem/react-d3-tree?branch=master)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/f9ed4796ee9c448dbcd80af2954cc0d1)](https://www.codacy.com/app/ben.kremer/react-d3-tree?utm_source=github.com&utm_medium=referral&utm_content=bkrem/react-d3-tree&utm_campaign=Badge_Grade)
 [![npm version](https://badge.fury.io/js/react-d3-tree.svg)](https://badge.fury.io/js/react-d3-tree)
 
 React D3 Tree is a [React](http://facebook.github.io/react/) component that lets you represent hierarchical data (e.g. ancestor trees, organisational structure, package dependencies) as an animated & interactive tree graph by leveraging [D3](https://d3js.org/)'s `tree` layout.
@@ -16,7 +17,7 @@ React D3 Tree is a [React](http://facebook.github.io/react/) component that lets
 
 
 ## Demo
-- Current release (stable): https://bkrem.github.io/react-d3-tree/ 
+- Current release: https://bkrem.github.io/react-d3-tree/ 
 
 
 ## Installation
@@ -33,6 +34,7 @@ yarn add react-d3-tree
 
 ## Usage
 ```jsx
+import React from 'react';
 import Tree from 'react-d3-tree';
 
 const myTreeData = [
@@ -59,7 +61,7 @@ const myTreeData = [
   },
 ];
 
-class MyComponent extends Component {
+class MyComponent extends React.Component {
   render() {
     return (
       {/* <Tree /> will fill width/height of its container; in this case `#treeWrapper` */}
@@ -127,6 +129,7 @@ Statically hosted JSON or CSV files can be used as data sources via the addition
 ### Example
 
 ```jsx
+import React from 'react';
 import { Tree, treeUtil } from 'react-d3-tree';
 
 const csvSource = 'https://raw.githubusercontent.com/bkrem/react-d3-tree/master/docs/examples/data/csv-example.csv';
@@ -147,7 +150,7 @@ componentWillMount() {
   .catch((err) => console.error(err));
 }
 
-class MyComponent extends Component {
+class MyComponent extends React.Component {
   render() {
     return (
       {/* <Tree /> will fill width/height of its container; in this case `#treeWrapper` */}

docs/components/Link.md

@@ -20,3 +20,13 @@ type: `enum('horizontal'|'vertical')`
 
 type: `enum('diagonal'|'elbow')`
 
+
+### `styles` (required)
+
+type: `object`
+
+
+### `transitionDuration` (required)
+
+type: `number`
+

docs/components/Node.md

@@ -6,43 +6,29 @@
 Props
 -----
 
-### `circleRadius`
-
-type: `number`
-defaultValue: `10`
-
-
-### `circleStyle`
+### `attributes`
 
 type: `object`
-defaultValue: `{
-  stroke: '#000',
-  strokeWidth: 2,
-  fill: 'grey',
-}`
+defaultValue: `undefined`
 
 
-### `depthFactor`
+### `circleRadius`
 
 type: `number`
+defaultValue: `10`
 
 
-### `leafCircleStyle`
+### `name` (required)
 
-type: `object`
-defaultValue: `{
-  stroke: '#000',
-  strokeWidth: 2,
-  fill: 'transparent',
-}`
+type: `string`
 
 
 ### `nodeData` (required)
 
 type: `object`
 
 
-### `onClick`
+### `onClick` (required)
 
 type: `func`
 
@@ -52,27 +38,18 @@ type: `func`
 type: `enum('horizontal'|'vertical')`
 
 
-### `primaryLabel`
-
-type: `string`
-
-
-### `primaryLabelStyle`
-
-type: `object`
-
-
-### `secondaryLabels`
+### `styles` (required)
 
 type: `object`
 
 
-### `secondaryLabelsStyle`
+### `textAnchor`
 
-type: `object`
+type: `string`
+defaultValue: `'start'`
 
 
-### `textAnchor`
+### `transitionDuration` (required)
 
-type: `string`
+type: `number`
 

docs/components/Tree.md

@@ -47,6 +47,32 @@ type: `shape[object Object]`
 defaultValue: `{ min: 0.1, max: 1 }`
 
 
+### `styles`
+
+type: `shape[object Object]`
+defaultValue: `{
+  nodes: {
+    node: {
+      circle: {},
+      name: {},
+      attributes: {},
+    },
+    leafNode: {
+      circle: {},
+      name: {},
+      attributes: {},
+    },
+  },
+  links: {},
+}`
+
+
+### `transitionDuration`
+
+type: `number`
+defaultValue: `500`
+
+
 ### `translate`
 
 type: `shape[object Object]`