Merge branch 'hotfix/v0.3.1' into develop

Author: bkrem

.editorconfig

@@ -0,0 +1,14 @@
+# editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false

README.md

@@ -1,9 +1,16 @@
 # 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) 
+[![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)
+[![npm](https://img.shields.io/npm/v/react-d3-tree.svg)](https://www.npmjs.com/package/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.
 
+## Contents
+- [Demo](#demo)
+- [Installation](#installation)
+- [Minimal example](#minimal-example)
+- [Props](#props)
+
 ## Demo
 - Current release (stable): https://bkrem.github.io/react-d3-tree/ 
 

lib/react-d3-tree.min.js

@@ -1,6 +1,6 @@
 {
   "name": "react-d3-tree",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "React component to create interactive D3 tree hierarchies",
   "main": "lib/react-d3-tree.min.js",
   "scripts": {

package.json

@@ -16,7 +16,7 @@ export default class Tree extends React.Component {
       data: this.assignInternalProperties(clone(this.props.data)),
       zoom: undefined,
     };
-    this.findTargetNode = this.findTargetNode.bind(this);
+    this.findNodesById = this.findNodesById.bind(this);
     this.collapseNode = this.collapseNode.bind(this);
     this.handleNodeToggle = this.handleNodeToggle.bind(this);
   }
@@ -100,29 +100,31 @@ export default class Tree extends React.Component {
 
 
   /**
-   * findTargetNode - Recursively walks a set of nodes (`nodeSet`) and its
-   * children until a `node.id` that matches `nodeId` param is found.
+   * findNodesById - Description
    *
-   * @param {string} nodeId  The `node.id` being searched for
+   * @param {string} nodeId The `node.id` being searched for
    * @param {array} nodeSet Array of `node` objects
+   * @param {array} hits Accumulator for matches, passed between recursive calls
    *
-   * @return {object} Returns the targeted `node` object
+   * @return {array} Set of nodes matching `nodeId`
    */
    // TODO Refactor this into a more readable/reasonable recursive depth-first walk.
-  findTargetNode(nodeId, nodeSet) {
-    const hits = nodeSet.filter((node) => node.id === nodeId);
-
+  findNodesById(nodeId, nodeSet, hits) {
     if (hits.length > 0) {
-      const targetNode = hits[0];
-      return targetNode;
+      return hits;
     }
 
-    return nodeSet.map((node) => {
+    hits = hits.concat(nodeSet.filter((node) => node.id === nodeId));
+
+    nodeSet.forEach((node) => {
       if (node._children && node._children.length > 0) {
-        return this.findTargetNode(nodeId, node._children);
+        hits = this.findNodesById(nodeId, node._children, hits);
+        return hits;
       }
-      return null;
-    })[0];
+      return hits;
+    });
+
+    return hits;
   }
 
 
@@ -169,7 +171,8 @@ export default class Tree extends React.Component {
   handleNodeToggle(nodeId) {
     if (this.props.collapsible) {
       const data = clone(this.state.data);
-      const targetNode = this.findTargetNode(nodeId, data);
+      const matches = this.findNodesById(nodeId, data, []);
+      const targetNode = matches[0];
       targetNode._collapsed
         ? this.expandNode(targetNode)
         : this.collapseNode(targetNode);