fix(initial depth): ensures branches do not fully expand on first click

Author: bkrem

src/Tree/index.tsx

@@ -399,16 +399,7 @@ class Tree extends React.Component<TreeProps, TreeState> {
       );
 
     const rootNode = tree(
-      hierarchy(this.state.data[0], d => {
-        if (initialDepth !== undefined && isInitialRenderForDataset) {
-          // If `initialDepth` is defined, a node's depth determines
-          // whether we append `children` on the first render.
-          return d.__rd3t.depth >= initialDepth ? null : d.children;
-        } else {
-          // Node's `collapsed` property determines appending of `children` for subsequent renders.
-          return d.__rd3t.collapsed ? null : d.children;
-        }
-      })
+      hierarchy(this.state.data[0], d => (d.__rd3t.collapsed ? null : d.children))
     );
     let nodes = rootNode.descendants();
     const links = rootNode.links();
@@ -498,7 +489,6 @@ class Tree extends React.Component<TreeProps, TreeState> {
             transform={`translate(${translate.x},${translate.y}) scale(${scale})`}
           >
             {links.map((linkData, i) => {
-              // console.log(linkData);
               return (
                 <Link
                   key={'link-' + i}
@@ -516,7 +506,6 @@ class Tree extends React.Component<TreeProps, TreeState> {
             })}
 
             {nodes.map(({ data, x, y, parent, ...rest }, i) => {
-              // console.log({ data, x, y, parent, ...rest });
               return (
                 <Node
                   key={'node-' + i}

src/Tree/tests/index.test.js

@@ -245,6 +245,17 @@ describe('<Tree />', () => {
       const renderedComponent = shallow(<Tree data={mockTree_D1N2_D2N2} initialDepth={0} />);
       expect(renderedComponent.find(Node).length).toBe(1);
     });
+
+    it('increases tree depth by no more than 1 level when a node is expanded after initialising to `initialDepth`', () => {
+      const renderedComponent = mount(<Tree data={mockTree_D1N2_D2N2} initialDepth={0} />);
+      expect(renderedComponent.find(Node).length).toBe(1);
+      renderedComponent
+        .find(Node)
+        .first()
+        .find('circle')
+        .simulate('click');
+      expect(renderedComponent.find(Node).length).toBe(3);
+    });
   });
 
   describe('zoomable', () => {